Fix a bug in NBT usage (#127)

GTNewHorizons · Jul 5, 2023 · ebcbef8 · ebcbef8
1 parent 1717d38
commit ebcbef8
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/crazypants/enderio/machine/painter/TileEntityPainter.java b/src/main/java/crazypants/enderio/machine/painter/TileEntityPainter.java
@@ -96,9 +96,10 @@ protected int getNumCanMerge(ItemStack itemStack, ItemStack result) {
             // next result is a different item type
             return 0;
         } else if (result.hasTagCompound() && inventory[2].hasTagCompound()) {
-            int cookedId = result.getTagCompound().getInteger(BlockPainter.KEY_SOURCE_BLOCK_ID);
-            int invId = inventory[2].getTagCompound().getInteger(BlockPainter.KEY_SOURCE_BLOCK_ID);
-            if (cookedId != invId) {
+            if (inventory[2].getTagCompound().hasKey("Items")) return 0; // presence of internal items
+            String cookedId = result.getTagCompound().getString(BlockPainter.KEY_SOURCE_BLOCK_ID);
+            String invId = inventory[2].getTagCompound().getString(BlockPainter.KEY_SOURCE_BLOCK_ID);
+            if (!cookedId.equals(invId)) {
                 // next result has a different source item than the current one
                 return 0;
             }