From d67777f8baf92e1dd1bb3a17221abd51dc336600 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 27 Dec 2022 16:04:45 +1100
Subject: [PATCH] SPIGOT-7218: Player's outer layer of skin disappears after
 respawn

---
 .../net/minecraft/server/players/PlayerList.patch   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/nms-patches/net/minecraft/server/players/PlayerList.patch b/nms-patches/net/minecraft/server/players/PlayerList.patch
index 3781f992e..05abde440 100644
--- a/nms-patches/net/minecraft/server/players/PlayerList.patch
+++ b/nms-patches/net/minecraft/server/players/PlayerList.patch
@@ -651,7 +651,7 @@
              if (entityplayer != entityhuman && entityplayer.level.dimension() == resourcekey) {
                  double d4 = d0 - entityplayer.getX();
                  double d5 = d1 - entityplayer.getY();
-@@ -754,23 +1042,34 @@
+@@ -754,23 +1042,35 @@
      public void reloadWhiteList() {}
  
      public void sendLevelInfo(EntityPlayer entityplayer, WorldServer worldserver) {
@@ -681,6 +681,7 @@
 -        entityplayer.resetSentInfo();
 +        // entityplayer.resetSentInfo();
 +        entityplayer.getBukkitEntity().updateScaledHealth(); // CraftBukkit - Update scaled health on respawn and worldchange
++        entityplayer.getEntityData().refresh(entityplayer); // CraftBukkkit - SPIGOT-7218: sync metadata
          entityplayer.connection.send(new PacketPlayOutHeldItemSlot(entityplayer.getInventory().selected));
 +        // CraftBukkit start - from GameRules
 +        int i = entityplayer.level.getGameRules().getBoolean(GameRules.RULE_REDUCEDDEBUGINFO) ? 22 : 23;
@@ -691,7 +692,7 @@
      }
  
      public int getPlayerCount() {
-@@ -826,12 +1125,22 @@
+@@ -826,12 +1126,22 @@
      }
  
      public void removeAll() {
@@ -716,7 +717,7 @@
      public void broadcastSystemMessage(IChatBaseComponent ichatbasecomponent, boolean flag) {
          this.broadcastSystemMessage(ichatbasecomponent, (entityplayer) -> {
              return ichatbasecomponent;
-@@ -889,16 +1198,23 @@
+@@ -889,16 +1199,23 @@
          return playerchatmessage.hasSignature() && !playerchatmessage.hasExpiredServer(Instant.now());
      }
  
@@ -744,7 +745,7 @@
                  Path path = file2.toPath();
  
                  if (FileUtils.isPathNormalized(path) && FileUtils.isPathPortable(path) && path.startsWith(file.getPath()) && file2.isFile()) {
-@@ -907,7 +1223,7 @@
+@@ -907,7 +1224,7 @@
              }
  
              serverstatisticmanager = new ServerStatisticManager(this.server, file1);
@@ -753,7 +754,7 @@
          }
  
          return serverstatisticmanager;
-@@ -915,14 +1231,14 @@
+@@ -915,14 +1232,14 @@
  
      public AdvancementDataPlayer getPlayerAdvancements(EntityPlayer entityplayer) {
          UUID uuid = entityplayer.getUUID();
@@ -770,7 +771,7 @@
          }
  
          advancementdataplayer.setPlayer(entityplayer);
-@@ -973,13 +1289,20 @@
+@@ -973,13 +1290,20 @@
      }
  
      public void reloadResources() {