Apply fixups

Spigot-Server-Patches/0001-POM-Changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index a31f1513a90c753deba35320a6698a933bc9782f..2559c83c1b811177ade56537aeab1982ac53ee67 100644
+index a31f1513a90c753deba35320a6698a933bc9782f..9b0d5a157af5e4af2884b11721217783ca123564 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,15 +1,14 @@
@@ -28,7 +28,7 @@ index a31f1513a90c753deba35320a6698a933bc9782f..2559c83c1b811177ade56537aeab1982
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <api.version>unknown</api.version>
          <bt.name>git</bt.name>
-@@ -20,21 +19,27 @@
+@@ -20,23 +19,29 @@
      </properties>
  
      <parent>
@@ -59,8 +59,11 @@ index a31f1513a90c753deba35320a6698a933bc9782f..2559c83c1b811177ade56537aeab1982
 +        <dependency>
 +            <groupId>io.papermc</groupId>
              <artifactId>minecraft-server</artifactId>
-             <version>${minecraft.version}-SNAPSHOT</version>
+-            <version>${minecraft.version}-SNAPSHOT</version>
++            <version>${minecraft.version}-R0.2-SNAPSHOT</version>
              <scope>compile</scope>
+         </dependency>
+         <dependency>
 @@ -64,6 +69,17 @@
              <version>9.0</version>
              <scope>compile</scope>

Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch

@@ -358,7 +358,7 @@ index 4828d356ca01cba5964c6397584d56643dbc0dae..55890ff463eb122934e8ba1fc550cf0c
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 67331fa5463dd31e4aea3aebf6204ec5cb43d99e..8265879466333f4941c63c64b95d94f6ac0b5558 100644
+index 67331fa5463dd31e4aea3aebf6204ec5cb43d99e..9cd50aa48c5cd67631c8c99543ed8e162603b423 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -150,6 +150,37 @@ public class Main {
@@ -442,9 +442,9 @@ index 67331fa5463dd31e4aea3aebf6204ec5cb43d99e..8265879466333f4941c63c64b95d94f6
 +            tryPreloadClass("com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent");
 +            tryPreloadClass("com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent");
 +            // Minecraft, seen during saving
-+            tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener$Void");
-+            tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener");
-+            tryPreloadClass("net.minecraft.server.ExceptionSuppressor");
++            tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener$Void");
++            tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener");
++            tryPreloadClass("net.minecraft.util.ExceptionSuppressor");
 +            // Paper end
 +        }
 +    }

Spigot-Server-Patches/0454-fixup-Load-chunks-asynchronously-for-players.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] fixup! Load chunks asynchronously for players.
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 1212084923780ab4fa0fb67afb4fe326159890e8..37c9b5fd712e30a9a0faccc840f738f4b2cfc723 100644
+index 2ca9335129465ffb67617b42534db530c1d78923..36b4792687a5c6316bf95995e761bf4aa49779f6 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -31,6 +31,7 @@ import net.minecraft.core.NonNullList;

Spigot-Server-Patches/0455-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch

@@ -7,7 +7,7 @@ The code following this has better support for null worlds to move
 them back to the world spawn.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c7786e8d100cb872b10664b9c16de332ada3e3fe..167c9eb09a2fc9ac6db19b90723feacee52ec39e 100644
+index 8ca7012264528f17ac2e4f15ced96c774fa566d7..675d0cb32efc99f66c4d2b000bf49cf1c065a5e2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1808,9 +1808,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne

Spigot-Server-Patches/0457-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch

