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

Temporary fix for multiple buffer type merges

Browse source
This commit is contained in:
Aidan C. Brady 2015-04-15 12:52:07 -04:00
parent 2c53ce6956
commit 308233720c
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/mekanism/api/gas/GasNetwork.java
View file

@ -98,6 +98,7 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
public void absorbBuffer(IGridTransmitter<IGasHandler, GasNetwork> transmitter) public void absorbBuffer(IGridTransmitter<IGasHandler, GasNetwork> transmitter)
{ {
Object b = transmitter.getBuffer(); Object b = transmitter.getBuffer();
if(!(b instanceof GasStack) || ((GasStack)b).getGas() == null || ((GasStack)b).amount == 0) if(!(b instanceof GasStack) || ((GasStack)b).getGas() == null || ((GasStack)b).amount == 0)
{ {
return; return;
@ -111,9 +112,12 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
return; return;
} }
// if(!gas.isGasEqual(buffer)) Mekanism.logger.warn("Gas type " + gas.getGas().getName() + " of buffer doesn't match type " + buffer.getGas().getName() + " of absorbing network"); //TODO better multiple buffer impl
if(buffer.isGasEqual(gas))
buffer.amount += gas.amount; {
buffer.amount += gas.amount;
}
gas.amount = 0; gas.amount = 0;
} }

12
src/main/java/mekanism/common/FluidNetwork.java
View file

@ -82,6 +82,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
public void absorbBuffer(IGridTransmitter<IFluidHandler, FluidNetwork> transmitter) public void absorbBuffer(IGridTransmitter<IFluidHandler, FluidNetwork> transmitter)
{ {
Object b = transmitter.getBuffer(); Object b = transmitter.getBuffer();
if(!(b instanceof FluidStack) || ((FluidStack)b).getFluid() == null || ((FluidStack)b).amount == 0) if(!(b instanceof FluidStack) || ((FluidStack)b).getFluid() == null || ((FluidStack)b).amount == 0)
{ {
return; return;
@ -94,10 +95,13 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
buffer = fluid.copy(); buffer = fluid.copy();
return; return;
} }
if(!fluid.isFluidEqual(buffer)) Mekanism.logger.warn("Fluid type " + fluid.getFluid().getName() + " of buffer doesn't match type " + buffer.getFluid().getName() + " of absorbing network"); //TODO better multiple buffer impl
if(buffer.isFluidEqual(fluid))
buffer.amount += fluid.amount; {
buffer.amount += fluid.amount;
}
fluid.amount = 0; fluid.amount = 0;
} }