From 80e9699ccf5bb7fe54a4ad675111290c2822d743 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Sun, 13 Feb 2022 20:52:46 +0100
Subject: [PATCH] #1012: Always save as skull owner and not as internal data

By: DerFrZocker <derrieple@gmail.com>
---
 .../bukkit/craftbukkit/inventory/CraftMetaSkull.java   | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
index 1ad14d41ce..0840984811 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
@@ -5,7 +5,6 @@ import com.mojang.authlib.GameProfile;
 import java.util.Map;
 import java.util.UUID;
 import net.minecraft.nbt.GameProfileSerializer;
-import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.level.block.entity.TileEntitySkull;
 import org.bukkit.Bukkit;
@@ -79,13 +78,6 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
         }
     }
 
-    @Override
-    void serializeInternal(final Map<String, NBTBase> internalTags) {
-        if (profile != null) {
-            internalTags.put(SKULL_PROFILE.NBT, serializedProfile);
-        }
-    }
-
     private void setProfile(GameProfile profile) {
         this.profile = profile;
         this.serializedProfile = (profile == null) ? null : GameProfileSerializer.writeGameProfile(new NBTTagCompound(), profile);
@@ -244,7 +236,7 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
     @Override
     Builder<String, Object> serialize(Builder<String, Object> builder) {
         super.serialize(builder);
-        if (hasOwner()) {
+        if (this.profile != null) {
             return builder.put(SKULL_OWNER.BUKKIT, new CraftPlayerProfile(this.profile));
         }
         return builder;