RS 1.6.11: Fixed blocks neighboring a controller breaking when returning from a dimension in a unchunkloaded area. Fixes #2101. Replaces a fix for #2069.

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.6.11
+- Fixed blocks neighboring a controller breaking when returning from a dimension in a unchunkloaded area (raoulvdberge)
+
 ### 1.6.10
 - Fixed client FPS stalling when using "@" mod search in the Grid (raoulvdberge)
 - Fixed client FPS stalling when using "#" tooltip search in the Grid (raoulvdberge)

build.gradle

@@ -16,7 +16,7 @@ apply plugin: 'maven'
 apply plugin: 'maven-publish'
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "1.6.10"
+version = "1.6.11"
 def env = System.getenv()
 if (env.BUILD_NUMBER) {
     version = version + "-" + "${env.BUILD_NUMBER}"

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java

@@ -160,8 +160,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
                 INetworkNodeProxy otherNodeProxy = NETWORK_NODE_PROXY_CAPABILITY.cast(tile.getCapability(NETWORK_NODE_PROXY_CAPABILITY, side));
                 INetworkNode otherNode = otherNodeProxy.getNode();
 
-                // This will work for regular nodes and for controllers too since controllers are internally a INetworkNode (and return themselves in INetworkNode#getNetwork).
-                if (otherNode.getNetwork() != null && otherNode.getNetwork() != network) {
+                if (otherNode.getNetwork() != null && !otherNode.getNetwork().equals(network)) {
                     if (action == Action.PERFORM) {
                         dropConflictingBlock(world, tile.getPos());
                     }