From 9b2394567000ef865285dff03f2e373ed33dc832 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 12 Apr 2018 15:42:09 +0100 Subject: [PATCH] Fix block inventory dropping in some situations --- .../blocks/transformers/BlockTransformer.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java index 784da72c9..4822d69f7 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java @@ -133,12 +133,7 @@ public abstract class BlockTransformer extends BaseTileBlock { TileEntity tileEntity = world.getTileEntity(pos); if (tileEntity instanceof IToolDrop) { ItemStack drop = ((IToolDrop) tileEntity).getToolDrop(player); - if (drop == null) { - return false; - } - if (!drop.isEmpty()) { - spawnAsEntity(world, pos, drop); - } + dropInventory(world, pos, drop); world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.BLOCK_DISMANTLE, SoundCategory.BLOCKS, 0.6F, 1F); if (!world.isRemote) { @@ -164,14 +159,7 @@ public abstract class BlockTransformer extends BaseTileBlock { protected List dropInventory(IBlockAccess world, BlockPos pos, ItemStack itemToDrop) { TileEntity tileEntity = world.getTileEntity(pos); - - if (tileEntity == null) { - System.out.print("Null"); - return null; - } if (!(tileEntity instanceof IInventory)) { - - System.out.print("Not INstance"); return null; } @@ -196,7 +184,9 @@ public abstract class BlockTransformer extends BaseTileBlock { } items.add(itemStack.copy()); } - items.add(itemToDrop.copy()); + if(!itemToDrop.isEmpty()){ + items.add(itemToDrop.copy()); + } return items; }