From 8c7a0e888fb65300076eb7330be881946ffc1ffc Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Tue, 6 Aug 2024 19:07:10 +1000
Subject: [PATCH] SPIGOT-7857: Fix spurious internal NBT tag when deserializing
 BlockStateMeta

By: md_5 <git@md-5.net>
---
 .../bukkit/craftbukkit/inventory/CraftMetaBlockState.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
index ca58207928..42b812b039 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
@@ -110,8 +110,10 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
         } else {
             material = Material.AIR;
         }
-        blockEntityTag = getBlockState(material, internalTag);
-        internalTag = null;
+        if (internalTag != null) {
+            blockEntityTag = getBlockState(material, internalTag);
+            internalTag = null;
+        }
     }
 
     @Override