Port chunk priority urgency patch

build-data/paper.at

@@ -180,3 +180,6 @@ public net.minecraft.server.level.ServerLevel players
 
 # Improve block entity unload performance
 public net.minecraft.Util$IdentityStrategy
+
+# Chunk priority urgency system
+public net.minecraft.server.level.ChunkMap$ChunkDistanceManager

patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch

@@ -8,8 +8,6 @@ an object pool for these.
 
 Uses lots of advanced new capabilities of the Paper codebase :)
 
-1.17 update note: ClientboundLightUpdatePacket has has made changes which necessitate updating this patch
-
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLightUpdatePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLightUpdatePacket.java
 index 24d5a44cb81ec5f10bfcce002a193f4566de88fc..d8be2ad889f46491e50404916fb4ae0de5f42098 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLightUpdatePacket.java

patches/server/0492-Move-range-check-for-block-placing-up.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fecb2a6b8674ca110d6af539396873e9dcdc0edb..74cdbe26b1453a3a54cff4a4698f58eba5a9cdf2 100644
+index 6476d2a478b85116061a13f7ef2a5fec2ade4a04..003cd8a304420671d487c9e55622d9578aa75b3a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1693,17 +1693,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1694,17 +1694,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          BlockPos blockposition = movingobjectpositionblock.getBlockPos();
          Direction enumdirection = movingobjectpositionblock.getDirection();
  

patches/server/0493-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 66735bbc2528c5812c9df14ef7cd91cb69d903b2..9c594c0f142ca10b7c1df50faf45ccb3f7468ba9 100644
+index 8ebbbecaebea8435232a2ccd9ad1062eb1dbbd6c..371ecab3f90be690b66db3992239bf5625eb1f6e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -77,6 +77,7 @@ import net.minecraft.world.level.GameRules;
@@ -21,7 +21,7 @@ index 66735bbc2528c5812c9df14ef7cd91cb69d903b2..9c594c0f142ca10b7c1df50faf45ccb3
  import net.minecraft.world.level.block.state.BlockState;
  import net.minecraft.world.level.border.BorderChangeListener;
  import net.minecraft.world.level.border.WorldBorder;
