From d2efbd56948cace644105ebda7b610485496e003 Mon Sep 17 00:00:00 2001 From: Henry Loenwind Date: Tue, 12 Jul 2016 04:58:55 +0200 Subject: [PATCH] Backport: Fix for inventory panel creating 'phantom items' (#3508) * Fix for inventory panel creating 'phantom items' --- .../enderio/machine/invpanel/InventoryDatabase.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java index f29c9463..786b753e 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java @@ -55,7 +55,7 @@ public abstract class InventoryDatabase { if(nbt == null && itemID < SIMPLE_MAX_ITEMID && meta < SIMPLE_MAX_META) { return getSimpleItem(itemID, meta, create); } else { - return getComplexItem(itemID, meta, nbt); + return getComplexItem(itemID, meta, nbt, create); } } @@ -66,11 +66,11 @@ public abstract class InventoryDatabase { return createItemEntry(dbId, hash, itemID, meta, nbt); } - private ItemEntry getComplexItem(int itemID, int meta, NBTTagCompound nbt) { + private ItemEntry getComplexItem(int itemID, int meta, NBTTagCompound nbt, boolean create) { int hash = computeComplexHash(itemID, meta, nbt); ItemEntryKey key = new ItemEntryKey(hash, itemID, meta, nbt); ItemEntry entry = complexRegistry.get(key); - if(entry == null) { + if(entry == null && create) { if(nbt != null) { nbt = (NBTTagCompound) nbt.copy(); }