From a1119cd77a6000bda711a9a507c4fda95e4f00f0 Mon Sep 17 00:00:00 2001 From: Alex O'Neill <35673674+alcatrazEscapee@users.noreply.github.com> Date: Mon, 28 Dec 2020 15:18:52 -0500 Subject: [PATCH] Fix potential NPE in ForgeHooks.onItemPlaceIntoWorld when passing in null player. (#7505) --- src/main/java/net/minecraftforge/common/ForgeHooks.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 2c17b7f8de..c879d16969 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -674,7 +674,8 @@ public class ForgeHooks world.markAndNotifyBlock(snap.getPos(), world.getChunkAt(snap.getPos()), oldBlock, newBlock, updateFlag, 512); } - player.addStat(Stats.ITEM_USED.get(item)); + if (player != null) + player.addStat(Stats.ITEM_USED.get(item)); } } world.capturedBlockSnapshots.clear();