From f38aceddd46251e260d495bcd4e8308745596ab5 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Sun, 9 Jul 2017 21:03:59 +0200
Subject: [PATCH] Fixed crash relating to MCMP

---
 CHANGELOG.md                                                 | 3 +++
 .../refinedstorage/apiimpl/network/node/NetworkNode.java     | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85044ee08..c322b369d 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.5.9
+- Fixed crash relating to MCMP (raoulvdberge)
+
 ### 1.5.8
 - Updated Forge to 2400 (raoulvdberge)
 - Updated Storage Drawers API (raoulvdberge, jaquadro)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
index b95f78d7b..a64b15db6 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
@@ -6,6 +6,8 @@ import com.raoulvdberge.refinedstorage.api.network.INetworkNodeVisitor;
 import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
 import com.raoulvdberge.refinedstorage.api.util.IWrenchable;
 import com.raoulvdberge.refinedstorage.apiimpl.API;
+import com.raoulvdberge.refinedstorage.integration.mcmp.IntegrationMCMP;
+import com.raoulvdberge.refinedstorage.integration.mcmp.RSMCMPAddon;
 import com.raoulvdberge.refinedstorage.tile.TileBase;
 import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode;
 import net.minecraft.block.state.IBlockState;
@@ -191,8 +193,9 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor,
         return direction;
     }
 
+    // @todo: move this data to the network node
     public void resetDirection() {
-        this.direction = ((TileBase) world.getTileEntity(pos)).getDirection();
+        this.direction = ((TileBase) (IntegrationMCMP.isLoaded() ? RSMCMPAddon.unwrapTile(world, pos) : world.getTileEntity(pos))).getDirection();
     }
 
     @Nullable