From 0614ea6dbf9d476e57eb9877028f7fd16bc8d51b Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Mon, 16 Oct 2017 21:14:31 +0200
Subject: [PATCH] Fixed crash with External Storage, fixes #1490

---
 CHANGELOG.md                                           |  1 +
 .../refinedstorage/block/BlockExternalStorage.java     | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0372a9d3d..d131a3d32 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### 1.5.21
 - Updated Portuguese (Brazilian) translation (Pinz714)
+- Fixed crash with External Storage (raoulvdberge)
 
 ### 1.5.20
 - Restore MC 1.12.0 compatibility (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java
index 269b80f73..7e5e4d0c4 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java
@@ -88,10 +88,14 @@ public class BlockExternalStorage extends BlockCable {
         super.neighborChanged(state, world, pos, block, fromPos);
 
         if (!world.isRemote) {
-            NetworkNodeExternalStorage externalStorage = ((TileExternalStorage) world.getTileEntity(pos)).getNode();
+            TileEntity tile = world.getTileEntity(pos);
 
-            if (externalStorage.getNetwork() != null) {
-                externalStorage.updateStorage(externalStorage.getNetwork());
+            if (tile instanceof TileExternalStorage) {
+                NetworkNodeExternalStorage externalStorage = ((TileExternalStorage) tile).getNode();
+
+                if (externalStorage.getNetwork() != null) {
+                    externalStorage.updateStorage(externalStorage.getNetwork());
+                }
             }
         }
     }