From 2cf3e979dfd9460a73fc297ab34b19486237b3ab Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Sat, 12 Sep 2015 06:46:08 +0200 Subject: [PATCH] Logic fix for reading the current task from nbt getCompoundTag() never returns null, it returns a new empty object instead --- .../crazypants/enderio/machine/AbstractPoweredTaskEntity.java | 2 +- src/main/java/crazypants/enderio/machine/PoweredTask.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 6aefd841..c289815d 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -363,7 +363,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt @Override public void readCustomNBT(NBTTagCompound nbtRoot) { super.readCustomNBT(nbtRoot); - currentTask = createTask(nbtRoot.getCompoundTag("currentTask")); + currentTask = nbtRoot.hasKey("currentTask") ? createTask(nbtRoot.getCompoundTag("currentTask")) : null; String uid = nbtRoot.getString("lastCompletedRecipe"); lastCompletedRecipe = MachineRecipeRegistry.instance.getRecipeForUid(uid); } diff --git a/src/main/java/crazypants/enderio/machine/PoweredTask.java b/src/main/java/crazypants/enderio/machine/PoweredTask.java index 978b482c..30b7223f 100644 --- a/src/main/java/crazypants/enderio/machine/PoweredTask.java +++ b/src/main/java/crazypants/enderio/machine/PoweredTask.java @@ -147,10 +147,6 @@ public class PoweredTask implements IPoweredTask { } public static IPoweredTask readFromNBT(NBTTagCompound nbtRoot) { - if(nbtRoot == null) { - return null; - } - IMachineRecipe recipe; float usedEnergy = nbtRoot.getFloat(KEY_USED_ENERGY);