Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
This commit is contained in:
commit
de81d57c96
1 changed files with 5 additions and 2 deletions
|
@ -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";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue