upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-13 00:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the petal apothecary eating buckets. Also it being able to have water AND lava at once, what's up with that? Closes #594

Browse Source
This commit is contained in:
Lizbeth Rika committed 2015-02-22 13:48:58 +00:00
1 parent eebab9835d
commit 6f8fabe402
1 file changed
+11 -6
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/vazkii/botania/common/block/BlockAltar.java
+11 -6
View File
@@ -104,15 +104,20 @@ public class BlockAltar extends BlockModContainer implements ILexiconable {
par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack));
tile.setLava(true);
tile.setWater(false);
par1World.func_147453_f(par2, par3, par4, this);
return true;
} else if(stack != null && stack.getItem() == Items.bucket) {
if (!par5EntityPlayer.capabilities.isCreativeMode)
par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack));
else
par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, new ItemStack(Items.water_bucket));
tile.setWater(false);
} else if(stack != null && stack.getItem() == Items.bucket && (tile.hasWater || tile.hasLava)) {
ItemStack bucket = tile.hasLava ? new ItemStack(Items.lava_bucket) : new ItemStack(Items.water_bucket);
if(stack.stackSize == 1)
par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, bucket);
else if(!par5EntityPlayer.inventory.addItemStackToInventory(bucket))
par5EntityPlayer.dropPlayerItemWithRandomChoice(bucket, false);
if(tile.hasLava)
tile.setLava(false);
else tile.setWater(false);
par1World.func_147453_f(par2, par3, par4, this);
return true;