AOE tools now behave like normal tools while sneaking.

SlimeKnights · Sep 23, 2014 · 570edc8 · 570edc8 · Vexatos · Sep 27, 2014
1 parent cb7ea6f
commit 570edc8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java
@@ -85,7 +85,7 @@ public float stoneboundModifier ()
     @Override
     public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player)
     {
-        if (!stack.hasTagCompound())
+        if (!stack.hasTagCompound() || player.isSneaking())
             return super.onBlockStartBreak(stack, x, y, z, player);
 
         World world = player.worldObj;

diff --git a/src/main/java/tconstruct/library/tools/AOEHarvestTool.java b/src/main/java/tconstruct/library/tools/AOEHarvestTool.java
@@ -24,10 +24,12 @@ public AOEHarvestTool(int baseDamage, int breakRadius, int breakDepth) {
         this.breakDepth = breakDepth;
     }
 
-    boolean antiRecurse;
-
     @Override
     public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) {
+        // sneaking == regular blockbreak
+        if(player.isSneaking())
+            return super.onBlockStartBreak(stack, x,y,z, player);
+
         // only effective materials matter. We don't want to aoe when beraking dirt with a hammer.
         Block block = player.worldObj.getBlock(x,y,z);
         int meta = player.worldObj.getBlockMetadata(x,y,z);
@@ -50,7 +52,6 @@ public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPla
 
         // the code below initiates block breaks, which again call this function. But we don't want to do the aoe-break-stuff again. This is to prevent recursive, infinite-range aoe blockbreaking.
         if(originalBlock || player.capabilities.isCreativeMode) {
-            antiRecurse = true;
             MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(player.worldObj, player, false, 4.5d);
             if(mop == null)
                 return super.onBlockStartBreak(stack, x,y,z, player);
@@ -87,8 +88,6 @@ public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPla
                             continue;
                         breakExtraBlock(player.worldObj, xPos, yPos, zPos, sideHit, player);
                     }
-
-            antiRecurse = false;
         }