@@ -14,7 +14,7 @@ Use an ArrayDeque to store this Queue
 We make sure to also implement a pattern that is recursion safe too.
 
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index 94860c06717e8dcf969277562e88687e9a99aaa4..1b309682b58a2ef52b973181aefb0136f1aa3e80 100644
+index e5d94dedc88e8bbcf8d9517dfb5c6ec6f62de5aa..042a6beb8cada116d54bed18181de291bf5ed1bb 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -162,24 +162,32 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {

Spigot-Server-Patches/0460-Fix-numerous-item-duplication-issues-and-teleport-is.patch

@@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 167c9eb09a2fc9ac6db19b90723feacee52ec39e..b57888b2b53a8cf6d1e8af0f6e779bbcf748cd61 100644
+index 675d0cb32efc99f66c4d2b000bf49cf1c065a5e2..cb5c93dca3b947462b89f79c60c7562085684b87 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1969,11 +1969,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne

Spigot-Server-Patches/0463-Validate-PickItem-Packet-and-kick-for-invalid.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index de0d37044911b50a91f82d4064520e2ba97ff4fd..5cd8ee9a9099cd435735c3d9a2194f86232db45f 100644
+index 839eb6a294a696c5abd0d5e005b70d9bdbf25f9b..41d4c3533119cc80cb4c93771db344531c8dd106 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -881,7 +881,14 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0464-Expose-game-version.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7630a7fc347f6add6e628093c1f149ee01d05264..d0091fb05a0122e099d4d496f3e04a91b778cff2 100644
+index 55890ff463eb122934e8ba1fc550cf0cccaf8451..96652862531301c08aefa0baa79b1258b5b307ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -518,6 +518,13 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0466-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch

@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 8265879466333f4941c63c64b95d94f6ac0b5558..22bde395939f97086e411cef190bb2b1e7ede79a 100644
+index 9cd50aa48c5cd67631c8c99543ed8e162603b423..8a1ff1000f82a590b293e8892a34484df068093c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -20,6 +20,7 @@ public class Main {

Spigot-Server-Patches/0467-Implement-Mob-Goal-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/pom.xml b/pom.xml
-index 42dd78821c061b0384b5b8feaea7b9590ae39bd4..806832714739d3ae264ba7c3d2ca64a5e73f8b7f 100644
+index d6e313021d268c5d865394859b3d748edf1b061c..70c0fb4621b16c33d7cdf7d920c17bfe1ff8d831 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -142,6 +142,13 @@

Spigot-Server-Patches/0469-Optimize-isOutsideRange-to-use-distance-maps.patch

@@ -77,7 +77,7 @@ index 60fcea78bf617559114b1ca1c0bf2d4cd9075a8c..335666db1854e8aa4b2ba71d5bdc2658
  
      public String c() {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
-index bc642671292a753484e47f87bef4eee724353f07..b24a96dddf50029e4b40a47d49e3278cacaf42ce 100644
+index ecf4cd6dfea777ab9daea0b40724d247df7ddb53..42bb00364375e5cf324b43557385345868b37ffe 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 @@ -753,6 +753,37 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -148,10 +148,10 @@ index bc642671292a753484e47f87bef4eee724353f07..b24a96dddf50029e4b40a47d49e3278c
                              }
  
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 2ca9335129465ffb67617b42534db530c1d78923..996e86d44c4d2a4451d9cb7cbc2fa699e229b6ca 100644
+index 36b4792687a5c6316bf95995e761bf4aa49779f6..d50b53ae3b8f463eb1caa93b1c21f5c6a5a6484c 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -248,6 +248,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -249,6 +249,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> cachedSingleHashSet; // Paper
  
@@ -192,7 +192,7 @@ index 445dba8ed210407664904b707c36c78a76f25510..25484cac9c62e49de39fbbf506fcb3ed
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index 3e5c3d33a2d031915305abd37d1ba6e1ebfd089e..ad6cfce582e319314134eff4571519aa7325d783 100644
+index c30ec3ad68fc10d01d0b3dd1feea32f08c19ab1c..3c49ca30959204840a656c1a44de50a60ea1c7df 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -210,6 +210,17 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {

Spigot-Server-Patches/0471-No-Tick-view-distance-implementation.patch

@@ -73,10 +73,10 @@ index 335666db1854e8aa4b2ba71d5bdc2658305cb70a..2bbdcedf4856080ea9232effdf3bdae9
                  if (flag1) {
                      ChunkMapDistance.this.j.a(ChunkTaskQueueSorter.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 996e86d44c4d2a4451d9cb7cbc2fa699e229b6ca..2def7680367e4a20d7402b27bff7242afdc250e2 100644
+index d50b53ae3b8f463eb1caa93b1c21f5c6a5a6484c..d4f0cb8d18a185e58892a42fb7151cf1065fc362 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -250,6 +250,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -251,6 +251,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
  

Spigot-Server-Patches/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch

@@ -569,10 +569,10 @@ index 42bb00364375e5cf324b43557385345868b37ffe..19e02d12bb0c5a73066f7c57da402779
          boolean flag1 = this.playerChunkMap.b();
  
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 2def7680367e4a20d7402b27bff7242afdc250e2..5d6865fd7b67c2031440a8bd862099244d2ea407 100644
+index d4f0cb8d18a185e58892a42fb7151cf1065fc362..bb4c6b3790192c0e9f21859b6b3fd62a847787b7 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -72,6 +72,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutWorldEvent;
+@@ -73,6 +73,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutWorldEvent;
  import net.minecraft.resources.MinecraftKey;
  import net.minecraft.resources.ResourceKey;
  import net.minecraft.server.AdvancementDataPlayer;
@@ -580,7 +580,7 @@ index 2def7680367e4a20d7402b27bff7242afdc250e2..5d6865fd7b67c2031440a8bd86209924
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.network.ITextFilter;
  import net.minecraft.server.network.PlayerConnection;
-@@ -186,6 +187,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -187,6 +188,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      private int lastArmorScored = Integer.MIN_VALUE;
      private int lastExpLevelScored = Integer.MIN_VALUE;
      private int lastExpTotalScored = Integer.MIN_VALUE;
@@ -593,7 +593,7 @@ index 2def7680367e4a20d7402b27bff7242afdc250e2..5d6865fd7b67c2031440a8bd86209924
      private float lastHealthSent = -1.0E8F;
      private int lastFoodSent = -99999999;
      private boolean lastSentSaturationZero = true;
-@@ -273,6 +280,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -274,6 +281,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.maxHealthCache = this.getMaxHealth();
          this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
      }
@@ -615,7 +615,7 @@ index 2def7680367e4a20d7402b27bff7242afdc250e2..5d6865fd7b67c2031440a8bd86209924
  
      // Yes, this doesn't match Vanilla, but it's the best we can do for now.
      // If this is an issue, PRs are welcome
-@@ -620,6 +642,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -621,6 +643,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              if (valid && !this.isSpectator() || this.world.isLoaded(this.getChunkCoordinates())) { // Paper - don't tick dead players that are not in the world currently (pending respawn)
                  super.tick();
              }

Spigot-Server-Patches/0488-Optimize-sending-packets-to-nearby-locations-sounds-.patch

@@ -11,7 +11,7 @@ This will drastically cut down on packet sending cost for worlds with
 lots of players in them.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 86e50a90e524bd8e77efd9e5641fa4e59560df11..abfe8b929ddc9dd397fa342f77186aebb982adb4 100644
+index 65e01b98c74d2fa9ff6d6db18f9f8c684b7bdac4..fa9fae3979caaaef16a21d7407bb05e796963d7c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1153,16 +1153,40 @@ public abstract class PlayerList {

Spigot-Server-Patches/0501-Prevent-position-desync-in-playerconnection-causing-.patch

@@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index c42b981038fcca80de0ac293bef6a78697d3818f..8c8fca94487eb315def1afab43d3c709bfd2c55b 100644
+index d8be5ff9620da8d96a0d157fb99145d3b43299df..caabb6c831ba280ef6b74ba8aee94c9c3375f38b 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -1324,6 +1324,11 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0505-Add-and-implement-PlayerRecipeBookClickEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 8c8fca94487eb315def1afab43d3c709bfd2c55b..3839a82328bd8d6f8e395b833c9bac6cc8564016 100644
+index caabb6c831ba280ef6b74ba8aee94c9c3375f38b..2f61d5fcaff10d2e5514f60a8a6430aa3949a077 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -2758,9 +2758,15 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0509-Ensure-Entity-AABB-s-are-never-invalid.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8a1a7a465f007109f8e3b5359cac8ea9d9673049..6b9c73265a987be4da9b1657ff594cde1f3e6304 100644
+index da2b5bfd3966ded2d5dde0d65646583576a088c5..c50b89ee8f16821923933025bf19243771dd1604 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -66,6 +66,7 @@ import net.minecraft.world.INamableTileEntity;

Spigot-Server-Patches/0514-Improve-Legacy-Component-serialization-size.patch

@@ -7,7 +7,7 @@ Don't constantly send format: false for all formatting options when parent alrea
 has it false
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-index 1582a799e456402453c43c2e0c6b8a194951a9dd..ede1cffb5de4f958ecf57b6c62a0d63896274746 100644
+index 666af6cc91bd12ba5d5a846d663a5aabf861fbc4..189a416bd033c9ff390d359aa19cec515d0461e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 @@ -46,6 +46,7 @@ public final class CraftChatMessage {

Spigot-Server-Patches/0523-Update-itemstack-legacy-name-and-lore.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 3d5a4d662ae4880fa27bd681127ddf7d1f70b51c..9f0aad908cf662aa7ba1e62c0639abf06d30568c 100644
+index 0468f80b7f52ee45fc9364470b23f80f7cd0cb57..158c7a30af8326fa419af391167c07d75b8611ac 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -27,6 +27,7 @@ import net.minecraft.core.IRegistry;

Spigot-Server-Patches/0524-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 abfe8b929ddc9dd397fa342f77186aebb982adb4..b24e3a1a323feba8c82d0933f06bb8565112e6b6 100644
+index fa9fae3979caaaef16a21d7407bb05e796963d7c..b33e610fee244e4791f6a88e8699c999913cb2d3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -196,7 +196,18 @@ public abstract class PlayerList {

Spigot-Server-Patches/0533-Move-range-check-for-block-placing-up.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 95f4d39f3c21933f440f8ee3e29fd8a533dfb4c1..e38e3b6f0efac9d7723706c2a03a1ce3e67a445f 100644
+index 316cb57870a6a3f568bb3d353540283b9d785976..bd6f3e9d321abcf039875dd5c9f7ccc59afd2dd2 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -1660,15 +1660,19 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0534-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 b24e3a1a323feba8c82d0933f06bb8565112e6b6..503ad38073fd8334d6692df97ea3fb68ded694d5 100644
+index b33e610fee244e4791f6a88e8699c999913cb2d3..1b78f53d09cc26fe881933df8aa1a7e77337acf1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -83,6 +83,7 @@ import net.minecraft.world.level.EnumGamemode;

Spigot-Server-Patches/0541-Incremental-player-saving.patch

@@ -47,10 +47,10 @@ index 3867e1d9a3d3648aaea46816643c0d8f070baf5d..ca284cd0419f5d99efa7e73c19fa1591
              // Paper start
              for (WorldServer world : getWorlds()) {
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 5d6865fd7b67c2031440a8bd862099244d2ea407..81fd2efd25d9f5ffdabd40fb29f356db053ceef9 100644
+index bb4c6b3790192c0e9f21859b6b3fd62a847787b7..c4f2c164927db4917f85a8bd65fdbf00e9b062a3 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -174,6 +174,7 @@ import org.bukkit.inventory.MainHand;
+@@ -175,6 +175,7 @@ import org.bukkit.inventory.MainHand;
  public class EntityPlayer extends EntityHuman implements ICrafting {
  
      private static final Logger LOGGER = LogManager.getLogger();