From ba55b234b687365e3a7f905bd40b96b48e22b1e1 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sun, 19 Aug 2018 17:41:11 -0400 Subject: [PATCH] matched code in a class to avoid future merge conflict --- .../java/nmd/primal/forgecraft/util/BreakerHandler.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/kfc/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java b/kfc/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java index aad542c1..519c06b6 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java @@ -48,13 +48,10 @@ public interface BreakerHandler { for (int i=0; i < EnumFacing.HORIZONTALS.length; i++) { EnumFacing face = world.getBlockState(pos).getValue(CustomContainerFacing.FACING); if(face.equals(world.getBlockState(pos).getValue(CustomContainerFacing.FACING))){ - Block smashBlock = world.getBlockState(pos.offset(face)).getBlock(); + //Block smashBlock = world.getBlockState(pos.offset(face)).getBlock(); IBlockState smashState = world.getBlockState(pos.offset(face)); - //Block smashBlock = world.getBlockState(pos).getBlock(); - ItemStack smashStack = NBTHelper.getStackBlockNBT(world, pos, state, new ItemStack(Item.getItemFromBlock(smashBlock), 1, smashBlock.damageDropped(state))); - - if(!smashState.getBlock().equals(Blocks.AIR)) { + ItemStack smashStack = new ItemStack(Item.getItemFromBlock(smashState.getBlock()), 1, smashState.getBlock().getMetaFromState(smashState)); for (GallagherRecipe recipe : GallagherRecipe.RECIPES) { if (recipe.match(smashState)) {