From bb83e11a7c77ba3e8bff20e5216ba30e8187a840 Mon Sep 17 00:00:00 2001 From: Nightenom <17338378+Nightenom@users.noreply.github.com> Date: Mon, 16 Sep 2019 22:36:43 +0200 Subject: [PATCH] Maintain default behavior for Item#canPlayerBreakBlockWhileHolding() (#6128) --- src/main/java/net/minecraftforge/common/ForgeHooks.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index f1054212b..853e447b7 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -531,9 +531,10 @@ public class ForgeHooks // Logic from tryHarvestBlock for pre-canceling the event boolean preCancelEvent = false; ItemStack itemstack = entityPlayer.getHeldItemMainhand(); - if (gameType.isCreative() && !itemstack.isEmpty() - && !itemstack.getItem().canPlayerBreakBlockWhileHolding(world.getBlockState(pos), world, pos, entityPlayer)) + if (!itemstack.isEmpty() && !itemstack.getItem().canPlayerBreakBlockWhileHolding(world.getBlockState(pos), world, pos, entityPlayer)) + { preCancelEvent = true; + } if (gameType.hasLimitedInteractions()) {