From bdf725ea5b0f837466ba26480495ce9c80e25a3e Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Tue, 30 Jul 2013 21:55:34 -0400 Subject: [PATCH] Fixed a redstone issue with the pumps The construction pump would not turn on due to the super.can() needing redstone to be off while con pump needed it to be on. --- .../dark/fluid/common/pump/TileEntityConstructionPump.java | 6 ------ .../dark/fluid/common/pump/TileEntityStarterPump.java | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java b/src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java index 4a3b26d6..535574e6 100644 --- a/src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java +++ b/src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java @@ -78,12 +78,6 @@ public class TileEntityConstructionPump extends TileEntityStarterPump implements return null; } - @Override - public boolean canRun() - { - return super.canRun() && this.worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord); - } - /** Gets the nextDrain in the list * * @param inputTile - input tile must be an instance of INetworkPipe diff --git a/src/minecraft/dark/fluid/common/pump/TileEntityStarterPump.java b/src/minecraft/dark/fluid/common/pump/TileEntityStarterPump.java index 4771ad0c..f715c379 100644 --- a/src/minecraft/dark/fluid/common/pump/TileEntityStarterPump.java +++ b/src/minecraft/dark/fluid/common/pump/TileEntityStarterPump.java @@ -57,7 +57,7 @@ public class TileEntityStarterPump extends TileEntityMachine implements IToolRea { super.updateEntity(); - if (this.ticks % 20 == 0) + if (this.ticks % 10 == 0) { this.currentWorldEdits = 0; @@ -191,7 +191,7 @@ public class TileEntityStarterPump extends TileEntityMachine implements IToolRea @Override public boolean canRun() { - return super.canRun() && !worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord); + return super.canRun() && worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord); } @Override