From 70f9b9f101e9bd1730d21a9c3f46d1fcd087c52f Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 8 Jan 2016 18:30:49 -0800 Subject: [PATCH] Fix Teleposer and Soul Forge dropping items on break --- .../WayofTime/bloodmagic/block/BlockSoulForge.java | 12 ++++++------ .../WayofTime/bloodmagic/block/BlockTeleposer.java | 11 +++++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index c6167d15..454061f8 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.tile.TileAltar; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -64,14 +65,13 @@ public class BlockSoulForge extends BlockContainer } @Override - public void breakBlock(World worldIn, BlockPos pos, IBlockState state) + public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) { - if (worldIn.getTileEntity(pos) != null && worldIn.getTileEntity(pos) instanceof TileTeleposer) - { - InventoryHelper.dropInventoryItems(worldIn, pos, (TileTeleposer) worldIn.getTileEntity(pos)); - } + TileSoulForge tileSoulForge = (TileSoulForge) world.getTileEntity(blockPos); + if (tileSoulForge != null) + tileSoulForge.dropItems(); - super.breakBlock(worldIn, pos, state); + super.breakBlock(world, blockPos, blockState); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index 1025a41c..c33f3c31 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -52,14 +52,13 @@ public class BlockTeleposer extends BlockContainer } @Override - public void breakBlock(World worldIn, BlockPos pos, IBlockState state) + public void breakBlock(World world, BlockPos blockPos, IBlockState blockState) { - if (worldIn.getTileEntity(pos) != null && worldIn.getTileEntity(pos) instanceof TileTeleposer) - { - InventoryHelper.dropInventoryItems(worldIn, pos, (TileTeleposer) worldIn.getTileEntity(pos)); - } + TileTeleposer tileTeleposer = (TileTeleposer) world.getTileEntity(blockPos); + if (tileTeleposer != null) + tileTeleposer.dropItems(); - super.breakBlock(worldIn, pos, state); + super.breakBlock(world, blockPos, blockState); } @Override