From c3e4d303e98399b32c36b42ab3a859b3cdebe2e3 Mon Sep 17 00:00:00 2001 From: Jacob Smith Date: Sun, 3 May 2020 13:48:17 -0700 Subject: [PATCH] Fix issue with providing a null ItemStack to onPlayerDestroyItem (#6633) --- src/main/java/net/minecraftforge/common/ForgeHooks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index d18761ab04..6d46a4ed12 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -606,7 +606,7 @@ public class ForgeHooks if (!(itemstack.getItem() instanceof BucketItem)) // if not bucket world.captureBlockSnapshots = true; - ItemStack copy = itemstack.isDamageable() ? itemstack.copy() : null; + ItemStack copy = itemstack.copy(); ActionResultType ret = itemstack.getItem().onItemUse(context); if (itemstack.isEmpty()) ForgeEventFactory.onPlayerDestroyItem(player, copy, context.getHand());