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

Should fix crashes

Browse Source
This commit is contained in:
raoulvdberge
2017-02-03 20:45:28 +01:00
parent c8def98677
commit ef66df9556
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
View File

@@ -190,8 +190,8 @@ public abstract class NetworkNode implements INetworkNode, INetworkNeighborhoodA
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
return o instanceof NetworkNode return o instanceof NetworkNode
&& holder.pos().equals(((NetworkNode) o).holder.pos()) && holder.pos().equals(((NetworkNode) o).holder.pos())
&& holder.world().provider.getDimension() == ((NetworkNode) o).holder.world().provider.getDimension(); && holder.world().provider.getDimension() == ((NetworkNode) o).holder.world().provider.getDimension();
} }
@Override @Override

20
src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
View File

@@ -1,6 +1,5 @@
package com.raoulvdberge.refinedstorage.tile; package com.raoulvdberge.refinedstorage.tile;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy;
import com.raoulvdberge.refinedstorage.api.util.IWrenchable; import com.raoulvdberge.refinedstorage.api.util.IWrenchable;
@@ -44,18 +43,7 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
getNode().update(); getNode().update();
} }
if (getNode().getHolder().world() != null) { super.update();
super.update();
}
}
@Override
public void onLoad() {
super.onLoad();
if (getNode().getHolder().world() == null) {
getNode().setHolder(this);
}
} }
@Override @Override
@@ -122,12 +110,16 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
public N getNode() { public N getNode() {
INetworkNodeManager manager = API.instance().getNetworkNodeManager(getWorld().provider.getDimension()); INetworkNodeManager manager = API.instance().getNetworkNodeManager(getWorld().provider.getDimension());
INetworkNode node = manager.getNode(pos); NetworkNode node = (NetworkNode) manager.getNode(pos);
if (node == null) { if (node == null) {
manager.setNode(pos, node = createNode()); manager.setNode(pos, node = createNode());
} }
if (node.getHolder().world() == null) {
node.setHolder(this);
}
return (N) node; return (N) node;
} }