Force item data to use a tag name. Fixes BUKKIT-4809

The recent Minecraft update rendered the
e20e50f85083dc53cb5456254bcf5781ef750daa fix incorrect by adding a
compound name to the base tag in some code. This fix changes all uses
of tag changes to explicitly use a name.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 69f81ca1..808860ed 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -117,8 +117,8 @@ public final class ItemStack {
         }
 
         if (nbttagcompound.hasKey("tag")) {
-            // CraftBukkit - clear name from compound and make defensive copy as this data may be coming from the save thread
-            this.tag = (NBTTagCompound) nbttagcompound.getCompound("tag").clone().setName("");
+            // CraftBukkit - make defensive copy as this data may be coming from the save thread
+            this.tag = (NBTTagCompound) nbttagcompound.getCompound("tag").clone();
         }
     }
 
@@ -334,6 +334,11 @@ public final class ItemStack {
     }
 
     public void setTag(NBTTagCompound nbttagcompound) {
+        // CraftBukkit start - Set compound name to "tag," remove discrepancy
+        if (nbttagcompound != null) {
+            nbttagcompound.setName("tag");
+        }
+        // CraftBukkit end
         this.tag = nbttagcompound;
     }