Updated Upstream (CraftBukkit/Spigot)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
fd92f1e65 SPIGOT-7378: Add BlockDropItemEvent for Suspicious Sand & Gravel drops
cb1b69d13 SPIGOT-7377: Server sends player list twice

Spigot Changes:
16cfc987 Rebuild patches

patches/server/0009-MC-Utils.patch

@@ -6595,7 +6595,7 @@ index a63d5ba706a5b8e430aedc045bdeb3a410bd0eef..e96a0ca47e4701ba187555bd92c96834
      public BlockState getBlockState(BlockPos pos) {
          return this.getChunk(SectionPos.blockToSectionCoord(pos.getX()), SectionPos.blockToSectionCoord(pos.getZ())).getBlockState(pos);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ce4194ebecceec9a86f5f11873da41e1382646d1..c48318d9d5882dd87e423aecf27c31994af42bdb 100644
+index 1413df83d5dad892a505850fd863d49148c185f0..5d572a56d7926a849af73f5335a749f30f250026 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -185,6 +185,7 @@ public abstract class PlayerList {

patches/server/0010-Adventure.patch

@@ -2533,7 +2533,7 @@ index 1cb95db25a20d38faacd99a5805630c1598e9db3..d99b2235038eb1aba8cda474c4aa51e2
  
                  @Override
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c48318d9d5882dd87e423aecf27c31994af42bdb..ae2c702955a60a38c48b5fce43b4edb19284b82c 100644
+index 5d572a56d7926a849af73f5335a749f30f250026..645bee9a926d71c3730a23391d21d48418444e9a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -8,6 +8,7 @@ import com.mojang.logging.LogUtils;

patches/server/0014-Timings-v2.patch

@@ -1317,7 +1317,7 @@ index a1b9a2eeba2febef1b568a4c5aea99829210dbe1..403f7c7f31e0072b0cad0706bc981ece
      }
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ae2c702955a60a38c48b5fce43b4edb19284b82c..90c73b9075489242556a7ba749618e20c0ed0c4d 100644
+index 645bee9a926d71c3730a23391d21d48418444e9a..ec414e72a36ae330a3a4c6a4c7d879f3350ecb86 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1,5 +1,6 @@

patches/server/0019-Rewrite-chunk-system.patch

@@ -20471,7 +20471,7 @@ index 403f7c7f31e0072b0cad0706bc981ece24733a1d..d72e8df4f99b6219ea305742f0cf8d1c
          StringReader stringreader = new StringReader(packet.getCommand());
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 90c73b9075489242556a7ba749618e20c0ed0c4d..0338a6b245ee482d470f5a80da712679ab9890fa 100644
+index ec414e72a36ae330a3a4c6a4c7d879f3350ecb86..0363ad83af48ddcec37b5bd2fee49c3b1350576c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -262,7 +262,7 @@ public abstract class PlayerList {

patches/server/0050-Add-PlayerInitialSpawnEvent.patch

@@ -12,7 +12,7 @@ improve setPosition to use raw
 public net.minecraft.world.entity.Entity setRot(FF)V
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0338a6b245ee482d470f5a80da712679ab9890fa..f03058205342f06c1dfbf38313e7d2088327b104 100644
+index 0363ad83af48ddcec37b5bd2fee49c3b1350576c..d9c45fb7a97797de2af2811f816110cc6c3681f6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -240,7 +240,7 @@ public abstract class PlayerList {

patches/server/0088-Configurable-Player-Collision.patch

@@ -43,7 +43,7 @@ index 81abb732e2bb3bca683028d505e7485052c0ec8d..d2b07b5f0ff7466f22f2c25c7e0cb9a0
          this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
          this.connection.acceptConnections();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f03058205342f06c1dfbf38313e7d2088327b104..05dd9e618336c5a8e44e20b97d9a7fd0fb5b3002 100644
+index d9c45fb7a97797de2af2811f816110cc6c3681f6..66b1a4593f9c96dbf7e098411f89dbacd6baf4ba 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -99,6 +99,7 @@ import net.minecraft.world.level.storage.PlayerDataStorage;

patches/server/0125-Enforce-Sync-Player-Saves.patch

@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 05dd9e618336c5a8e44e20b97d9a7fd0fb5b3002..ba96e12395fd8c9cd55f45631b2816d30f90830a 100644
+index 66b1a4593f9c96dbf7e098411f89dbacd6baf4ba..0eceacb8b58339820a515c59d978239bc5be0731 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1069,11 +1069,13 @@ public abstract class PlayerList {

patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch

@@ -64,7 +64,7 @@ index 14edacfd5cc77cc85dc84e3fdad94be8c8932dc6..79b4139b653a09142e1b624849ad7c52
          if (waitForShutdown) {
              try {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ba96e12395fd8c9cd55f45631b2816d30f90830a..c55321724a2215b84690640013b2a8bc4ff989f5 100644
+index 0eceacb8b58339820a515c59d978239bc5be0731..a9cab02b97f85fec31ad636f7a340066d409be36 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1181,8 +1181,15 @@ public abstract class PlayerList {

patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -222,7 +222,7 @@ index 81a0a897a1fd2a408bfe43f24ed5e5f4bbefe161..24f62f9c4d288297d7a324e806745cc1
          System.setOut(IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream());
          System.setErr(IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream());
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c55321724a2215b84690640013b2a8bc4ff989f5..c825c6a16fbdb8b06845f3c2c7a11881866d6301 100644
+index a9cab02b97f85fec31ad636f7a340066d409be36..03ea44619bc3445956f3e4539fc0e2923a29a92d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -169,8 +169,7 @@ public abstract class PlayerList {

patches/server/0149-ProfileWhitelistVerifyEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c825c6a16fbdb8b06845f3c2c7a11881866d6301..145d373d26c6e72f2db4b444f8b2bda79649d0dd 100644
+index 03ea44619bc3445956f3e4539fc0e2923a29a92d..493099d1a1df085ec909ed6cd65a250c24f28bd1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -646,9 +646,9 @@ public abstract class PlayerList {

patches/server/0216-InventoryCloseEvent-Reason-API.patch

@@ -104,7 +104,7 @@ index e7d2bd1b2ee80c5cc68048f2d90dcf21e50f04d2..3a3c21132b2a843de642490c7a256e53
          this.player.doCloseContainer();
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 145d373d26c6e72f2db4b444f8b2bda79649d0dd..bf55ecb0112eb5c4d89c0b785a0dd6a46d977ab0 100644
+index 493099d1a1df085ec909ed6cd65a250c24f28bd1..233e79c71e2c46f4220dd7423ac421be9742f53e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -533,7 +533,7 @@ public abstract class PlayerList {

patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch

@@ -23,7 +23,7 @@ Modified isEmpty to use the isEmpty() method instead of the slightly confusing s
 The point of this is readability, but does have a side-benefit of a small microptimization
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index bf55ecb0112eb5c4d89c0b785a0dd6a46d977ab0..8a46f1b3091700140dba0862075107adf894f0a7 100644
+index 233e79c71e2c46f4220dd7423ac421be9742f53e..a9930382c39e20f30a3d613eb3c27144637c033b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -649,7 +649,7 @@ public abstract class PlayerList {

patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch

@@ -28,7 +28,7 @@ index 698c28b425b82ec024cbdf9e00b15b02b3cab860..47b3a068e1e8759648b24b362a34a045
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8a46f1b3091700140dba0862075107adf894f0a7..fa614a64b75e6ceeba06bf93f80fcb8f1428d7e9 100644
+index a9930382c39e20f30a3d613eb3c27144637c033b..d3a4de9d140440eb9dda9138bd73e8bd481d0139 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -189,6 +189,7 @@ public abstract class PlayerList {

patches/server/0300-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fa614a64b75e6ceeba06bf93f80fcb8f1428d7e9..13d19946c5051ec876698626dcea18c28e47ff19 100644
+index d3a4de9d140440eb9dda9138bd73e8bd481d0139..888547c662b99193af8f803817bc830ab3cc9378 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1157,6 +1157,7 @@ public abstract class PlayerList {

patches/server/0301-Entity-getEntitySpawnReason.patch

@@ -22,7 +22,7 @@ index 6b157b362cffedae26133fc0f0af1094655ee11f..986a509998d217228eb1dc2b58157875
              // Paper start
              if (DEBUG_ENTITIES) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 13d19946c5051ec876698626dcea18c28e47ff19..110cb6ca8abe4fa1b07dc69004cd4377229e4cca 100644
+index 888547c662b99193af8f803817bc830ab3cc9378..6151563936d5863bd44487da6fc6c0341e25df14 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -233,6 +233,11 @@ public abstract class PlayerList {

patches/server/0303-Implement-PlayerPostRespawnEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 110cb6ca8abe4fa1b07dc69004cd4377229e4cca..57dbd14166df7e0043c353b89b8ea3ef6c644820 100644
+index 6151563936d5863bd44487da6fc6c0341e25df14..bbc2cbc4e08f0cd7d82233f5168abda81d583d0b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -758,9 +758,14 @@ public abstract class PlayerList {

patches/server/0321-Fix-MC-158900.patch

@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 57dbd14166df7e0043c353b89b8ea3ef6c644820..9bfbd2ca9d70ac25fa86e35217289cbc9f09c199 100644
+index bbc2cbc4e08f0cd7d82233f5168abda81d583d0b..8371a95cf3c4b8df73e8bfb68e45291da80fac0d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -642,8 +642,10 @@ public abstract class PlayerList {

patches/server/0367-Optimize-Collision-to-not-load-chunks.patch

@@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading
 massive amounts of surrounding chunks due to large AABB lookups.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9bfbd2ca9d70ac25fa86e35217289cbc9f09c199..16982a16639a07e31456aa1e27c1058fbf9519ac 100644
+index 8371a95cf3c4b8df73e8bfb68e45291da80fac0d..6eb33551b05152a5ea98f047f072ea4d663d72d8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -827,6 +827,7 @@ public abstract class PlayerList {

patches/server/0368-Don-t-move-existing-players-to-world-spawn.patch

@@ -35,7 +35,7 @@ index 1d322c8d7e072cea923edcb92e28fa82de8daba8..e8a1aff3ddd94925e1c0f554cc8e7ff9
          this.gameMode.setLevel((ServerLevel) world);
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 16982a16639a07e31456aa1e27c1058fbf9519ac..47f810e7be3fb7a1233a260fec456b8f65f9a9e2 100644
+index 6eb33551b05152a5ea98f047f072ea4d663d72d8..5b3e8adde28d11aec4ea526ebba61d561ec06cb6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -236,6 +236,7 @@ public abstract class PlayerList {

patches/server/0370-Improved-Watchdog-Support.patch

@@ -270,7 +270,7 @@ index f4c7866a27319b2da8c00e8fe9b8f1f6306045ab..71b395db734c257a64ec3297eebbe528
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 47f810e7be3fb7a1233a260fec456b8f65f9a9e2..0a9e83117a44be51e5879831fb3f27639fecc064 100644
+index 5b3e8adde28d11aec4ea526ebba61d561ec06cb6..95356cfb36f2103889a21d6c360d29a318c871dd 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -547,7 +547,7 @@ public abstract class PlayerList {

patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch

@@ -55,7 +55,7 @@ index cc3ebc15e25e132870bbc336e68216459a4545da..af6b92056d924f7cb9a7a583fd089025
      public String kickLeaveMessage = null; // SPIGOT-3034: Forward leave message to PlayerQuitEvent
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0a9e83117a44be51e5879831fb3f27639fecc064..de4b483d60abcff8e941961958000e198b8c5424 100644
+index 95356cfb36f2103889a21d6c360d29a318c871dd..8a67971d67230b30b769eea5745919946d868bd8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -311,6 +311,12 @@ public abstract class PlayerList {

patches/server/0425-incremental-chunk-and-player-saving.patch

@@ -127,7 +127,7 @@ index 6fe74d96659029efb6fe798fb3b3b02b619cb1f1..bdc7b67b4302a217071c2087732bbd78
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
      public ServerGamePacketListenerImpl connection;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index de4b483d60abcff8e941961958000e198b8c5424..b757e32afd9fcd844a590fd58ee128593997696f 100644
+index 8a67971d67230b30b769eea5745919946d868bd8..3c98a55a1b9eee854d8c48af449b876d3a46501f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -535,6 +535,7 @@ public abstract class PlayerList {

patches/server/0435-Spawn-player-in-correct-world-on-login.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b757e32afd9fcd844a590fd58ee128593997696f..98c9ede25e70234462ce0494ee3bf1451fcfb7b2 100644
+index 3c98a55a1b9eee854d8c48af449b876d3a46501f..0cd93062ffc2bf824e99f8776254a5269e9117c3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -212,7 +212,18 @@ public abstract class PlayerList {

patches/server/0441-Fix-SPIGOT-5989.patch

@@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 98c9ede25e70234462ce0494ee3bf1451fcfb7b2..ed8c1227864167feaa9b65c3c525487e0581c200 100644
+index 0cd93062ffc2bf824e99f8776254a5269e9117c3..36715e8bc9047962a2ced70d6838672159665771 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -794,6 +794,7 @@ public abstract class PlayerList {

patches/server/0449-Add-setMaxPlayers-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ed8c1227864167feaa9b65c3c525487e0581c200..14d568eb5ced04e01caff1b414f0ca4f75d8c2b4 100644
+index 36715e8bc9047962a2ced70d6838672159665771..b810ae5536cc1a64d44266f2158db0f6930429ff 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -155,7 +155,7 @@ public abstract class PlayerList {

patches/server/0492-Add-API-for-quit-reason.patch

@@ -49,7 +49,7 @@ index a4233fa223bdf9b29a3d75b84ef38640331d7fb8..2f0cb4d692631f6485b3a70c6e15e7d9
              this.connection.disconnect(ichatbasecomponent);
          }));
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 14d568eb5ced04e01caff1b414f0ca4f75d8c2b4..a291c178461b4caf54d7ce9a5d2e9e1b3b946dfe 100644
+index b810ae5536cc1a64d44266f2158db0f6930429ff..b5d39d5ec89150e71cab1efe087c5254f2b4ba97 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -573,7 +573,7 @@ public abstract class PlayerList {

patches/server/0494-Expose-world-spawn-angle.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a291c178461b4caf54d7ce9a5d2e9e1b3b946dfe..eac95d1c17bbfc6cccc46a33ea1e3eb42a38b8ac 100644
+index b5d39d5ec89150e71cab1efe087c5254f2b4ba97..db5902a97e46213c162fc2a5a0f94d2e2d53fa5a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -837,7 +837,7 @@ public abstract class PlayerList {

patches/server/0536-Fix-villager-boat-exploit.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index eac95d1c17bbfc6cccc46a33ea1e3eb42a38b8ac..f5dcbcb46de49dfaad4923dc71a5406122fd092a 100644
+index db5902a97e46213c162fc2a5a0f94d2e2d53fa5a..9d569e4021e2727602eae65e19d77a7c0d367693 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -598,6 +598,14 @@ public abstract class PlayerList {

patches/server/0537-Add-sendOpLevel-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f5dcbcb46de49dfaad4923dc71a5406122fd092a..07912867c64cf9586afbcc03648562eeefd8c680 100644
+index 9d569e4021e2727602eae65e19d77a7c0d367693..adb616a519b1bba4babb92ca1042e964a2b79586 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1086,6 +1086,11 @@ public abstract class PlayerList {

patches/server/0565-fix-converting-txt-to-json-file.patch

@@ -48,7 +48,7 @@ index 6c1db5d6bf11184205073a4ce755e7f4e987643a..01e67001435dfa74062fda386072c552
          if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
              return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 07912867c64cf9586afbcc03648562eeefd8c680..12e88ab27197b92caf786d92846f49f5c9054fbd 100644
+index adb616a519b1bba4babb92ca1042e964a2b79586..063aed795bb668c62f69d0c93ffc6d939af681ad 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -186,6 +186,7 @@ public abstract class PlayerList {

patches/server/0575-Drop-carried-item-when-player-has-disconnected.patch

@@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 12e88ab27197b92caf786d92846f49f5c9054fbd..26b41c2517e05cbc12a1497d65e7277c11cfc2a3 100644
+index 063aed795bb668c62f69d0c93ffc6d939af681ad..7e26f87ffd8f50cf4e2cd582c9cd5d9abbf9c3f3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -591,6 +591,14 @@ public abstract class PlayerList {

patches/server/0593-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 26b41c2517e05cbc12a1497d65e7277c11cfc2a3..0413fca169c7bd723d01e7319c28a9de322d10fe 100644
+index 7e26f87ffd8f50cf4e2cd582c9cd5d9abbf9c3f3..10d02d71b67f4022c6d5c709793a11283694362d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -810,6 +810,7 @@ public abstract class PlayerList {

patches/server/0595-add-RespawnFlags-to-PlayerRespawnEvent.patch

@@ -18,7 +18,7 @@ index 4f4b6348da714854fc87ed992d16ff567a5690aa..d27eeef0cfeda8de66710f7b3ca1b905
                  } else {
                      if (this.player.getHealth() > 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0413fca169c7bd723d01e7319c28a9de322d10fe..d1abf9d373542e0fab18c594792d3b1b49bbf084 100644
+index 10d02d71b67f4022c6d5c709793a11283694362d..8fb526c84850162bbce004dc4179219320634eeb 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -769,6 +769,12 @@ public abstract class PlayerList {

patches/server/0619-Add-PlayerKickEvent-causes.patch

@@ -427,7 +427,7 @@ index 707f0e0bdd3617fac987dacea36df6c363ca71ca..18bdc328dd80e637c3e8cb8a12bd7bfe
  
              }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d1abf9d373542e0fab18c594792d3b1b49bbf084..85ce52f49212fbdbc291766aa2e5255180d8b9b7 100644
+index 8fb526c84850162bbce004dc4179219320634eeb..ea195117f25ea0009ff646e08aec7401d1edb6b4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -678,7 +678,7 @@ public abstract class PlayerList {

patches/server/0641-Fixes-kick-event-leave-message-not-being-sent.patch

@@ -59,7 +59,7 @@ index 30e732d8d5c8944baf6080707568926500c6061d..46ded046ec267aadc6366ff726974f54
              this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(quitMessage), false);
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 85ce52f49212fbdbc291766aa2e5255180d8b9b7..2e0f9c4edf8b4ef8c4c507c80841a9804f8519ad 100644
+index ea195117f25ea0009ff646e08aec7401d1edb6b4..a427354b357e13bde80e4a09e019dd777caca280 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -564,6 +564,11 @@ public abstract class PlayerList {

patches/server/0655-Add-PlayerSetSpawnEvent.patch

@@ -154,7 +154,7 @@ index 3d9f3e49cc783ace04f5228a5ae33f35799ced4a..fc0ef295241036230e2a0a1277544598
  
      public void trackChunk(ChunkPos chunkPos, Packet<?> chunkDataPacket) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2e0f9c4edf8b4ef8c4c507c80841a9804f8519ad..348265d5686072d625d694a5a3cdbe3060c950f7 100644
+index a427354b357e13bde80e4a09e019dd777caca280..2896123ce0384ee1b5039f5263aa902532bce67d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -860,7 +860,7 @@ public abstract class PlayerList {

patches/server/0729-Add-config-option-for-logging-player-ip-addresses.patch

@@ -47,7 +47,7 @@ index 595779cfd0ee1c405d7936f00a7cae1706125e7f..ed3af916dfa875dd0a5f1e730d20d11e
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 348265d5686072d625d694a5a3cdbe3060c950f7..5f957a28e9d30144f724ebdc581d5f0b80bf6dc1 100644
+index 2896123ce0384ee1b5039f5263aa902532bce67d..c94172f2d2435ff4256fe21533cea2719b4cffe0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -255,7 +255,7 @@ public abstract class PlayerList {

patches/server/0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch

@@ -1202,7 +1202,7 @@ index c6ff2f5d1a13b4357229244cbd375461b51d1779..68e7342a72509fb41734ee23638ffb56
              }
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5f957a28e9d30144f724ebdc581d5f0b80bf6dc1..23ab7960120c1e2a76880f634787a089857ebff4 100644
+index c94172f2d2435ff4256fe21533cea2719b4cffe0..432c9e4e2b16b18f795e854f4cbe30b7e14a8947 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -895,7 +895,7 @@ public abstract class PlayerList {

patches/server/0763-Validate-usernames.patch

@@ -56,7 +56,7 @@ index ed3af916dfa875dd0a5f1e730d20d11efd6419c6..cd4e76fe5b79c7d9e615b4886a568c74
  
          if (gameprofile != null && packet.name().equalsIgnoreCase(gameprofile.getName())) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 23ab7960120c1e2a76880f634787a089857ebff4..3ba9d736ac8f3029b57fbf5deccc28cc68b34a3e 100644
+index 432c9e4e2b16b18f795e854f4cbe30b7e14a8947..42e7b41526f7cf31f33a58f18e851cd435472921 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -673,7 +673,7 @@ public abstract class PlayerList {

patches/server/0794-Force-close-world-loading-screen.patch

@@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3ba9d736ac8f3029b57fbf5deccc28cc68b34a3e..752e4114227ac0eabc877732584cd2429c58f70b 100644
+index 42e7b41526f7cf31f33a58f18e851cd435472921..3d6b84e307f3222bb96270d149abddb7024c83da 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -396,6 +396,16 @@ public abstract class PlayerList {

patches/server/0816-Use-username-instead-of-display-name-in-PlayerList-g.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 752e4114227ac0eabc877732584cd2429c58f70b..f73436c8c48640514764735e28fa15f0b080d419 100644
+index 3d6b84e307f3222bb96270d149abddb7024c83da..1bce8dca483ebf53f82b7b67a5194c38b5b3963d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1430,7 +1430,7 @@ public abstract class PlayerList {

patches/server/0914-Properly-resend-entities.patch

@@ -79,7 +79,7 @@ index 1b58accf9d00940617d60024ef196c55b10cce7c..7281e1cf6e41a222657c3deaf13e1f09
                              }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f73436c8c48640514764735e28fa15f0b080d419..a07238b697d11dd1845d5c8f643e8cf359b6214f 100644
+index 1bce8dca483ebf53f82b7b67a5194c38b5b3963d..c11780c9dc444e0f9d80eac9ba7b024ba52faf5f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -371,7 +371,7 @@ public abstract class PlayerList {

patches/server/0930-Use-single-player-info-update-packet-on-join.patch

@@ -18,18 +18,9 @@ index 3c4e3c1f161dc14b2341a7847e872584c52c719f..3ed87a3a00bb7da4106f3430ffa6afaa
          });
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a07238b697d11dd1845d5c8f643e8cf359b6214f..64da478118537c497363c394fb2ebc92fba6a505 100644
+index c11780c9dc444e0f9d80eac9ba7b024ba52faf5f..647607827949302098ff45ffa4296ed62511987a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -317,7 +317,7 @@ 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);
 @@ -353,6 +353,7 @@ public abstract class PlayerList {
          // CraftBukkit start - sendAll above replaced with this loop
          ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player));

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit f3b2b2210362d2f322fe1999e96453bc4abb98a4
+Subproject commit fd92f1e65447be1d336ce0c43f2e915f01f2fc1d

work/Spigot

@@ -1 +1 @@
-Subproject commit 723951c3cf8cf3bb6721b3da29cd262f642fbfb1
+Subproject commit 16cfc987271eddcc0ffeb5d8cc968ea16c19e986