diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index 05ccfe9b..b575c2c5 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -222,10 +222,6 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { @Override public void doUpdate() { - if(worldObj == null) { - return; - } - for (IConduit conduit : conduits) { conduit.updateEntity(worldObj); } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 45d644af..4c7b6cbe 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -233,10 +233,6 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi @Override public void doUpdate() { - if(worldObj == null) { // sanity check - return; - } - if(worldObj.isRemote) { updateEntityClient(); return; diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java index 18c88e2c..828cd871 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java @@ -37,7 +37,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity super.doUpdate(); - if(worldObj == null || worldObj.isRemote) { // sanity check + if (worldObj.isRemote) { return; } boolean powerChanged = (lastSyncPowerStored != storedEnergyRF && shouldDoWorkThisTick(5)); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java index b7031d9d..e059a38e 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java @@ -240,9 +240,6 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerHandle @Override public void doUpdate() { - if(worldObj == null) { // sanity check - return; - } if(worldObj.isRemote) { return; } // else is server, do all logic only on the server diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index 97263017..3fbab123 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -107,7 +107,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle public void doUpdate() { updateArmSwingProgress(); hooverXP(); - if(worldObj != null && !worldObj.isRemote) { + if (!worldObj.isRemote) { getAttackera().onUpdate(); if(inventory[0] != null != hadSword) { worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index 1b88ccc8..a8aa430d 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -196,10 +196,6 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerHa @Override public void doUpdate() { - if(worldObj == null) { // sanity check - return; - } - if(blockMetadata == -1) { isCreative = getBlockMetadata() == 1; } diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java index e6bed0a5..3e2b791d 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -84,7 +84,7 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler, ITank @Override public void doUpdate() { - if(worldObj == null || worldObj.isRemote) { + if (worldObj.isRemote) { return; } diff --git a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java index 382ffc25..9e253e70 100644 --- a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java @@ -86,7 +86,7 @@ public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowe @Override public void doUpdate() { - if(worldObj == null || worldObj.isRemote) { + if (worldObj.isRemote) { return; } collectEnergy(); diff --git a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java index ed172b35..28cf4bcd 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java @@ -96,7 +96,7 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid @Override public void doUpdate() { - if(!registered && worldObj != null && !worldObj.isRemote) { + if (!registered && !worldObj.isRemote) { ServerChannelRegister.instance.register(this); registered = true; removeUnregsiteredChannels(sendChannels); @@ -104,7 +104,7 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid } super.doUpdate(); - if(worldObj != null && !worldObj.isRemote) { + if (!worldObj.isRemote) { railController.doTick(); if(sendChannelsDirty) { PacketHandler.sendToAllAround(new PacketSendRecieveChannelList(this, true), this, 256); diff --git a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java index 49aceadc..518357a3 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java @@ -35,7 +35,7 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower @Override public void doUpdate() { - if(worldObj == null || worldObj.isRemote) { + if (worldObj.isRemote) { return; } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index 43209ce6..ec731ca5 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -91,10 +91,6 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei master.breakNetwork(); } - if (worldObj == null) { - return; - } - if(autoUpdate) { updateConnectedState(true); autoUpdate = false;