From 4b5837cac2e8f9eb804ed1d87e70cae55c3fa920 Mon Sep 17 00:00:00 2001 From: Bears Dot Zone Date: Wed, 13 Dec 2023 08:32:56 -0600 Subject: [PATCH] Fix an edge case pertaining to freshly crafted tanks (#141) * Update dependencies * Replace faulty dummy object logic with object creation * Remove logic that is exiting a function erroneously --- .../crazypants/enderio/machine/AbstractMachineEntity.java | 6 +----- .../java/crazypants/enderio/machine/tank/BlockItemTank.java | 6 ++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 3a20720b..b2a6c256 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -489,11 +489,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio if (stack == null || stack.stackTagCompound == null) { return; } - NBTTagCompound root = stack.stackTagCompound; - if (!root.hasKey("eio.abstractMachine")) { - return; - } - readCommon(root); + readCommon(stack.stackTagCompound); } @Override diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java index d367d2ad..51f61025 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java @@ -71,14 +71,12 @@ public class BlockItemTank extends ItemBlockWithMetadata implements IAdvancedToo EnderIO.blockTank.addDetailedEntries(itemstack, entityplayer, list, flag); } - private static final FluidTank dummy = new SmartTank(FluidRegistry.WATER, 16000); - private FluidTank loadTank(ItemStack stack) { if (stack.hasTagCompound()) { FluidTank tank = TileTank.loadTank(stack.getTagCompound()); - return tank != null ? tank : dummy; + return tank != null ? tank : new SmartTank(FluidRegistry.WATER, 16000); } - return dummy; + return new SmartTank(FluidRegistry.WATER, 16000); } private void saveTank(ItemStack stack, FluidTank tank) {