Fix block rotation.

gamerforEA · Mar 23, 2015 · 39aa626 · 39aa626
1 parent 4b5e70b
commit 39aa626
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java
@@ -115,6 +115,10 @@ public boolean serverSideToolLogic(ItemStack is, EntityPlayer p, World w, int x,
 			Block b = w.getBlock(x, y, z);
 			if (b != null && !p.isSneaking())
 			{
+				// TODO gamerforEA code start
+				if (ToolQuartzWrench.callBlockBreakEvent(x, y, z, w, p)) return false;
+				// TODO gamerforEA code end
+
 				TileEntity te = w.getTileEntity(x, y, z);
 				if (!(te instanceof IGridHost))
 				{
@@ -154,13 +158,13 @@ public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer
 	@Override
 	public boolean canWrench(ItemStack is, EntityPlayer player, int x, int y, int z)
 	{
-		return !ToolQuartzWrench.callBlockBreakEvent(x, y, z, player.worldObj, player);
+		return !ToolQuartzWrench.callBlockBreakEvent(x, y, z, player.worldObj, player); // TODO gamerforEA call event
 	}
 
 	@Override
 	public boolean canWrench(EntityPlayer player, int x, int y, int z)
 	{
-		return !ToolQuartzWrench.callBlockBreakEvent(x, y, z, player.worldObj, player);
+		return !ToolQuartzWrench.callBlockBreakEvent(x, y, z, player.worldObj, player); // TODO gamerforEA call event
 	}
 
 	@Override

diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java
@@ -35,6 +35,10 @@ public boolean onItemUseFirst(ItemStack is, EntityPlayer player, World world, in
 		{
 			if (Platform.isClient()) return !world.isRemote;
 
+			// TODO gamerforEA code start
+			if (callBlockBreakEvent(x, y, z, world, player)) return false;
+			// TODO gamerforEA code end
+
 			ForgeDirection mySide = ForgeDirection.getOrientation(side);
 			if (b.rotateBlock(world, x, y, z, mySide))
 			{
@@ -56,13 +60,13 @@ public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer
 	@Override
 	public boolean canWrench(ItemStack is, EntityPlayer player, int x, int y, int z)
 	{
-		return !callBlockBreakEvent(x, y, z, player.worldObj, player);
+		return !callBlockBreakEvent(x, y, z, player.worldObj, player); // TODO gamerforEA call event
 	}
 
 	@Override
 	public boolean canWrench(EntityPlayer player, int x, int y, int z)
 	{
-		return !callBlockBreakEvent(x, y, z, player.worldObj, player);
+		return !callBlockBreakEvent(x, y, z, player.worldObj, player); // TODO gamerforEA call event
 	}
 
 	@Override
@@ -71,6 +75,7 @@ public void wrenchUsed(EntityPlayer player, int x, int y, int z)
 		player.swingItem();
 	}
 
+	// TODO gamerforEA code start
 	/**
 	 * 
 	 * @param x - X coord
@@ -85,4 +90,5 @@ public static boolean callBlockBreakEvent(int x, int y, int z, World w, EntityPl
 		BreakEvent event = new BreakEvent(x, y, z, w, w.getBlock(x, y, z), w.getBlockMetadata(x, y, z), p);
 		return MinecraftForge.EVENT_BUS.post(event);
 	}
+	// TODO gamerforEA code end
 }