diff --git a/patches/server/Use-single-player-info-update-packet-on-join.patch b/patches/server/Use-single-player-info-update-packet-on-join.patch
index 69b255cd9f..6150695961 100644
--- a/patches/server/Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/Use-single-player-info-update-packet-on-join.patch
@@ -21,15 +21,6 @@ diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/ma
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-             player.sendServerStatus(serverping);
-         }
- 
--        player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players));
-+        // player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players)); // Paper
-         this.players.add(player);
-         this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player); // Spigot
-         this.playersByUUID.put(player.getUUID(), player);
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
          // CraftBukkit start - sendAll above replaced with this loop
          ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player));
diff --git a/work/CraftBukkit b/work/CraftBukkit
index f3b2b22103..fd92f1e654 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f3b2b2210362d2f322fe1999e96453bc4abb98a4
+Subproject commit fd92f1e65447be1d336ce0c43f2e915f01f2fc1d
diff --git a/work/Spigot b/work/Spigot
index 723951c3cf..16cfc98727 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 723951c3cf8cf3bb6721b3da29cd262f642fbfb1
+Subproject commit 16cfc987271eddcc0ffeb5d8cc968ea16c19e986