From fc537451572c78c3b1e6081a2f94efccff267985 Mon Sep 17 00:00:00 2001 From: tomevoll Date: Mon, 28 Mar 2016 07:06:36 +0200 Subject: [PATCH 1/2] Update TileMachine.java null pointer on worldObj --- src/main/java/refinedstorage/tile/TileMachine.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java index e82e6250c..aa9d8f50e 100755 --- a/src/main/java/refinedstorage/tile/TileMachine.java +++ b/src/main/java/refinedstorage/tile/TileMachine.java @@ -19,7 +19,7 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed private Block originalBlock; public void onConnected(TileController controller) { - if (worldObj.getBlockState(pos).getBlock() == originalBlock) { + if (worldObj != null && worldObj.getBlockState(pos).getBlock() == originalBlock) { markDirty(); connected = true; @@ -31,7 +31,7 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed } public void onDisconnected() { - if (worldObj.getBlockState(pos).getBlock() == originalBlock) { + if (worldObj != null && worldObj.getBlockState(pos).getBlock() == originalBlock) { markDirty(); connected = false; @@ -42,6 +42,12 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed @Override public void update() { + if(worldObj == null) + { + super.update(); + return; + } + if (ticks == 0) { originalBlock = worldObj.getBlockState(pos).getBlock(); } From 3e08be85e7e7044d83a32a943e3505852357011b Mon Sep 17 00:00:00 2001 From: tomevoll Date: Mon, 28 Mar 2016 07:08:01 +0200 Subject: [PATCH 2/2] style change --- src/main/java/refinedstorage/tile/TileMachine.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java index aa9d8f50e..25b3dd24e 100755 --- a/src/main/java/refinedstorage/tile/TileMachine.java +++ b/src/main/java/refinedstorage/tile/TileMachine.java @@ -42,8 +42,7 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed @Override public void update() { - if(worldObj == null) - { + if(worldObj == null) { super.update(); return; }