dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
raoulvdberge
2018-11-24 21:37:03 +01:00
parent d2d7cd6944
commit 1005843d86
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -1,5 +1,8 @@
# Refined Storage Changelog # 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 ### 1.6.10
- Fixed client FPS stalling when using "@" mod search in the Grid (raoulvdberge) - Fixed client FPS stalling when using "@" mod search in the Grid (raoulvdberge)
- Fixed client FPS stalling when using "#" tooltip search in the Grid (raoulvdberge) - Fixed client FPS stalling when using "#" tooltip search in the Grid (raoulvdberge)

2
build.gradle
View File

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

3
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java
View File

@@ -160,8 +160,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
INetworkNodeProxy otherNodeProxy = NETWORK_NODE_PROXY_CAPABILITY.cast(tile.getCapability(NETWORK_NODE_PROXY_CAPABILITY, side)); INetworkNodeProxy otherNodeProxy = NETWORK_NODE_PROXY_CAPABILITY.cast(tile.getCapability(NETWORK_NODE_PROXY_CAPABILITY, side));
INetworkNode otherNode = otherNodeProxy.getNode(); 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().equals(network)) {
if (otherNode.getNetwork() != null && otherNode.getNetwork() != network) {
if (action == Action.PERFORM) { if (action == Action.PERFORM) {
dropConflictingBlock(world, tile.getPos()); dropConflictingBlock(world, tile.getPos());
} }