twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-05 22:52:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update upstream B/CB

Browse Source 
--- work/Bukkit
Submodule work/Bukkit 538ceaff..d6b23768:
  > SPIGOT-5534: ItemStack copy constructor can cause legacy layer to load

--- work/CraftBukkit
Submodule work/CraftBukkit efd6cf55..a81f6ed3:
  > SPIGOT-5532: Material.values() yields an exception
This commit is contained in:
Zach Brown
2020-01-21 21:06:28 -06:00
parent a55f66b607
commit 1b14d02fe2
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-API-Patches/Add-getI18NDisplayName-API.patch
View File

@@ -29,7 +29,7 @@ index bb3f7cdc..3cada348 100644
// Paper end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 8d9ebcb3..65aa1c4e 100644
index ca6d1233..8adf9399 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {