Possible fix for the endless recursions that sometimes seem to happen…

… with AOE tools. #1213
SlimeKnights · Dec 4, 2014 · f8a0520 · f8a0520
1 parent 855b58f
commit f8a0520
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java
@@ -311,11 +311,21 @@ protected void breakExtraBlock(World world, int x, int y, int z, int sidehit, En
 
             // following code can be found in PlayerControllerMP.onPlayerDestroyBlock
             world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12));
-            if(block.removedByPlayer(world, player, x,y,z))
+            if(block.removedByPlayer(world, player, x,y,z, true))
             {
                 block.onBlockDestroyedByPlayer(world, x,y,z, meta);
             }
-            pcmp.onPlayerDestroyBlock(x, y, z, sidehit);
+            // callback to the tool
+            ItemStack itemstack = player.getCurrentEquippedItem();
+            if (itemstack != null)
+            {
+                itemstack.func_150999_a(world, block, x, y, z, player);
+
+                if (itemstack.stackSize == 0)
+                {
+                    player.destroyCurrentEquippedItem();
+                }
+            }
 
             // send an update to the server, so we get an update back
             if(PHConstruct.extraBlockUpdates)