From b7af3b7d8e9b1dd11486c4ceb5e696653e7bbe94 Mon Sep 17 00:00:00 2001
From: "Pantera (Mad_Daniel)" <89838384+Pantera07@users.noreply.github.com>
Date: Sat, 15 Jun 2024 22:10:20 +0900
Subject: [PATCH] Fix player head in 1.20.2->1.20 (#786)

---
 .../rewriter/BlockItemPacketRewriter1_20_2.java     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java
index 3e7f3d9e..a86a7233 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java
@@ -18,6 +18,7 @@
 package com.viaversion.viabackwards.protocol.v1_20_2to1_20.rewriter;
 
 import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.IntArrayTag;
 import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter;
@@ -378,6 +379,11 @@ public final class BlockItemPacketRewriter1_20_2 extends BackwardsItemRewriter<C
         }
         if (item.tag() != null) {
             com.viaversion.viaversion.protocols.v1_20to1_20_2.rewriter.BlockItemPacketRewriter1_20_2.to1_20_1Effects(item);
+
+            final CompoundTag skullOwnerTag = item.tag().getCompoundTag("SkullOwner");
+            if (skullOwnerTag != null && !skullOwnerTag.contains("Id") && skullOwnerTag.contains("Properties")) {
+                skullOwnerTag.put("Id", new IntArrayTag(new int[]{0, 0, 0, 0}));
+            }
         }
 
         return super.handleItemToClient(connection, item);
@@ -411,6 +417,11 @@ public final class BlockItemPacketRewriter1_20_2 extends BackwardsItemRewriter<C
             final String effectKey = Key.stripMinecraftNamespace(((StringTag) secondaryEffect).getValue());
             tag.putInt("Secondary", PotionEffects1_20_2.keyToId(effectKey) + 1); // Empty effect at 0
         }
+
+        final CompoundTag skullOwnerTag = tag.getCompoundTag("SkullOwner");
+        if (skullOwnerTag != null && !skullOwnerTag.contains("Id") && skullOwnerTag.contains("Properties")) {
+            skullOwnerTag.put("Id", new IntArrayTag(new int[]{0, 0, 0, 0}));
+        }
         return tag;
     }
-}
\ No newline at end of file
+}