SPIGOT-279: Fix all metadata being cleared for items that support blockEntityTag on material mis-match

2 files changed, 1 insertions, 8 deletions

diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
index b46d3b5c..0f89623d 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -103,13 +103,6 @@ public final class CraftItemFactory implements ItemFactory {
         case HOPPER:
         case REDSTONE_COMPARATOR:
         case FLOWER_POT_ITEM:
-            if (meta instanceof CraftMetaTileEntity) {
-                CraftMetaTileEntity te = (CraftMetaTileEntity) meta;
-                if (te.material != material) {
-                    return new CraftMetaTileEntity((CraftMetaTileEntity) null, material);
-                }
-                return meta;
-            }
             return new CraftMetaTileEntity(meta, material);
         default:
             return new CraftMetaItem(meta);
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTileEntity.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTileEntity.java
index fc293741..6718f96e 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTileEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTileEntity.java
@@ -20,7 +20,7 @@ public class CraftMetaTileEntity extends CraftMetaItem {
         super(meta);
         this.material = material;
 
-        if (!(meta instanceof CraftMetaTileEntity)) {
+        if (!(meta instanceof CraftMetaTileEntity) || ((CraftMetaTileEntity) meta).material != material) {
             blockEntityTag = null;
             return;
         }