Merge remote-tracking branch 'origin/mc1.9.4' into mc1.9.4

2016-06-19 17:28:42 +02:00
parent d3a4bf095c ab40f040fc
commit 6a7194a929
1 changed files with 1 additions and 1 deletions
--- a/src/main/java/refinedstorage/tile/TileMachine.java
+++ b/src/main/java/refinedstorage/tile/TileMachine.java
@@ -81,7 +81,7 @@ public abstract class TileMachine extends TileBase implements ISynchronizedConta
    }

    public void onConnected(World world, TileController controller) {
-        if (tryConnect(controller)) {
+        if (tryConnect(controller) && block != null) {
            world.notifyNeighborsOfStateChange(pos, block);
        }
    }