mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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
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/ensureServerConversions-API.patch
View file

@ -29,7 +29,7 @@ index 4ff149fd..bb3f7cdc 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 9d9df827..8d9ebcb3 100644
index 180c292f..ca6d1233 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 {