From 766f0d530220ea32b234fc139b8df2e0f24fdde4 Mon Sep 17 00:00:00 2001 From: Yip Rui Fung Date: Sat, 25 Jul 2015 08:59:25 +0800 Subject: [PATCH] Fix bin crash when interacting with empty hand. --- src/main/java/mekanism/common/block/BlockBasic.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 8f1f30328..848c9b9fb 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -469,10 +469,9 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { TileEntityBin bin = (TileEntityBin)world.getTileEntity(x, y, z); - Item tool = entityplayer.getCurrentEquippedItem().getItem(); - - if(MekanismUtils.hasUsableWrench(entityplayer, x, y, z)) + if(entityplayer.getCurrentEquippedItem() != null && MekanismUtils.hasUsableWrench(entityplayer, x, y, z)) { + Item tool = entityplayer.getCurrentEquippedItem().getItem(); if(entityplayer.isSneaking()) { dismantleBlock(world, x, y, z, false);