diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java index c6fe23c4..d533b428 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java @@ -98,17 +98,27 @@ public class CapBankNetwork implements ICapBankNetwork { protected void setNetwork(World world, TileCapBank cap) { - if(cap != null && cap.setNetwork(this)) { - addMember(cap); - Collection neighbours = NetworkUtil.getNeigbours(cap); - for (TileCapBank neighbour : neighbours) { - if(neighbour.getNetwork() == null) { - setNetwork(world, neighbour); - } else if(neighbour.getNetwork() != this) { - neighbour.getNetwork().destroyNetwork(); - setNetwork(world, neighbour); + if(cap == null) { + return; + } + Set work = new HashSet(); + for(;;) { + ICapBankNetwork network = cap.getNetwork(); + if(network != this) { + if(network != null) { + network.destroyNetwork(); + } + if(cap.setNetwork(this)) { + addMember(cap); + NetworkUtil.getNeigbours(cap, work); } } + if(work.isEmpty()) { + return; + } + Iterator iter = work.iterator(); + cap = iter.next(); + iter.remove(); } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java index ae78be9d..53f24dfe 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java @@ -32,7 +32,12 @@ public class NetworkUtil { if(!cap.getType().isMultiblock()) { return Collections.emptyList(); } - List res = new ArrayList(); + Collection res = new ArrayList(); + getNeigbours(cap, res); + return res; + } + + public static void getNeigbours(TileCapBank cap, Collection res) { for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { BlockCoord bc = cap.getLocation().getLocation(dir); TileEntity te = cap.getWorldObj().getTileEntity(bc.x, bc.y, bc.z); @@ -43,7 +48,6 @@ public class NetworkUtil { } } } - return res; } private static boolean reuseNetwork(TileCapBank cap, Collection neighbours, World world) {