tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed pumps not outputting

Browse source
This commit is contained in:
aidancbrady 2016-03-22 20:37:16 -04:00
parent 461cb79704
commit ac16acb59a
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/mekanism/common/tile/TileEntityElectricPump.java
View file

@ -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);
}
}
}

2
src/main/java/mekanism/generators/client/render/RenderWindGenerator.java
View file

@ -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);