From 790da699dd92d3bed7dff2ab07aee05c2da0d431 Mon Sep 17 00:00:00 2001
From: Ben Staddon <bs2609@users.noreply.github.com>
Date: Tue, 25 Jun 2019 21:59:10 +0100
Subject: [PATCH] Fix item placement losing NBT data in creative mode (#5757)

---
 .../java/net/minecraftforge/common/ForgeHooks.java | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java
index dcb172ad49..e14902ad84 100644
--- a/src/main/java/net/minecraftforge/common/ForgeHooks.java
+++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java
@@ -587,7 +587,7 @@ public class ForgeHooks
         // handle all placement events here
         int size = itemstack.getCount();
         CompoundNBT nbt = null;
-        if (itemstack.hasTag())
+        if (itemstack.getTag() != null)
         {
             nbt = itemstack.getTag().copy();
         }
@@ -605,7 +605,7 @@ public class ForgeHooks
             // save new item data
             int newSize = itemstack.getCount();
             CompoundNBT newNBT = null;
-            if (itemstack.hasTag())
+            if (itemstack.getTag() != null)
             {
                 newNBT = itemstack.getTag().copy();
             }
@@ -615,10 +615,7 @@ public class ForgeHooks
 
             // make sure to set pre-placement item data for event
             itemstack.setCount(size);
-            if (nbt != null)
-            {
-                itemstack.setTag(nbt);
-            }
+            itemstack.setTag(nbt);
 
             PlayerEntity player = context.getPlayer();
             Direction side = context.getFace();
@@ -648,10 +645,7 @@ public class ForgeHooks
             {
                 // Change the stack to its new content
                 itemstack.setCount(newSize);
-                if (nbt != null)
-                {
-                    itemstack.setTag(newNBT);
-                }
+                itemstack.setTag(newNBT);
 
                 for (BlockSnapshot snap : blockSnapshots)
                 {