Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Set network to invalidate when merging

Browse source
This commit is contained in:
DarkGuardsman 2013-11-08 17:40:26 -05:00
parent 5fe979c5f0
commit 06c4b331b6
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/dark/core/prefab/tilenetwork/NetworkTileEntities.java
View file

@ -149,17 +149,17 @@ public class NetworkTileEntities implements ITileNetwork
/** Processing that needs too be done before the network merges. Use this to do final network /** Processing that needs too be done before the network merges. Use this to do final network
* merge calculations and to cause network merge failure * merge calculations and to cause network merge failure
* *
* @param network the network that is to merge with this one * @param network the network that is to merge with this one
* @param part the part at which started the network merge. Use this to cause damage if two * @param part the part at which started the network merge. Use this to cause damage if two
* networks merge with real world style failures * networks merge with real world style failures
* *
* @return false if the merge needs to be canceled. * @return false if the merge needs to be canceled.
* *
* Cases in which the network should fail to merge are were the two networks merge with error. * Cases in which the network should fail to merge are were the two networks merge with error.
* Or, in the case of pipes the two networks merge and the merge point was destroyed by * Or, in the case of pipes the two networks merge and the merge point was destroyed by
* combination of liquids. * combination of liquids.
* *
* Ex Lava and water */ * Ex Lava and water */
public boolean preMergeProcessing(ITileNetwork network, INetworkPart part) public boolean preMergeProcessing(ITileNetwork network, INetworkPart part)
{ {
@ -174,6 +174,7 @@ public class NetworkTileEntities implements ITileNetwork
newNetwork.getMembers().addAll(this.getMembers()); newNetwork.getMembers().addAll(this.getMembers());
newNetwork.getMembers().addAll(network.getMembers()); newNetwork.getMembers().addAll(network.getMembers());
newNetwork.onCreated(); newNetwork.onCreated();
this.invalidate();
} }
@Override @Override
@ -215,8 +216,6 @@ public class NetworkTileEntities implements ITileNetwork
} }
newNetwork.onCreated(); newNetwork.onCreated();
} }
this.cleanUpMembers();
this.load();
} }
} }
} }