diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 33d65c74..7b61c1b2 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -4,6 +4,7 @@ Version 2.2.4 Bugs - #1409 Energy conduit and capacitor interaction bug +- #1412 Nullpointer Exception in console - Fixed infinite power bug ------------------------------------------------------ diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java index 9f29b0b4..9a0caf85 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java @@ -30,7 +30,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity super.updateEntity(); - if(worldObj == null) { // sanity check + if(worldObj == null || worldObj.isRemote) { // sanity check return; } boolean powerChanged = (lastSyncPowerStored != storedEnergyRF && worldObj.getTotalWorldTime() % 5 == 0);