diff --git a/gradle.properties b/gradle.properties
index b206b14d7..8abd4ded2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19-R0.1-SNAPSHOT
 
-paperCommit = acd50c5287deba895bb2ee5a4f431b1d274fb8d7
+paperCommit = 5ac29fcb93a7d3b9fcae744d878d7303cf986953
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0009-Bring-back-server-name.patch b/patches/api/0009-Bring-back-server-name.patch
index 400583e20..5bf0c4798 100644
--- a/patches/api/0009-Bring-back-server-name.patch
+++ b/patches/api/0009-Bring-back-server-name.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a87399fa4838d4b2c1ff9cc35d433ae76cc149bf..2d9a065aa8c6a835e49eee76acdf8cfa6af420bf 100644
+index fc16e897f4ebaf9d79e49774e15a1cded33ef725..4e4d4931ec8d097f8b6162d56c9ec2eed8a982b4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2368,4 +2368,15 @@ public final class Bukkit {
+@@ -2381,4 +2381,15 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -25,10 +25,10 @@ index a87399fa4838d4b2c1ff9cc35d433ae76cc149bf..2d9a065aa8c6a835e49eee76acdf8cfa
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 30a1ba5ec7752a1771046072d00ed1718e6d0b84..0eb5c94458e7a87e6cf9d6332a0889286f96826e 100644
+index 1895962c5ad0e9549cc90b0fa2861b7874d3e5aa..ca6ea0b03fb06f91712c68f7c84d8025908d65bf 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2067,4 +2067,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2077,4 +2077,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
      // Paper end
diff --git a/patches/api/0012-Lagging-threshold.patch b/patches/api/0012-Lagging-threshold.patch
index 6abe7fbbe..52bf0db3a 100644
--- a/patches/api/0012-Lagging-threshold.patch
+++ b/patches/api/0012-Lagging-threshold.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 2d9a065aa8c6a835e49eee76acdf8cfa6af420bf..cd7e04aa1de8f051ff4bb23f36912830ab573987 100644
+index 4e4d4931ec8d097f8b6162d56c9ec2eed8a982b4..d9fca5c2d50b3d15c4719ebf5f92a56b00b28033 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2378,5 +2378,14 @@ public final class Bukkit {
+@@ -2391,5 +2391,14 @@ public final class Bukkit {
      public static String getServerName() {
          return server.getServerName();
      }
@@ -24,10 +24,10 @@ index 2d9a065aa8c6a835e49eee76acdf8cfa6af420bf..cd7e04aa1de8f051ff4bb23f36912830
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0eb5c94458e7a87e6cf9d6332a0889286f96826e..cc026cbb487244851f8f58b763655a583c7b32e5 100644
+index ca6ea0b03fb06f91712c68f7c84d8025908d65bf..4909c0ebf7d15d950eb18a5793590fac545a95bb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2075,5 +2075,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2085,5 +2085,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      String getServerName();
diff --git a/patches/api/0039-Added-the-ability-to-add-combustible-items.patch b/patches/api/0039-Added-the-ability-to-add-combustible-items.patch
index ac4a93a55..e794a4d3e 100644
--- a/patches/api/0039-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/api/0039-Added-the-ability-to-add-combustible-items.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index cd7e04aa1de8f051ff4bb23f36912830ab573987..419808643514cf894db69f2ed00283a760d8d8b8 100644
+index d9fca5c2d50b3d15c4719ebf5f92a56b00b28033..44673fcec96a075bd02800b51318832d82b63c7e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2387,5 +2387,24 @@ public final class Bukkit {
+@@ -2400,5 +2400,24 @@ public final class Bukkit {
      public static boolean isLagging() {
          return server.isLagging();
      }
@@ -34,10 +34,10 @@ index cd7e04aa1de8f051ff4bb23f36912830ab573987..419808643514cf894db69f2ed00283a7
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index cc026cbb487244851f8f58b763655a583c7b32e5..18376f615d5b00f6d41f006c5e0af7bd715e4364 100644
+index 4909c0ebf7d15d950eb18a5793590fac545a95bb..72adbee17a6c5cb7f067fb4875ff39e4da3f8ef1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2082,5 +2082,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2092,5 +2092,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return True if lagging
       */
      boolean isLagging();
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index 1c30567e4..bab32d1fa 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 91fa33c642547e84b7af9046938f30aed0e0c16a..2dac3fae601fc9d8ec68db8a47010d727f043b8c 100644
+index eefbd0a742b5875e0e9826b87c6bd4da66b2d7f7..b7310d4b38561a9314a9fb04bd1a15f15ee5028e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,8 +9,8 @@ plugins {
@@ -170,7 +170,7 @@ index 1a859fef0848cf23a672012e9764965ae1c07ec5..14ed740609b14242c2a8d377a78b2f71
          stringbuilder.append(CrashReport.getErrorComment());
          stringbuilder.append("\n\n");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c3ca919ed60f027d6116a85cb79e3b6cd3bf1619..9df1401eb9361df0532b8f5fbfbb46e9923ae558 100644
+index 9e1d3a22ed7e34e4968b5fb34cc77b661eb4747d..ef42da89af85367d7733de8896ce8dc45ea12d36 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -908,7 +908,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -192,10 +192,10 @@ index c3ca919ed60f027d6116a85cb79e3b6cd3bf1619..9df1401eb9361df0532b8f5fbfbb46e9
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index afc16bd5a2056d1ee8ce290ec1a6f67c0ac9aedb..4fbeee4bede41d96b92c6cdd6503362a2c4dd5fb 100644
+index aea18838a17fc52e1bf8cd84cd185565e6e2246d..ddfee22ad840970e495c1a6d537fee810b137cbb 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -282,11 +282,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -283,11 +283,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
              DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
              // Spigot start
@@ -224,7 +224,7 @@ index c31b9a6b1d4548d507ecb60d42ca9f96f49f6c4b..f613825c69a8d683b8029fe345031259
  
      private static final int DEFAULT_SIZE_THRESHOLD = 1024 * 8;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a7a038835579c599368e409b86cc5eecf0013952..24917a7d1a6792d5a4ae281200011ddb1bc5b931 100644
+index f1e5ccfbcd08a73ac3aba9a1cb7b414faef81f9e..db154e64869ff7792d8d3c2c317cb9e00a25f048 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -243,7 +243,7 @@ import javax.annotation.Nullable; // Paper
diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch
index 3b3b8055f..634725633 100644
--- a/patches/server/0002-Purpur-config-files.patch
+++ b/patches/server/0002-Purpur-config-files.patch
@@ -64,13 +64,13 @@ index 0148cadbeb41a882a05d982f0b34770b2829a04a..5213f132f826b47e2825644242aaece2
          if (this.source.acceptsSuccess() && !this.silent) {
              this.source.sendSystemMessage(message);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 4fbeee4bede41d96b92c6cdd6503362a2c4dd5fb..6d0a0186778a115f556bbb376a9c1684f9c5740c 100644
+index ddfee22ad840970e495c1a6d537fee810b137cbb..a4f19720738b167fd5932defabff9aa144f59c37 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -222,6 +222,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash);
+@@ -223,6 +223,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          thread.start(); // Paper - start console thread after MinecraftServer.console & PaperConfig are initialized
-         io.papermc.paper.configuration.PaperConfigurations.registerCommands(this);
+         io.papermc.paper.command.PaperCommands.registerCommands(this);
+         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
 +        // Purpur start
 +        try {
 +            org.purpurmc.purpur.PurpurConfig.init((java.io.File) options.valueOf("purpur-settings"));
@@ -84,7 +84,7 @@ index 4fbeee4bede41d96b92c6cdd6503362a2c4dd5fb..6d0a0186778a115f556bbb376a9c1684
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          // Paper end
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 76aa5d1bcb2ccb554966dcb5916ae527d73f042e..cf719642e6fe7f041489c86560a431eebe839acf 100644
+index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..9c7943b8712133aa71de113a5581f591cfd68657 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -175,6 +175,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -105,7 +105,7 @@ index 76aa5d1bcb2ccb554966dcb5916ae527d73f042e..cf719642e6fe7f041489c86560a431ee
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 24917a7d1a6792d5a4ae281200011ddb1bc5b931..aaa9060a4b61034ade81639fb3e8b7ef214eb05b 100644
+index db154e64869ff7792d8d3c2c317cb9e00a25f048..00fdfad4164f010ddfbdbf8c4567a94641cc3789 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -950,6 +950,7 @@ public final class CraftServer implements Server {
@@ -127,7 +127,7 @@ index 24917a7d1a6792d5a4ae281200011ddb1bc5b931..aaa9060a4b61034ade81639fb3e8b7ef
 @@ -980,6 +982,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
-         io.papermc.paper.configuration.PaperConfigurations.registerCommands(this.console);
+         io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
 +        org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
diff --git a/patches/server/0003-Purpur-client-support.patch b/patches/server/0003-Purpur-client-support.patch
index c32dcbf0a..6bb91adce 100644
--- a/patches/server/0003-Purpur-client-support.patch
+++ b/patches/server/0003-Purpur-client-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c816bae0227d0a1d38d9d20343e727ef2f30a8c0..b4bfee6b20e030db74b697d0f47eecaf0261203f 100644
+index c8057f98e16ba6e19640e0b250e5201e0f4f57db..9a5e3f75663f6dd3351e23d850c446874c03b6a0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -260,6 +260,7 @@ public class ServerPlayer extends Player {
@@ -43,10 +43,10 @@ index 03507b5ac5908962e9ebc4b98f53f23110573baa..ec60f7b80c0443fa5baf5acb1829a64b
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 04b991ec6a808839df1d2b5037ad386bda5094fe..b81a747b3b247b5bfc65381c1497b9fd0a14cda3 100644
+index abcce6bd0b32d0188751393a6f56f2e82530912c..8deb966c33b890560c8f5cc875d8225e29aa42e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2754,4 +2754,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2789,4 +2789,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end
diff --git a/patches/server/0007-Timings-stuff.patch b/patches/server/0007-Timings-stuff.patch
index 3be5570d5..e572a0e1a 100644
--- a/patches/server/0007-Timings-stuff.patch
+++ b/patches/server/0007-Timings-stuff.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Timings stuff
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 78280fb3bcd8d792a58ece6d735e0824ea4be536..1789fdbd8b59f9d465ba0881481a578d5c7f9ec6 100644
+index 06bff37e4c1fddd3be6343049a66787c63fb420c..fcc9d08b70671beee7db681544b0d50bf0784c5a 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -235,9 +235,13 @@ public class TimingsExport extends Thread {
+@@ -239,9 +239,13 @@ public class TimingsExport extends Thread {
          // Information on the users Config
  
          parent.put("config", createObject(
@@ -24,7 +24,7 @@ index 78280fb3bcd8d792a58ece6d735e0824ea4be536..1789fdbd8b59f9d465ba0881481a578d
          ));
  
          new TimingsExport(listeners, parent, history).start();
-@@ -278,6 +282,19 @@ public class TimingsExport extends Thread {
+@@ -282,6 +286,19 @@ public class TimingsExport extends Thread {
          return timingsCost;
      }
  
diff --git a/patches/server/0010-AFK-API.patch b/patches/server/0010-AFK-API.patch
index 080707cc3..63a9df62b 100644
--- a/patches/server/0010-AFK-API.patch
+++ b/patches/server/0010-AFK-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 7a28ac8d31ed5712e6fb2fbd59c72be5855165fe..79c4da6fb1cad621454b08e64f5da79678d21dc5 100644
+index f4b33e5788665eefef35e701ed99d58d0ea1b3c2..e40e8e837273c243f5ccc192514d540440f49310 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2000,8 +2000,58 @@ public class ServerPlayer extends Player {
@@ -213,7 +213,7 @@ index 3f458ddd4dc04ed28510a212be76bb19e7f6a61e..a36469186f72eccf8c4428d920d0583b
                  if (range < 0.0D || d < range * range) {
                      return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b81a747b3b247b5bfc65381c1497b9fd0a14cda3..d523a517ff0f4c8f0efaa38e64ecafef1ba6dc4d 100644
+index 8deb966c33b890560c8f5cc875d8225e29aa42e9..16aa402f7b9ff8c2f1748bc4c82005ccf093ceb4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -442,10 +442,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -233,7 +233,7 @@ index b81a747b3b247b5bfc65381c1497b9fd0a14cda3..d523a517ff0f4c8f0efaa38e64ecafef
          for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
                  player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
-@@ -2760,5 +2765,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2795,5 +2800,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }
diff --git a/patches/server/0011-Bring-back-server-name.patch b/patches/server/0011-Bring-back-server-name.patch
index 7a3416daf..547d3a654 100644
--- a/patches/server/0011-Bring-back-server-name.patch
+++ b/patches/server/0011-Bring-back-server-name.patch
@@ -17,10 +17,10 @@ index 26345494ce190b5cd2ab58dd7d4b046796767b20..20d579a20e186e59975df1b35112015e
      public final boolean spawnNpcs = this.get("spawn-npcs", true);
      public final boolean pvp = this.get("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index aaa9060a4b61034ade81639fb3e8b7ef214eb05b..638f7cf222dce27b7e81eb3ade943094b72e538b 100644
+index 00fdfad4164f010ddfbdbf8c4567a94641cc3789..dac6769842d8e168d0366d610a0bd404062d341c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2879,4 +2879,11 @@ public final class CraftServer implements Server {
+@@ -2884,4 +2884,11 @@ public final class CraftServer implements Server {
      }
  
      // Paper end
diff --git a/patches/server/0014-Lagging-threshold.patch b/patches/server/0014-Lagging-threshold.patch
index 539172ce7..35f1483c2 100644
--- a/patches/server/0014-Lagging-threshold.patch
+++ b/patches/server/0014-Lagging-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e2cd44e6f785265aba0e67770a684b5f58e3d4e6..fa8986c6502b58089b98500ba7e152e51ce8d30b 100644
+index 089a50948619f87e44c795453c6565c4b555cfc4..cb3b6708fcf647feac832023a00fe7ab0939da6b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -291,6 +291,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -25,10 +25,10 @@ index e2cd44e6f785265aba0e67770a684b5f58e3d4e6..fa8986c6502b58089b98500ba7e152e5
                  }
                  // Spigot end
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 638f7cf222dce27b7e81eb3ade943094b72e538b..d7a1219efe8f95df1bbd50cab1aeaf7d80ad0e45 100644
+index dac6769842d8e168d0366d610a0bd404062d341c..3d328bbb7a35df0b4fc2ddc1ec72c809b01495c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2885,5 +2885,10 @@ public final class CraftServer implements Server {
+@@ -2890,5 +2890,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return this.getProperties().serverName;
      }
diff --git a/patches/server/0017-Player-invulnerabilities.patch b/patches/server/0017-Player-invulnerabilities.patch
index 93fcf67b4..20e32f211 100644
--- a/patches/server/0017-Player-invulnerabilities.patch
+++ b/patches/server/0017-Player-invulnerabilities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 79c4da6fb1cad621454b08e64f5da79678d21dc5..3a665115eb3da35fa7f5bd1b01b15c5536581220 100644
+index e40e8e837273c243f5ccc192514d540440f49310..64183c02cf278b20ed59120fa20fc7265321fc40 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
@@ -108,7 +108,7 @@ index b67bd2d606e44804f51478847e01da18f0d64349..194c352c1d038ca9726aecfd944b38d5
          this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 02415cd2baf066b556886f63ae7e3f7fc60968e4..b031b358a2f87891e383f3bdfb5243a174ead8d2 100644
+index 1e4be9af14b305aed38a7a3cf38a4659ba3aeb18..407bcae5459cbc6c670f7f44dd8bb593935ffffa 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1007,6 +1007,8 @@ public abstract class PlayerList {
@@ -121,10 +121,10 @@ index 02415cd2baf066b556886f63ae7e3f7fc60968e4..b031b358a2f87891e383f3bdfb5243a1
          return entityplayer1;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d523a517ff0f4c8f0efaa38e64ecafef1ba6dc4d..eb37881e39004dea82a5b5e8e9832c361561d9c0 100644
+index 16aa402f7b9ff8c2f1748bc4c82005ccf093ceb4..5cd36fef58afdc60d58acde8809f6507d4d1ea04 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2780,5 +2780,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2815,5 +2815,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }
diff --git a/patches/server/0027-Zombie-horse-naturally-spawn.patch b/patches/server/0027-Zombie-horse-naturally-spawn.patch
index daf34a9d0..5e36ae1a3 100644
--- a/patches/server/0027-Zombie-horse-naturally-spawn.patch
+++ b/patches/server/0027-Zombie-horse-naturally-spawn.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Zombie horse naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3d209313c594f1f2f9beb5c47894b30f7e0b0fd7..63e5adc88c4a3763eeb62bb34acc6938ea1c4334 100644
+index 31fe4b148ded17e6a76bae1dabee3850cc635208..ab262c53bd45c4ca2d2942aee20cfbac1b313678 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -771,9 +771,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -774,9 +774,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01D) && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper
  
                  if (flag1) {
diff --git a/patches/server/0066-Item-entity-immunities.patch b/patches/server/0066-Item-entity-immunities.patch
index 33e70a961..41325c390 100644
--- a/patches/server/0066-Item-entity-immunities.patch
+++ b/patches/server/0066-Item-entity-immunities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index e25423b46ced54dd6b270d45a3c4502a01b2e227..f153176210618c5778056f351ac94a8fb6b4a4e3 100644
+index a78cc85ba2acca982097317d56e7074c6042effd..67cb760da4683c7031e51766a8f928eadd937de0 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -2311,7 +2311,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -2269,7 +2269,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
      public class TrackedEntity {
  
diff --git a/patches/server/0075-Add-allow-water-in-end-world-option.patch b/patches/server/0075-Add-allow-water-in-end-world-option.patch
index b867bc8fc..b177feab4 100644
--- a/patches/server/0075-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0075-Add-allow-water-in-end-world-option.patch
@@ -27,10 +27,10 @@ index 73f1211470d9626c82c8345037da19aed9db3f23..40c7bf266eccc43faa081ade9402bee5
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index cf719642e6fe7f041489c86560a431eebe839acf..063cde55ad7c4ef294994dc7d16f3f738d62049f 100644
+index 9c7943b8712133aa71de113a5581f591cfd68657..c5176597ce07b3173a1446150103ba9b6d296c2f 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1462,4 +1462,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1467,4 +1467,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return null;
      }
      // Paper end
diff --git a/patches/server/0078-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0078-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
index bc2420cc3..e87eb7d30 100644
--- a/patches/server/0078-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0078-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 36420fffc1085c85741c029c33ea03446bf37e3a..654d0576106ff9bbe30e48100c9039b4724a39d0 100644
+index 71f3fb4d60abff73dce22006345e210c706d448b..8e5aa1666ca929780670ce513d969973a513e21e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2582,4 +2582,26 @@ public class ServerPlayer extends Player {
      // CraftBukkit end
  
-     public final int getViewDistance() { return this.getLevel().getChunkSource().chunkMap.viewDistance - 1; } // Paper - placeholder
+     public final int getViewDistance() { throw new UnsupportedOperationException("Use PlayerChunkLoader"); } // Paper - placeholder
 +
 +    // Purpur start
 +    public void teleport(Location to) {
diff --git a/patches/server/0102-Configurable-daylight-cycle.patch b/patches/server/0102-Configurable-daylight-cycle.patch
index 576c5b1f3..ed44757f3 100644
--- a/patches/server/0102-Configurable-daylight-cycle.patch
+++ b/patches/server/0102-Configurable-daylight-cycle.patch
@@ -18,7 +18,7 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe
      public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
          this.gameTime = time % 192000; // Paper - fix guardian beam
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 47f1fb6851834183a28ef97ccbf6c53746e528a2..1a3f709c8aa455f1ce7e63751074044b85b14d19 100644
+index 863cb20d9f67f9399dc0bd5c5f7cd955519f7e1d..f1198c07e479954a1be1e9fe52329a660ed15e9b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1526,7 +1526,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -31,7 +31,7 @@ index 47f1fb6851834183a28ef97ccbf6c53746e528a2..1a3f709c8aa455f1ce7e63751074044b
                  }
                  ServerPlayer entityplayer = (ServerPlayer) entityhuman;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 96acb6ef2ea31395f666e40c86eb7a4c61f7353c..4369cc7a72a29acd6004b7f76d8d7ef94932ec76 100644
+index 3dea01cdb2332817ea7185900bb178efa8ae0f73..7f0de91fa60f527c9396a67dde060c13d0ee5444 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -209,6 +209,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -51,7 +51,7 @@ index 96acb6ef2ea31395f666e40c86eb7a4c61f7353c..4369cc7a72a29acd6004b7f76d8d7ef9
      }
  
      public void setWeatherParameters(int clearDuration, int rainDuration, boolean raining, boolean thundering) {
-@@ -735,6 +738,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -738,6 +741,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              this.serverLevelData.setGameTime(i);
              this.serverLevelData.getScheduledEvents().tick(this.server, i);
              if (this.levelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
@@ -65,7 +65,7 @@ index 96acb6ef2ea31395f666e40c86eb7a4c61f7353c..4369cc7a72a29acd6004b7f76d8d7ef9
                  this.setDayTime(this.levelData.getDayTime() + 1L);
              }
  
-@@ -743,7 +753,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -746,7 +756,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      public void setDayTime(long timeOfDay) {
          this.serverLevelData.setDayTime(timeOfDay);
diff --git a/patches/server/0119-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0119-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
index ccdc49f7f..1e741eb32 100644
--- a/patches/server/0119-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
+++ b/patches/server/0119-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Spread out and optimise player list ticksSpread out and
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a4a895a54ad0266301d50f95eaec3a2bb604f8f1..cdb40088112bf86becc9f08d002d7a7c06b65df8 100644
+index db23e2afd1b9a7a8e1b29e48a31441b0a64beb5d..dea412353ba3e997d8024cb0770b9ac7300b63a1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1021,22 +1021,22 @@ public abstract class PlayerList {
@@ -46,10 +46,10 @@ index a4a895a54ad0266301d50f95eaec3a2bb604f8f1..cdb40088112bf86becc9f08d002d7a7c
  
      public void broadcastAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 69db9fb3b319b7f43d93375e719ec13c67388dff..eef64bca59a9b1558d83eb178e988d45281d4638 100644
+index 5cd36fef58afdc60d58acde8809f6507d4d1ea04..6e061bf2951f0bd86364da3129f365799edda24c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1699,7 +1699,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1734,7 +1734,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(org.bukkit.entity.Entity entity) {
diff --git a/patches/server/0124-Implement-TPSBar.patch b/patches/server/0124-Implement-TPSBar.patch
index e250dda53..7610c7e69 100644
--- a/patches/server/0124-Implement-TPSBar.patch
+++ b/patches/server/0124-Implement-TPSBar.patch
@@ -17,7 +17,7 @@ index a26672fce303a2ad468014d88033c55789a95e87..c6a97b3fa04c683a92a8d838f98e73b5
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 862825556b52bb65a003fa633f08ed42cd6ad1fa..90b192ea540c99df4d9ba8713f126cd7f1cdc81d 100644
+index f1198c07e479954a1be1e9fe52329a660ed15e9b..e5c42c28556d1ffca8b4c7a51fffb9c54236dad7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1043,6 +1043,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -29,10 +29,10 @@ index 862825556b52bb65a003fa633f08ed42cd6ad1fa..90b192ea540c99df4d9ba8713f126cd7
          this.hasLoggedStop = true; // Paper
          if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 6d0a0186778a115f556bbb376a9c1684f9c5740c..eb17a81e5d45892bf5623160d03197591ddc2ac1 100644
+index a4f19720738b167fd5932defabff9aa144f59c37..27ad703c5b723f3cd9c8fb8d231e3f065f217353 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -347,6 +347,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -348,6 +348,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
                  DedicatedServer.LOGGER.info("JMX monitoring enabled");
              }
  
@@ -41,7 +41,7 @@ index 6d0a0186778a115f556bbb376a9c1684f9c5740c..eb17a81e5d45892bf5623160d0319759
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6228ee10d8227d3bc8934dc22d201bdf4fc343fd..749c423c4b2da0520f2fd87530b0e486819fba1e 100644
+index fe2d7acece87d5b825f3f3668c11c0efc877439b..c65eeec4ee990a1efaf5648ca31f8bb4a178ce2b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
@@ -83,7 +83,7 @@ index 6228ee10d8227d3bc8934dc22d201bdf4fc343fd..749c423c4b2da0520f2fd87530b0e486
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f2b863ade7c8d620542510f733ad6c5f03d78388..9d8635530bc2c0b322d3b45542106ac98a4d4122 100644
+index dea412353ba3e997d8024cb0770b9ac7300b63a1..7b3ad3316243d0d8fd2106a0f0475e1b5fadb1d0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -496,6 +496,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0131-Add-EntityTeleportHinderedEvent.patch b/patches/server/0131-Add-EntityTeleportHinderedEvent.patch
index 0868c3bbc..c8b4f04b2 100644
--- a/patches/server/0131-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0131-Add-EntityTeleportHinderedEvent.patch
@@ -38,7 +38,7 @@ index 15c5cccfe02c924c02f605eb47dd0b420b189891..04bae5085756842ce88710646a17e9dc
              ServerLevel worldserver = ((ServerLevel) world).getServer().getLevel(resourcekey);
  
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-index 51f0dc173ddb29c6928badbc3c3a68ff3677a0e1..352568607e16be8f0e5942acd0097b4b2cf13bbc 100644
+index 08a84e8fdb242f467fb20eec73764ef71691ad42..65fa00b3d4d35a4125f8de444e77ac54e9e28551 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 @@ -86,7 +86,15 @@ public class NetherPortalBlock extends Block {
@@ -93,10 +93,10 @@ index 3cc9dab362141fdf61bdcd542ffa5e5c11f99e24..51325f67c49680417b8b843135ec0e91
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index eef64bca59a9b1558d83eb178e988d45281d4638..1948eda5fd4d6b8d8a9bdb8ee36fd9f12764525a 100644
+index 6e061bf2951f0bd86364da3129f365799edda24c..3cc4f0020829ac935c325d5df7a16aabe26fe154 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1116,6 +1116,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1151,6 +1151,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          if (entity.isVehicle()) {
diff --git a/patches/server/0187-Flying-Fall-Damage-API.patch b/patches/server/0187-Flying-Fall-Damage-API.patch
index 9b335e6ed..2c3806a5e 100644
--- a/patches/server/0187-Flying-Fall-Damage-API.patch
+++ b/patches/server/0187-Flying-Fall-Damage-API.patch
@@ -26,10 +26,10 @@ index d9fe4f09e48f67fd4b79528a38fcaef9b94269d8..38b1807c7abf7278b2d00be1e1c8e3e3
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 120625dc6e748fb1bd12334848911e8d1d85679a..d7560a3a65129a4de219caafe8126bfd0f4db6ad 100644
+index 3cc4f0020829ac935c325d5df7a16aabe26fe154..956a82b0c0837bfc49c0ea8a66b9323a4351fbc8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2805,5 +2805,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2840,5 +2840,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }
diff --git a/patches/server/0188-Make-lightning-rod-range-configurable.patch b/patches/server/0188-Make-lightning-rod-range-configurable.patch
index da866cee8..a9c3c3d14 100644
--- a/patches/server/0188-Make-lightning-rod-range-configurable.patch
+++ b/patches/server/0188-Make-lightning-rod-range-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make lightning rod range configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index bf61f916059ea38586ee9ddd9261f71494be8a3f..02adcf7c443536aa067e18c9d4b4253fa192c9b5 100644
+index 4677fa4a7869dd2cb23228e17cbf11c273bc338f..14ebaab8ae3765ddcc56257ef5da657b8d4ef700 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -914,7 +914,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -917,7 +917,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return holder.is(PoiTypes.LIGHTNING_ROD);
          }, (blockposition1) -> {
              return blockposition1.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, blockposition1.getX(), blockposition1.getZ()) - 1;
diff --git a/patches/server/0203-Customizable-sleeping-actionbar-messages.patch b/patches/server/0203-Customizable-sleeping-actionbar-messages.patch
index f2667204e..5c22740c4 100644
--- a/patches/server/0203-Customizable-sleeping-actionbar-messages.patch
+++ b/patches/server/0203-Customizable-sleeping-actionbar-messages.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Customizable sleeping actionbar messages
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 02adcf7c443536aa067e18c9d4b4253fa192c9b5..66c646d51428f898fe98a4f0a47cf35b339c6963 100644
+index 14ebaab8ae3765ddcc56257ef5da657b8d4ef700..a8840bccc147237f74780f44241544b87d59ae8f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -963,11 +963,27 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -966,11 +966,27 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (this.canSleepThroughNights()) {
              if (!this.getServer().isSingleplayer() || this.getServer().isPublished()) {
                  int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
diff --git a/patches/server/0222-Extended-OfflinePlayer-API.patch b/patches/server/0222-Extended-OfflinePlayer-API.patch
index aa86355bd..937200d6c 100644
--- a/patches/server/0222-Extended-OfflinePlayer-API.patch
+++ b/patches/server/0222-Extended-OfflinePlayer-API.patch
@@ -223,10 +223,10 @@ index 50927403d07954f3b930b39046866899a1b289e6..c544e411934832cabb230047632454ff
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3747a3b47735a26a86651677579c20a5eb6a915f..09d1640e67a820aa9d05784b5fb005ef24242cc1 100644
+index 956a82b0c0837bfc49c0ea8a66b9323a4351fbc8..a43aad1317b50b5ef42a84721f82318beccd66ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2073,6 +2073,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2108,6 +2108,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  
diff --git a/patches/server/0224-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0224-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
index cacaa849f..8f9f2d439 100644
--- a/patches/server/0224-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
+++ b/patches/server/0224-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option for if rain and thunder should stop on sleep
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 66c646d51428f898fe98a4f0a47cf35b339c6963..8b3ea95fb593bfb0ce95ca5d6fd9ea424bde555e 100644
+index a8840bccc147237f74780f44241544b87d59ae8f..974b7bb2cd2f8186a6d1bf73e48fdd52f4e0348d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1122,6 +1122,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1125,6 +1125,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      private void resetWeatherCycle() {
          // CraftBukkit start
@@ -16,7 +16,7 @@ index 66c646d51428f898fe98a4f0a47cf35b339c6963..8b3ea95fb593bfb0ce95ca5d6fd9ea42
          this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - when passing the night
          // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
          // Not that everyone ever manages to get the whole server to sleep at the same time....
-@@ -1129,6 +1130,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1132,6 +1133,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              this.serverLevelData.setRainTime(0);
          }
          // CraftBukkit end
diff --git a/patches/server/0232-UPnP-Port-Forwarding.patch b/patches/server/0232-UPnP-Port-Forwarding.patch
index 2956eac7b..06a15b48c 100644
--- a/patches/server/0232-UPnP-Port-Forwarding.patch
+++ b/patches/server/0232-UPnP-Port-Forwarding.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] UPnP Port Forwarding
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d6faf01b6225fec11a4290592ac6ddf674ca6ce2..d88acaff65e5e19ce1afbbdb39459b07fda08ffc 100644
+index 9adefd365fe7e9ad76bf1ae2494e5cfb53cad2b0..ccab594285628af829e556d41ec34846d689f186 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -293,6 +293,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -32,10 +32,10 @@ index d6faf01b6225fec11a4290592ac6ddf674ca6ce2..d88acaff65e5e19ce1afbbdb39459b07
          if (this.server != null) {
              this.server.disablePlugins();
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index f831481434d3bfdb7dba5068ee3fc55f78b98ca0..42f1f732673713291dc1d1c037c7043c3d50e390 100644
+index 27ad703c5b723f3cd9c8fb8d231e3f065f217353..fe67756f0d6e3007c97b5001ec530af08d73381d 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -280,6 +280,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -281,6 +281,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              DedicatedServer.LOGGER.warn("Perhaps a server is already running on that port?");
              return false;
          }
diff --git a/patches/server/0250-Give-bee-counts-in-beehives-to-Purpur-clients.patch b/patches/server/0250-Give-bee-counts-in-beehives-to-Purpur-clients.patch
index d4a819e69..4e9e0756c 100644
--- a/patches/server/0250-Give-bee-counts-in-beehives-to-Purpur-clients.patch
+++ b/patches/server/0250-Give-bee-counts-in-beehives-to-Purpur-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Give bee counts in beehives to Purpur clients
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d88acaff65e5e19ce1afbbdb39459b07fda08ffc..dc306e6df26a8153348d509b7d5c0c6526100f1c 100644
+index ccab594285628af829e556d41ec34846d689f186..a76a3df1c4c9c804a24c4337fc499515b2c3e3cf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1054,6 +1054,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -17,10 +17,10 @@ index d88acaff65e5e19ce1afbbdb39459b07fda08ffc..dc306e6df26a8153348d509b7d5c0c65
          this.hasLoggedStop = true; // Paper
          if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 42f1f732673713291dc1d1c037c7043c3d50e390..438d95690d5762c88bffef8afd25ac63b5d838fd 100644
+index fe67756f0d6e3007c97b5001ec530af08d73381d..7ce14e04d9818613889d1ec0db1bf29f420fe6dc 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -372,6 +372,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -373,6 +373,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              }
  
              org.purpurmc.purpur.task.BossBarTask.startAll(); // Purpur
diff --git a/patches/server/0253-Allow-void-trading.patch b/patches/server/0253-Allow-void-trading.patch
index d43fc6003..8de2f9647 100644
--- a/patches/server/0253-Allow-void-trading.patch
+++ b/patches/server/0253-Allow-void-trading.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow void trading
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8b3ea95fb593bfb0ce95ca5d6fd9ea424bde555e..e176298f1f18c359a19036ab6546c9698c717d0b 100644
+index 974b7bb2cd2f8186a6d1bf73e48fdd52f4e0348d..3586ca6e42ca710a56046ca067d9d6423945d8b0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2660,7 +2660,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2663,7 +2663,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
                  // Paper start
diff --git a/patches/server/0254-Dont-eat-blocks-in-non-ticking-chunks.patch b/patches/server/0254-Dont-eat-blocks-in-non-ticking-chunks.patch
index 8a2b28ac2..d248dca3e 100644
--- a/patches/server/0254-Dont-eat-blocks-in-non-ticking-chunks.patch
+++ b/patches/server/0254-Dont-eat-blocks-in-non-ticking-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Dont eat blocks in non ticking chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f153176210618c5778056f351ac94a8fb6b4a4e3..123e02df1a60842b8f73afc2729724a697df4954 100644
+index 67cb760da4683c7031e51766a8f928eadd937de0..ef501b2a84511ff5d7be0eb2dedce293eff2bb4c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1829,7 +1829,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1820,7 +1820,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          return this.anyPlayerCloseEnoughForSpawning(this.getUpdatingChunkIfPresent(chunkcoordintpair.toLong()), chunkcoordintpair, reducedRange);
      }
  
diff --git a/patches/server/0257-Max-joins-per-second.patch b/patches/server/0257-Max-joins-per-second.patch
index d518257eb..6913ce282 100644
--- a/patches/server/0257-Max-joins-per-second.patch
+++ b/patches/server/0257-Max-joins-per-second.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Max joins per second
 When this option is set to true the `max-joins-per-tick` setting in paper.yml will be used per second instead of per tick
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index f76c52e4661ef740dc924b0704a9ce28982294f1..f08c24920aebe5a84927024fdd14d954053129d3 100644
+index c1e8d8674738eebaaf7bd918eacb5227a1331b67..fd23bb94194b94a203de8aa165096ebce11c2a63 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -516,11 +516,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -545,11 +545,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper
      private static int joinAttemptsThisTick; // Paper
      private static int currTick; // Paper