From 516a02b8bb5010ee720a2d955b8ee4297e6f9095 Mon Sep 17 00:00:00 2001 From: Wesley Wolfe Date: Thu, 23 Jan 2014 23:02:40 -0600 Subject: [PATCH] Fix stacking for items after setting empty meta. Fixes BUKKIT-5331 ItemStacks do not stack if one has null for a tag, while the other has an empty tag. In CraftItemStack, if you set an item to an empty ItemMeta, it will create an empty tag for the internal ItemStack. This changes the setItemMeta function to check for empty meta, and then use null for the tag instead of an empty NBTTagCompound. --- .../java/org/bukkit/craftbukkit/inventory/CraftItemStack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java index 04ae4ec8b7..704be690c8 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -360,7 +360,7 @@ public final class CraftItemStack extends ItemStack { if (item == null) { return false; } - if (itemMeta == null) { + if (CraftItemFactory.instance().equals(itemMeta, null)) { item.tag = null; return true; }