From 1005843d86cd022cf993594755ef99c08bbec514 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 24 Nov 2018 21:37:03 +0100 Subject: [PATCH] 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 | 3 +++ build.gradle | 2 +- .../refinedstorage/apiimpl/network/NetworkNodeGraph.java | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5aaee6b9b..182cdecf2 100755 --- a/CHANGELOG.md +++ b/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) diff --git a/build.gradle b/build.gradle index 5adf32edf..52b1a6f9e 100755 --- a/build.gradle +++ b/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}" diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java index b15dba5d6..d9b85daa5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java +++ b/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()); }