Fix dig speed on redstone ore and obsidian.

MinecraftForge · Dec 25, 2013 · a6827f9 · a6827f9
1 parent 40d02fe
commit a6827f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch
@@ -186,7 +186,7 @@
      }
 
      protected ItemStack func_149644_j(int p_149644_1_)
-@@ -1114,6 +1147,1062 @@
+@@ -1114,6 +1147,1065 @@
          return null;
      }
 
@@ -1189,6 +1189,7 @@
 +            setHarvestLevel(toolClass, level, m);
 +        }
 +    }
++
 +    /**
 +     * Sets or removes the tool and level required to harvest this block.
 +     * 
@@ -1241,6 +1242,8 @@
 +     */
 +    public boolean isToolEffective(String type, int metadata)
 +    {
++        if ("pickaxe".equals(type) && (this == Blocks.redstone_ore || this == Blocks.lit_redstone_ore || this == Blocks.obsidian))
++            return false;
 +        if (harvestTool[metadata] == null) return true;
 +        return harvestTool[metadata].equals(type);
 +    }

diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java
@@ -178,9 +178,6 @@ static void initTools()
         Blocks.iron_block.setHarvestLevel("pickaxe", 1);
         Blocks.lapis_ore.setHarvestLevel("pickaxe", 1);
         Blocks.lapis_block.setHarvestLevel("pickaxe", 1);
-        //MinecraftForge.removeBlockEffectiveness(Blocks.redstone_ore, "pickaxe");
-        //MinecraftForge.removeBlockEffectiveness(Blocks.obsidian,     "pickaxe");
-        //MinecraftForge.removeBlockEffectiveness(Blocks.lit_redstone_ore, "pickaxe");
     }
 
     public static int getTotalArmorValue(EntityPlayer player)