Add correct isEffective implementation to DualHarvestTool.

SlimeKnights · Aug 13, 2014 · 8f5d065 · 8f5d065
1 parent 3c218e2
commit 8f5d065
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java
@@ -111,20 +111,9 @@ public float getDigSpeed (ItemStack stack, Block block, int meta)
     public boolean func_150897_b (Block block)
     {
         if (block.getMaterial().isToolNotRequired())
-        {
             return true;
-        }
-        for (Material m : getEffectiveMaterials())
-        {
-            if (m == block.getMaterial())
-                return true;
-        }
-        for (Material m : getEffectiveSecondaryMaterials())
-        {
-            if (m == block.getMaterial())
-                return true;
-        }
-        return false;
+
+        return isEffective(block.getMaterial());
     }
 
     @Override
@@ -133,6 +122,18 @@ public boolean canHarvestBlock (Block block, ItemStack itemStack)
         return func_150897_b(block);
     }
 
+    @Override
+    public boolean isEffective(Material material) {
+        if(super.isEffective(material))
+            return true;
+
+        for(Material m : getEffectiveSecondaryMaterials())
+            if(m == material)
+                return true;
+
+        return false;
+    }
+
     @Override
     public String[] getTraits ()
     {