diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index e1ecd7fb..4b9c3d23 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,10 @@ +------------------------------------------------------ +Version 2.1.6 +------------------------------------------------------ + +Bugs +- #1142 Dimension Tranciever crash, NullPointerException + ------------------------------------------------------ Version 2.1.5 ------------------------------------------------------ diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 8afbc04f..b054a274 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -146,7 +146,9 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity { public int usePower(int wantToUse) { int used = Math.min(getEnergyStored(), wantToUse); setEnergyStored( Math.max(0, getEnergyStored() - used)); - currentTask.update(used); + if(currentTask != null) { + currentTask.update(used); + } return used; }