From 729db1bed478d2e0f606ee73219b8930c4ad81b7 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 1 Feb 2022 13:06:41 +0000
Subject: [PATCH] Rebuild patches

Cos, you know, pushing the correct changes the first time woulda been
overrated
---
 .../server/Player.setPlayerProfile-API.patch  | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/patches/server/Player.setPlayerProfile-API.patch b/patches/server/Player.setPlayerProfile-API.patch
index be92f2904a..14ea954df0 100644
--- a/patches/server/Player.setPlayerProfile-API.patch
+++ b/patches/server/Player.setPlayerProfile-API.patch
@@ -45,6 +45,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper start
          Entity other = ((CraftEntity) entity).getHandle();
 +        unregisterEntity(other);
++
++        server.getPluginManager().callEvent(new PlayerHideEntityEvent(this, entity));
 +    }
 +    private void unregisterEntity(Entity other) {
 +        // Paper end
@@ -52,6 +54,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
          if (entry != null) {
              entry.removePlayer(this.getHandle());
+@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+                 this.getHandle().connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER, otherPlayer));
+             }
+         }
+-
+-        server.getPluginManager().callEvent(new PlayerHideEntityEvent(this, entity));
+     }
+ 
+     @Override
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          this.hiddenEntities.remove(entity.getUniqueId());
@@ -60,6 +71,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper start
          Entity other = ((CraftEntity) entity).getHandle();
 +        registerEntity(other);
++
++        server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity));
 +    }
 +    private void registerEntity(Entity other) {
 +        ChunkMap tracker = ((ServerLevel) this.getHandle().level).getChunkSource().chunkMap;
@@ -68,9 +81,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (other instanceof ServerPlayer) {
              ServerPlayer otherPlayer = (ServerPlayer) other;
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-         server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity));
-     }
+         if (entry != null && !entry.seenBy.contains(this.getHandle().connection)) {
+             entry.updatePlayer(this.getHandle());
+         }
++    }
 +    // Paper start
 +    private void reregisterPlayer(ServerPlayer player) {
 +        if (!hiddenEntities.containsKey(player.getUUID())) {
@@ -93,7 +107,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile() {
 +        return new com.destroystokyo.paper.profile.CraftPlayerProfile(this).clone();
 +    }
-+
+ 
+-        server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity));
 +    private void refreshPlayer() {
 +        ServerPlayer handle = getHandle();
 +
@@ -113,7 +128,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            this.setOp(false);
 +            this.setOp(true);
 +        }
-+    }
+     }
 +    // Paper end
  
      public void onEntityRemove(Entity entity) {