Merge pull request #539 from Glassmaker/patch-3

Fix for Harvest tools speed issues
SlimeKnights · Mar 19, 2014 · 82cacb0 · 82cacb0
2 parents 57cecd1 + 0f47080
commit 82cacb0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java
@@ -106,7 +106,7 @@ public float getDigSpeed (ItemStack stack, Block block, int meta)
     }
 
     @Override
-    public boolean canHarvestBlock (Block block)
+    public boolean func_150897_b (Block block)
     {
         if (block.getMaterial().isToolNotRequired())
         {
@@ -125,6 +125,12 @@ public boolean canHarvestBlock (Block block)
         return false;
     }
 
+    @Override
+    public boolean canHarvestBlock(Block block, ItemStack itemStack)
+    {
+        return func_150897_b(block);
+    }
+
     @Override
     public String[] toolCategories ()
     {

diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java
@@ -173,7 +173,8 @@ float calculateStrength (NBTTagCompound tags, Block block, int meta)
         return 0.1f;
     }
 
-    public boolean canHarvestBlock (Block block)
+    @Override
+    public boolean func_150897_b (Block block)
     {
         if (block.getMaterial().isToolNotRequired())
         {
@@ -187,6 +188,12 @@ public boolean canHarvestBlock (Block block)
         return false;
     }
 
+    @Override
+    public boolean canHarvestBlock(Block block, ItemStack itemStack)
+    {
+        return func_150897_b(block);
+    }
+
     @Override
     public String[] toolCategories ()
     {