Remap CraftBukkit to Mojang+Yarn Mappings

By: Initial Source <noreply+automated@papermc.io>
2024-12-11 22:26:55 +01:00
parent a265d64138
commit 30e4583dbe
1780 changed files with 44628 additions and 41274 deletions
--- a/paper-server/patches/sources/net/minecraft/server/players/BanListEntry.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/players/BanListEntry.java.patch
@@ -0,0 +1,34 @@
+--- a/net/minecraft/server/players/BanListEntry.java
+++ b/net/minecraft/server/players/BanListEntry.java
+@@ -27,7 +27,7 @@
+     }
+ 
+     protected BanListEntry(@Nullable T key, JsonObject json) {
+-        super(key);
+        super(BanListEntry.checkExpiry(key, json)); // CraftBukkit
+ 
+         Date date;
+ 
+@@ -83,4 +83,22 @@
+         json.addProperty("expires", this.expires == null ? "forever" : BanListEntry.DATE_FORMAT.format(this.expires));
+         json.addProperty("reason", this.reason);
+     }
+
+    // CraftBukkit start
+    private static <T> T checkExpiry(T object, JsonObject jsonobject) {
+        Date expires = null;
+
+        try {
+            expires = jsonobject.has("expires") ? BanListEntry.DATE_FORMAT.parse(jsonobject.get("expires").getAsString()) : null;
+        } catch (ParseException ex) {
+            // Guess we don't have a date
+        }
+
+        if (expires == null || expires.after(new Date())) {
+            return object;
+        } else {
+            return null;
+        }
+    }
+    // CraftBukkit end
+ }
--- a/paper-server/patches/sources/net/minecraft/server/players/ExpirableListEntry.patch
+++ b/paper-server/patches/sources/net/minecraft/server/players/ExpirableListEntry.patch
@@ -1,34 +0,0 @@
--- a/net/minecraft/server/players/ExpirableListEntry.java
-+++ b/net/minecraft/server/players/ExpirableListEntry.java
-@@ -27,7 +27,7 @@
-     }
- 
-     protected ExpirableListEntry(@Nullable T t0, JsonObject jsonobject) {
-        super(t0);
-+        super(checkExpiry(t0, jsonobject)); // CraftBukkit
- 
-         Date date;
- 
-@@ -83,4 +83,22 @@
-         jsonobject.addProperty("expires", this.expires == null ? "forever" : ExpirableListEntry.DATE_FORMAT.format(this.expires));
-         jsonobject.addProperty("reason", this.reason);
-     }
-+
-+    // CraftBukkit start
-+    private static <T> T checkExpiry(T object, JsonObject jsonobject) {
-+        Date expires = null;
-+
-+        try {
-+            expires = jsonobject.has("expires") ? DATE_FORMAT.parse(jsonobject.get("expires").getAsString()) : null;
-+        } catch (ParseException ex) {
-+            // Guess we don't have a date
-+        }
-+
-+        if (expires == null || expires.after(new Date())) {
-+            return object;
-+        } else {
-+            return null;
-+        }
-+    }
-+    // CraftBukkit end
- }
--- a/paper-server/patches/sources/net/minecraft/server/players/GameProfileBanEntry.patch
+++ b/paper-server/patches/sources/net/minecraft/server/players/GameProfileBanEntry.patch
@@ -1,7 +0,0 @@
--- a/net/minecraft/server/players/GameProfileBanEntry.java
-+++ b/net/minecraft/server/players/GameProfileBanEntry.java
-@@ -1,3 +1,4 @@
-+// mc-dev import
- package net.minecraft.server.players;
- 
- import com.google.gson.JsonObject;
--- a/paper-server/patches/sources/net/minecraft/server/players/GameProfileCache.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/players/GameProfileCache.java.patch
@@ -1,5 +1,5 @@
--- a/net/minecraft/server/players/UserCache.java
-+++ b/net/minecraft/server/players/UserCache.java
+--- a/net/minecraft/server/players/GameProfileCache.java
+++ b/net/minecraft/server/players/GameProfileCache.java
@@ -85,7 +85,7 @@
                 }
 
