Update upstream B/CB
--- 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:
parent
a55f66b607
commit
1b14d02fe2
7 changed files with 7 additions and 7 deletions
|
@ -105,7 +105,7 @@ index 3cada348..03ba2265 100644
|
|||
|
||||
/**
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
index dfe52817..19e0852c 100644
|
||||
index f2c3d2ac..5426e7c2 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -0,0 +0,0 @@ import java.util.Set; // Paper
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue