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

fix multiple controllers not always exploding

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-09 16:53:20 +01:00
parent ec81755506
commit 9d9208ca17
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/storagecraft/tile/TileCable.java
View File

@@ -26,11 +26,11 @@ public class TileCable extends TileSC {
return true; return true;
} }
public List<IMachine> findMachines() { public List<IMachine> findMachines(TileController controller) {
return findMachines(new ArrayList(), true); return findMachines(new ArrayList(), controller);
} }
private List<IMachine> findMachines(List<Vec3> visited, boolean ignoreController) { private List<IMachine> findMachines(List<Vec3> visited, TileController controller) {
List<IMachine> machines = new ArrayList<IMachine>(); List<IMachine> machines = new ArrayList<IMachine>();
for (Vec3 visitedCable : visited) { for (Vec3 visitedCable : visited) {
@@ -47,9 +47,9 @@ public class TileCable extends TileSC {
if (tile instanceof IMachine) { if (tile instanceof IMachine) {
machines.add((IMachine) tile); machines.add((IMachine) tile);
} else if (tile instanceof TileCable) { } else if (tile instanceof TileCable) {
machines.addAll(((TileCable) tile).findMachines(visited, false)); machines.addAll(((TileCable) tile).findMachines(visited, controller));
} else if (tile instanceof TileController && !ignoreController) { } else if (tile instanceof TileController && (tile.xCoord != controller.xCoord || tile.yCoord != controller.yCoord || tile.zCoord != controller.zCoord)) {
worldObj.createExplosion(null, xCoord, yCoord, zCoord, 4.5f, true); worldObj.createExplosion(null, tile.xCoord, tile.yCoord, tile.zCoord, 4.5f, true);
} }
} }

2
src/main/java/storagecraft/tile/TileController.java
View File

@@ -34,7 +34,7 @@ public class TileController extends TileSC implements IEnergyHandler, INetworkTi
TileEntity tile = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ); TileEntity tile = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ);
if (tile instanceof TileCable) { if (tile instanceof TileCable) {
machines.addAll(((TileCable) tile).findMachines()); machines.addAll(((TileCable) tile).findMachines(this));
} }
} }