Merge remote-tracking branch 'bearsdotzone/master' into dev

GTNewHorizons · Dec 12, 2023 · a60ed2f · a60ed2f
2 parents 555815a + 21c906e
commit a60ed2f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java
@@ -489,11 +489,7 @@ public void readFromItemStack(ItemStack stack) {
  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
@@ -71,14 +71,12 @@ public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, L
  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) {