diff --git a/common/net/minecraftforge/common/ForgeHooks.java b/common/net/minecraftforge/common/ForgeHooks.java index b493325ff2..2a9b615025 100644 --- a/common/net/minecraftforge/common/ForgeHooks.java +++ b/common/net/minecraftforge/common/ForgeHooks.java @@ -116,6 +116,20 @@ public class ForgeHooks } return true; } + + public static boolean canToolHarvestBlock(Block block, int metadata, ItemStack stack) + { + if (stack == null) return false; + List info = (List)toolClasses.get(stack.getItem()); + if (info == null) return false; + + Object[] tmp = info.toArray(); + String toolClass = (String)tmp[0]; + int harvestLevel = (Integer)tmp[1]; + + Integer blockHarvestLevel = (Integer)toolHarvestLevels.get(Arrays.asList(block, metadata, toolClass)); + return !(blockHarvestLevel == null || blockHarvestLevel > harvestLevel); + } public static float blockStrength(Block block, EntityPlayer player, World world, int x, int y, int z) { diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch index 27074b1e59..3378c6255b 100644 --- a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch +++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch @@ -145,7 +145,7 @@ float var5 = (float)(var3 * var3 + 1); - - if (!var4.canHarvestBlock(par1Block) && var2 <= 1.0F) -+ boolean canHarvest = ForgeHooks.canHarvestBlock(par1Block, this, meta); ++ boolean canHarvest = ForgeHooks.canToolHarvestBlock(par1Block, meta, var4); + + if (!canHarvest && var2 <= 1.0F) {