@@ -13,8 +13,8 @@
             usercache_usercacheentry.setLastAccess(this.getNextOperation());
             optional = Optional.of(usercache_usercacheentry.getProfile());
         } else {
-            optional = lookupGameProfile(this.profileRepository, s1);
-+            optional = lookupGameProfile(this.profileRepository, s); // CraftBukkit - use correct case for offline players
+-            optional = GameProfileCache.lookupGameProfile(this.profileRepository, s1);
+            optional = GameProfileCache.lookupGameProfile(this.profileRepository, name); // CraftBukkit - use correct case for offline players
             if (optional.isPresent()) {
                 this.add((GameProfile) optional.get());
                 flag = false;
@@ -23,16 +23,16 @@
             label54:
             {
 -                ArrayList arraylist;
-+                List<UserCache.UserCacheEntry> arraylist; // CraftBukkit - decompile error
+                List<GameProfileCache.GameProfileInfo> arraylist; // CraftBukkit - decompile error
 
                 try {
                     JsonArray jsonarray = (JsonArray) this.gson.fromJson(bufferedreader, JsonArray.class);
@@ -217,7 +217,7 @@
-                         DateFormat dateformat = createDateFormat();
+                         DateFormat dateformat = GameProfileCache.createDateFormat();
 
                         jsonarray.forEach((jsonelement) -> {
-                            Optional optional = readGameProfile(jsonelement, dateformat);
-+                            Optional<UserCache.UserCacheEntry> optional = readGameProfile(jsonelement, dateformat); // CraftBukkit - decompile error
+-                            Optional optional = GameProfileCache.readGameProfile(jsonelement, dateformat);
+                            Optional<GameProfileCache.GameProfileInfo> optional = GameProfileCache.readGameProfile(jsonelement, dateformat); // CraftBukkit - decompile error
 
                             Objects.requireNonNull(list);
                             optional.ifPresent(list::add);
--- a/paper-server/patches/sources/net/minecraft/server/players/NameReferencingFileConverter.patch
+++ b/paper-server/patches/sources/net/minecraft/server/players/NameReferencingFileConverter.patch
@@ -1,82 +0,0 @@
--- a/net/minecraft/server/players/NameReferencingFileConverter.java
-+++ b/net/minecraft/server/players/NameReferencingFileConverter.java
-@@ -27,6 +27,12 @@
- import net.minecraft.world.level.storage.SavedFile;
- import org.slf4j.Logger;
- 
-+// CraftBukkit start
-+import net.minecraft.nbt.NBTCompressedStreamTools;
-+import net.minecraft.nbt.NBTReadLimiter;
-+import net.minecraft.nbt.NBTTagCompound;
-+// CraftBukkit end
-+
- public class NameReferencingFileConverter {
- 
-     static final Logger LOGGER = LogUtils.getLogger();
-@@ -85,7 +91,7 @@
-                 try {
-                     gameprofilebanlist.load();
-                 } catch (IOException ioexception) {
-                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", gameprofilebanlist.getFile().getName(), ioexception);
-+                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", gameprofilebanlist.getFile().getName()); // CraftBukkit - don't print stacktrace
-                 }
-             }
- 
-@@ -143,7 +149,7 @@
-                 try {
-                     ipbanlist.load();
-                 } catch (IOException ioexception) {
-                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", ipbanlist.getFile().getName(), ioexception);
-+                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", ipbanlist.getFile().getName()); // CraftBukkit - don't print stacktrace
-                 }
-             }
- 
-@@ -184,7 +190,7 @@
-                 try {
-                     oplist.load();
-                 } catch (IOException ioexception) {
-                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", oplist.getFile().getName(), ioexception);
-+                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", oplist.getFile().getName()); // CraftBukkit - don't print stacktrace
-                 }
-             }
- 
-@@ -228,7 +234,7 @@
-                 try {
-                     whitelist.load();
-                 } catch (IOException ioexception) {
-                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", whitelist.getFile().getName(), ioexception);
-+                    NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", whitelist.getFile().getName()); // CraftBukkit - don't print stacktrace
-                 }
-             }
- 
-@@ -347,6 +353,30 @@
-                         File file5 = new File(file, s2 + ".dat");
-                         File file6 = new File(file4, s3 + ".dat");
- 
-+                        // CraftBukkit start - Use old file name to seed lastKnownName
-+                        NBTTagCompound root = null;
-+
-+                        try {
-+                            root = NBTCompressedStreamTools.readCompressed(new java.io.FileInputStream(file5), NBTReadLimiter.unlimitedHeap());
-+                        } catch (Exception exception) {
-+                            exception.printStackTrace();
-+                        }
-+
-+                        if (root != null) {
-+                            if (!root.contains("bukkit")) {
-+                                root.put("bukkit", new NBTTagCompound());
-+                            }
-+                            NBTTagCompound data = root.getCompound("bukkit");
-+                            data.putString("lastKnownName", s2);
-+
-+                            try {
-+                                NBTCompressedStreamTools.writeCompressed(root, new java.io.FileOutputStream(file2));
-+                            } catch (Exception exception) {
-+                                exception.printStackTrace();
-+                            }
-+                       }
-+                        // CraftBukkit end
-+
-                         NameReferencingFileConverter.ensureDirectoryExists(file4);
-                         if (!file5.renameTo(file6)) {
-                             throw new NameReferencingFileConverter.FileConversionException("Could not convert file for " + s2);
--- a/paper-server/patches/sources/net/minecraft/server/players/OldUsersConverter.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/players/OldUsersConverter.java.patch
@@ -0,0 +1,79 @@
+--- a/net/minecraft/server/players/OldUsersConverter.java
+++ b/net/minecraft/server/players/OldUsersConverter.java
+@@ -21,6 +21,9 @@
+ import java.util.UUID;
+ import javax.annotation.Nullable;
+ import net.minecraft.core.UUIDUtil;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtAccounter;
+import net.minecraft.nbt.NbtIo;
+ import net.minecraft.server.MinecraftServer;
+ import net.minecraft.server.dedicated.DedicatedServer;
+ import net.minecraft.util.StringUtil;
+@@ -85,7 +88,7 @@
+                 try {
+                     gameprofilebanlist.load();
+                 } catch (IOException ioexception) {
+-                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", gameprofilebanlist.getFile().getName(), ioexception);
+                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", gameprofilebanlist.getFile().getName()); // CraftBukkit - don't print stacktrace
+                 }
+             }
+ 
+@@ -143,7 +146,7 @@
+                 try {
+                     ipbanlist.load();
+                 } catch (IOException ioexception) {
+-                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", ipbanlist.getFile().getName(), ioexception);
+                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", ipbanlist.getFile().getName()); // CraftBukkit - don't print stacktrace
+                 }
+             }
+ 
+@@ -184,7 +187,7 @@
+                 try {
+                     oplist.load();
+                 } catch (IOException ioexception) {
+-                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", oplist.getFile().getName(), ioexception);
+                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", oplist.getFile().getName()); // CraftBukkit - don't print stacktrace
+                 }
+             }
+ 
+@@ -228,7 +231,7 @@
+                 try {
+                     whitelist.load();
+                 } catch (IOException ioexception) {
+-                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", whitelist.getFile().getName(), ioexception);
+                    OldUsersConverter.LOGGER.warn("Could not load existing file {}", whitelist.getFile().getName()); // CraftBukkit - don't print stacktrace
+                 }
+             }
+ 
+@@ -347,6 +350,30 @@
+                         File file5 = new File(file, fileName + ".dat");
+                         File file6 = new File(playerDataFolder, uuid + ".dat");
+ 
+                        // CraftBukkit start - Use old file name to seed lastKnownName
+                        CompoundTag root = null;
+
+                        try {
+                            root = NbtIo.readCompressed(new java.io.FileInputStream(file5), NbtAccounter.unlimitedHeap());
+                        } catch (Exception exception) {
+                            exception.printStackTrace();
+                        }
+
+                        if (root != null) {
+                            if (!root.contains("bukkit")) {
+                                root.put("bukkit", new CompoundTag());
+                            }
+                            CompoundTag data = root.getCompound("bukkit");
+                            data.putString("lastKnownName", fileName);
+
+                            try {
+                                NbtIo.writeCompressed(root, new java.io.FileOutputStream(file2));
+                            } catch (Exception exception) {
+                                exception.printStackTrace();
+                            }
+                       }
+                        // CraftBukkit end
+
+                         OldUsersConverter.ensureDirectoryExists(playerDataFolder);
+                         if (!file5.renameTo(file6)) {
+                             throw new OldUsersConverter.ConversionError("Could not convert file for " + fileName);
--- a/paper-server/patches/sources/net/minecraft/server/players/PlayerList.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/players/PlayerList.java.patch
@@ -0,0 +1,911 @@
+--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
+@@ -76,6 +76,7 @@
+ import net.minecraft.server.level.ServerPlayer;
+ import net.minecraft.server.network.CommonListenerCookie;
+ import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.server.network.ServerLoginPacketListenerImpl;
+ import net.minecraft.sounds.SoundEvents;
+ import net.minecraft.sounds.SoundSource;
+ import net.minecraft.stats.ServerStatsCounter;
+@@ -84,7 +85,6 @@
+ import net.minecraft.world.effect.MobEffectInstance;
+ import net.minecraft.world.entity.Entity;
+ import net.minecraft.world.entity.LivingEntity;
+-import net.minecraft.world.entity.player.Player;
+ import net.minecraft.world.entity.projectile.ThrownEnderpearl;
+ import net.minecraft.world.item.crafting.RecipeManager;
+ import net.minecraft.world.level.GameRules;
+@@ -104,6 +104,26 @@
+ import net.minecraft.world.scores.PlayerTeam;
+ import org.slf4j.Logger;
+ 
+// CraftBukkit start
+import java.util.stream.Collectors;
+import net.minecraft.server.dedicated.DedicatedServer;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.craftbukkit.util.CraftChatMessage;
+import org.bukkit.craftbukkit.util.CraftLocation;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityRemoveEvent;
+import org.bukkit.event.player.PlayerChangedWorldEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.event.player.PlayerRespawnEvent.RespawnReason;
+import org.bukkit.event.player.PlayerSpawnChangeEvent;
+// CraftBukkit end
+
+ public abstract class PlayerList {
+ 
+     public static final File USERBANLIST_FILE = new File("banned-players.json");
+@@ -116,14 +136,16 @@
+     private static final int SEND_PLAYER_INFO_INTERVAL = 600;
+     private static final SimpleDateFormat BAN_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z");
+     private final MinecraftServer server;
+-    public final List<ServerPlayer> players = Lists.newArrayList();
+    public final List<ServerPlayer> players = new java.util.concurrent.CopyOnWriteArrayList(); // CraftBukkit - ArrayList -> CopyOnWriteArrayList: Iterator safety
+     private final Map<UUID, ServerPlayer> playersByUUID = Maps.newHashMap();
+     private final UserBanList bans;
+     private final IpBanList ipBans;
+     private final ServerOpList ops;
+     private final UserWhiteList whitelist;
+-    private final Map<UUID, ServerStatsCounter> stats;
+-    private final Map<UUID, PlayerAdvancements> advancements;
+    // CraftBukkit start
+    // private final Map<UUID, ServerStatisticManager> stats;
+    // private final Map<UUID, AdvancementDataPlayer> advancements;
+    // CraftBukkit end
+     public final PlayerDataStorage playerIo;
+     private boolean doWhiteList;
+     private final LayeredRegistryAccess<RegistryLayer> registries;
+@@ -134,13 +156,23 @@
+     private static final boolean ALLOW_LOGOUTIVATOR = false;
+     private int sendAllPlayerInfoIn;
+ 
+    // CraftBukkit start
+    private CraftServer cserver;
+
+     public PlayerList(MinecraftServer server, LayeredRegistryAccess<RegistryLayer> registryManager, PlayerDataStorage saveHandler, int maxPlayers) {
+        this.cserver = server.server = new CraftServer((DedicatedServer) server, this);
+        server.console = org.bukkit.craftbukkit.command.ColouredConsoleSender.getInstance();
+        server.reader.addCompleter(new org.bukkit.craftbukkit.command.ConsoleCommandCompleter(server.server));
+        // CraftBukkit end
+
+         this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
+         this.ipBans = new IpBanList(PlayerList.IPBANLIST_FILE);
+         this.ops = new ServerOpList(PlayerList.OPLIST_FILE);
+         this.whitelist = new UserWhiteList(PlayerList.WHITELIST_FILE);
+-        this.stats = Maps.newHashMap();
+-        this.advancements = Maps.newHashMap();
+        // CraftBukkit start
+        // this.stats = Maps.newHashMap();
+        // this.advancements = Maps.newHashMap();
+        // CraftBukkit end
+         this.server = server;
+         this.registries = registryManager;
+         this.maxPlayers = maxPlayers;
+@@ -150,25 +182,34 @@
+     public void placeNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie clientData) {
+         GameProfile gameprofile = player.getGameProfile();
+         GameProfileCache usercache = this.server.getProfileCache();
+-        Optional optional;
+        // Optional optional; // CraftBukkit - decompile error
+         String s;
+ 
+         if (usercache != null) {
+-            optional = usercache.get(gameprofile.getId());
+            Optional<GameProfile> optional = usercache.get(gameprofile.getId()); // CraftBukkit - decompile error
+             s = (String) optional.map(GameProfile::getName).orElse(gameprofile.getName());
+             usercache.add(gameprofile);
+         } else {
+             s = gameprofile.getName();
+         }
+ 
+-        optional = this.load(player);
+        Optional<CompoundTag> optional = this.load(player); // CraftBukkit - decompile error
+        // CraftBukkit start - Better rename detection
+        if (optional.isPresent()) {
+            CompoundTag nbttagcompound = optional.get();
+            if (nbttagcompound.contains("bukkit")) {
+                CompoundTag bukkit = nbttagcompound.getCompound("bukkit");
+                s = bukkit.contains("lastKnownName", 8) ? bukkit.getString("lastKnownName") : s;
+            }
+        }
+        // CraftBukkit end
+         ResourceKey<Level> resourcekey = (ResourceKey) optional.flatMap((nbttagcompound) -> {
+-            DataResult dataresult = DimensionType.parseLegacy(new Dynamic(NbtOps.INSTANCE, nbttagcompound.get("Dimension")));
+            DataResult<ResourceKey<Level>> dataresult = DimensionType.parseLegacy(new Dynamic(NbtOps.INSTANCE, nbttagcompound.get("Dimension"))); // CraftBukkit - decompile error
+             Logger logger = PlayerList.LOGGER;
+ 
+             Objects.requireNonNull(logger);
+             return dataresult.resultOrPartial(logger::error);
+-        }).orElse(Level.OVERWORLD);
+        }).orElse(player.serverLevel().dimension()); // CraftBukkit - SPIGOT-7507: If no dimension, fall back to existing dimension loaded from "WorldUUID", which in turn defaults to World.OVERWORLD
+         ServerLevel worldserver = this.server.getLevel(resourcekey);
+         ServerLevel worldserver1;
+ 
+@@ -182,10 +223,11 @@
+         player.setServerLevel(worldserver1);
+         String s1 = connection.getLoggableAddress(this.server.logIPs());
+ 
+-        PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", new Object[]{player.getName().getString(), s1, player.getId(), player.getX(), player.getY(), player.getZ()});
+        // CraftBukkit - Moved message to after join
+        // PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", new Object[]{entityplayer.getName().getString(), s1, entityplayer.getId(), entityplayer.getX(), entityplayer.getY(), entityplayer.getZ()});
+         LevelData worlddata = worldserver1.getLevelData();
+ 
+-        player.loadGameTypes((CompoundTag) optional.orElse((Object) null));
+        player.loadGameTypes((CompoundTag) optional.orElse(null)); // CraftBukkit - decompile error
+         ServerGamePacketListenerImpl playerconnection = new ServerGamePacketListenerImpl(this.server, connection, player, clientData);
+ 
+         connection.setupInboundProtocol(GameProtocols.SERVERBOUND_TEMPLATE.bind(RegistryFriendlyByteBuf.decorator(this.server.registryAccess())), playerconnection);
+@@ -195,6 +237,7 @@
+         boolean flag2 = gamerules.getBoolean(GameRules.RULE_LIMITED_CRAFTING);
+ 
+         playerconnection.send(new ClientboundLoginPacket(player.getId(), worlddata.isHardcore(), this.server.levelKeys(), this.getMaxPlayers(), this.viewDistance, this.simulationDistance, flag1, !flag, flag2, player.createCommonSpawnInfo(worldserver1), this.server.enforceSecureProfile()));
+        player.getBukkitEntity().sendSupportedChannels(); // CraftBukkit
+         playerconnection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
+         playerconnection.send(new ClientboundPlayerAbilitiesPacket(player.getAbilities()));
+         playerconnection.send(new ClientboundSetHeldSlotPacket(player.getInventory().selected));
+@@ -213,8 +256,10 @@
+         } else {
+             ichatmutablecomponent = Component.translatable("multiplayer.player.joined.renamed", player.getDisplayName(), s);
+         }
+        // CraftBukkit start
+        ichatmutablecomponent.withStyle(ChatFormatting.YELLOW);
+        String joinMessage = CraftChatMessage.fromComponent(ichatmutablecomponent);
+ 
+-        this.broadcastSystemMessage(ichatmutablecomponent.withStyle(ChatFormatting.YELLOW), false);
+         playerconnection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
+         ServerStatus serverping = this.server.getStatus();
+ 
+@@ -222,17 +267,70 @@
+             player.sendServerStatus(serverping);
+         }
+ 
+-        player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players));
+        // entityplayer.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players)); // CraftBukkit - replaced with loop below
+         this.players.add(player);
+         this.playersByUUID.put(player.getUUID(), player);
+-        this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player)));
+        // this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer))); // CraftBukkit - replaced with loop below
+
+        // CraftBukkit start
+        CraftPlayer bukkitPlayer = player.getBukkitEntity();
+
+        // Ensure that player inventory is populated with its viewer
+        player.containerMenu.transferTo(player.containerMenu, bukkitPlayer);
+
+        PlayerJoinEvent playerJoinEvent = new PlayerJoinEvent(bukkitPlayer, joinMessage);
+        this.cserver.getPluginManager().callEvent(playerJoinEvent);
+
+        if (!player.connection.isAcceptingMessages()) {
+            return;
+        }
+
+        joinMessage = playerJoinEvent.getJoinMessage();
+
+        if (joinMessage != null && joinMessage.length() > 0) {
+            for (Component line : org.bukkit.craftbukkit.util.CraftChatMessage.fromString(joinMessage)) {
+                this.server.getPlayerList().broadcastSystemMessage(line, false);
+            }
+        }
+        // CraftBukkit end
+
+        // CraftBukkit start - sendAll above replaced with this loop
+        ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player));
+
+        for (int i = 0; i < this.players.size(); ++i) {
+            ServerPlayer entityplayer1 = (ServerPlayer) this.players.get(i);
+
+            if (entityplayer1.getBukkitEntity().canSee(bukkitPlayer)) {
+                entityplayer1.connection.send(packet);
+            }
+
+            if (!bukkitPlayer.canSee(entityplayer1.getBukkitEntity())) {
+                continue;
+            }
+
+            player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer1)));
+        }
+        player.sentListPacket = true;
+        // CraftBukkit end
+
+        player.refreshEntityData(player); // CraftBukkit - BungeeCord#2321, send complete data to self on spawn
+
+         this.sendLevelInfo(player, worldserver1);
+-        worldserver1.addNewPlayer(player);
+-        this.server.getCustomBossEvents().onPlayerConnect(player);
+
+        // CraftBukkit start - Only add if the player wasn't moved in the event
+        if (player.level() == worldserver1 && !worldserver1.players().contains(player)) {
+            worldserver1.addNewPlayer(player);
+            this.server.getCustomBossEvents().onPlayerConnect(player);
+        }
+
+        worldserver1 = player.serverLevel(); // CraftBukkit - Update in case join event changed it
+        // CraftBukkit end
+         this.sendActivePlayerEffects(player);
+         player.loadAndSpawnEnderpearls(optional);
+         player.loadAndSpawnParentVehicle(optional);
+         player.initInventoryMenu();
+        // CraftBukkit - Moved from above, added world
+        PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
+     }
+ 
+     public void updateEntireScoreboard(ServerScoreboard scoreboard, ServerPlayer player) {
+@@ -269,30 +367,31 @@
+     }
+ 
+     public void addWorldborderListener(ServerLevel world) {
+        if (this.playerIo != null) return; // CraftBukkit
+         world.getWorldBorder().addListener(new BorderChangeListener() {
+             @Override
+             public void onBorderSizeSet(WorldBorder border, double size) {
+-                PlayerList.this.broadcastAll(new ClientboundSetBorderSizePacket(border));
+                PlayerList.this.broadcastAll(new ClientboundSetBorderSizePacket(border), border.world); // CraftBukkit
+             }
+ 
+             @Override
+             public void onBorderSizeLerping(WorldBorder border, double fromSize, double toSize, long time) {
+-                PlayerList.this.broadcastAll(new ClientboundSetBorderLerpSizePacket(border));
+                PlayerList.this.broadcastAll(new ClientboundSetBorderLerpSizePacket(border), border.world); // CraftBukkit
+             }
+ 
+             @Override
+             public void onBorderCenterSet(WorldBorder border, double centerX, double centerZ) {
+-                PlayerList.this.broadcastAll(new ClientboundSetBorderCenterPacket(border));
+                PlayerList.this.broadcastAll(new ClientboundSetBorderCenterPacket(border), border.world); // CraftBukkit
+             }
+ 
+             @Override
+             public void onBorderSetWarningTime(WorldBorder border, int warningTime) {
+-                PlayerList.this.broadcastAll(new ClientboundSetBorderWarningDelayPacket(border));
+                PlayerList.this.broadcastAll(new ClientboundSetBorderWarningDelayPacket(border), border.world); // CraftBukkit
+             }
+ 
+             @Override
+             public void onBorderSetWarningBlocks(WorldBorder border, int warningBlockDistance) {
+-                PlayerList.this.broadcastAll(new ClientboundSetBorderWarningDistancePacket(border));
+                PlayerList.this.broadcastAll(new ClientboundSetBorderWarningDistancePacket(border), border.world); // CraftBukkit
+             }
+ 
+             @Override
+@@ -319,14 +418,15 @@
+     }
+ 
+     protected void save(ServerPlayer player) {
+        if (!player.getBukkitEntity().isPersistent()) return; // CraftBukkit
+         this.playerIo.save(player);
+-        ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) this.stats.get(player.getUUID());
+        ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit
+ 
+         if (serverstatisticmanager != null) {
+             serverstatisticmanager.save();
+         }
+ 
+-        PlayerAdvancements advancementdataplayer = (PlayerAdvancements) this.advancements.get(player.getUUID());
+        PlayerAdvancements advancementdataplayer = (PlayerAdvancements) player.getAdvancements(); // CraftBukkit
+ 
+         if (advancementdataplayer != null) {
+             advancementdataplayer.save();
+@@ -334,95 +434,175 @@
+ 
+     }
+ 
+-    public void remove(ServerPlayer player) {
+-        ServerLevel worldserver = player.serverLevel();
+    public String remove(ServerPlayer entityplayer) { // CraftBukkit - return string
+        ServerLevel worldserver = entityplayer.serverLevel();
+ 
+-        player.awardStat(Stats.LEAVE_GAME);
+-        this.save(player);
+-        if (player.isPassenger()) {
+-            Entity entity = player.getRootVehicle();
+        entityplayer.awardStat(Stats.LEAVE_GAME);
+ 
+        // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it
+        // See SPIGOT-5799, SPIGOT-6145
+        if (entityplayer.containerMenu != entityplayer.inventoryMenu) {
+            entityplayer.closeContainer();
+        }
+
+        PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), entityplayer.kickLeaveMessage != null ? entityplayer.kickLeaveMessage : "\u00A7e" + entityplayer.getScoreboardName() + " left the game");
+        this.cserver.getPluginManager().callEvent(playerQuitEvent);
+        entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
+
+        entityplayer.doTick(); // SPIGOT-924
+        // CraftBukkit end
+
+        this.save(entityplayer);
+        if (entityplayer.isPassenger()) {
+            Entity entity = entityplayer.getRootVehicle();
+
+             if (entity.hasExactlyOnePlayerPassenger()) {
+                 PlayerList.LOGGER.debug("Removing player mount");
+-                player.stopRiding();
+                entityplayer.stopRiding();
+                 entity.getPassengersAndSelf().forEach((entity1) -> {
+-                    entity1.setRemoved(Entity.RemovalReason.UNLOADED_WITH_PLAYER);
+                    entity1.setRemoved(Entity.RemovalReason.UNLOADED_WITH_PLAYER, EntityRemoveEvent.Cause.PLAYER_QUIT); // CraftBukkit - add Bukkit remove cause
+                 });
+             }
+         }
+ 
+-        player.unRide();
+-        Iterator iterator = player.getEnderPearls().iterator();
+        entityplayer.unRide();
+        Iterator iterator = entityplayer.getEnderPearls().iterator();
+ 
+         while (iterator.hasNext()) {
+             ThrownEnderpearl entityenderpearl = (ThrownEnderpearl) iterator.next();
+ 
+-            entityenderpearl.setRemoved(Entity.RemovalReason.UNLOADED_WITH_PLAYER);
+            entityenderpearl.setRemoved(Entity.RemovalReason.UNLOADED_WITH_PLAYER, EntityRemoveEvent.Cause.PLAYER_QUIT); // CraftBukkit - add Bukkit remove cause
+         }
+ 
+-        worldserver.removePlayerImmediately(player, Entity.RemovalReason.UNLOADED_WITH_PLAYER);
+-        player.getAdvancements().stopListening();
+-        this.players.remove(player);
+-        this.server.getCustomBossEvents().onPlayerDisconnect(player);
+-        UUID uuid = player.getUUID();
+        worldserver.removePlayerImmediately(entityplayer, Entity.RemovalReason.UNLOADED_WITH_PLAYER);
+        entityplayer.getAdvancements().stopListening();
+        this.players.remove(entityplayer);
+        this.server.getCustomBossEvents().onPlayerDisconnect(entityplayer);
+        UUID uuid = entityplayer.getUUID();
+         ServerPlayer entityplayer1 = (ServerPlayer) this.playersByUUID.get(uuid);
+ 
+-        if (entityplayer1 == player) {
+        if (entityplayer1 == entityplayer) {
+             this.playersByUUID.remove(uuid);
+-            this.stats.remove(uuid);
+-            this.advancements.remove(uuid);
+            // CraftBukkit start
+            // this.stats.remove(uuid);
+            // this.advancements.remove(uuid);
+            // CraftBukkit end
+         }
+ 
+-        this.broadcastAll(new ClientboundPlayerInfoRemovePacket(List.of(player.getUUID())));
+        // CraftBukkit start
+        // this.broadcastAll(new ClientboundPlayerInfoRemovePacket(List.of(entityplayer.getUUID())));
+        ClientboundPlayerInfoRemovePacket packet = new ClientboundPlayerInfoRemovePacket(List.of(entityplayer.getUUID()));
+        for (int i = 0; i < this.players.size(); i++) {
+            ServerPlayer entityplayer2 = (ServerPlayer) this.players.get(i);
+
+            if (entityplayer2.getBukkitEntity().canSee(entityplayer.getBukkitEntity())) {
+                entityplayer2.connection.send(packet);
+            } else {
+                entityplayer2.getBukkitEntity().onEntityRemove(entityplayer);
+            }
+        }
+        // This removes the scoreboard (and player reference) for the specific player in the manager
+        this.cserver.getScoreboardManager().removePlayer(entityplayer.getBukkitEntity());
+        // CraftBukkit end
+
+        return playerQuitEvent.getQuitMessage(); // CraftBukkit
+     }
+ 
+-    @Nullable
+-    public Component canPlayerLogin(SocketAddress address, GameProfile profile) {
+    // CraftBukkit start - Whole method, SocketAddress to LoginListener, added hostname to signature, return EntityPlayer
+    public ServerPlayer canPlayerLogin(ServerLoginPacketListenerImpl loginlistener, GameProfile gameprofile) {
+         MutableComponent ichatmutablecomponent;
+ 
+-        if (this.bans.isBanned(profile)) {
+-            UserBanListEntry gameprofilebanentry = (UserBanListEntry) this.bans.get(profile);
+        // Moved from processLogin
+        UUID uuid = gameprofile.getId();
+        List<ServerPlayer> list = Lists.newArrayList();
+ 
+        ServerPlayer entityplayer;
+
+        for (int i = 0; i < this.players.size(); ++i) {
+            entityplayer = (ServerPlayer) this.players.get(i);
+            if (entityplayer.getUUID().equals(uuid)) {
+                list.add(entityplayer);
+            }
+        }
+
+        Iterator iterator = list.iterator();
+
+        while (iterator.hasNext()) {
+            entityplayer = (ServerPlayer) iterator.next();
+            this.save(entityplayer); // CraftBukkit - Force the player's inventory to be saved
+            entityplayer.connection.disconnect(Component.translatable("multiplayer.disconnect.duplicate_login"));
+        }
+
+        // Instead of kicking then returning, we need to store the kick reason
+        // in the event, check with plugins to see if it's ok, and THEN kick
+        // depending on the outcome.
+        SocketAddress socketaddress = loginlistener.connection.getRemoteAddress();
+
+        ServerPlayer entity = new ServerPlayer(this.server, this.server.getLevel(Level.OVERWORLD), gameprofile, ClientInformation.createDefault());
+        entity.transferCookieConnection = loginlistener;
+        Player player = entity.getBukkitEntity();
+        PlayerLoginEvent event = new PlayerLoginEvent(player, loginlistener.connection.hostname, ((java.net.InetSocketAddress) socketaddress).getAddress());
+
+        if (this.bans.isBanned(gameprofile)) {
+            UserBanListEntry gameprofilebanentry = (UserBanListEntry) this.bans.get(gameprofile);
+
+             ichatmutablecomponent = Component.translatable("multiplayer.disconnect.banned.reason", gameprofilebanentry.getReason());
+             if (gameprofilebanentry.getExpires() != null) {
+                 ichatmutablecomponent.append((Component) Component.translatable("multiplayer.disconnect.banned.expiration", PlayerList.BAN_DATE_FORMAT.format(gameprofilebanentry.getExpires())));
+             }
+ 
+-            return ichatmutablecomponent;
+-        } else if (!this.isWhiteListed(profile)) {
+-            return Component.translatable("multiplayer.disconnect.not_whitelisted");
+-        } else if (this.ipBans.isBanned(address)) {
+-            IpBanListEntry ipbanentry = this.ipBans.get(address);
+            // return chatmessage;
+            event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(ichatmutablecomponent));
+        } else if (!this.isWhiteListed(gameprofile)) {
+            ichatmutablecomponent = Component.translatable("multiplayer.disconnect.not_whitelisted");
+            event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, CraftChatMessage.fromComponent(ichatmutablecomponent));
+        } else if (this.ipBans.isBanned(socketaddress)) {
+            IpBanListEntry ipbanentry = this.ipBans.get(socketaddress);
+ 
+             ichatmutablecomponent = Component.translatable("multiplayer.disconnect.banned_ip.reason", ipbanentry.getReason());
+             if (ipbanentry.getExpires() != null) {
+                 ichatmutablecomponent.append((Component) Component.translatable("multiplayer.disconnect.banned_ip.expiration", PlayerList.BAN_DATE_FORMAT.format(ipbanentry.getExpires())));
+             }
+ 
+-            return ichatmutablecomponent;
+-        } else {
+-            return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(profile) ? Component.translatable("multiplayer.disconnect.server_full") : null;
+            // return chatmessage;
+            event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(ichatmutablecomponent));
+        } else {
+            // return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile) ? IChatBaseComponent.translatable("multiplayer.disconnect.server_full") : null;
+            if (this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile)) {
+                event.disallow(PlayerLoginEvent.Result.KICK_FULL, "The server is full");
+            }
+         }
+
+        this.cserver.getPluginManager().callEvent(event);
+        if (event.getResult() != PlayerLoginEvent.Result.ALLOWED) {
+            loginlistener.disconnect(event.getKickMessage());
+            return null;
+        }
+        return entity;
+     }
+ 
+-    public ServerPlayer getPlayerForLogin(GameProfile profile, ClientInformation syncedOptions) {
+-        return new ServerPlayer(this.server, this.server.overworld(), profile, syncedOptions);
+    // CraftBukkit start - added EntityPlayer
+    public ServerPlayer getPlayerForLogin(GameProfile gameprofile, ClientInformation clientinformation, ServerPlayer player) {
+        player.updateOptions(clientinformation);
+        return player;
+        // CraftBukkit end
+     }
+ 
+-    public boolean disconnectAllPlayersWithProfile(GameProfile profile) {
+-        UUID uuid = profile.getId();
+-        Set<ServerPlayer> set = Sets.newIdentityHashSet();
+    public boolean disconnectAllPlayersWithProfile(GameProfile gameprofile, ServerPlayer player) { // CraftBukkit - added EntityPlayer
+        /* CraftBukkit startMoved up
+        UUID uuid = gameprofile.getId();
+        Set<EntityPlayer> set = Sets.newIdentityHashSet();
+         Iterator iterator = this.players.iterator();
+ 
+         while (iterator.hasNext()) {
+-            ServerPlayer entityplayer = (ServerPlayer) iterator.next();
+            EntityPlayer entityplayer = (EntityPlayer) iterator.next();
+ 
+             if (entityplayer.getUUID().equals(uuid)) {
+                 set.add(entityplayer);
+             }
+         }
+ 
+-        ServerPlayer entityplayer1 = (ServerPlayer) this.playersByUUID.get(profile.getId());
+        EntityPlayer entityplayer1 = (EntityPlayer) this.playersByUUID.get(gameprofile.getId());
+ 
+         if (entityplayer1 != null) {
+             set.add(entityplayer1);
+@@ -431,30 +611,49 @@
+         Iterator iterator1 = set.iterator();
+ 
+         while (iterator1.hasNext()) {
+-            ServerPlayer entityplayer2 = (ServerPlayer) iterator1.next();
+            EntityPlayer entityplayer2 = (EntityPlayer) iterator1.next();
+ 
+             entityplayer2.connection.disconnect(PlayerList.DUPLICATE_LOGIN_DISCONNECT_MESSAGE);
+         }
+ 
+         return !set.isEmpty();
+        */
+        return player == null;
+        // CraftBukkit end
+     }
+ 
+-    public ServerPlayer respawn(ServerPlayer player, boolean alive, Entity.RemovalReason removalReason) {
+-        this.players.remove(player);
+-        player.serverLevel().removePlayerImmediately(player, removalReason);
+-        TeleportTransition teleporttransition = player.findRespawnPositionAndUseSpawnBlock(!alive, TeleportTransition.DO_NOTHING);
+-        ServerLevel worldserver = teleporttransition.newLevel();
+-        ServerPlayer entityplayer1 = new ServerPlayer(this.server, worldserver, player.getGameProfile(), player.clientInformation());
+    // CraftBukkit start
+    public ServerPlayer respawn(ServerPlayer entityplayer, boolean flag, Entity.RemovalReason entity_removalreason, RespawnReason reason) {
+        return this.respawn(entityplayer, flag, entity_removalreason, reason, null);
+    }
+ 
+-        entityplayer1.connection = player.connection;
+-        entityplayer1.restoreFrom(player, alive);
+-        entityplayer1.setId(player.getId());
+-        entityplayer1.setMainArm(player.getMainArm());
+    public ServerPlayer respawn(ServerPlayer entityplayer, boolean flag, Entity.RemovalReason entity_removalreason, RespawnReason reason, Location location) {
+        entityplayer.stopRiding(); // CraftBukkit
+        this.players.remove(entityplayer);
+        entityplayer.serverLevel().removePlayerImmediately(entityplayer, entity_removalreason);
+        /* CraftBukkit start
+        TeleportTransition teleporttransition = entityplayer.findRespawnPositionAndUseSpawnBlock(!flag, TeleportTransition.DO_NOTHING);
+        WorldServer worldserver = teleporttransition.newLevel();
+        EntityPlayer entityplayer1 = new EntityPlayer(this.server, worldserver, entityplayer.getGameProfile(), entityplayer.clientInformation());
+        // */
+        ServerPlayer entityplayer1 = entityplayer;
+        Level fromWorld = entityplayer.level();
+        entityplayer.wonGame = false;
+        // CraftBukkit end
+
+        entityplayer1.connection = entityplayer.connection;
+        entityplayer1.restoreFrom(entityplayer, flag);
+        entityplayer1.setId(entityplayer.getId());
+        entityplayer1.setMainArm(entityplayer.getMainArm());
+        // CraftBukkit - not required, just copies old location into reused entity
+        /*
+         if (!teleporttransition.missingRespawnBlock()) {
+-            entityplayer1.copyRespawnPosition(player);
+            entityplayer1.copyRespawnPosition(entityplayer);
+         }
+         */
+        // CraftBukkit end
+ 
+-        Iterator iterator = player.getTags().iterator();
+        Iterator iterator = entityplayer.getTags().iterator();
+ 
+         while (iterator.hasNext()) {
+             String s = (String) iterator.next();
+@@ -462,41 +661,79 @@
+             entityplayer1.addTag(s);
+         }
+ 
+        // CraftBukkit start - fire PlayerRespawnEvent
+        TeleportTransition teleporttransition;
+        if (location == null) {
+            teleporttransition = entityplayer.findRespawnPositionAndUseSpawnBlock(!flag, TeleportTransition.DO_NOTHING, reason);
+
+            if (!flag) entityplayer.reset(); // SPIGOT-4785
+        } else {
+            teleporttransition = new TeleportTransition(((CraftWorld) location.getWorld()).getHandle(), CraftLocation.toVec3D(location), Vec3.ZERO, location.getYaw(), location.getPitch(), TeleportTransition.DO_NOTHING);
+        }
+        ServerLevel worldserver = teleporttransition.newLevel();
+        entityplayer1.spawnIn(worldserver);
+        entityplayer1.unsetRemoved();
+        entityplayer1.setShiftKeyDown(false);
+         Vec3 vec3d = teleporttransition.position();
+ 
+-        entityplayer1.moveTo(vec3d.x, vec3d.y, vec3d.z, teleporttransition.yRot(), teleporttransition.xRot());
+        entityplayer1.forceSetPositionRotation(vec3d.x, vec3d.y, vec3d.z, teleporttransition.yRot(), teleporttransition.xRot());
+        // CraftBukkit end
+         if (teleporttransition.missingRespawnBlock()) {
+             entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
+            entityplayer1.setRespawnPosition(null, null, 0f, false, false, PlayerSpawnChangeEvent.Cause.RESET); // CraftBukkit - SPIGOT-5988: Clear respawn location when obstructed
+         }
+ 
+-        int i = alive ? 1 : 0;
+        int i = flag ? 1 : 0;
+         ServerLevel worldserver1 = entityplayer1.serverLevel();
+         LevelData worlddata = worldserver1.getLevelData();
+ 
+         entityplayer1.connection.send(new ClientboundRespawnPacket(entityplayer1.createCommonSpawnInfo(worldserver1), (byte) i));
+-        entityplayer1.connection.teleport(entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot());
+        entityplayer1.connection.teleport(CraftLocation.toBukkit(entityplayer1.position(), worldserver1.getWorld(), entityplayer1.getYRot(), entityplayer1.getXRot())); // CraftBukkit
+         entityplayer1.connection.send(new ClientboundSetDefaultSpawnPositionPacket(worldserver.getSharedSpawnPos(), worldserver.getSharedSpawnAngle()));
+         entityplayer1.connection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
+         entityplayer1.connection.send(new ClientboundSetExperiencePacket(entityplayer1.experienceProgress, entityplayer1.totalExperience, entityplayer1.experienceLevel));
+         this.sendActivePlayerEffects(entityplayer1);
+         this.sendLevelInfo(entityplayer1, worldserver);
+         this.sendPlayerPermissionLevel(entityplayer1);
+-        worldserver.addRespawnedPlayer(entityplayer1);
+-        this.players.add(entityplayer1);
+-        this.playersByUUID.put(entityplayer1.getUUID(), entityplayer1);
+-        entityplayer1.initInventoryMenu();
+        if (!entityplayer.connection.isDisconnected()) {
+            worldserver.addRespawnedPlayer(entityplayer1);
+            this.players.add(entityplayer1);
+            this.playersByUUID.put(entityplayer1.getUUID(), entityplayer1);
+        }
+        // entityplayer1.initInventoryMenu();
+         entityplayer1.setHealth(entityplayer1.getHealth());
+         BlockPos blockposition = entityplayer1.getRespawnPosition();
+         ServerLevel worldserver2 = this.server.getLevel(entityplayer1.getRespawnDimension());
+ 
+-        if (!alive && blockposition != null && worldserver2 != null) {
+        if (!flag && blockposition != null && worldserver2 != null) {
+             BlockState iblockdata = worldserver2.getBlockState(blockposition);
+ 
+             if (iblockdata.is(Blocks.RESPAWN_ANCHOR)) {
+                 entityplayer1.connection.send(new ClientboundSoundPacket(SoundEvents.RESPAWN_ANCHOR_DEPLETE, SoundSource.BLOCKS, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), 1.0F, 1.0F, worldserver.getRandom().nextLong()));
+             }
+         }
+        // Added from changeDimension
+        this.sendAllPlayerInfo(entityplayer); // Update health, etc...
+        entityplayer.onUpdateAbilities();
+        for (MobEffectInstance mobEffect : entityplayer.getActiveEffects()) {
+            entityplayer.connection.send(new ClientboundUpdateMobEffectPacket(entityplayer.getId(), mobEffect, false)); // blend = false
+        }
+ 
+        // Fire advancement trigger
+        entityplayer.triggerDimensionChangeTriggers(worldserver);
+
+        // Don't fire on respawn
+        if (fromWorld != worldserver) {
+            PlayerChangedWorldEvent event = new PlayerChangedWorldEvent(entityplayer.getBukkitEntity(), fromWorld.getWorld());
+            this.server.server.getPluginManager().callEvent(event);
+        }
+
+        // Save player file again if they were disconnected
+        if (entityplayer.connection.isDisconnected()) {
+            this.save(entityplayer);
+        }
+        // CraftBukkit end
+
+         return entityplayer1;
+     }
+ 
+@@ -524,7 +761,18 @@
+ 
+     public void tick() {
+         if (++this.sendAllPlayerInfoIn > 600) {
+-            this.broadcastAll(new ClientboundPlayerInfoUpdatePacket(EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY), this.players));
+            // CraftBukkit start
+            for (int i = 0; i < this.players.size(); ++i) {
+                final ServerPlayer target = (ServerPlayer) this.players.get(i);
+
+                target.connection.send(new ClientboundPlayerInfoUpdatePacket(EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY), this.players.stream().filter(new Predicate<ServerPlayer>() {
+                    @Override
+                    public boolean test(ServerPlayer input) {
+                        return target.getBukkitEntity().canSee(input.getBukkitEntity());
+                    }
+                }).collect(Collectors.toList())));
+            }
+            // CraftBukkit end
+             this.sendAllPlayerInfoIn = 0;
+         }
+ 
+@@ -541,6 +789,25 @@
+ 
+     }
+ 
+    // CraftBukkit start - add a world/entity limited version
+    public void broadcastAll(Packet packet, net.minecraft.world.entity.player.Player entityhuman) {
+        for (int i = 0; i < this.players.size(); ++i) {
+            ServerPlayer entityplayer =  this.players.get(i);
+            if (entityhuman != null && !entityplayer.getBukkitEntity().canSee(entityhuman.getBukkitEntity())) {
+                continue;
+            }
+            ((ServerPlayer) this.players.get(i)).connection.send(packet);
+        }
+    }
+
+    public void broadcastAll(Packet packet, Level world) {
+        for (int i = 0; i < world.players().size(); ++i) {
+            ((ServerPlayer) world.players().get(i)).connection.send(packet);
+        }
+
+    }
+    // CraftBukkit end
+
+     public void broadcastAll(Packet<?> packet, ResourceKey<Level> dimension) {
+         Iterator iterator = this.players.iterator();
+ 
+@@ -554,7 +821,7 @@
+ 
+     }
+ 
+-    public void broadcastSystemToTeam(Player source, Component message) {
+    public void broadcastSystemToTeam(net.minecraft.world.entity.player.Player source, Component message) {
+         PlayerTeam scoreboardteam = source.getTeam();
+ 
+         if (scoreboardteam != null) {
+@@ -573,7 +840,7 @@
+         }
+     }
+ 
+-    public void broadcastSystemToAllExceptTeam(Player source, Component message) {
+    public void broadcastSystemToAllExceptTeam(net.minecraft.world.entity.player.Player source, Component message) {
+         PlayerTeam scoreboardteam = source.getTeam();
+ 
+         if (scoreboardteam == null) {
+@@ -619,7 +886,7 @@
+     }
+ 
+     public void deop(GameProfile profile) {
+-        this.ops.remove((Object) profile);
+        this.ops.remove(profile); // CraftBukkit - decompile error
+         ServerPlayer entityplayer = this.getPlayer(profile.getId());
+ 
+         if (entityplayer != null) {
+@@ -643,6 +910,7 @@
+             player.connection.send(new ClientboundEntityEventPacket(player, b0));
+         }
+ 
+        player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
+         this.server.getCommands().sendCommands(player);
+     }
+ 
+@@ -669,10 +937,16 @@
+         return null;
+     }
+ 
+-    public void broadcast(@Nullable Player player, double x, double y, double z, double distance, ResourceKey<Level> worldKey, Packet<?> packet) {
+    public void broadcast(@Nullable net.minecraft.world.entity.player.Player player, double x, double y, double z, double distance, ResourceKey<Level> worldKey, Packet<?> packet) {
+         for (int i = 0; i < this.players.size(); ++i) {
+             ServerPlayer entityplayer = (ServerPlayer) this.players.get(i);
+ 
+            // CraftBukkit start - Test if player receiving packet can see the source of the packet
+            if (player != null && !entityplayer.getBukkitEntity().canSee(player.getBukkitEntity())) {
+               continue;
+            }
+            // CraftBukkit end
+
+             if (entityplayer != player && entityplayer.level().dimension() == worldKey) {
+                 double d4 = x - entityplayer.getX();
+                 double d5 = y - entityplayer.getY();
+@@ -712,15 +986,19 @@
+     public void reloadWhiteList() {}
+ 
+     public void sendLevelInfo(ServerPlayer player, ServerLevel world) {
+-        WorldBorder worldborder = this.server.overworld().getWorldBorder();
+        WorldBorder worldborder = player.level().getWorldBorder(); // CraftBukkit
+ 
+         player.connection.send(new ClientboundInitializeBorderPacket(worldborder));
+         player.connection.send(new ClientboundSetTimePacket(world.getGameTime(), world.getDayTime(), world.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)));
+         player.connection.send(new ClientboundSetDefaultSpawnPositionPacket(world.getSharedSpawnPos(), world.getSharedSpawnAngle()));
+         if (world.isRaining()) {
+-            player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.START_RAINING, 0.0F));
+-            player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.RAIN_LEVEL_CHANGE, world.getRainLevel(1.0F)));
+-            player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.THUNDER_LEVEL_CHANGE, world.getThunderLevel(1.0F)));
+            // CraftBukkit start - handle player weather
+            // entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.START_RAINING, 0.0F));
+            // entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, worldserver.getRainLevel(1.0F)));
+            // entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.THUNDER_LEVEL_CHANGE, worldserver.getThunderLevel(1.0F)));
+            player.setPlayerWeather(org.bukkit.WeatherType.DOWNFALL, false);
+            player.updateWeather(-world.rainLevel, world.rainLevel, -world.thunderLevel, world.thunderLevel);
+            // CraftBukkit end
+         }
+ 
+         player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.LEVEL_CHUNKS_LOAD_START, 0.0F));
+@@ -729,8 +1007,16 @@
+ 
+     public void sendAllPlayerInfo(ServerPlayer player) {
+         player.inventoryMenu.sendAllDataToRemote();
+-        player.resetSentInfo();
+        // entityplayer.resetSentInfo();
+        player.getBukkitEntity().updateScaledHealth(); // CraftBukkit - Update scaled health on respawn and worldchange
+        player.refreshEntityData(player); // CraftBukkkit - SPIGOT-7218: sync metadata
+         player.connection.send(new ClientboundSetHeldSlotPacket(player.getInventory().selected));
+        // CraftBukkit start - from GameRules
+        int i = player.serverLevel().getGameRules().getBoolean(GameRules.RULE_REDUCEDDEBUGINFO) ? 22 : 23;
+        player.connection.send(new ClientboundEntityEventPacket(player, (byte) i));
+        float immediateRespawn = player.serverLevel().getGameRules().getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN) ? 1.0F: 0.0F;
+        player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.IMMEDIATE_RESPAWN, immediateRespawn));
+        // CraftBukkit end
+     }
+ 
+     public int getPlayerCount() {
+@@ -786,12 +1072,22 @@
+     }
+ 
+     public void removeAll() {
+-        for (int i = 0; i < this.players.size(); ++i) {
+-            ((ServerPlayer) this.players.get(i)).connection.disconnect((Component) Component.translatable("multiplayer.disconnect.server_shutdown"));
+        // CraftBukkit start - disconnect safely
+        for (ServerPlayer player : this.players) {
+            player.connection.disconnect(CraftChatMessage.fromStringOrEmpty(this.server.server.getShutdownMessage())); // CraftBukkit - add custom shutdown message
+         }
+        // CraftBukkit end
+ 
+     }
+ 
+    // CraftBukkit start
+    public void broadcastMessage(Component[] iChatBaseComponents) {
+        for (Component component : iChatBaseComponents) {
+            this.broadcastSystemMessage(component, false);
+        }
+    }
+    // CraftBukkit end
+
+     public void broadcastSystemMessage(Component message, boolean overlay) {
+         this.broadcastSystemMessage(message, (entityplayer) -> {
+             return message;
+@@ -849,16 +1145,23 @@
+         return message.hasSignature() && !message.hasExpiredServer(Instant.now());
+     }
+ 
+-    public ServerStatsCounter getPlayerStats(Player player) {
+-        UUID uuid = player.getUUID();
+-        ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) this.stats.get(uuid);
+    // CraftBukkit start
+    public ServerStatsCounter getPlayerStats(ServerPlayer entityhuman) {
+        ServerStatsCounter serverstatisticmanager = entityhuman.getStats();
+        return serverstatisticmanager == null ? this.getPlayerStats(entityhuman.getUUID(), entityhuman.getDisplayName().getString()) : serverstatisticmanager;
+    }
+ 
+    public ServerStatsCounter getPlayerStats(UUID uuid, String displayName) {
+        ServerPlayer entityhuman = this.getPlayer(uuid);
+        ServerStatsCounter serverstatisticmanager = entityhuman == null ? null : (ServerStatsCounter) entityhuman.getStats();
+        // CraftBukkit end
+
+         if (serverstatisticmanager == null) {
+             File file = this.server.getWorldPath(LevelResource.PLAYER_STATS_DIR).toFile();
+             File file1 = new File(file, String.valueOf(uuid) + ".json");
+ 
+             if (!file1.exists()) {
+-                File file2 = new File(file, player.getName().getString() + ".json");
+                File file2 = new File(file, displayName + ".json"); // CraftBukkit
+                 Path path = file2.toPath();
+ 
+                 if (FileUtil.isPathNormalized(path) && FileUtil.isPathPortable(path) && path.startsWith(file.getPath()) && file2.isFile()) {
+@@ -867,7 +1170,7 @@
+             }
+ 
+             serverstatisticmanager = new ServerStatsCounter(this.server, file1);
+-            this.stats.put(uuid, serverstatisticmanager);
+            // this.stats.put(uuid, serverstatisticmanager); // CraftBukkit
+         }
+ 
+         return serverstatisticmanager;
+@@ -875,13 +1178,13 @@
+ 
+     public PlayerAdvancements getPlayerAdvancements(ServerPlayer player) {
+         UUID uuid = player.getUUID();
+-        PlayerAdvancements advancementdataplayer = (PlayerAdvancements) this.advancements.get(uuid);
+        PlayerAdvancements advancementdataplayer = (PlayerAdvancements) player.getAdvancements(); // CraftBukkit
+ 
+         if (advancementdataplayer == null) {
+             Path path = this.server.getWorldPath(LevelResource.PLAYER_ADVANCEMENTS_DIR).resolve(String.valueOf(uuid) + ".json");
+ 
+             advancementdataplayer = new PlayerAdvancements(this.server.getFixerUpper(), this, this.server.getAdvancements(), path, player);
+-            this.advancements.put(uuid, advancementdataplayer);
+            // this.advancements.put(uuid, advancementdataplayer); // CraftBukkit
+         }
+ 
+         advancementdataplayer.setPlayer(player);
+@@ -932,15 +1235,28 @@
+     }
+ 
+     public void reloadResources() {
+-        Iterator iterator = this.advancements.values().iterator();
+        // CraftBukkit start
+        /*Iterator iterator = this.advancements.values().iterator();
+ 
+         while (iterator.hasNext()) {
+-            PlayerAdvancements advancementdataplayer = (PlayerAdvancements) iterator.next();
+            AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) iterator.next();
+ 
+             advancementdataplayer.reload(this.server.getAdvancements());
+        }*/
+
+        for (ServerPlayer player : this.players) {
+            player.getAdvancements().reload(this.server.getAdvancements());
+            player.getAdvancements().flushDirty(player); // CraftBukkit - trigger immediate flush of advancements
+         }
+        // CraftBukkit end
+ 
+         this.broadcastAll(new ClientboundUpdateTagsPacket(TagNetworkSerialization.serializeTagsToNetwork(this.registries)));
+        // CraftBukkit start
+        this.reloadRecipes();
+    }
+
+    public void reloadRecipes() {
+        // CraftBukkit end
+         RecipeManager craftingmanager = this.server.getRecipeManager();
+         ClientboundUpdateRecipesPacket packetplayoutrecipeupdate = new ClientboundUpdateRecipesPacket(craftingmanager.getSynchronizedItemProperties(), craftingmanager.getSynchronizedStonecutterRecipes());
+         Iterator iterator1 = this.players.iterator();
--- a/paper-server/patches/sources/net/minecraft/server/players/PlayerList.patch
+++ b/paper-server/patches/sources/net/minecraft/server/players/PlayerList.patch
@@ -1,798 +0,0 @@
--- a/net/minecraft/server/players/PlayerList.java
-+++ b/net/minecraft/server/players/PlayerList.java
-@@ -104,6 +104,27 @@
- import net.minecraft.world.scores.ScoreboardTeam;
- import org.slf4j.Logger;
- 
-+// CraftBukkit start
-+import java.util.stream.Collectors;
-+import net.minecraft.server.dedicated.DedicatedServer;
-+import net.minecraft.server.network.LoginListener;
-+import org.bukkit.Location;
-+import org.bukkit.craftbukkit.CraftServer;
-+import org.bukkit.craftbukkit.CraftWorld;
-+import org.bukkit.craftbukkit.entity.CraftPlayer;
-+import org.bukkit.craftbukkit.util.CraftChatMessage;
-+import org.bukkit.craftbukkit.util.CraftLocation;
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.entity.EntityRemoveEvent;
-+import org.bukkit.event.player.PlayerChangedWorldEvent;
-+import org.bukkit.event.player.PlayerJoinEvent;
-+import org.bukkit.event.player.PlayerLoginEvent;
-+import org.bukkit.event.player.PlayerQuitEvent;
-+import org.bukkit.event.player.PlayerRespawnEvent;
-+import org.bukkit.event.player.PlayerRespawnEvent.RespawnReason;
-+import org.bukkit.event.player.PlayerSpawnChangeEvent;
-+// CraftBukkit end
-+
- public abstract class PlayerList {
- 
-     public static final File USERBANLIST_FILE = new File("banned-players.json");
-@@ -116,14 +137,16 @@
-     private static final int SEND_PLAYER_INFO_INTERVAL = 600;
-     private static final SimpleDateFormat BAN_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z");
-     private final MinecraftServer server;
-    public final List<EntityPlayer> players = Lists.newArrayList();
-+    public final List<EntityPlayer> players = new java.util.concurrent.CopyOnWriteArrayList(); // CraftBukkit - ArrayList -> CopyOnWriteArrayList: Iterator safety
-     private final Map<UUID, EntityPlayer> playersByUUID = Maps.newHashMap();
-     private final GameProfileBanList bans;
-     private final IpBanList ipBans;
-     private final OpList ops;
-     private final WhiteList whitelist;
-    private final Map<UUID, ServerStatisticManager> stats;
-    private final Map<UUID, AdvancementDataPlayer> advancements;
-+    // CraftBukkit start
-+    // private final Map<UUID, ServerStatisticManager> stats;
-+    // private final Map<UUID, AdvancementDataPlayer> advancements;
-+    // CraftBukkit end
-     public final WorldNBTStorage playerIo;
-     private boolean doWhiteList;
-     private final LayeredRegistryAccess<RegistryLayer> registries;
-@@ -134,13 +157,23 @@
-     private static final boolean ALLOW_LOGOUTIVATOR = false;
-     private int sendAllPlayerInfoIn;
- 
-+    // CraftBukkit start
-+    private CraftServer cserver;
-+
-     public PlayerList(MinecraftServer minecraftserver, LayeredRegistryAccess<RegistryLayer> layeredregistryaccess, WorldNBTStorage worldnbtstorage, int i) {
-+        this.cserver = minecraftserver.server = new CraftServer((DedicatedServer) minecraftserver, this);
-+        minecraftserver.console = org.bukkit.craftbukkit.command.ColouredConsoleSender.getInstance();
-+        minecraftserver.reader.addCompleter(new org.bukkit.craftbukkit.command.ConsoleCommandCompleter(minecraftserver.server));
-+        // CraftBukkit end
-+
-         this.bans = new GameProfileBanList(PlayerList.USERBANLIST_FILE);
-         this.ipBans = new IpBanList(PlayerList.IPBANLIST_FILE);
-         this.ops = new OpList(PlayerList.OPLIST_FILE);
-         this.whitelist = new WhiteList(PlayerList.WHITELIST_FILE);
-        this.stats = Maps.newHashMap();
-        this.advancements = Maps.newHashMap();
-+        // CraftBukkit start
-+        // this.stats = Maps.newHashMap();
-+        // this.advancements = Maps.newHashMap();
-+        // CraftBukkit end
-         this.server = minecraftserver;
-         this.registries = layeredregistryaccess;
-         this.maxPlayers = i;
-@@ -150,25 +183,34 @@
-     public void placeNewPlayer(NetworkManager networkmanager, EntityPlayer entityplayer, CommonListenerCookie commonlistenercookie) {
-         GameProfile gameprofile = entityplayer.getGameProfile();
-         UserCache usercache = this.server.getProfileCache();
-        Optional optional;
-+        // Optional optional; // CraftBukkit - decompile error
-         String s;
- 
-         if (usercache != null) {
-            optional = usercache.get(gameprofile.getId());
-+            Optional<GameProfile> optional = usercache.get(gameprofile.getId()); // CraftBukkit - decompile error
-             s = (String) optional.map(GameProfile::getName).orElse(gameprofile.getName());
-             usercache.add(gameprofile);
-         } else {
-             s = gameprofile.getName();
-         }
- 
-        optional = this.load(entityplayer);
-+        Optional<NBTTagCompound> optional = this.load(entityplayer); // CraftBukkit - decompile error
-+        // CraftBukkit start - Better rename detection
-+        if (optional.isPresent()) {
-+            NBTTagCompound nbttagcompound = optional.get();
-+            if (nbttagcompound.contains("bukkit")) {
-+                NBTTagCompound bukkit = nbttagcompound.getCompound("bukkit");
-+                s = bukkit.contains("lastKnownName", 8) ? bukkit.getString("lastKnownName") : s;
-+            }
-+        }
-+        // CraftBukkit end
-         ResourceKey<World> resourcekey = (ResourceKey) optional.flatMap((nbttagcompound) -> {
-            DataResult dataresult = DimensionManager.parseLegacy(new Dynamic(DynamicOpsNBT.INSTANCE, nbttagcompound.get("Dimension")));
-+            DataResult<ResourceKey<World>> dataresult = DimensionManager.parseLegacy(new Dynamic(DynamicOpsNBT.INSTANCE, nbttagcompound.get("Dimension"))); // CraftBukkit - decompile error
-             Logger logger = PlayerList.LOGGER;
- 
-             Objects.requireNonNull(logger);
-             return dataresult.resultOrPartial(logger::error);
-        }).orElse(World.OVERWORLD);
-+        }).orElse(entityplayer.serverLevel().dimension()); // CraftBukkit - SPIGOT-7507: If no dimension, fall back to existing dimension loaded from "WorldUUID", which in turn defaults to World.OVERWORLD
-         WorldServer worldserver = this.server.getLevel(resourcekey);
-         WorldServer worldserver1;
- 
-@@ -182,10 +224,11 @@
-         entityplayer.setServerLevel(worldserver1);
-         String s1 = networkmanager.getLoggableAddress(this.server.logIPs());
- 
-        PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", new Object[]{entityplayer.getName().getString(), s1, entityplayer.getId(), entityplayer.getX(), entityplayer.getY(), entityplayer.getZ()});
-+        // CraftBukkit - Moved message to after join
-+        // PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", new Object[]{entityplayer.getName().getString(), s1, entityplayer.getId(), entityplayer.getX(), entityplayer.getY(), entityplayer.getZ()});
-         WorldData worlddata = worldserver1.getLevelData();
- 
-        entityplayer.loadGameTypes((NBTTagCompound) optional.orElse((Object) null));
-+        entityplayer.loadGameTypes((NBTTagCompound) optional.orElse(null)); // CraftBukkit - decompile error
-         PlayerConnection playerconnection = new PlayerConnection(this.server, networkmanager, entityplayer, commonlistenercookie);
- 
-         networkmanager.setupInboundProtocol(GameProtocols.SERVERBOUND_TEMPLATE.bind(RegistryFriendlyByteBuf.decorator(this.server.registryAccess())), playerconnection);
-@@ -195,6 +238,7 @@
-         boolean flag2 = gamerules.getBoolean(GameRules.RULE_LIMITED_CRAFTING);
- 
-         playerconnection.send(new PacketPlayOutLogin(entityplayer.getId(), worlddata.isHardcore(), this.server.levelKeys(), this.getMaxPlayers(), this.viewDistance, this.simulationDistance, flag1, !flag, flag2, entityplayer.createCommonSpawnInfo(worldserver1), this.server.enforceSecureProfile()));
-+        entityplayer.getBukkitEntity().sendSupportedChannels(); // CraftBukkit
-         playerconnection.send(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
-         playerconnection.send(new PacketPlayOutAbilities(entityplayer.getAbilities()));
-         playerconnection.send(new PacketPlayOutHeldItemSlot(entityplayer.getInventory().selected));
-@@ -213,8 +257,10 @@
-         } else {
-             ichatmutablecomponent = IChatBaseComponent.translatable("multiplayer.player.joined.renamed", entityplayer.getDisplayName(), s);
-         }
-+        // CraftBukkit start
-+        ichatmutablecomponent.withStyle(EnumChatFormat.YELLOW);
-+        String joinMessage = CraftChatMessage.fromComponent(ichatmutablecomponent);
- 
-        this.broadcastSystemMessage(ichatmutablecomponent.withStyle(EnumChatFormat.YELLOW), false);
-         playerconnection.teleport(entityplayer.getX(), entityplayer.getY(), entityplayer.getZ(), entityplayer.getYRot(), entityplayer.getXRot());
-         ServerPing serverping = this.server.getStatus();
- 
-@@ -222,17 +268,70 @@
-             entityplayer.sendServerStatus(serverping);
-         }
- 
-        entityplayer.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players));
-+        // entityplayer.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players)); // CraftBukkit - replaced with loop below
-         this.players.add(entityplayer);
-         this.playersByUUID.put(entityplayer.getUUID(), entityplayer);
-        this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer)));
-+        // this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer))); // CraftBukkit - replaced with loop below
-+
-+        // CraftBukkit start
-+        CraftPlayer bukkitPlayer = entityplayer.getBukkitEntity();
-+
-+        // Ensure that player inventory is populated with its viewer
-+        entityplayer.containerMenu.transferTo(entityplayer.containerMenu, bukkitPlayer);
-+
-+        PlayerJoinEvent playerJoinEvent = new PlayerJoinEvent(bukkitPlayer, joinMessage);
-+        cserver.getPluginManager().callEvent(playerJoinEvent);
-+
-+        if (!entityplayer.connection.isAcceptingMessages()) {
-+            return;
-+        }
-+
-+        joinMessage = playerJoinEvent.getJoinMessage();
-+
-+        if (joinMessage != null && joinMessage.length() > 0) {
-+            for (IChatBaseComponent line : org.bukkit.craftbukkit.util.CraftChatMessage.fromString(joinMessage)) {
-+                server.getPlayerList().broadcastSystemMessage(line, false);
-+            }
-+        }
-+        // CraftBukkit end
-+
-+        // CraftBukkit start - sendAll above replaced with this loop
-+        ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer));
-+
-+        for (int i = 0; i < this.players.size(); ++i) {
-+            EntityPlayer entityplayer1 = (EntityPlayer) this.players.get(i);
-+
-+            if (entityplayer1.getBukkitEntity().canSee(bukkitPlayer)) {
-+                entityplayer1.connection.send(packet);
-+            }
-+
-+            if (!bukkitPlayer.canSee(entityplayer1.getBukkitEntity())) {
-+                continue;
-+            }
-+
-+            entityplayer.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer1)));
-+        }
-+        entityplayer.sentListPacket = true;
-+        // CraftBukkit end
-+
-+        entityplayer.refreshEntityData(entityplayer); // CraftBukkit - BungeeCord#2321, send complete data to self on spawn
-+
-         this.sendLevelInfo(entityplayer, worldserver1);
-        worldserver1.addNewPlayer(entityplayer);
-        this.server.getCustomBossEvents().onPlayerConnect(entityplayer);
-+
-+        // CraftBukkit start - Only add if the player wasn't moved in the event
-+        if (entityplayer.level() == worldserver1 && !worldserver1.players().contains(entityplayer)) {
-+            worldserver1.addNewPlayer(entityplayer);
-+            this.server.getCustomBossEvents().onPlayerConnect(entityplayer);
-+        }
-+
-+        worldserver1 = entityplayer.serverLevel(); // CraftBukkit - Update in case join event changed it
-+        // CraftBukkit end
-         this.sendActivePlayerEffects(entityplayer);
-         entityplayer.loadAndSpawnEnderpearls(optional);
-         entityplayer.loadAndSpawnParentVehicle(optional);
-         entityplayer.initInventoryMenu();
-+        // CraftBukkit - Moved from above, added world
-+        PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", entityplayer.getName().getString(), s1, entityplayer.getId(), worldserver1.serverLevelData.getLevelName(), entityplayer.getX(), entityplayer.getY(), entityplayer.getZ());
-     }
- 
-     public void updateEntireScoreboard(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) {
-@@ -269,30 +368,31 @@
-     }
- 
-     public void addWorldborderListener(WorldServer worldserver) {
-+        if (playerIo != null) return; // CraftBukkit
-         worldserver.getWorldBorder().addListener(new IWorldBorderListener() {
-             @Override
-             public void onBorderSizeSet(WorldBorder worldborder, double d0) {
-                PlayerList.this.broadcastAll(new ClientboundSetBorderSizePacket(worldborder));
-+                PlayerList.this.broadcastAll(new ClientboundSetBorderSizePacket(worldborder), worldborder.world); // CraftBukkit
-             }
- 
-             @Override
-             public void onBorderSizeLerping(WorldBorder worldborder, double d0, double d1, long i) {
-                PlayerList.this.broadcastAll(new ClientboundSetBorderLerpSizePacket(worldborder));
-+                PlayerList.this.broadcastAll(new ClientboundSetBorderLerpSizePacket(worldborder), worldborder.world); // CraftBukkit
-             }
- 
-             @Override
-             public void onBorderCenterSet(WorldBorder worldborder, double d0, double d1) {
-                PlayerList.this.broadcastAll(new ClientboundSetBorderCenterPacket(worldborder));
-+                PlayerList.this.broadcastAll(new ClientboundSetBorderCenterPacket(worldborder), worldborder.world); // CraftBukkit
-             }
- 
-             @Override
-             public void onBorderSetWarningTime(WorldBorder worldborder, int i) {
-                PlayerList.this.broadcastAll(new ClientboundSetBorderWarningDelayPacket(worldborder));
-+                PlayerList.this.broadcastAll(new ClientboundSetBorderWarningDelayPacket(worldborder), worldborder.world); // CraftBukkit
-             }
- 
-             @Override
-             public void onBorderSetWarningBlocks(WorldBorder worldborder, int i) {
-                PlayerList.this.broadcastAll(new ClientboundSetBorderWarningDistancePacket(worldborder));
-+                PlayerList.this.broadcastAll(new ClientboundSetBorderWarningDistancePacket(worldborder), worldborder.world); // CraftBukkit
-             }
- 
-             @Override
-@@ -319,14 +419,15 @@
-     }
- 
-     protected void save(EntityPlayer entityplayer) {
-+        if (!entityplayer.getBukkitEntity().isPersistent()) return; // CraftBukkit
-         this.playerIo.save(entityplayer);
-        ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) this.stats.get(entityplayer.getUUID());
-+        ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) entityplayer.getStats(); // CraftBukkit
- 
-         if (serverstatisticmanager != null) {
-             serverstatisticmanager.save();
-         }
- 
-        AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) this.advancements.get(entityplayer.getUUID());
-+        AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) entityplayer.getAdvancements(); // CraftBukkit
- 
-         if (advancementdataplayer != null) {
-             advancementdataplayer.save();
-@@ -334,10 +435,24 @@
- 
-     }
- 
-    public void remove(EntityPlayer entityplayer) {
-+    public String remove(EntityPlayer entityplayer) { // CraftBukkit - return string
-         WorldServer worldserver = entityplayer.serverLevel();
- 
-         entityplayer.awardStat(StatisticList.LEAVE_GAME);
-+
-+        // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it
-+        // See SPIGOT-5799, SPIGOT-6145
-+        if (entityplayer.containerMenu != entityplayer.inventoryMenu) {
-+            entityplayer.closeContainer();
-+        }
-+
-+        PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), entityplayer.kickLeaveMessage != null ? entityplayer.kickLeaveMessage : "\u00A7e" + entityplayer.getScoreboardName() + " left the game");
-+        cserver.getPluginManager().callEvent(playerQuitEvent);
-+        entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
-+
-+        entityplayer.doTick(); // SPIGOT-924
-+        // CraftBukkit end
-+
-         this.save(entityplayer);
-         if (entityplayer.isPassenger()) {
-             Entity entity = entityplayer.getRootVehicle();
-@@ -346,7 +461,7 @@
-                 PlayerList.LOGGER.debug("Removing player mount");
-                 entityplayer.stopRiding();
-                 entity.getPassengersAndSelf().forEach((entity1) -> {
-                    entity1.setRemoved(Entity.RemovalReason.UNLOADED_WITH_PLAYER);
-+                    entity1.setRemoved(Entity.RemovalReason.UNLOADED_WITH_PLAYER, EntityRemoveEvent.Cause.PLAYER_QUIT); // CraftBukkit - add Bukkit remove cause
-                 });
-             }
-         }
-@@ -357,7 +472,7 @@
-         while (iterator.hasNext()) {
-             EntityEnderPearl entityenderpearl = (EntityEnderPearl) iterator.next();
- 
-            entityenderpearl.setRemoved(Entity.RemovalReason.UNLOADED_WITH_PLAYER);
-+            entityenderpearl.setRemoved(Entity.RemovalReason.UNLOADED_WITH_PLAYER, EntityRemoveEvent.Cause.PLAYER_QUIT); // CraftBukkit - add Bukkit remove cause
-         }
- 
-         worldserver.removePlayerImmediately(entityplayer, Entity.RemovalReason.UNLOADED_WITH_PLAYER);
-@@ -369,17 +484,66 @@
- 
-         if (entityplayer1 == entityplayer) {
-             this.playersByUUID.remove(uuid);
-            this.stats.remove(uuid);
-            this.advancements.remove(uuid);
-+            // CraftBukkit start
-+            // this.stats.remove(uuid);
-+            // this.advancements.remove(uuid);
-+            // CraftBukkit end
-         }
- 
-        this.broadcastAll(new ClientboundPlayerInfoRemovePacket(List.of(entityplayer.getUUID())));
-+        // CraftBukkit start
-+        // this.broadcastAll(new ClientboundPlayerInfoRemovePacket(List.of(entityplayer.getUUID())));
-+        ClientboundPlayerInfoRemovePacket packet = new ClientboundPlayerInfoRemovePacket(List.of(entityplayer.getUUID()));
-+        for (int i = 0; i < players.size(); i++) {
-+            EntityPlayer entityplayer2 = (EntityPlayer) this.players.get(i);
-+
-+            if (entityplayer2.getBukkitEntity().canSee(entityplayer.getBukkitEntity())) {
-+                entityplayer2.connection.send(packet);
-+            } else {
-+                entityplayer2.getBukkitEntity().onEntityRemove(entityplayer);
-+            }
-+        }
-+        // This removes the scoreboard (and player reference) for the specific player in the manager
-+        cserver.getScoreboardManager().removePlayer(entityplayer.getBukkitEntity());
-+        // CraftBukkit end
-+
-+        return playerQuitEvent.getQuitMessage(); // CraftBukkit
-     }
- 
-    @Nullable
-    public IChatBaseComponent canPlayerLogin(SocketAddress socketaddress, GameProfile gameprofile) {
-+    // CraftBukkit start - Whole method, SocketAddress to LoginListener, added hostname to signature, return EntityPlayer
-+    public EntityPlayer canPlayerLogin(LoginListener loginlistener, GameProfile gameprofile) {
-         IChatMutableComponent ichatmutablecomponent;
- 
-+        // Moved from processLogin
-+        UUID uuid = gameprofile.getId();
-+        List<EntityPlayer> list = Lists.newArrayList();
-+
-+        EntityPlayer entityplayer;
-+
-+        for (int i = 0; i < this.players.size(); ++i) {
-+            entityplayer = (EntityPlayer) this.players.get(i);
-+            if (entityplayer.getUUID().equals(uuid)) {
-+                list.add(entityplayer);
-+            }
-+        }
-+
-+        Iterator iterator = list.iterator();
-+
-+        while (iterator.hasNext()) {
-+            entityplayer = (EntityPlayer) iterator.next();
-+            save(entityplayer); // CraftBukkit - Force the player's inventory to be saved
-+            entityplayer.connection.disconnect(IChatBaseComponent.translatable("multiplayer.disconnect.duplicate_login"));
-+        }
-+
-+        // Instead of kicking then returning, we need to store the kick reason
-+        // in the event, check with plugins to see if it's ok, and THEN kick
-+        // depending on the outcome.
-+        SocketAddress socketaddress = loginlistener.connection.getRemoteAddress();
-+
-+        EntityPlayer entity = new EntityPlayer(this.server, this.server.getLevel(World.OVERWORLD), gameprofile, ClientInformation.createDefault());
-+        entity.transferCookieConnection = loginlistener;
-+        Player player = entity.getBukkitEntity();
-+        PlayerLoginEvent event = new PlayerLoginEvent(player, loginlistener.connection.hostname, ((java.net.InetSocketAddress) socketaddress).getAddress());
-+
-         if (this.bans.isBanned(gameprofile)) {
-             GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.bans.get(gameprofile);
- 
-@@ -388,9 +552,11 @@
-                 ichatmutablecomponent.append((IChatBaseComponent) IChatBaseComponent.translatable("multiplayer.disconnect.banned.expiration", PlayerList.BAN_DATE_FORMAT.format(gameprofilebanentry.getExpires())));
-             }
- 
-            return ichatmutablecomponent;
-+            // return chatmessage;
-+            event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(ichatmutablecomponent));
-         } else if (!this.isWhiteListed(gameprofile)) {
-            return IChatBaseComponent.translatable("multiplayer.disconnect.not_whitelisted");
-+            ichatmutablecomponent = IChatBaseComponent.translatable("multiplayer.disconnect.not_whitelisted");
-+            event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, CraftChatMessage.fromComponent(ichatmutablecomponent));
-         } else if (this.ipBans.isBanned(socketaddress)) {
-             IpBanEntry ipbanentry = this.ipBans.get(socketaddress);
- 
-@@ -399,17 +565,32 @@
-                 ichatmutablecomponent.append((IChatBaseComponent) IChatBaseComponent.translatable("multiplayer.disconnect.banned_ip.expiration", PlayerList.BAN_DATE_FORMAT.format(ipbanentry.getExpires())));
-             }
- 
-            return ichatmutablecomponent;
-+            // return chatmessage;
-+            event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(ichatmutablecomponent));
-         } else {
-            return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile) ? IChatBaseComponent.translatable("multiplayer.disconnect.server_full") : null;
-+            // return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile) ? IChatBaseComponent.translatable("multiplayer.disconnect.server_full") : null;
-+            if (this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile)) {
-+                event.disallow(PlayerLoginEvent.Result.KICK_FULL, "The server is full");
-+            }
-+        }
-+
-+        cserver.getPluginManager().callEvent(event);
-+        if (event.getResult() != PlayerLoginEvent.Result.ALLOWED) {
-+            loginlistener.disconnect(event.getKickMessage());
-+            return null;
-         }
-+        return entity;
-     }
- 
-    public EntityPlayer getPlayerForLogin(GameProfile gameprofile, ClientInformation clientinformation) {
-        return new EntityPlayer(this.server, this.server.overworld(), gameprofile, clientinformation);
-+    // CraftBukkit start - added EntityPlayer
-+    public EntityPlayer getPlayerForLogin(GameProfile gameprofile, ClientInformation clientinformation, EntityPlayer player) {
-+        player.updateOptions(clientinformation);
-+        return player;
-+        // CraftBukkit end
-     }
- 
-    public boolean disconnectAllPlayersWithProfile(GameProfile gameprofile) {
-+    public boolean disconnectAllPlayersWithProfile(GameProfile gameprofile, EntityPlayer player) { // CraftBukkit - added EntityPlayer
-+        /* CraftBukkit startMoved up
-         UUID uuid = gameprofile.getId();
-         Set<EntityPlayer> set = Sets.newIdentityHashSet();
-         Iterator iterator = this.players.iterator();
-@@ -437,22 +618,41 @@
-         }
- 
-         return !set.isEmpty();
-+        */
-+        return player == null;
-+        // CraftBukkit end
-     }
- 
-    public EntityPlayer respawn(EntityPlayer entityplayer, boolean flag, Entity.RemovalReason entity_removalreason) {
-+    // CraftBukkit start
-+    public EntityPlayer respawn(EntityPlayer entityplayer, boolean flag, Entity.RemovalReason entity_removalreason, RespawnReason reason) {
-+        return this.respawn(entityplayer, flag, entity_removalreason, reason, null);
-+    }
-+
-+    public EntityPlayer respawn(EntityPlayer entityplayer, boolean flag, Entity.RemovalReason entity_removalreason, RespawnReason reason, Location location) {
-+        entityplayer.stopRiding(); // CraftBukkit
-         this.players.remove(entityplayer);
-         entityplayer.serverLevel().removePlayerImmediately(entityplayer, entity_removalreason);
-+        /* CraftBukkit start
-         TeleportTransition teleporttransition = entityplayer.findRespawnPositionAndUseSpawnBlock(!flag, TeleportTransition.DO_NOTHING);
-         WorldServer worldserver = teleporttransition.newLevel();
-         EntityPlayer entityplayer1 = new EntityPlayer(this.server, worldserver, entityplayer.getGameProfile(), entityplayer.clientInformation());
-+        // */
-+        EntityPlayer entityplayer1 = entityplayer;
-+        World fromWorld = entityplayer.level();
-+        entityplayer.wonGame = false;
-+        // CraftBukkit end
- 
-         entityplayer1.connection = entityplayer.connection;
-         entityplayer1.restoreFrom(entityplayer, flag);
-         entityplayer1.setId(entityplayer.getId());
-         entityplayer1.setMainArm(entityplayer.getMainArm());
-+        // CraftBukkit - not required, just copies old location into reused entity
-+        /*
-         if (!teleporttransition.missingRespawnBlock()) {
-             entityplayer1.copyRespawnPosition(entityplayer);
-         }
-+         */
-+        // CraftBukkit end
- 
-         Iterator iterator = entityplayer.getTags().iterator();
- 
-@@ -462,11 +662,26 @@
-             entityplayer1.addTag(s);
-         }
- 
-+        // CraftBukkit start - fire PlayerRespawnEvent
-+        TeleportTransition teleporttransition;
-+        if (location == null) {
-+            teleporttransition = entityplayer.findRespawnPositionAndUseSpawnBlock(!flag, TeleportTransition.DO_NOTHING, reason);
-+
-+            if (!flag) entityplayer.reset(); // SPIGOT-4785
-+        } else {
-+            teleporttransition = new TeleportTransition(((CraftWorld) location.getWorld()).getHandle(), CraftLocation.toVec3D(location), Vec3D.ZERO, location.getYaw(), location.getPitch(), TeleportTransition.DO_NOTHING);
-+        }
-+        WorldServer worldserver = teleporttransition.newLevel();
-+        entityplayer1.spawnIn(worldserver);
-+        entityplayer1.unsetRemoved();
-+        entityplayer1.setShiftKeyDown(false);
-         Vec3D vec3d = teleporttransition.position();
- 
-        entityplayer1.moveTo(vec3d.x, vec3d.y, vec3d.z, teleporttransition.yRot(), teleporttransition.xRot());
-+        entityplayer1.forceSetPositionRotation(vec3d.x, vec3d.y, vec3d.z, teleporttransition.yRot(), teleporttransition.xRot());
-+        // CraftBukkit end
-         if (teleporttransition.missingRespawnBlock()) {
-             entityplayer1.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
-+            entityplayer1.setRespawnPosition(null, null, 0f, false, false, PlayerSpawnChangeEvent.Cause.RESET); // CraftBukkit - SPIGOT-5988: Clear respawn location when obstructed
-         }
- 
-         int i = flag ? 1 : 0;
-@@ -474,17 +689,19 @@
-         WorldData worlddata = worldserver1.getLevelData();
- 
-         entityplayer1.connection.send(new PacketPlayOutRespawn(entityplayer1.createCommonSpawnInfo(worldserver1), (byte) i));
-        entityplayer1.connection.teleport(entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot());
-+        entityplayer1.connection.teleport(CraftLocation.toBukkit(entityplayer1.position(), worldserver1.getWorld(), entityplayer1.getYRot(), entityplayer1.getXRot())); // CraftBukkit
-         entityplayer1.connection.send(new PacketPlayOutSpawnPosition(worldserver.getSharedSpawnPos(), worldserver.getSharedSpawnAngle()));
-         entityplayer1.connection.send(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
-         entityplayer1.connection.send(new PacketPlayOutExperience(entityplayer1.experienceProgress, entityplayer1.totalExperience, entityplayer1.experienceLevel));
-         this.sendActivePlayerEffects(entityplayer1);
-         this.sendLevelInfo(entityplayer1, worldserver);
-         this.sendPlayerPermissionLevel(entityplayer1);
-        worldserver.addRespawnedPlayer(entityplayer1);
-        this.players.add(entityplayer1);
-        this.playersByUUID.put(entityplayer1.getUUID(), entityplayer1);
-        entityplayer1.initInventoryMenu();
-+        if (!entityplayer.connection.isDisconnected()) {
-+            worldserver.addRespawnedPlayer(entityplayer1);
-+            this.players.add(entityplayer1);
-+            this.playersByUUID.put(entityplayer1.getUUID(), entityplayer1);
-+        }
-+        // entityplayer1.initInventoryMenu();
-         entityplayer1.setHealth(entityplayer1.getHealth());
-         BlockPosition blockposition = entityplayer1.getRespawnPosition();
-         WorldServer worldserver2 = this.server.getLevel(entityplayer1.getRespawnDimension());
-@@ -496,6 +713,27 @@
-                 entityplayer1.connection.send(new PacketPlayOutNamedSoundEffect(SoundEffects.RESPAWN_ANCHOR_DEPLETE, SoundCategory.BLOCKS, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), 1.0F, 1.0F, worldserver.getRandom().nextLong()));
-             }
-         }
-+        // Added from changeDimension
-+        sendAllPlayerInfo(entityplayer); // Update health, etc...
-+        entityplayer.onUpdateAbilities();
-+        for (MobEffect mobEffect : entityplayer.getActiveEffects()) {
-+            entityplayer.connection.send(new PacketPlayOutEntityEffect(entityplayer.getId(), mobEffect, false)); // blend = false
-+        }
-+
-+        // Fire advancement trigger
-+        entityplayer.triggerDimensionChangeTriggers(worldserver);
-+
-+        // Don't fire on respawn
-+        if (fromWorld != worldserver) {
-+            PlayerChangedWorldEvent event = new PlayerChangedWorldEvent(entityplayer.getBukkitEntity(), fromWorld.getWorld());
-+            server.server.getPluginManager().callEvent(event);
-+        }
-+
-+        // Save player file again if they were disconnected
-+        if (entityplayer.connection.isDisconnected()) {
-+            this.save(entityplayer);
-+        }
-+        // CraftBukkit end
- 
-         return entityplayer1;
-     }
-@@ -524,7 +762,18 @@
- 
-     public void tick() {
-         if (++this.sendAllPlayerInfoIn > 600) {
-            this.broadcastAll(new ClientboundPlayerInfoUpdatePacket(EnumSet.of(ClientboundPlayerInfoUpdatePacket.a.UPDATE_LATENCY), this.players));
-+            // CraftBukkit start
-+            for (int i = 0; i < this.players.size(); ++i) {
-+                final EntityPlayer target = (EntityPlayer) this.players.get(i);
-+
-+                target.connection.send(new ClientboundPlayerInfoUpdatePacket(EnumSet.of(ClientboundPlayerInfoUpdatePacket.a.UPDATE_LATENCY), this.players.stream().filter(new Predicate<EntityPlayer>() {
-+                    @Override
-+                    public boolean test(EntityPlayer input) {
-+                        return target.getBukkitEntity().canSee(input.getBukkitEntity());
-+                    }
-+                }).collect(Collectors.toList())));
-+            }
-+            // CraftBukkit end
-             this.sendAllPlayerInfoIn = 0;
-         }
- 
-@@ -541,6 +790,25 @@
- 
-     }
- 
-+    // CraftBukkit start - add a world/entity limited version
-+    public void broadcastAll(Packet packet, EntityHuman entityhuman) {
-+        for (int i = 0; i < this.players.size(); ++i) {
-+            EntityPlayer entityplayer =  this.players.get(i);
-+            if (entityhuman != null && !entityplayer.getBukkitEntity().canSee(entityhuman.getBukkitEntity())) {
-+                continue;
-+            }
-+            ((EntityPlayer) this.players.get(i)).connection.send(packet);
-+        }
-+    }
-+
-+    public void broadcastAll(Packet packet, World world) {
-+        for (int i = 0; i < world.players().size(); ++i) {
-+            ((EntityPlayer) world.players().get(i)).connection.send(packet);
-+        }
-+
-+    }
-+    // CraftBukkit end
-+
-     public void broadcastAll(Packet<?> packet, ResourceKey<World> resourcekey) {
-         Iterator iterator = this.players.iterator();
- 
-@@ -619,7 +887,7 @@
-     }
- 
-     public void deop(GameProfile gameprofile) {
-        this.ops.remove((Object) gameprofile);
-+        this.ops.remove(gameprofile); // CraftBukkit - decompile error
-         EntityPlayer entityplayer = this.getPlayer(gameprofile.getId());
- 
-         if (entityplayer != null) {
-@@ -643,6 +911,7 @@
-             entityplayer.connection.send(new PacketPlayOutEntityStatus(entityplayer, b0));
-         }
- 
-+        entityplayer.getBukkitEntity().recalculatePermissions(); // CraftBukkit
-         this.server.getCommands().sendCommands(entityplayer);
-     }
- 
-@@ -673,6 +942,12 @@
-         for (int i = 0; i < this.players.size(); ++i) {
-             EntityPlayer entityplayer = (EntityPlayer) this.players.get(i);
- 
-+            // CraftBukkit start - Test if player receiving packet can see the source of the packet
-+            if (entityhuman != null && !entityplayer.getBukkitEntity().canSee(entityhuman.getBukkitEntity())) {
-+               continue;
-+            }
-+            // CraftBukkit end
-+
-             if (entityplayer != entityhuman && entityplayer.level().dimension() == resourcekey) {
-                 double d4 = d0 - entityplayer.getX();
-                 double d5 = d1 - entityplayer.getY();
-@@ -712,15 +987,19 @@
-     public void reloadWhiteList() {}
- 
-     public void sendLevelInfo(EntityPlayer entityplayer, WorldServer worldserver) {
-        WorldBorder worldborder = this.server.overworld().getWorldBorder();
-+        WorldBorder worldborder = entityplayer.level().getWorldBorder(); // CraftBukkit
- 
-         entityplayer.connection.send(new ClientboundInitializeBorderPacket(worldborder));
-         entityplayer.connection.send(new PacketPlayOutUpdateTime(worldserver.getGameTime(), worldserver.getDayTime(), worldserver.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)));
-         entityplayer.connection.send(new PacketPlayOutSpawnPosition(worldserver.getSharedSpawnPos(), worldserver.getSharedSpawnAngle()));
-         if (worldserver.isRaining()) {
-            entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.START_RAINING, 0.0F));
-            entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, worldserver.getRainLevel(1.0F)));
-            entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.THUNDER_LEVEL_CHANGE, worldserver.getThunderLevel(1.0F)));
-+            // CraftBukkit start - handle player weather
-+            // entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.START_RAINING, 0.0F));
-+            // entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, worldserver.getRainLevel(1.0F)));
-+            // entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.THUNDER_LEVEL_CHANGE, worldserver.getThunderLevel(1.0F)));
-+            entityplayer.setPlayerWeather(org.bukkit.WeatherType.DOWNFALL, false);
-+            entityplayer.updateWeather(-worldserver.rainLevel, worldserver.rainLevel, -worldserver.thunderLevel, worldserver.thunderLevel);
-+            // CraftBukkit end
-         }
- 
-         entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.LEVEL_CHUNKS_LOAD_START, 0.0F));
-@@ -729,8 +1008,16 @@
- 
-     public void sendAllPlayerInfo(EntityPlayer entityplayer) {
-         entityplayer.inventoryMenu.sendAllDataToRemote();
-        entityplayer.resetSentInfo();
-+        // entityplayer.resetSentInfo();
-+        entityplayer.getBukkitEntity().updateScaledHealth(); // CraftBukkit - Update scaled health on respawn and worldchange
-+        entityplayer.refreshEntityData(entityplayer); // CraftBukkkit - SPIGOT-7218: sync metadata
-         entityplayer.connection.send(new PacketPlayOutHeldItemSlot(entityplayer.getInventory().selected));
-+        // CraftBukkit start - from GameRules
-+        int i = entityplayer.serverLevel().getGameRules().getBoolean(GameRules.RULE_REDUCEDDEBUGINFO) ? 22 : 23;
-+        entityplayer.connection.send(new PacketPlayOutEntityStatus(entityplayer, (byte) i));
-+        float immediateRespawn = entityplayer.serverLevel().getGameRules().getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN) ? 1.0F: 0.0F;
-+        entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.IMMEDIATE_RESPAWN, immediateRespawn));
-+        // CraftBukkit end
-     }
- 
-     public int getPlayerCount() {
-@@ -786,12 +1073,22 @@
-     }
- 
-     public void removeAll() {
-        for (int i = 0; i < this.players.size(); ++i) {
-            ((EntityPlayer) this.players.get(i)).connection.disconnect((IChatBaseComponent) IChatBaseComponent.translatable("multiplayer.disconnect.server_shutdown"));
-+        // CraftBukkit start - disconnect safely
-+        for (EntityPlayer player : this.players) {
-+            player.connection.disconnect(CraftChatMessage.fromStringOrEmpty(this.server.server.getShutdownMessage())); // CraftBukkit - add custom shutdown message
-         }
-+        // CraftBukkit end
- 
-     }
- 
-+    // CraftBukkit start
-+    public void broadcastMessage(IChatBaseComponent[] iChatBaseComponents) {
-+        for (IChatBaseComponent component : iChatBaseComponents) {
-+            broadcastSystemMessage(component, false);
-+        }
-+    }
-+    // CraftBukkit end
-+
-     public void broadcastSystemMessage(IChatBaseComponent ichatbasecomponent, boolean flag) {
-         this.broadcastSystemMessage(ichatbasecomponent, (entityplayer) -> {
-             return ichatbasecomponent;
-@@ -849,16 +1146,23 @@
-         return playerchatmessage.hasSignature() && !playerchatmessage.hasExpiredServer(Instant.now());
-     }
- 
-    public ServerStatisticManager getPlayerStats(EntityHuman entityhuman) {
-        UUID uuid = entityhuman.getUUID();
-        ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) this.stats.get(uuid);
-+    // CraftBukkit start
-+    public ServerStatisticManager getPlayerStats(EntityPlayer entityhuman) {
-+        ServerStatisticManager serverstatisticmanager = entityhuman.getStats();
-+        return serverstatisticmanager == null ? getPlayerStats(entityhuman.getUUID(), entityhuman.getDisplayName().getString()) : serverstatisticmanager;
-+    }
-+
-+    public ServerStatisticManager getPlayerStats(UUID uuid, String displayName) {
-+        EntityPlayer entityhuman = this.getPlayer(uuid);
-+        ServerStatisticManager serverstatisticmanager = entityhuman == null ? null : (ServerStatisticManager) entityhuman.getStats();
-+        // CraftBukkit end
- 
-         if (serverstatisticmanager == null) {
-             File file = this.server.getWorldPath(SavedFile.PLAYER_STATS_DIR).toFile();
-             File file1 = new File(file, String.valueOf(uuid) + ".json");
- 
-             if (!file1.exists()) {
-                File file2 = new File(file, entityhuman.getName().getString() + ".json");
-+                File file2 = new File(file, displayName + ".json"); // CraftBukkit
-                 Path path = file2.toPath();
- 
-                 if (FileUtils.isPathNormalized(path) && FileUtils.isPathPortable(path) && path.startsWith(file.getPath()) && file2.isFile()) {
-@@ -867,7 +1171,7 @@
-             }
- 
-             serverstatisticmanager = new ServerStatisticManager(this.server, file1);
-            this.stats.put(uuid, serverstatisticmanager);
-+            // this.stats.put(uuid, serverstatisticmanager); // CraftBukkit
-         }
- 
-         return serverstatisticmanager;
-@@ -875,13 +1179,13 @@
- 
-     public AdvancementDataPlayer getPlayerAdvancements(EntityPlayer entityplayer) {
-         UUID uuid = entityplayer.getUUID();
-        AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) this.advancements.get(uuid);
-+        AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) entityplayer.getAdvancements(); // CraftBukkit
- 
-         if (advancementdataplayer == null) {
-             Path path = this.server.getWorldPath(SavedFile.PLAYER_ADVANCEMENTS_DIR).resolve(String.valueOf(uuid) + ".json");
- 
-             advancementdataplayer = new AdvancementDataPlayer(this.server.getFixerUpper(), this, this.server.getAdvancements(), path, entityplayer);
-            this.advancements.put(uuid, advancementdataplayer);
-+            // this.advancements.put(uuid, advancementdataplayer); // CraftBukkit
-         }
- 
-         advancementdataplayer.setPlayer(entityplayer);
-@@ -932,15 +1236,28 @@
-     }
- 
-     public void reloadResources() {
-        Iterator iterator = this.advancements.values().iterator();
-+        // CraftBukkit start
-+        /*Iterator iterator = this.advancements.values().iterator();
- 
-         while (iterator.hasNext()) {
-             AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) iterator.next();
- 
-             advancementdataplayer.reload(this.server.getAdvancements());
-+        }*/
-+
-+        for (EntityPlayer player : players) {
-+            player.getAdvancements().reload(this.server.getAdvancements());
-+            player.getAdvancements().flushDirty(player); // CraftBukkit - trigger immediate flush of advancements
-         }
-+        // CraftBukkit end
- 
-         this.broadcastAll(new ClientboundUpdateTagsPacket(TagNetworkSerialization.serializeTagsToNetwork(this.registries)));
-+        // CraftBukkit start
-+        reloadRecipes();
-+    }
-+
-+    public void reloadRecipes() {
-+        // CraftBukkit end
-         CraftingManager craftingmanager = this.server.getRecipeManager();
-         PacketPlayOutRecipeUpdate packetplayoutrecipeupdate = new PacketPlayOutRecipeUpdate(craftingmanager.getSynchronizedItemProperties(), craftingmanager.getSynchronizedStonecutterRecipes());
-         Iterator iterator1 = this.players.iterator();
--- a/paper-server/patches/sources/net/minecraft/server/players/SleepStatus.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/players/SleepStatus.java.patch
@@ -3,26 +3,26 @@
@@ -18,9 +18,12 @@
     }
 
-     public boolean areEnoughDeepSleeping(int i, List<EntityPlayer> list) {
-        int j = (int) list.stream().filter(EntityHuman::isSleepingLongEnough).count();
+     public boolean areEnoughDeepSleeping(int percentage, List<ServerPlayer> players) {
+-        int j = (int) players.stream().filter(Player::isSleepingLongEnough).count();
 +        // CraftBukkit start
-+        int j = (int) list.stream().filter((eh) -> { return eh.isSleepingLongEnough() || eh.fauxSleeping; }).count();
-+        boolean anyDeepSleep = list.stream().anyMatch(EntityHuman::isSleepingLongEnough);
+        int j = (int) players.stream().filter((eh) -> { return eh.isSleepingLongEnough() || eh.fauxSleeping; }).count();
+        boolean anyDeepSleep = players.stream().anyMatch(Player::isSleepingLongEnough);
 
-        return j >= this.sleepersNeeded(i);
-+        return anyDeepSleep && j >= this.sleepersNeeded(i);
+-        return j >= this.sleepersNeeded(percentage);
+        return anyDeepSleep && j >= this.sleepersNeeded(percentage);
 +        // CraftBukkit end
     }
 
-     public int sleepersNeeded(int i) {
+     public int sleepersNeeded(int percentage) {
@@ -42,18 +45,24 @@
         this.activePlayers = 0;
         this.sleepingPlayers = 0;
-         Iterator iterator = list.iterator();
+         Iterator iterator = players.iterator();
 +        boolean anySleep = false; // CraftBukkit
 
         while (iterator.hasNext()) {
-             EntityPlayer entityplayer = (EntityPlayer) iterator.next();
+             ServerPlayer entityplayer = (ServerPlayer) iterator.next();
 
             if (!entityplayer.isSpectator()) {
                 ++this.activePlayers;
--- a/paper-server/patches/sources/net/minecraft/server/players/StoredUserList.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/players/StoredUserList.java.patch
@@ -1,14 +1,14 @@
--- a/net/minecraft/server/players/JsonList.java
-+++ b/net/minecraft/server/players/JsonList.java
+--- a/net/minecraft/server/players/StoredUserList.java
+++ b/net/minecraft/server/players/StoredUserList.java
@@ -54,7 +54,7 @@
     @Nullable
-     public V get(K k0) {
+     public V get(K key) {
         this.removeExpired();
-        return (JsonListEntry) this.map.get(this.getKeyForUser(k0));
-+        return (V) this.map.get(this.getKeyForUser(k0)); // CraftBukkit - fix decompile error
+-        return (StoredUserEntry) this.map.get(this.getKeyForUser(key));
+        return (V) this.map.get(this.getKeyForUser(key)); // CraftBukkit - fix decompile error
     }
 
-     public void remove(K k0) {
+     public void remove(K key) {
@@ -85,6 +85,7 @@
     }
 
@@ -21,7 +21,7 @@
         Iterator iterator = this.map.values().iterator();
 
         while (iterator.hasNext()) {
-            V v0 = (JsonListEntry) iterator.next();
+-            V v0 = (StoredUserEntry) iterator.next();
 +            V v0 = (V) iterator.next(); // CraftBukkit - decompile error
 
             if (v0.hasExpired()) {
@@ -45,7 +45,7 @@
 
             Objects.requireNonNull(jsonlistentry);
@@ -171,7 +172,7 @@
-                         JsonListEntry<K> jsonlistentry = this.createEntry(jsonobject);
+                         StoredUserEntry<K> jsonlistentry = this.createEntry(jsonobject);
 
                         if (jsonlistentry.getUser() != null) {
 -                            this.map.put(this.getKeyForUser(jsonlistentry.getUser()), jsonlistentry);
--- a/paper-server/patches/sources/net/minecraft/server/players/UserBanListEntry.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/players/UserBanListEntry.java.patch
@@ -0,0 +1,7 @@
+--- a/net/minecraft/server/players/UserBanListEntry.java
+++ b/net/minecraft/server/players/UserBanListEntry.java
+@@ -1,3 +1,4 @@
+// mc-dev import
+ package net.minecraft.server.players;
+ 
+ import com.google.gson.JsonObject;