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

Merge pull request #99 from CovertJaguar/patch-2

Browse source 
Added putting liquid in the tank from non-standard capacity containers.
This commit is contained in:
SirSengir 2012-07-14 07:54:31 -07:00
commit 6566cae096
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,12 +93,12 @@ public class BlockTank extends BlockContainer implements ITextureProvider {
ItemStack current = entityplayer.inventory.getCurrentItem();
if (current != null) {
int liquidId = LiquidManager.getLiquidIDForFilledItem(current);
LiquidStack liquid = LiquidManager.getLiquidForFilledItem(current);
TileTank tank = (TileTank) world.getBlockTileEntity(i, j, k);
if (liquidId != 0) {
int qty = tank.fill(Orientations.Unknown, BuildCraftAPI.BUCKET_VOLUME, liquidId, true);
if (liquid != null) {
int qty = tank.fill(Orientations.Unknown, liquid.amount, liquid.itemID, true);
if (qty != 0 && !BuildCraftCore.debugMode) {
entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem,
@ -111,7 +111,7 @@ public class BlockTank extends BlockContainer implements ITextureProvider {
int qty = tank.empty(BuildCraftAPI.BUCKET_VOLUME, false);
LiquidStack liquid = LiquidManager.getLiquidForFilledItem(filled);
liquid = LiquidManager.getLiquidForFilledItem(filled);
if(liquid != null && qty >= liquid.amount){
if(current.stackSize > 1 && !entityplayer.inventory.addItemStackToInventory(filled)){
return false;