[ci skip] Move some disruptive patches back

patches/server/0668-Oprimise-map-impl-for-tracked-players.patch

@@ -7,7 +7,7 @@ Reference2BooleanOpenHashMap is going to have
 better lookups than HashMap.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index bdda124f6cc89b8a7ed198fdf095aee5f3f24ce3..f761d600bb5d995a25ffbbe5469625508de1f8bc 100644
+index 03eb13021c3aa6d7b7254660ebc40908460a4cb6..dd16f13ca44cda3051a38085f6de117a475ce797 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1297,7 +1297,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider

patches/server/0670-Distance-manager-tick-timings.patch

@@ -7,7 +7,7 @@ Recently this has been taking up more time, so add a timings to
 really figure out how much.
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
-index 46449728f69ee7d4f78470f8da23c055acd53a3b..4b467f1af93452d13829f756d55dee18b8889d40 100644
+index 6b3cde6d4d1e63bec01f502f2027ee9fddac08aa..7a4234abf620b8394307fa01913bc00215a64e23 100644
 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -47,6 +47,7 @@ public final class MinecraftTimings {
@@ -16,7 +16,7 @@ index 46449728f69ee7d4f78470f8da23c055acd53a3b..4b467f1af93452d13829f756d55dee18
      public static final Timing scoreboardScoreSearch = Timings.ofSafe("Scoreboard score search"); // Paper - add timings for scoreboard search
 +    public static final Timing distanceManagerTick = Timings.ofSafe("Distance Manager Tick"); // Paper - add timings for distance manager
  
-     public static final Timing midTickChunkTasks = Timings.ofSafe("Mid Tick Chunk Tasks");
+     private static final Map<Class<?>, String> taskNameCache = new MapMaker().weakKeys().makeMap();
  
 diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java
 index 5b446e6ac151f99f64f0c442d0b40b5e251bc4c4..6bc7c6f16a1649fc9e24e7cf90fca401e5bd4875 100644

patches/server/0671-Fix-merchant-inventory-not-closing-on-entity-removal.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0c60fa914310c7b6706e72cd3a61630873005102..4b0d854ed9fc16ecbdfabca4192969aa1beeaa19 100644
+index 109143fca98c6952ca6129f261a9ff8b43f00e52..6540c4e1d9d347ce41fb0f504ee275ee3a1c0a4f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2676,6 +2676,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2629,6 +2629,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot end
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message

patches/server/0673-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4f318c5e8a8cd2113d7b404aa97cdf03f7a87fd4..ff60a7951818341d5b279b51cdf3d0dd4d89bc26 100644
+index 27bcfe893db83bb369186ccf1d48f28e9d2cae82..0280c215f4e502cd0471523b040d8b54c50f7ab8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -733,6 +733,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0674-Add-packet-limiter-config.patch

@@ -24,7 +24,7 @@ and an action can be defined: DROP or KICK
 If interval or rate are less-than 0, the limit is ignored
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 5d73043dc9847ae195cef804fa0b0f4bf6db06f2..e18406b4172499b0cb116a45cd5a968ae3e3fdce 100644
+index 6e75a5e7eb51a5bbb7b73436bbd37df1519cb0fc..a0434b92615c10a319eb4528808a83d01df2c516 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -132,6 +132,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {

patches/server/0676-Ensure-valid-vehicle-status.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8d657cdb516b6b439b29100c48cccd5b27178fe9..5d30d67745ce3988f42457137f43b15b75a96a0c 100644
+index 9cd64d14d4b6df92bb30d0ad610f8af85791962a..c1dd624e03c85eaba8733769dc650d33142af714 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -576,7 +576,7 @@ public class ServerPlayer extends Player {

patches/server/0682-Update-head-rotation-in-missing-places.patch

@@ -8,10 +8,10 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d548a262515548808ffe075606ee2f2dba38740f..fe0f57dd69cb5477b64317ef940e3f748037d0e0 100644
+index 51791692213866adaff2eea48f14f818aaaa276c..b90caa5e25837bfb866bbac884468bd730b1f6d5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1917,6 +1917,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1875,6 +1875,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          this.setXRot(Mth.clamp(pitch, -90.0F, 90.0F) % 360.0F);
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();
@@ -19,7 +19,7 @@ index d548a262515548808ffe075606ee2f2dba38740f..fe0f57dd69cb5477b64317ef940e3f74
      }
  
      public void absMoveTo(double x, double y, double z) {
-@@ -1955,6 +1956,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1913,6 +1914,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          this.setXRot(pitch);
          this.setOldPosAndRot();
          this.reapplyPosition();

patches/server/0686-Configurable-feature-seeds.patch

@@ -19,7 +19,7 @@ index 1080e1f67afe5574baca0df50cdb1d029a7a586a..a2f71a6d1a9e98133dff6cd0f625da94
              }
              final Object val = config.get(key);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 0a21632a3e02690a8edcc17ac25d2551a8964bbe..10b4458f3081dea06c1ff39d4134ab8e99adcc99 100644
+index 180f8ae443d1ea44a748c7f3ebb82a0bab8d31f1..f8306b4d0d1c0a4e7336bd5f99222f59920ab796 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -431,7 +431,14 @@ public abstract class ChunkGenerator {

patches/server/0689-don-t-attempt-to-teleport-dead-entities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fe0f57dd69cb5477b64317ef940e3f748037d0e0..22d25fea0c995bf1509bb78d5f10e2b63eb484cb 100644
+index b90caa5e25837bfb866bbac884468bd730b1f6d5..6c2c9c2e0599fbe03f6a1622c64e071f92b66f34 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -793,7 +793,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S

patches/server/0690-Prevent-excessive-velocity-through-repeated-crits.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index dfc62f5cfad3e0e0f5f25c614055426bbfcd5327..3fca4aad128195325d9d00433fae09f193f8f868 100644
+index 09425940b041755fd640a94362fffcd69636bcf1..9bd611292cf6e686c9e737d332bb0ae6d2fbaa98 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2677,13 +2677,26 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0693-Prevent-sending-oversized-item-data-in-equipment-and.patch

@@ -34,7 +34,7 @@ index e0802f1cb73a80b08482832c2b269ac8485d5c1a..945a0317e9e49a159a1f42882a0a267a
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3fca4aad128195325d9d00433fae09f193f8f868..c8592032106e1e355fa51428cde03ec3c4184953 100644
+index 9bd611292cf6e686c9e737d332bb0ae6d2fbaa98..afed1b1287668250974bea61a7bc1b6720d19701 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3188,7 +3188,10 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0694-Hide-unnecessary-itemmeta-from-clients.patch

@@ -18,7 +18,7 @@ index 945a0317e9e49a159a1f42882a0a267a2141e86d..e9fd9590e90e58fd4c31985a704a4511
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c84a8e6fc5f136b12bc542ec64a6686386bfe0cf..2c4da4f18a217269f17e281cf99a573e759a5d52 100644
+index 0280c215f4e502cd0471523b040d8b54c50f7ab8..5aa9f337e1e251485310436f87786b02d181bcbb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2561,8 +2561,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -33,7 +33,7 @@ index c84a8e6fc5f136b12bc542ec64a6686386bfe0cf..2c4da4f18a217269f17e281cf99a573e
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c8592032106e1e355fa51428cde03ec3c4184953..51e8cfeb21206793245b54379c5a14266d3e67bd 100644
+index afed1b1287668250974bea61a7bc1b6720d19701..fc965b9d51cc0c8fd5c0ea6440e4eae3eb50ed73 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3190,7 +3190,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0699-Allow-delegation-to-vanilla-chunk-gen.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b603541d56c7cee7aff8d3448d18c76cd72b63cb..4dc80d0cbd414cde8137d7030d7fe90d1fac424a 100644
+index b9e6d28d8eb982a404981ac4df71238bf30d0989..468756c24c9439fd6afe4f73f82e0094e41ade25 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2459,6 +2459,88 @@ public final class CraftServer implements Server {

patches/server/0702-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch

@@ -8,10 +8,10 @@ This ensures at least a valid version of the chunk exists
 on disk, even if outdated
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 1f8fa4a054ed1c76688d1a919ea170587fb4806f..50de979a447171ab98de59bf25b6c82871d03543 100644
+index 0ae3d1ea6f00efcdea5da5bf1a0f984f4473f5a2..6ca572500a3bb36acf481e54262e811295d64136 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-@@ -1003,6 +1003,9 @@ public class RegionFile implements AutoCloseable {
+@@ -529,6 +529,9 @@ public class RegionFile implements AutoCloseable {
          }
  
      }
@@ -21,7 +21,7 @@ index 1f8fa4a054ed1c76688d1a919ea170587fb4806f..50de979a447171ab98de59bf25b6c828
      // Paper end
      private class ChunkBuffer extends ByteArrayOutputStream {
  
-@@ -1018,6 +1021,24 @@ public class RegionFile implements AutoCloseable {
+@@ -544,6 +547,24 @@ public class RegionFile implements AutoCloseable {
              this.pos = chunkcoordintpair;
          }
  
@@ -47,10 +47,10 @@ index 1f8fa4a054ed1c76688d1a919ea170587fb4806f..50de979a447171ab98de59bf25b6c828
              ByteBuffer bytebuffer = ByteBuffer.wrap(this.buf, 0, this.count);
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 156cecae8ea7ffbc38974829942a1c92e828eca9..a25e7183da64f726773aa279707ae67941246b46 100644
+index 9e30b47ece5549c30f487e5542ae65d5faaa8c39..99f2e104b2214dbbc0b6e43d9011744ff4b0b843 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -314,10 +314,17 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -286,10 +286,17 @@ public class RegionFileStorage implements AutoCloseable {
                  NbtIo.write(nbt, (DataOutput) dataoutputstream);
                  regionfile.setStatus(pos.x, pos.z, ChunkSerializer.getStatus(nbt)); // Paper - Cache chunk status
                  regionfile.setOversized(pos.x, pos.z, false); // Paper - We don't do this anymore, mojang stores differently, but clear old meta flag if it exists to get rid of our own meta file once last oversized is gone
@@ -69,7 +69,7 @@ index 156cecae8ea7ffbc38974829942a1c92e828eca9..a25e7183da64f726773aa279707ae679
                      } catch (Throwable throwable1) {
                          throwable.addSuppressed(throwable1);
                      }
-@@ -325,10 +332,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -297,10 +304,7 @@ public class RegionFileStorage implements AutoCloseable {
  
                  throw throwable;
              }
@@ -81,7 +81,7 @@ index 156cecae8ea7ffbc38974829942a1c92e828eca9..a25e7183da64f726773aa279707ae679
          }
          // Paper start
          return;
-@@ -374,4 +378,13 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -346,4 +350,13 @@ public class RegionFileStorage implements AutoCloseable {
          }
  
      }

patches/server/0703-Forward-CraftEntity-in-teleport-command.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 696497771e607cd07bd8414deeffdd0f211a5ef6..85c48c92987bd87ee5e8c0ffb8847447e7ba4b78 100644
+index 6c2c9c2e0599fbe03f6a1622c64e071f92b66f34..3e8fe380f676fc93538a75650aa23e9034409614 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3530,6 +3530,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3344,6 +3344,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public void restoreFrom(Entity original) {
@@ -22,7 +22,7 @@ index 696497771e607cd07bd8414deeffdd0f211a5ef6..85c48c92987bd87ee5e8c0ffb8847447
          CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
  
          nbttagcompound.remove("Dimension");
-@@ -3620,10 +3627,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3434,10 +3441,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                          }
                      }
                      // CraftBukkit end

patches/server/0713-Validate-usernames.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 67c1cf5eb198079bd146a4a8ca0492b94cca788c..c03329267a2a97af32a0c2c9d7e94fa00596e1cf 100644
+index d4658328eeecb1c9e3e25eec14dea07e9e2a8b74..ebda34825bbd10145a81d54c345e31c2a4fb5de4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -63,6 +63,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -26,7 +26,7 @@ index 67c1cf5eb198079bd146a4a8ca0492b94cca788c..c03329267a2a97af32a0c2c9d7e94fa0
          GameProfile gameprofile = this.server.getSingleplayerProfile();
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 00f65551b82935a6b7b88cba4650404b9311f8f2..801b1f9b9b7dcdf4fe758e3a7a5800bf4b07d93b 100644
+index 385a2abff1660ed892a498e1d3283eb3b9fc4310..89e745736e6b53223cbab9dd63456ace43757f75 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -679,7 +679,7 @@ public abstract class PlayerList {
@@ -39,7 +39,7 @@ index 00f65551b82935a6b7b88cba4650404b9311f8f2..801b1f9b9b7dcdf4fe758e3a7a5800bf
              }
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 80caada014bae0571a5aa6aa67d9bb87f89db17f..61516fbc3cbfb3aa85895b4458b5319752149f73 100644
+index e33278611e4f52ff01cf628c570bd3378ff5c071..dbecf65fdd4e094b9b8b8f9267618934642db40f 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -2340,9 +2340,23 @@ public abstract class Player extends LivingEntity {

patches/server/0715-Expose-vanilla-BiomeProvider-from-WorldInfo.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ec48aea4e352e8ee3ad8cda8ce8ec33daf49dae8..5329f98cd455e863a1eae9dc12d26146e492e730 100644
+index 6f2fcf39835d8a8b7408a39a511a2a9ee1e31248..497cc9729faceccaa43ac0a39ec75674507b1567 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -596,7 +596,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index ec48aea4e352e8ee3ad8cda8ce8ec33daf49dae8..5329f98cd455e863a1eae9dc12d26146
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4dc80d0cbd414cde8137d7030d7fe90d1fac424a..11211d27a24266724043420a369ff9e2e77683eb 100644
+index 468756c24c9439fd6afe4f73f82e0094e41ade25..15e4eecdea44983d621debdbd7614f27b6ffb792 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1258,7 +1258,7 @@ public final class CraftServer implements Server {
@@ -31,7 +31,7 @@ index 4dc80d0cbd414cde8137d7030d7fe90d1fac424a..11211d27a24266724043420a369ff9e2
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3e25f22ffd656cded58634049d48f19d97694496..94f722229432d5b88fc1ced115b0fbeb0eca5f57 100644
+index 1977368c44212eb290a1b141216bb3a880b3742e..921cbadba393616a7169e708a60846eea20b3438 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -205,6 +205,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {

patches/server/0724-Freeze-Tick-Lock-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 85c48c92987bd87ee5e8c0ffb8847447e7ba4b78..6c995ac8a40e61a29d685b5527807efa73375147 100644
+index 3e8fe380f676fc93538a75650aa23e9034409614..6f1bd75c5bd38ac198290e05ceb2d9cf7fc0fbf1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -408,6 +408,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -25,7 +25,7 @@ index 85c48c92987bd87ee5e8c0ffb8847447e7ba4b78..6c995ac8a40e61a29d685b5527807efa
                  this.setTicksFrozen(0);
                  this.level().levelEvent((Player) null, 1009, this.blockPosition, 1);
              }
-@@ -2453,6 +2454,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2326,6 +2327,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              if (fromNetherPortal) {
                  nbttagcompound.putBoolean("Paper.FromNetherPortal", true);
              }
@@ -35,7 +35,7 @@ index 85c48c92987bd87ee5e8c0ffb8847447e7ba4b78..6c995ac8a40e61a29d685b5527807efa
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -2597,6 +2601,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2470,6 +2474,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              if (spawnReason == null) {
                  spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT;
              }
@@ -46,7 +46,7 @@ index 85c48c92987bd87ee5e8c0ffb8847447e7ba4b78..6c995ac8a40e61a29d685b5527807efa
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 51e8cfeb21206793245b54379c5a14266d3e67bd..c41153ad6025fe276326132f6cbfd3986f9c5c51 100644
+index fc965b9d51cc0c8fd5c0ea6440e4eae3eb50ed73..69afdbf5eac010f04b1a7f0c0b99bc7e0035fda1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3452,7 +3452,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0727-API-for-creating-command-sender-which-forwards-feedb.patch

@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 11211d27a24266724043420a369ff9e2e77683eb..3bf600de4eb99bd33bc4cd20529e38002f22f1d3 100644
+index 15e4eecdea44983d621debdbd7614f27b6ffb792..4e239b061db4b3d05804dd4fc44bb23bd803597a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2110,6 +2110,13 @@ public final class CraftServer implements Server {

patches/server/0728-Add-missing-structure-set-seed-configs.patch

@@ -20,7 +20,7 @@ seeds/salts to the frequency reducer which has a similar effect.
 Co-authored-by: William Blake Galbreath <blake.galbreath@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 10b4458f3081dea06c1ff39d4134ab8e99adcc99..6b743d4c7b304c21e2e89300e69df8eff672e8a6 100644
+index f8306b4d0d1c0a4e7336bd5f99222f59920ab796..aa2a014f5451e780219415fffcb64a6e7cdf9b87 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -568,7 +568,7 @@ public abstract class ChunkGenerator {

patches/server/0729-Implement-regenerateChunk.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 94f722229432d5b88fc1ced115b0fbeb0eca5f57..ba71ea08e1e2fa178366fdce1aa752fa12030ee6 100644
+index 921cbadba393616a7169e708a60846eea20b3438..f59555c21014cf5ff0b0e1c2c5fd0f73ba689803 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -144,6 +144,7 @@ import org.jetbrains.annotations.NotNull;

patches/server/0731-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3bf600de4eb99bd33bc4cd20529e38002f22f1d3..8257b94fc234b6d10c9120a8ba4de526c45e66b1 100644
+index 4e239b061db4b3d05804dd4fc44bb23bd803597a..c569ddd5ae932d172aa791efab5c92c1394caf02 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2287,6 +2287,8 @@ public final class CraftServer implements Server {

patches/server/0732-Add-GameEvent-tags.patch

@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8257b94fc234b6d10c9120a8ba4de526c45e66b1..1f70bd8267772a6f477caee4958a1cb271b30ee2 100644
+index c569ddd5ae932d172aa791efab5c92c1394caf02..8dc49151791b847aeec4f3f0341de0c6013ed757 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2708,6 +2708,15 @@ public final class CraftServer implements Server {

patches/server/0733-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch

@@ -9,18 +9,18 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5329f98cd455e863a1eae9dc12d26146e492e730..2d41aaa651dfefff9968ccbfee693c4410ba0f4e 100644
+index 497cc9729faceccaa43ac0a39ec75674507b1567..02f2c0185324ffd0f6f0a832f75efec28f691915 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1416,6 +1416,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             this.executeMidTickTasks(); // Paper - execute chunk tasks mid tick
+@@ -1345,6 +1345,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         if (super.pollTask()) {
              return true;
          } else {
 +            boolean ret = false; // Paper - force execution of all worlds, do not just bias the first
              if (this.tickRateManager.isSprinting() || this.haveTime()) {
                  Iterator iterator = this.getAllLevels().iterator();
  
-@@ -1423,12 +1424,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1352,12 +1353,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      ServerLevel worldserver = (ServerLevel) iterator.next();
  
                      if (worldserver.getChunkSource().pollTask()) {

patches/server/0737-Option-to-have-default-CustomSpawners-in-custom-worl.patch

@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2d41aaa651dfefff9968ccbfee693c4410ba0f4e..5ec58c9eab4b790b68bb196d02c0818fc98ffaa4 100644
+index 02f2c0185324ffd0f6f0a832f75efec28f691915..8bbf8f051b38c351cdfedac9dee346410ee08553 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -623,7 +623,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0738-Put-world-into-worldlist-before-initing-the-world.patch

@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5ec58c9eab4b790b68bb196d02c0818fc98ffaa4..23d8734a234efeeeba6843719715305f88b67dd5 100644
+index 8bbf8f051b38c351cdfedac9dee346410ee08553..a3cf92b539f6a0b3d80c61d7b81632c8673560b6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -635,9 +635,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -23,7 +23,7 @@ index 5ec58c9eab4b790b68bb196d02c0818fc98ffaa4..23d8734a234efeeeba6843719715305f
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1f70bd8267772a6f477caee4958a1cb271b30ee2..032fbe061a989c0e77ff6a78f11b09e20320ec7c 100644
+index 8dc49151791b847aeec4f3f0341de0c6013ed757..9fdf24d84ac7cc506f662c2eb82d582a13e42768 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1288,10 +1288,11 @@ public final class CraftServer implements Server {

patches/server/0740-Custom-Potion-Mixes.patch

@@ -32,10 +32,10 @@ index 0000000000000000000000000000000000000000..7ea357ac2f3a93db4ebdf24b5072be7d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 23d8734a234efeeeba6843719715305f88b67dd5..ffd0e4326c0c4ddd18b0f09f9f3037b1eefd546f 100644
+index a3cf92b539f6a0b3d80c61d7b81632c8673560b6..f5c551a0d6a63c4a28169052cb7c8c6d0b688dda 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2213,6 +2213,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2142,6 +2142,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.worldData.setDataConfiguration(worlddataconfiguration);
              this.resources.managers.updateRegistryTags(this.registryAccess());
@@ -172,7 +172,7 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..bc01481ac5990ad1cfd1def5a16dd0ed
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 032fbe061a989c0e77ff6a78f11b09e20320ec7c..6cbf54f50538082a9027ec04de3337fe20bda452 100644
+index 9fdf24d84ac7cc506f662c2eb82d582a13e42768..884d3ba1be2d89da076b4cb63da6dd43c1c3ed95 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -304,6 +304,7 @@ public final class CraftServer implements Server {

patches/server/0741-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 801b1f9b9b7dcdf4fe758e3a7a5800bf4b07d93b..506d91df4dbcced7554db14b6efdf8697ea6805a 100644
+index 89e745736e6b53223cbab9dd63456ace43757f75..ec0c53a86c9e76f8c5bbd0eed8f7c7fa1d31a804 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -398,6 +398,16 @@ public abstract class PlayerList {

patches/server/0742-Fix-falling-block-spawn-methods.patch

@@ -11,7 +11,7 @@ Restores the API behavior from previous versions of the server
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ba71ea08e1e2fa178366fdce1aa752fa12030ee6..a39f439716678611bc7daf943d29b4c330ab5acc 100644
+index f59555c21014cf5ff0b0e1c2c5fd0f73ba689803..c0e7680bff3f65269a7031c08c06f38fdbaa4979 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1453,7 +1453,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {

patches/server/0745-More-Projectile-API.patch

@@ -509,7 +509,7 @@ index 20f9735c7cb76024e15dbdca7684f5c560876175..8a6af0db8e0aa0cffbf19584be747076
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6423af82fbae4267d06229fde2390bfb5569137a..01fac95fde3c9b9d58e6a7ef7b35b48fe1c992ed 100644
+index 25133298b26523bd36300ab03e216200c915386b..af7e3acde2eb521ac809b4c5980ff6adb30c7135 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -831,19 +831,19 @@ public class CraftEventFactory {

patches/server/0747-Don-t-allow-vehicle-movement-from-players-while-tele.patch

@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e6e9a2688a3d2f789831a9e095e555f784bd9c4a..6842ccf68ab5ae2b2c093ea8ac34eeabc0f95770 100644
+index 5aa9f337e1e251485310436f87786b02d181bcbb..22d93d04d614ad68d12cddd2b7607a8988da0d3c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -465,6 +465,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0751-Fix-saving-in-unloadWorld.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6cbf54f50538082a9027ec04de3337fe20bda452..f4faa98285ab8cd675e84a5f5a02afb0c5cec599 100644
+index 884d3ba1be2d89da076b4cb63da6dd43c1c3ed95..e94c4a5419806e35aaabb88624afe672f93ffa57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1336,7 +1336,7 @@ public final class CraftServer implements Server {

patches/server/0754-Fix-new-block-data-for-EntityChangeBlockEvent.patch

@@ -91,7 +91,7 @@ index 0a2c2b847dc516abf31870116056dbdbb22f31d9..45906d273e6d6ec20cf44b4d07efdac6
                                      }
                                      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 2a8ed27101ff78542db120ff183ff33276fb832a..fed8a2519f6b20466f1986702baec2c0f7078dfe 100644
+index c360135b923aa8d1ed2c7caf97ede981cb605cf2..f33c03e81b7ff643741f56eea055e6af260de618 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -580,7 +580,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -196,7 +196,7 @@ index 61abbcfe97e3d3e3da5ee658672549d14594ad17..05e14322e519d1399e87beb532e1cc4a
              }
              // CraftBukkit end
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 01fac95fde3c9b9d58e6a7ef7b35b48fe1c992ed..269a3837becfe8eb56997276e840c7055e10e6eb 100644
+index af7e3acde2eb521ac809b4c5980ff6adb30c7135..52a4a2b90f5b4684ffb94bf1db6020490e14942d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1410,11 +1410,11 @@ public class CraftEventFactory {

patches/server/0755-fix-player-loottables-running-when-mob-loot-gamerule.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c76358e108a72297baf92b234d43145dde09e99f..aba972c49d6044f5b72c98a2c4f99f6e3d531a91 100644
+index c1dd624e03c85eaba8733769dc650d33142af714..8332af6921e37d7dbf2a57a40f8413443a1706f8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -924,12 +924,14 @@ public class ServerPlayer extends Player {

patches/server/0756-Ensure-entity-passenger-world-matches-ridden-entity.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6c995ac8a40e61a29d685b5527807efa73375147..cef8f5473baab959471e108b81e418f6a668e8ac 100644
+index 6f1bd75c5bd38ac198290e05ceb2d9cf7fc0fbf1..1c72365643ea807c56f5f0b7484c06252acb1b6e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2846,7 +2846,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2660,7 +2660,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public boolean startRiding(Entity entity, boolean force) {

patches/server/0761-Prevent-tile-entity-copies-loading-chunks.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6842ccf68ab5ae2b2c093ea8ac34eeabc0f95770..985fdb70d4bc9fd6c08de83889108824facfd049 100644
+index 22d93d04d614ad68d12cddd2b7607a8988da0d3c..a5f4bc0160b073c0551107b382889031fed24d52 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3192,7 +3192,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3118,7 +3118,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                  BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound);
  
                  if (this.player.level().isLoaded(blockposition)) {

patches/server/0762-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 506d91df4dbcced7554db14b6efdf8697ea6805a..f22ca56e6acd56d894bd26d46133e835c7901b72 100644
+index ec0c53a86c9e76f8c5bbd0eed8f7c7fa1d31a804..c0ffcca75509b1ccee155c799ad8fbdfa657db26 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1449,7 +1449,7 @@ public abstract class PlayerList {

patches/server/0763-Pass-ServerLevel-for-gamerule-callbacks.patch

@@ -18,10 +18,10 @@ index bb3acbe0ad049703245c51a92539376811365eb2..30b9685963ffc620846c220d1fff3fda
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 985fdb70d4bc9fd6c08de83889108824facfd049..79f791dbe8dced29b311ad50237da9bfec0fbb2f 100644
+index a5f4bc0160b073c0551107b382889031fed24d52..a08cf32d56b6f5491d2f2e8e9486a5d65ec9a825 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2756,7 +2756,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2682,7 +2682,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      this.player = this.server.getPlayerList().respawn(this.player, false, RespawnReason.DEATH);
                      if (this.server.isHardcore()) {
                          this.player.setGameMode(GameType.SPECTATOR, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.HARDCORE_DEATH, null); // Paper - Expand PlayerGameModeChangeEvent
@@ -167,7 +167,7 @@ index f3cdf1fa7731eb7bb1cb89aa6a37204d81257cb0..0112ef51815c4fab38b95d5e917d335e
              this.onChanged(server);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a39f439716678611bc7daf943d29b4c330ab5acc..499452383527844354b39b43fb2ea0853ba5478e 100644
+index c0e7680bff3f65269a7031c08c06f38fdbaa4979..f22048c66f28a0c2cb6edb6afda4d3cf1469d913 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2038,7 +2038,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {

patches/server/0765-WorldCreator-keepSpawnLoaded.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f4faa98285ab8cd675e84a5f5a02afb0c5cec599..eff4f3100b018bc6475a9307bfe9853cd69abd2f 100644
+index e94c4a5419806e35aaabb88624afe672f93ffa57..583e3cfcd223561d1733c503f84b99edbb4b365e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1283,7 +1283,7 @@ public final class CraftServer implements Server {

patches/server/0767-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Trigger bee_nest_destroyed trigger in the correct place
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 066e7e420b8eaa9733532a893855bcab14c22d0e..cfd09698025262f262489c4d024dc8b0013b542d 100644
+index 03b337ce5ccb1db61dc395b91b061a2aecf8fbf6..c783e0cbc2f124eeacebc7c7cabb9c38f720a328 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -423,12 +423,16 @@ public class ServerPlayerGameMode {