From 94e853e5cfe5bfa1628c9ecced9093447ac38464 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 22 May 2024 10:40:43 +0200
Subject: [PATCH] Add entity id to painting items

---
 .../rewriter/BlockItemPacketRewriter1_20_5.java           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 fe0a4032a..78617b543 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
@@ -439,9 +439,13 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
             updateBlockState(data, blockState);
         }
 
-        final CompoundTag entityTag = tag.getCompoundTag("EntityTag");
+        CompoundTag entityTag = tag.getCompoundTag("EntityTag");
         if (entityTag != null) {
-            data.set(StructuredDataKey.ENTITY_DATA, entityTag.copy());
+            entityTag = entityTag.copy();
+            if (entityTag.contains("variant")) {
+                entityTag.putString("id", "minecraft:painting");
+            }
+            data.set(StructuredDataKey.ENTITY_DATA, entityTag);
         }
 
         final CompoundTag blockEntityTag = tag.getCompoundTag("BlockEntityTag");