From 619eecacf8ec598ea2fa11748f7b7eff526421a8 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Thu, 26 Sep 2024 12:16:06 +0200
Subject: [PATCH] Don't add block entity tag if the id is missing

---
 .../rewriter/BlockItemPacketRewriter1_20_5.java             | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
index 476d4e0e2..1e247371c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -488,7 +488,11 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
         if (blockEntityTag != null) {
             final CompoundTag clonedTag = blockEntityTag.copy();
             updateBlockEntityTag(connection, data, clonedTag);
-            item.dataContainer().set(StructuredDataKey.BLOCK_ENTITY_DATA, clonedTag);
+
+            // Not always needed, e.g. shields that had the base color in a block entity tag before
+            if (blockEntityTag.contains("id")) {
+                item.dataContainer().set(StructuredDataKey.BLOCK_ENTITY_DATA, clonedTag);
+            }
         }
 
         final CompoundTag debugProperty = tag.getCompoundTag("DebugProperty");