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

Re-commit Dynamic Tank fix

Browse source
This commit is contained in:
Aidan Brady 2013-07-20 12:17:58 -04:00
parent 26e86c8eee
commit cd53a8b4db
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/common/BlockBasic.java
View file

@ -269,7 +269,7 @@ public class BlockBasic extends Block
FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(itemStack); FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(itemStack);
int max = tileEntity.structure.volume*16000; int max = tileEntity.structure.volume*16000;
if(tileEntity.structure.fluidStored == null || (tileEntity.structure.fluidStored.amount+itemFluid.amount <= max)) if(tileEntity.structure.fluidStored == null || (tileEntity.structure.fluidStored.isFluidEqual(itemFluid) && (tileEntity.structure.fluidStored.amount+itemFluid.amount <= max)))
{ {
if(FluidContainerRegistry.isBucket(itemStack)) if(FluidContainerRegistry.isBucket(itemStack))
{ {