Anvilcraft/buildcraft
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #98 from CovertJaguar/patch-1

Browse source 
Added support for non-standard capacity liquid container filling.
This commit is contained in:
SirSengir 2012-07-14 06:56:57 -07:00
parent 69412830a7 5e5c3dba08
commit 29b074acf5
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/net/minecraft/src/buildcraft/factory/BlockTank.java
View file

@ -110,13 +110,14 @@ public class BlockTank extends BlockContainer implements ITextureProvider {
int qty = tank.empty(BuildCraftAPI.BUCKET_VOLUME, false); int qty = tank.empty(BuildCraftAPI.BUCKET_VOLUME, false);
if(filled != null && qty >= BuildCraftAPI.BUCKET_VOLUME){ LiquidStack liquid = LiquidManager.getLiquidForFilledItem(filled);
if(liquid != null && qty >= liquid.amount){
if(current.stackSize > 1 && !entityplayer.inventory.addItemStackToInventory(filled)){ if(current.stackSize > 1 && !entityplayer.inventory.addItemStackToInventory(filled)){
return false; return false;
} }
entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem, entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem,
Utils.consumeItem(current)); Utils.consumeItem(current));
tank.empty(BuildCraftAPI.BUCKET_VOLUME, true); tank.empty(liquid.amount, true);
return true; return true;
} }
} }