From 1e01243973a73bd8d4ced4942a3799f201d2311e Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Wed, 9 Nov 2016 13:41:20 +0100
Subject: [PATCH] Protect reads from world being null

---
 .../java/com/raoulvdberge/refinedstorage/tile/TileBase.java   | 4 +++-
 .../com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java   | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java
index f57b165e1..f2affdc47 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java
@@ -32,7 +32,9 @@ public abstract class TileBase extends TileEntity implements ITickable {
     }
 
     public void updateBlock() {
-        worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 1 | 2);
+        if (worldObj != null) {
+            worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 1 | 2);
+        }
     }
 
     public void setDirection(EnumFacing direction) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
index 8a30835e2..35b5cb97f 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
@@ -164,9 +164,7 @@ public class TileDiskDrive extends TileNode implements IItemStorageProvider, IFl
                     network.getFluidStorageCache().invalidate();
                 }
 
-                if (worldObj != null) {
-                    updateBlock();
-                }
+                updateBlock();
             }
         }