Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

This commit is contained in:
Aidan C. Brady 2014-03-22 12:24:15 -04:00
commit de81d57c96

View file

@ -209,6 +209,8 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
if(FMLCommonHandler.instance().getEffectiveSide().isServer()) if(FMLCommonHandler.instance().getEffectiveSide().isServer())
{ {
prevTransferAmount = 0;
if(transferDelay == 0) if(transferDelay == 0)
{ {
didTransfer = false; didTransfer = false;
@ -236,7 +238,8 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
if(fluidStored != null) if(fluidStored != null)
{ {
fluidStored.amount -= tickEmit(fluidStored, true); prevTransferAmount = tickEmit(fluidStored, true);
fluidStored.amount -= prevTransferAmount;
if(fluidStored != null && fluidStored.amount <= 0) if(fluidStored != null && fluidStored.amount <= 0)
{ {
@ -470,6 +473,6 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
@Override @Override
public String getFlow() public String getFlow()
{ {
return Integer.toString(prevTransferAmount); return Integer.toString(prevTransferAmount) + "mB/t";
} }
} }