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

.

Browse source
This commit is contained in:
RSeifert 2013-03-04 20:44:16 -05:00
parent f7c6588335
commit fc6fbcb560
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/minecraft/fluidmech/common/machines/TileEntityPump.java
View file

@ -88,7 +88,7 @@ public class TileEntityPump extends TileEntityElectricityReceiver implements IPa
{ {
super.updateEntity(); super.updateEntity();
if (!this.worldObj.isRemote) if (!this.worldObj.isRemote && !this.isDisabled())
{ {
// consume/give away stored units // consume/give away stored units
this.chargeUp(); this.chargeUp();
@ -195,22 +195,17 @@ public class TileEntityPump extends TileEntityElectricityReceiver implements IPa
{ {
return false; return false;
} }
else if ((LiquidHandler.getFromBlockID(worldObj.getBlockId(x, y, z)) == null || LiquidHandler.getFromBlockID(worldObj.getBlockId(x, y, z)) == LiquidHandler.unkown))
if (this.isDisabled())
{ {
return false; return false;
} }
else
if ((LiquidHandler.getFromBlockID(worldObj.getBlockId(x, y, z)) == null || LiquidHandler.getFromBlockID(worldObj.getBlockId(x, y, z)) == LiquidHandler.unkown)) if (blockID == Block.waterMoving.blockID || blockID == Block.lavaMoving.blockID)
{ {
return false; return false;
} }
else if (blockID == Block.waterStill.blockID || blockID == Block.waterStill.blockID)
if (blockID == Block.waterMoving.blockID || blockID == Block.lavaStill.blockID)
{
return false;
}
if (blockID == Block.waterStill.blockID || blockID == Block.waterStill.blockID)
{ {
} }
@ -228,7 +223,7 @@ public class TileEntityPump extends TileEntityElectricityReceiver implements IPa
int blockID = worldObj.getBlockId(loc.intX(), loc.intY(), loc.intZ()); int blockID = worldObj.getBlockId(loc.intX(), loc.intY(), loc.intZ());
int meta = worldObj.getBlockMetadata(loc.intX(), loc.intY(), loc.intZ()); int meta = worldObj.getBlockMetadata(loc.intX(), loc.intY(), loc.intZ());
LiquidData resource = LiquidHandler.getFromBlockID(blockID); LiquidData resource = LiquidHandler.getFromBlockID(blockID);
if (resource == color.getLiquidData() && meta == 0 && this.fillTarget.fill(back, resource.getStack(), false) != 0) if (resource == color.getLiquidData() && meta == 0 && this.fillTarget.fill(back, resource.getStack(), false) != 0)
{ {
@ -278,7 +273,7 @@ public class TileEntityPump extends TileEntityElectricityReceiver implements IPa
@Override @Override
public boolean getCanPressureTo(LiquidData type, ForgeDirection dir) public boolean getCanPressureTo(LiquidData type, ForgeDirection dir)
{ {
return dir == this.side.getOpposite() && this.color.isValidLiquid(type.getStack()); return dir == this.side.getOpposite() && this.color.isValidLiquid(type.getStack());
} }