tilera
/
Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

fix a bug that allows network tool to rotate blocks without the permission.

This commit is contained in:
xsun2001 2018-02-18 20:47:13 +08:00
parent 27fecccec4
commit 3cc48fec60
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/appeng/items/tools/ToolNetworkTool.java
View File

@ -156,6 +156,13 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench,
}
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 class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench,
}
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