Merge branch 'master' into experimental

This commit is contained in:
Bernhard Bonigl committed 2014-11-25 21:45:57 +01:00
commit 6ea64191e1
4 files changed
+23 -34

No files matched your search

@@ -98,7 +98,7 @@ public class DryingRack extends InventoryBlock
{
ItemStack decrStack = logic.decrStackSize(0, 1);
if (decrStack != null)
addItemToInventory(player, world, x, y, z, decrStack);
AbilityHelper.spawnItemAtPlayer(player, decrStack);
}
world.markBlockForUpdate(x, y, z);
@@ -106,15 +106,6 @@ public class DryingRack extends InventoryBlock
return true;
}
public void addItemToInventory (EntityPlayer player, World world, int x, int y, int z, ItemStack stack)
{
if(!player.inventory.addItemStackToInventory(stack))
{
// drop the rest as an item
AbilityHelper.spawnItemAtPlayer(player, stack);
}
}
@Override
public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, int z)
{