From b68048c094941fbbce89be297110d10498c50d3c Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Fri, 9 Jun 2023 08:24:31 +1000 Subject: [PATCH] SPIGOT-7377: Server sends player list twice By: md_5 --- .../net/minecraft/server/players/PlayerList.patch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch b/paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch index 0e4a41bc57..4d2e0f4878 100644 --- a/paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch +++ b/paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch @@ -120,8 +120,12 @@ playerconnection.teleport(entityplayer.getX(), entityplayer.getY(), entityplayer.getZ(), entityplayer.getYRot(), entityplayer.getXRot()); ServerPing serverping = this.server.getStatus(); -@@ -238,10 +280,61 @@ - entityplayer.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players)); +@@ -235,13 +277,64 @@ + 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)));