From 77889845bf10896c0f55b85b184a1e29a681a82e Mon Sep 17 00:00:00 2001 From: xsun2001 <1563770452@qq.com> Date: Fri, 29 Dec 2017 20:30:01 +0800 Subject: [PATCH] fix the bug that allows the NetworkTool to open the chests, which protected by LMC or other plugins, when press shift + right click. --- src/main/java/appeng/items/tools/ToolNetworkTool.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index 9eca7440ea3..647469561d6 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -192,7 +192,11 @@ public boolean serverSideToolLogic( final ItemStack is, final EntityPlayer p, fi } else { - b.onBlockActivated( w, x, y, z, p, side, hitX, hitY, hitZ ); + if( b != null ) + if( !ForgeEventFactory.onPlayerInteract( p, + b.isAir( w, x, y, z ) ? PlayerInteractEvent.Action.RIGHT_CLICK_AIR : PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK, + x, y, z, side, w ).isCanceled() ) + b.onBlockActivated( w, x, y, z, p, side, hitX, hitY, hitZ ); } } else