From fc6b38d7f2461a163cf10d75edd7d6122478497c Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 26 Jun 2020 15:40:05 -0700 Subject: [PATCH] Fix blocks being harvested with incorrect tools. --- .../java/net/minecraftforge/common/ForgeHooks.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 42bb9bdfe6..6a1a8047ce 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -166,23 +166,17 @@ public class ForgeHooks public static boolean canHarvestBlock(@Nonnull BlockState state, @Nonnull PlayerEntity player, @Nonnull IBlockReader world, @Nonnull BlockPos pos) { //state = state.getActualState(world, pos); - if (state.func_235783_q_()) - { + if (!state.func_235783_q_()) return true; - } ItemStack stack = player.getHeldItemMainhand(); ToolType tool = state.getHarvestTool(); if (stack.isEmpty() || tool == null) - { - return true; // TODO: player.canHarvestBlock(state); - } + return player.func_234569_d_(state); int toolLevel = stack.getItem().getHarvestLevel(stack, tool, player, state); if (toolLevel < 0) - { - return true; //TODO: player.canHarvestBlock(state); - } + return player.func_234569_d_(state); return ForgeEventFactory.doPlayerHarvestCheck(player, state, toolLevel >= state.getHarvestLevel()); }