From 2b37fdb69f9e5db3c476db534547249f49347b93 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 28 Apr 2017 15:18:58 -0400 Subject: [PATCH] Fix Atomic Disassemblers for good --- .../common/item/ItemAtomicDisassembler.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 6e41039a6..ba99d008f 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -178,10 +178,14 @@ public class ItemAtomicDisassembler extends ItemEnergized { ItemStack itemstack = entityplayer.getHeldItem(hand); - if(!world.isRemote && entityplayer.isSneaking()) + if(entityplayer.isSneaking()) { - toggleMode(itemstack); - entityplayer.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.modeToggle") + " " + EnumColor.INDIGO + getModeName(itemstack) + EnumColor.AQUA + " (" + getEfficiency(itemstack) + ")")); + if(!world.isRemote) + { + toggleMode(itemstack); + entityplayer.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.modeToggle") + " " + EnumColor.INDIGO + getModeName(itemstack) + EnumColor.AQUA + " (" + getEfficiency(itemstack) + ")")); + } + return new ActionResult(EnumActionResult.SUCCESS, itemstack); } @@ -192,8 +196,9 @@ public class ItemAtomicDisassembler extends ItemEnergized public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getHeldItem(hand); + Block block = world.getBlockState(pos).getBlock(); - if(!player.isSneaking() && world.getBlockState(pos).getBlock() == Blocks.FARMLAND) + if(!player.isSneaking() && (block == Blocks.DIRT || block == Blocks.GRASS || block == Blocks.GRASS_PATH)) { if(useHoe(stack, player, world, pos, side) == EnumActionResult.FAIL) {