diff --git a/common/crazypants/enderio/machine/power/BlockCapacitorBank.java b/common/crazypants/enderio/machine/power/BlockCapacitorBank.java index 59157129..75fa4235 100644 --- a/common/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/common/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -1,6 +1,7 @@ package crazypants.enderio.machine.power; import java.text.NumberFormat; +import java.util.ArrayList; import java.util.Random; import buildcraft.api.tools.IToolWrench; @@ -167,14 +168,32 @@ public class BlockCapacitorBank extends Block implements ITileEntityProvider, IG te.onNeighborBlockChange(blockId); } - public void breakBlock(World world, int x, int y, int z, int par5, int par6) { + public ArrayList getBlockDropped(World world, int x, int y, int z, int metadata, int fortune) { + ArrayList ret = new ArrayList(); + if(!world.isRemote) { + TileEntity te = world.getBlockTileEntity(x, y, z); + if (te instanceof TileCapacitorBank) { + TileCapacitorBank cb = (TileCapacitorBank) te; + cb.onBreakBlock(); + + ItemStack itemStack = + BlockItemCapacitorBank.createItemStackWithPower(cb.doGetEnergyStored()); + ret.add(itemStack); + } + } + return ret; + } + + @Override + public boolean removeBlockByPlayer(World world, EntityPlayer player, int x, int y, int z) { if (!world.isRemote) { TileEntity te = world.getBlockTileEntity(x, y, z); if (te instanceof TileCapacitorBank) { TileCapacitorBank cb = (TileCapacitorBank) te; cb.onBreakBlock(); - ItemStack itemStack = BlockItemCapacitorBank.createItemStackWithPower(cb.doGetEnergyStored()); + ItemStack itemStack = + BlockItemCapacitorBank.createItemStackWithPower(cb.doGetEnergyStored()); float f = 0.7F; double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; @@ -184,7 +203,7 @@ public class BlockCapacitorBank extends Block implements ITileEntityProvider, IG world.spawnEntityInWorld(entityitem); } } - world.removeBlockTileEntity(x, y, z); + return super.removeBlockByPlayer(world, player, x, y, z); } @Override