From 1b998258d9477ee4bdc0962542223bf481f709ba Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 20 Dec 2015 19:22:53 +0100 Subject: [PATCH] make more clear --- src/main/java/storagecraft/tile/TileCable.java | 10 +++------- src/main/java/storagecraft/tile/TileController.java | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/storagecraft/tile/TileCable.java b/src/main/java/storagecraft/tile/TileCable.java index 07f231afd..6af965b14 100644 --- a/src/main/java/storagecraft/tile/TileCable.java +++ b/src/main/java/storagecraft/tile/TileCable.java @@ -33,7 +33,7 @@ public class TileCable extends TileBase { return worldObj.getBlockMetadata(xCoord, yCoord, zCoord) == 1; } - public boolean isActive() { + public boolean isEnabled() { if (isSensitiveCable()) { return !isPowered(); } @@ -73,12 +73,8 @@ public class TileCable extends TileBase { machines.add((TileMachine) tile); visited.add(Vec3.createVectorHelper(x, y, z)); - } else if (tile instanceof TileCable) { - TileCable cable = (TileCable) tile; - - if (cable.isActive()) { - ((TileCable) tile).addMachines(visited, machines, controller); - } + } else if (tile instanceof TileCable && ((TileCable) tile).isEnabled()) { + ((TileCable) tile).addMachines(visited, machines, controller); } else if (tile instanceof TileController && (x != controller.xCoord || y != controller.yCoord || z != controller.zCoord)) { worldObj.createExplosion(null, x, y, z, 4.5f, true); } diff --git a/src/main/java/storagecraft/tile/TileController.java b/src/main/java/storagecraft/tile/TileController.java index b6812a681..a73d2afb2 100644 --- a/src/main/java/storagecraft/tile/TileController.java +++ b/src/main/java/storagecraft/tile/TileController.java @@ -53,7 +53,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor if (tile instanceof TileCable) { TileCable cable = (TileCable) tile; - if (cable.isActive()) { + if (cable.isEnabled()) { cable.addMachines(visitedCables, newMachines, this); } }