From ac16acb59a3693e25145ca967310b6c680acb86b Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 22 Mar 2016 20:37:16 -0400 Subject: [PATCH] Fixed pumps not outputting --- .../common/tile/TileEntityElectricPump.java | 18 +++++------------- .../client/render/RenderWindGenerator.java | 2 +- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index b892f6189..5d580a271 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -148,20 +148,12 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(!worldObj.isRemote && fluidTank.getFluid() != null) { - for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) + TileEntity tileEntity = Coord4D.get(this).getFromSide(ForgeDirection.UP).getTileEntity(worldObj); + + if(tileEntity instanceof IFluidHandler) { - TileEntity tileEntity = Coord4D.get(this).getFromSide(orientation).getTileEntity(worldObj); - - if(tileEntity instanceof IFluidHandler) - { - FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(256*upgradeComponent.getUpgrades(Upgrade.SPEED), fluidTank.getFluidAmount())); - fluidTank.drain(((IFluidHandler)tileEntity).fill(orientation.getOpposite(), toDrain, true), true); - - if(fluidTank.getFluid() == null || fluidTank.getFluid().amount <= 0) - { - break; - } - } + FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(256*(upgradeComponent.getUpgrades(Upgrade.SPEED)+1), fluidTank.getFluidAmount())); + fluidTank.drain(((IFluidHandler)tileEntity).fill(ForgeDirection.DOWN, toDrain, true), true); } } } diff --git a/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java b/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java index f8ecaa6c6..35744a2a2 100644 --- a/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java @@ -39,7 +39,7 @@ public class RenderWindGenerator extends TileEntitySpecialRenderer if(!Mekanism.proxy.isPaused() && tileEntity.getWorldObj().canBlockSeeTheSky(tileEntity.xCoord, tileEntity.yCoord+4, tileEntity.zCoord)) { - tileEntity.angle = (tileEntity.angle+((tileEntity.yCoord+4)/256F)*8) % 360; + tileEntity.angle = (tileEntity.angle+((tileEntity.yCoord+4F)/256F)*8) % 360; } model.render(0.0625F, tileEntity.angle);