Updated Upstream (Bukkit/CraftBukkit) (#7009)

patches/server/Entity-AddTo-RemoveFrom-World-Events.patch

@@ -18,8 +18,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          public void onTrackingEnd(Entity entity) {
 @@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  }
- 
-             entity.valid = false; // CraftBukkit
+             }
+             // CraftBukkit end
 +            new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
          }
      }

patches/server/Player.setPlayerProfile-API.patch

@@ -116,5 +116,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end
  
-     public void removeDisconnectingPlayer(Player player) {
-         this.hiddenEntities.remove(player.getUniqueId());
+     public void onEntityRemove(Entity entity) {
+         this.hiddenEntities.remove(entity.getUUID());