From 0554de0251c862c8107df82b74ac7d74558ab74d Mon Sep 17 00:00:00 2001
From: Martijn van den Brand <MartijnvandenBrand@outlook.com>
Date: Thu, 18 Jul 2024 22:03:23 +0200
Subject: [PATCH] Fix `onPlaceItemIntoWorld` always resetting item stack when
 in creative mode (#10048)

---
 src/main/java/net/minecraftforge/common/ForgeHooks.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java
index 3af1cb8af7..521d77dc89 100644
--- a/src/main/java/net/minecraftforge/common/ForgeHooks.java
+++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java
@@ -474,7 +474,7 @@ public final class ForgeHooks {
         level.captureBlockSnapshots = false;
 
         if (ret.consumesAction()) {
-            var postUse = itemstack.copy();
+            var postUse = player.getItemInHand(context.getHand());
 
             var blockSnapshots = new ArrayList<>(level.capturedBlockSnapshots);
             level.capturedBlockSnapshots.clear();
@@ -500,8 +500,7 @@ public final class ForgeHooks {
                 }
             } else {
                 // Change the stack to its new content
-                if (!player.isCreative())
-                    player.setItemInHand(context.getHand(), postUse);
+                player.setItemInHand(context.getHand(), postUse);
 
                 for (BlockSnapshot snap : blockSnapshots) {
                     int updateFlag = snap.getFlag();