-@@ -821,6 +822,7 @@ public abstract class PlayerList {
+@@ -822,6 +823,7 @@ public abstract class PlayerList {
          // Paper start
          boolean isBedSpawn = false;
          boolean isRespawn = false;
@@ -29,7 +29,7 @@ index 66735bbc2528c5812c9df14ef7cd91cb69d903b2..9c594c0f142ca10b7c1df50faf45ccb3
          // Paper end
  
          // CraftBukkit start - fire PlayerRespawnEvent
-@@ -831,7 +833,7 @@ public abstract class PlayerList {
+@@ -832,7 +834,7 @@ public abstract class PlayerList {
                  Optional optional;
  
                  if (blockposition != null) {
@@ -38,7 +38,7 @@ index 66735bbc2528c5812c9df14ef7cd91cb69d903b2..9c594c0f142ca10b7c1df50faf45ccb3
                  } else {
                      optional = Optional.empty();
                  }
-@@ -874,7 +876,12 @@ public abstract class PlayerList {
+@@ -875,7 +877,12 @@ public abstract class PlayerList {
              }
              // Spigot End
  
@@ -52,7 +52,7 @@ index 66735bbc2528c5812c9df14ef7cd91cb69d903b2..9c594c0f142ca10b7c1df50faf45ccb3
              if (!flag) entityplayer.reset(); // SPIGOT-4785
              isRespawn = true; // Paper
          } else {
-@@ -911,8 +918,12 @@ public abstract class PlayerList {
+@@ -913,8 +920,12 @@ public abstract class PlayerList {
          }
          // entityplayer1.syncInventory();
          entityplayer1.setHealth(entityplayer1.getHealth());

patches/server/0497-Add-missing-strikeLighting-call-to-World-spigot-stri.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add missing strikeLighting call to
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f72471ac82907a0d5112598b3289689495285944..d79a711d4080ad8acb2c240870be9d99a0b84cea 100644
+index 6e1f8323d028790d1f55d51edb3214d0161a0072..6c5b6a5f1b9ee3fb5a6bae4d57c70cfcaba75624 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2623,6 +2623,7 @@ public class CraftWorld implements World {
+@@ -2629,6 +2629,7 @@ public class CraftWorld implements World {
              lightning.moveTo( loc.getX(), loc.getY(), loc.getZ() );
              lightning.visualOnly = true;
              lightning.isSilent = isSilent;

patches/server/0502-Brand-support.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 74cdbe26b1453a3a54cff4a4698f58eba5a9cdf2..ffc64bd05428f147c03e242d9f9a134cd560c452 100644
+index 003cd8a304420671d487c9e55622d9578aa75b3a..6caae980ab043b8d48479e0849e1e297a78eb97a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
@@ -33,7 +33,7 @@ index 74cdbe26b1453a3a54cff4a4698f58eba5a9cdf2..ffc64bd05428f147c03e242d9f9a134c
      public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player) {
          this.server = server;
          this.connection = connection;
-@@ -3000,6 +3004,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3001,6 +3005,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      private static final ResourceLocation CUSTOM_REGISTER = new ResourceLocation("register");
      private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
  
@@ -42,7 +42,7 @@ index 74cdbe26b1453a3a54cff4a4698f58eba5a9cdf2..ffc64bd05428f147c03e242d9f9a134c
      @Override
      public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
-@@ -3027,6 +3033,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3028,6 +3034,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
                  packet.data.readBytes(data);
@@ -58,7 +58,7 @@ index 74cdbe26b1453a3a54cff4a4698f58eba5a9cdf2..ffc64bd05428f147c03e242d9f9a134c
                  this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), packet.identifier.toString(), data);
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
-@@ -3036,6 +3051,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3037,6 +3052,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      }
  
@@ -72,10 +72,10 @@ index 74cdbe26b1453a3a54cff4a4698f58eba5a9cdf2..ffc64bd05428f147c03e242d9f9a134c
          return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5bab49aa7f4a99dc6387fcf57bc39b16f912e6ab..e4475535dadc39bc15b46d2c5b1f548dc8f8332c 100644
+index 443dcc97f8056df408b8abab6e71a6f5467c6aaf..a9e3687d145c15f218d83a2d10b151fd9e993868 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2390,6 +2390,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2400,6 +2400,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      };
  

patches/server/0503-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 9c594c0f142ca10b7c1df50faf45ccb3f7468ba9..31dd2c4a41e172c7eeb835ae61a45c954d0e647a 100644
+index 371ecab3f90be690b66db3992239bf5625eb1f6e..4b8f1a9e4d9654443e695ef0f18299ebb2507465 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -142,7 +142,7 @@ public abstract class PlayerList {

patches/server/0506-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2188666675192cb02e0bccf845cf7863486a305b..4821c64761fd136b4d27ad4bb190e0aa8950db26 100644
+index 0d553955460bf54181b8e3674c783c0febc30ce9..6a2b683ee5ec38da8b87a0f9eb09e9ad8431a56f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1649,12 +1649,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -24,7 +24,7 @@ index 2188666675192cb02e0bccf845cf7863486a305b..4821c64761fd136b4d27ad4bb190e0aa
              // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
              this.removeTicketsForSpawn(this.paperConfig.keepLoadedRange, prevSpawn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d79a711d4080ad8acb2c240870be9d99a0b84cea..4ca674fac0e1ed354a0c49284c21ca2b117dd852 100644
+index 6c5b6a5f1b9ee3fb5a6bae4d57c70cfcaba75624..d1c7d5a0918bf4d11c453fe31b3dfda9e146474c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -386,11 +386,13 @@ public class CraftWorld implements World {

patches/server/0507-Add-moon-phase-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add moon phase API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4ca674fac0e1ed354a0c49284c21ca2b117dd852..d0b2de0f0a37554eb812aa8c7c20f1067807dc40 100644
+index d1c7d5a0918bf4d11c453fe31b3dfda9e146474c..99e0413cad2bca77e80ea67aaeb78ebb25e6f896 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -325,6 +325,11 @@ public class CraftWorld implements World {

patches/server/0520-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch

@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ffc64bd05428f147c03e242d9f9a134cd560c452..93fc13fa6f631f779227262fb9aeebe40d451a25 100644
+index 6caae980ab043b8d48479e0849e1e297a78eb97a..b5b5f36cbdaac7791426ed721ff7db523edbda95 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -682,7 +682,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -27,11 +27,11 @@ index ffc64bd05428f147c03e242d9f9a134cd560c452..93fc13fa6f631f779227262fb9aeebe4
          this.awaitingTeleportTime = this.tickCount;
 -        this.player.absMoveTo(d0, d1, d2, f, f1);
 +        this.player.moveTo(d0, d1, d2, f, f1); // Paper - use proper setPositionRotation for teleportation
+         this.player.forceCheckHighPriority(); // Paper
          this.player.connection.send(new ClientboundPlayerPositionPacket(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.awaitingTeleport, flag));
      }
- 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 831290b1f2a6fd0e683085b0cbaee68ee7d1cf5e..5369ef871c7a8c2d84629ad06906d46dc5d54861 100644
+index 3eaf72f49d8e520c6f3d2fea2818864018b41732..2177e7aaf80ac715052e678fd77c1b9578a5b2e8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -152,6 +152,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

patches/server/0523-Extend-block-drop-capture-to-capture-all-items-added.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4821c64761fd136b4d27ad4bb190e0aa8950db26..30824d000fce6c74288d9c5e656e668fad746e26 100644
+index 6a2b683ee5ec38da8b87a0f9eb09e9ad8431a56f..898a2549900b1af70a0bed94a9c9c1f5fbb3c15d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1194,6 +1194,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl

patches/server/0524-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Don't mark dirty in invalid locations (SPIGOT-6086)
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index c2401b2ff0547335ddbbeb05c07b74552c246fc9..3f4506eb99e7b11416a48386c4185380e4680611 100644
+index 377993f325400a9bc77f5fbc77d9ec50f5d76638..6be677e618ca5b5d5a969a02e77457dd6e3d2e11 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-@@ -244,6 +244,7 @@ public class ChunkHolder {
+@@ -373,6 +373,7 @@ public class ChunkHolder {
      }
  
      public void blockChanged(BlockPos pos) {

patches/server/0525-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5369ef871c7a8c2d84629ad06906d46dc5d54861..3dcbd9f3e17a52441100b2b89e83dc5a91a7031e 100644
+index 2177e7aaf80ac715052e678fd77c1b9578a5b2e8..550130ff6ab386bc7b45758d637f20b17cbee2eb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3925,4 +3925,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

patches/server/0527-Entity-isTicking.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3dcbd9f3e17a52441100b2b89e83dc5a91a7031e..24d955c436b4ecf95a0bd0b0ff30b3794df9798e 100644
+index 550130ff6ab386bc7b45758d637f20b17cbee2eb..d698fefd5d492bc6fe8b9e7d07108d6ba77d8576 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -52,6 +52,7 @@ import net.minecraft.resources.ResourceKey;

patches/server/0529-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CME on adding a passenger in CreatureSpawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 24d955c436b4ecf95a0bd0b0ff30b3794df9798e..e0d98ed993414f5834dcbd4c4b482209a5cb4188 100644
+index d698fefd5d492bc6fe8b9e7d07108d6ba77d8576..f562f29193f30ac38112a1e9db45da4efe10eeb0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3434,7 +3434,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

patches/server/0532-Fix-for-large-move-vectors-crashing-server.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 93fc13fa6f631f779227262fb9aeebe40d451a25..f3b7a9203bca8246789b293f0d043a4f253ce57f 100644
+index b5b5f36cbdaac7791426ed721ff7db523edbda95..36dccc209afb838cd3dbdfd26893cf5481d6653f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -507,19 +507,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

patches/server/0539-Player-elytra-boost-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e4475535dadc39bc15b46d2c5b1f548dc8f8332c..b04fef0c559241295443659d08df366fc56c00e6 100644
+index a9e3687d145c15f218d83a2d10b151fd9e993868..5a2c999f95684e02131daf7a9582cdf48feb6290 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -538,6 +538,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -25,10 +25,10 @@ index d32b96a5f51d745869cfc40c01c54de58e1eb843..759e563d1ed13249fada8a8eab6b6a10
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          ConnectionProtocol enumprotocol = this.getCurrentProtocol();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d59e707f28a5f04545208ad33d122fc433b85933..a361701e3be790ca7477d178a8fd73f932efe797 100644
+index 1dd21dc364eef75667d56db33c5df8e006453a08..4444e1235fdd5a3630e71848e1269b5d05bf1c55 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -247,6 +247,7 @@ public class ServerPlayer extends Player {
+@@ -255,6 +255,7 @@ public class ServerPlayer extends Player {
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
      boolean needsChunkCenterUpdate; // Paper - no-tick view distance
@@ -37,7 +37,7 @@ index d59e707f28a5f04545208ad33d122fc433b85933..a361701e3be790ca7477d178a8fd73f9
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f3b7a9203bca8246789b293f0d043a4f253ce57f..52a23465cbb76a164bf2163045d09bdee249002d 100644
+index 36dccc209afb838cd3dbdfd26893cf5481d6653f..c49d9eb34883342e685c5363a4d33bf4519b2b3b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -444,6 +444,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -49,7 +49,7 @@ index f3b7a9203bca8246789b293f0d043a4f253ce57f..52a23465cbb76a164bf2163045d09bde
              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 31dd2c4a41e172c7eeb835ae61a45c954d0e647a..b7e3ed5a6298774a315300daef771f278aa20af7 100644
+index 4b8f1a9e4d9654443e695ef0f18299ebb2507465..f3e59b028d05c2d65ed2dab6717df68b68405fe5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -587,7 +587,7 @@ public abstract class PlayerList {

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

@@ -5,10 +5,10 @@ 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 b7e3ed5a6298774a315300daef771f278aa20af7..d8278190323d00c186d81f578f77fa335529baad 100644
+index f3e59b028d05c2d65ed2dab6717df68b68405fe5..acead204b21b58af3c4f35963a5699e2a75beead 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -864,7 +864,7 @@ public abstract class PlayerList {
+@@ -865,7 +865,7 @@ public abstract class PlayerList {
              if (location == null) {
                  worldserver1 = this.server.getLevel(Level.OVERWORLD);
                  blockposition = entityplayer1.getSpawnPoint(worldserver1);
@@ -18,7 +18,7 @@ index b7e3ed5a6298774a315300daef771f278aa20af7..d8278190323d00c186d81f578f77fa33
  
              Player respawnPlayer = this.cserver.getPlayer(entityplayer1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d0b2de0f0a37554eb812aa8c7c20f1067807dc40..ed8c8b7ff07a58dfaf7bbb1e630a1e68cc0c29f3 100644
+index 99e0413cad2bca77e80ea67aaeb78ebb25e6f896..612f707bfc8179c143cb9c1c70b305464598b815 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -377,7 +377,7 @@ public class CraftWorld implements World {

patches/server/0555-Fix-Player-spawnParticle-x-y-z-precision-loss.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b04fef0c559241295443659d08df366fc56c00e6..049bfec8e8e078f335d34a96707320bf48f336c2 100644
+index 5a2c999f95684e02131daf7a9582cdf48feb6290..9fe60810f0184ad4c65228457eb3adb86ac22c29 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2051,7 +2051,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2061,7 +2061,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (data != null && !particle.getDataType().isInstance(data)) {
              throw new IllegalArgumentException("data should be " + particle.getDataType() + " got " + data.getClass());
          }

patches/server/0559-Climbing-should-not-bypass-cramming-gamerule.patch

@@ -21,7 +21,7 @@ index f4b533b8e8b6c4bb59d032e91a94353f4b201b69..5344d25e7bef34954aa058ec019b4ba8
      private void keepLoadedRange() {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e0d98ed993414f5834dcbd4c4b482209a5cb4188..143f4b9e7247d0d715a69aff69d5652bc9343fa0 100644
+index f562f29193f30ac38112a1e9db45da4efe10eeb0..bb6ee8e9c7665ab5c88b71dc68269c79997dc024 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1724,6 +1724,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

patches/server/0564-Limit-recipe-packets.patch

@@ -23,7 +23,7 @@ index 649e46115260259820a9d2255ad669b926319a3f..f9d438325aed9d488d8aa60e0ae68a37
      public static boolean velocityOnlineMode;
      public static byte[] velocitySecretKey;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 52a23465cbb76a164bf2163045d09bdee249002d..c4734bcb26558a6524d4463aff28c4d2776ba22d 100644
+index c49d9eb34883342e685c5363a4d33bf4519b2b3b..4d4b0c1fd4021367f16a292e6059de7f61a8ca8a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -232,6 +232,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -42,7 +42,7 @@ index 52a23465cbb76a164bf2163045d09bdee249002d..c4734bcb26558a6524d4463aff28c4d2
          /* Use thread-safe field access instead
          if (this.chatSpamTickCount > 0) {
              --this.chatSpamTickCount;
-@@ -2794,6 +2796,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2795,6 +2797,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      @Override
      public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {

patches/server/0566-MC-4-Fix-item-position-desync.patch

@@ -41,7 +41,7 @@ index b30c08bfb8c55161543a4ef09f2e462e0a1fe4ae..ec93f5300cc7d423ec0d292f0f8443f9
  
      public Vec3 updateEntityPosition(Vec3 orig) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 143f4b9e7247d0d715a69aff69d5652bc9343fa0..5e9fd6e501df6a84e508cde01e456323d6707b3e 100644
+index bb6ee8e9c7665ab5c88b71dc68269c79997dc024..7194e2b51ab8aca929eb970e0a6ff31a07a4c09f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3752,6 +3752,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

patches/server/0567-Player-Chunk-Load-Unload-Events.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a361701e3be790ca7477d178a8fd73f932efe797..28eb1f6e323d50fe8dc0587724ae73c6939f6721 100644
+index 4444e1235fdd5a3630e71848e1269b5d05bf1c55..b6daeb86db4f066429888bc9e442961f062f993a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2064,11 +2064,21 @@ public class ServerPlayer extends Player {
+@@ -2088,11 +2088,21 @@ public class ServerPlayer extends Player {
      public void trackChunk(ChunkPos chunkcoordintpair, Packet<?> packet, Packet<?> packet1) {
          this.connection.send(packet1);
          this.connection.send(packet);

patches/server/0581-Fix-interact-event-not-being-called-in-adventure.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Fix interact event not being called in adventure
 Call PlayerInteractEvent when left-clicking on a block in adventure mode
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c4734bcb26558a6524d4463aff28c4d2776ba22d..f6f8b7e18a5ebee5a5599b0cb314eab6bef0fbc3 100644
+index 4d4b0c1fd4021367f16a292e6059de7f61a8ca8a..703c5de24d2be2462cffe597f3a05d766075b128 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1733,7 +1733,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1734,7 +1734,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                      MutableComponent ichatmutablecomponent = (new TranslatableComponent("build.tooHigh", new Object[]{i - 1})).withStyle(ChatFormatting.RED);
  
                      this.player.sendMessage((Component) ichatmutablecomponent, ChatType.GAME_INFO, Util.NIL_UUID);
@@ -18,7 +18,7 @@ index c4734bcb26558a6524d4463aff28c4d2776ba22d..f6f8b7e18a5ebee5a5599b0cb314eab6
                      this.player.swing(enumhand, true);
                  }
              }
-@@ -2205,7 +2205,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2206,7 +2206,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          Vec3 vec3d1 = vec3d.add((double) f7 * d3, (double) f6 * d3, (double) f8 * d3);
          HitResult movingobjectposition = this.player.level.clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, this.player));