Merge branch 'development' into v8.1

This commit is contained in:
Aidan C. Brady 2015-03-29 14:20:11 -04:00
commit 78ed108904

View file

@ -406,7 +406,7 @@ public class BlockReactor extends BlockContainer implements IBlockCTM
public ItemStack dismantleBlock(World world, int x, int y, int z, boolean returnBlock) public ItemStack dismantleBlock(World world, int x, int y, int z, boolean returnBlock)
{ {
ItemStack itemStack = getPickBlock(null, world, x, y, z); ItemStack itemStack = new ItemStack(this, 1, world.getBlockMetadata(x, y, z));
world.setBlockToAir(x, y, z); world.setBlockToAir(x, y, z);