fix a bug that allows network tool to rotate blocks without the permi…

…ssion.
xsun2001 · Feb 18, 2018 · 3cc48fe · 3cc48fe
1 parent 27feccc
commit 3cc48fe
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java
@@ -156,6 +156,13 @@ public boolean serverSideToolLogic( final ItemStack is, final EntityPlayer p, fi
 			}
 
 			final Block b = w.getBlock( x, y, z );
+
+			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() )
+					return false;
+
 			if( b != null && !p.isSneaking() )
 			{
 				final TileEntity te = w.getTileEntity( x, y, z );
@@ -192,11 +199,7 @@ public boolean serverSideToolLogic( final ItemStack is, final EntityPlayer p, fi
 			}
 			else
 			{
-				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 );
+				b.onBlockActivated( w, x, y, z, p, side, hitX, hitY, hitZ );
 			}
 		}
 		else