diff --git a/gradle.properties b/gradle.properties
index c4b8580d6..ca70a9143 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = 90f717fa5a6b375b9c46a3a56fdbdb026aabdad8
+paperCommit = 975f2e5104b961f491ed2dde97de12d1cbb50d1f
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0003-Purpur-config-files.patch b/patches/api/0003-Purpur-config-files.patch
index 94ede091a..8c78c4930 100644
--- a/patches/api/0003-Purpur-config-files.patch
+++ b/patches/api/0003-Purpur-config-files.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 83870d54a5ff1017ad7455e9c931fdee54354434..7347636e2845f7723706ab280c2a788302c67854 100644
+index 1db87711dd9b67bcba42e731c8c1a81502abf56c..0cba13a8a0bc1ebe5f8365072c4d3234f2261056 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1679,6 +1679,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1715,6 +1715,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
  
diff --git a/patches/api/0011-Bring-back-server-name.patch b/patches/api/0011-Bring-back-server-name.patch
index 381907977..cd8989f10 100644
--- a/patches/api/0011-Bring-back-server-name.patch
+++ b/patches/api/0011-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 d36e4bc3c3713407704b865574cba28662f17315..fc956758335734ac89e86e9c5fbbb6cc965d0e59 100644
+index a4fd6f6e51c478efa9b125d3878c246b5f762999..16b37de6e0c585570499949f931ba14c801bd421 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2063,4 +2063,15 @@ public final class Bukkit {
+@@ -2104,4 +2104,15 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -25,10 +25,10 @@ index d36e4bc3c3713407704b865574cba28662f17315..fc956758335734ac89e86e9c5fbbb6cc
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7347636e2845f7723706ab280c2a788302c67854..6f809515d87d70cc824f7414fa48de07fec4f726 100644
+index 0cba13a8a0bc1ebe5f8365072c4d3234f2261056..a031e0003d712f123da3b112dce4fc1e98a5bc68 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1801,4 +1801,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1837,4 +1837,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      io.papermc.paper.datapack.DatapackManager getDatapackManager();
      // Paper end
diff --git a/patches/api/0014-Lagging-threshold.patch b/patches/api/0014-Lagging-threshold.patch
index c687e6371..9d2e23ba3 100644
--- a/patches/api/0014-Lagging-threshold.patch
+++ b/patches/api/0014-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 fc956758335734ac89e86e9c5fbbb6cc965d0e59..39490406f914a5082d9d4b3937d9df63c222efa6 100644
+index 16b37de6e0c585570499949f931ba14c801bd421..fa3b34c9e79e57d9385c9160ac654cd5d5f54dc7 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2073,5 +2073,14 @@ public final class Bukkit {
+@@ -2114,5 +2114,14 @@ public final class Bukkit {
      public static String getServerName() {
          return server.getServerName();
      }
@@ -24,10 +24,10 @@ index fc956758335734ac89e86e9c5fbbb6cc965d0e59..39490406f914a5082d9d4b3937d9df63
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6f809515d87d70cc824f7414fa48de07fec4f726..573e0e4dc692952035221a5222ca106e12461310 100644
+index a031e0003d712f123da3b112dce4fc1e98a5bc68..f1b351610185332e9c1e32d4cb7182783d33cc0b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1809,5 +1809,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1845,5 +1845,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      String getServerName();
diff --git a/patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch
index 3ede3a103..97716e539 100644
--- a/patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch
+++ b/patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch
@@ -489,10 +489,10 @@ index 3afd5f5c0208a4ee93b5dbfc2aab2b9d2e8a7544..7838731e0e16bdccfb79e74ceb64148f
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 573e0e4dc692952035221a5222ca106e12461310..6962b1d13fc6fdda973ba12cb2bba5553ce5ae50 100644
+index f1b351610185332e9c1e32d4cb7182783d33cc0b..ed67b960689d7b1a686f64f5c77393be56a17ef4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1652,6 +1652,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1688,6 +1688,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      UnsafeValues getUnsafe();
  
      // Spigot start
diff --git a/patches/api/0039-Conflict-on-change-for-adventure-deprecations.patch b/patches/api/0039-Conflict-on-change-for-adventure-deprecations.patch
index fc25f9be0..0aa68c0f7 100644
--- a/patches/api/0039-Conflict-on-change-for-adventure-deprecations.patch
+++ b/patches/api/0039-Conflict-on-change-for-adventure-deprecations.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Conflict on change for adventure deprecations
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 39490406f914a5082d9d4b3937d9df63c222efa6..e4ec2a0c15a6ada5bef9671e427cd56413f18d80 100644
+index fa3b34c9e79e57d9385c9160ac654cd5d5f54dc7..f4e35cd1a398cc07842c359ec560eed4596732b4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -346,7 +346,7 @@ public final class Bukkit {
+@@ -347,7 +347,7 @@ public final class Bukkit {
       * @return the number of players
       * @deprecated in favour of {@link Server#broadcast(net.kyori.adventure.text.Component)}
       */
@@ -17,7 +17,7 @@ index 39490406f914a5082d9d4b3937d9df63c222efa6..e4ec2a0c15a6ada5bef9671e427cd564
      public static int broadcastMessage(@NotNull String message) {
          return server.broadcastMessage(message);
      }
-@@ -1045,7 +1045,7 @@ public final class Bukkit {
+@@ -1067,7 +1067,7 @@ public final class Bukkit {
       * @return number of message recipients
       * @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)}
       */
@@ -26,7 +26,7 @@ index 39490406f914a5082d9d4b3937d9df63c222efa6..e4ec2a0c15a6ada5bef9671e427cd564
      public static int broadcast(@NotNull String message, @NotNull String permission) {
          return server.broadcast(message, permission);
      }
-@@ -1324,7 +1324,7 @@ public final class Bukkit {
+@@ -1346,7 +1346,7 @@ public final class Bukkit {
       *
       * @see InventoryType#isCreatable()
       */
@@ -35,7 +35,7 @@ index 39490406f914a5082d9d4b3937d9df63c222efa6..e4ec2a0c15a6ada5bef9671e427cd564
      @NotNull
      public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
          return server.createInventory(owner, type, title);
-@@ -1374,7 +1374,7 @@ public final class Bukkit {
+@@ -1396,7 +1396,7 @@ public final class Bukkit {
       * @throws IllegalArgumentException if the size is not a multiple of 9
       * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)}
       */
@@ -44,7 +44,7 @@ index 39490406f914a5082d9d4b3937d9df63c222efa6..e4ec2a0c15a6ada5bef9671e427cd564
      @NotNull
      public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException {
          return server.createInventory(owner, size, title);
-@@ -1401,7 +1401,7 @@ public final class Bukkit {
+@@ -1423,7 +1423,7 @@ public final class Bukkit {
       * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
       */
      @NotNull
@@ -53,7 +53,7 @@ index 39490406f914a5082d9d4b3937d9df63c222efa6..e4ec2a0c15a6ada5bef9671e427cd564
      public static Merchant createMerchant(@Nullable String title) {
          return server.createMerchant(title);
      }
-@@ -1490,7 +1490,7 @@ public final class Bukkit {
+@@ -1521,7 +1521,7 @@ public final class Bukkit {
       * @deprecated in favour of {@link #motd()}
       */
      @NotNull
@@ -62,7 +62,7 @@ index 39490406f914a5082d9d4b3937d9df63c222efa6..e4ec2a0c15a6ada5bef9671e427cd564
      public static String getMotd() {
          return server.getMotd();
      }
-@@ -1512,7 +1512,7 @@ public final class Bukkit {
+@@ -1543,7 +1543,7 @@ public final class Bukkit {
       * @deprecated in favour of {@link #shutdownMessage()}
       */
      @Nullable
@@ -72,10 +72,10 @@ index 39490406f914a5082d9d4b3937d9df63c222efa6..e4ec2a0c15a6ada5bef9671e427cd564
          return server.getShutdownMessage();
      }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6962b1d13fc6fdda973ba12cb2bba5553ce5ae50..6888deaba01cd2edb8a84ad0a1cdfc6feb132ab2 100644
+index ed67b960689d7b1a686f64f5c77393be56a17ef4..e89d80128b2944efb7e105b92f8f825afe80affb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -270,7 +270,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -271,7 +271,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return the number of players
       * @deprecated use {@link #broadcast(net.kyori.adventure.text.Component)}
       */
@@ -84,7 +84,7 @@ index 6962b1d13fc6fdda973ba12cb2bba5553ce5ae50..6888deaba01cd2edb8a84ad0a1cdfc6f
      public int broadcastMessage(@NotNull String message);
  
      // Paper start
-@@ -844,7 +844,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -865,7 +865,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return number of message recipients
       * @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)}
       */
@@ -93,7 +93,7 @@ index 6962b1d13fc6fdda973ba12cb2bba5553ce5ae50..6888deaba01cd2edb8a84ad0a1cdfc6f
      public int broadcast(@NotNull String message, @NotNull String permission);
      // Paper start
      /**
-@@ -1108,7 +1108,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1129,7 +1129,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @see InventoryType#isCreatable()
       */
@@ -102,7 +102,7 @@ index 6962b1d13fc6fdda973ba12cb2bba5553ce5ae50..6888deaba01cd2edb8a84ad0a1cdfc6f
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
  
-@@ -1152,7 +1152,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1173,7 +1173,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @throws IllegalArgumentException if the size is not a multiple of 9
       * @deprecated in favour of {@link #createInventory(InventoryHolder, int, net.kyori.adventure.text.Component)}
       */
@@ -111,7 +111,7 @@ index 6962b1d13fc6fdda973ba12cb2bba5553ce5ae50..6888deaba01cd2edb8a84ad0a1cdfc6f
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException;
  
-@@ -1175,7 +1175,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1196,7 +1196,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
       */
      @NotNull
@@ -120,7 +120,7 @@ index 6962b1d13fc6fdda973ba12cb2bba5553ce5ae50..6888deaba01cd2edb8a84ad0a1cdfc6f
      Merchant createMerchant(@Nullable String title);
  
      /**
-@@ -1248,7 +1248,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1276,7 +1276,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @deprecated in favour of {@link #motd()}
       */
      @NotNull
@@ -129,7 +129,7 @@ index 6962b1d13fc6fdda973ba12cb2bba5553ce5ae50..6888deaba01cd2edb8a84ad0a1cdfc6f
      String getMotd();
  
      // Paper start
-@@ -1266,7 +1266,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1294,7 +1294,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @deprecated in favour of {@link #shutdownMessage()}
       */
      @Nullable
diff --git a/patches/api/0050-Added-the-ability-to-add-combustible-items.patch b/patches/api/0050-Added-the-ability-to-add-combustible-items.patch
index 93f7369e1..202b5bef2 100644
--- a/patches/api/0050-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/api/0050-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 e4ec2a0c15a6ada5bef9671e427cd56413f18d80..390a0d09b78e46cfebe78bfa3d1dd73aedca8256 100644
+index f4e35cd1a398cc07842c359ec560eed4596732b4..6197605519abf3c59108f1dff34105cc2bca10c2 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2082,5 +2082,24 @@ public final class Bukkit {
+@@ -2123,5 +2123,24 @@ public final class Bukkit {
      public static boolean isLagging() {
          return server.isLagging();
      }
@@ -34,10 +34,10 @@ index e4ec2a0c15a6ada5bef9671e427cd56413f18d80..390a0d09b78e46cfebe78bfa3d1dd73a
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6888deaba01cd2edb8a84ad0a1cdfc6feb132ab2..88767865cc2dce0e341eef0f53323af6f95fb841 100644
+index e89d80128b2944efb7e105b92f8f825afe80affb..c44212baa2cc167a1a818c158441e5ff749f29eb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1819,5 +1819,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1855,5 +1855,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return True if lagging
       */
      boolean isLagging();
diff --git a/patches/server/0001-Airplane-Server-Changes.patch b/patches/server/0001-Airplane-Server-Changes.patch
index 85f5a044e..e53583262 100644
--- a/patches/server/0001-Airplane-Server-Changes.patch
+++ b/patches/server/0001-Airplane-Server-Changes.patch
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d80cfcb94db51440b5d0aa589a9a3d8a4189a9aa..ae0be22d1ad7a37e8f7f0b11a15d78559af72cbc 100644
+index cb1a931417073908be5c7aa1af710477775b3dbd..d28ed33187f146bbaad6ebd4247cd798d84b3173 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -2,9 +2,12 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCach
@@ -35,7 +35,7 @@ index d80cfcb94db51440b5d0aa589a9a3d8a4189a9aa..ae0be22d1ad7a37e8f7f0b11a15d7855
  import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
  import java.nio.file.Files
  import java.util.Locale
-@@ -29,8 +32,8 @@ repositories {
+@@ -28,8 +31,8 @@ repositories {
  }
  
  dependencies {
@@ -46,7 +46,7 @@ index d80cfcb94db51440b5d0aa589a9a3d8a4189a9aa..ae0be22d1ad7a37e8f7f0b11a15d7855
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.12.1")
      implementation("net.minecrell:terminalconsoleappender:1.2.0")
-@@ -65,6 +68,13 @@ dependencies {
+@@ -64,6 +67,13 @@ dependencies {
      implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
      implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Paper
  
@@ -60,7 +60,7 @@ index d80cfcb94db51440b5d0aa589a9a3d8a4189a9aa..ae0be22d1ad7a37e8f7f0b11a15d7855
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("junit:junit:4.13.1")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
-@@ -83,6 +93,7 @@ tasks.jar {
+@@ -82,6 +92,7 @@ tasks.jar {
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
              "Implementation-Version" to "git-Paper-$implementationVersion",
@@ -68,7 +68,7 @@ index d80cfcb94db51440b5d0aa589a9a3d8a4189a9aa..ae0be22d1ad7a37e8f7f0b11a15d7855
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -140,6 +151,22 @@ relocation {
+@@ -139,6 +150,22 @@ relocation {
      }
  }
  
@@ -128,7 +128,7 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..f5d01bce4d5547b4aeca96b7962b2090
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f421e6a2e43e0a673dbb8a9a2b4331387e523e02..3cb9e223c90f97aa106ee1e9512d33897a6bac1a 100644
+index e143e4514789f707938a67fab4d313d5c55dc870..361b05c3211704edbbe921a042d4daae8dbd5d45 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -202,16 +202,26 @@ public class PaperConfig {
@@ -160,10 +160,10 @@ index f421e6a2e43e0a673dbb8a9a2b4331387e523e02..3cb9e223c90f97aa106ee1e9512d3389
          int timingHistoryLength = getInt("timings.history-length", 3600);
          timingsServerName = getString("timings.server-name", "Unknown Server");
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 580bae0d414d371a07a6bfeefc41fdd989dc0083..51d89d6bcbcc24a6be6a836263ebb1ed23e91cba 100644
+index ece77f5ea4b14bbed7c070131b3251ea86764538..8642f3eaa4035243afd629b78ddb8cd2430323dd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -29,8 +29,8 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -31,8 +31,8 @@ public class PaperVersionFetcher implements VersionFetcher {
      @Nonnull
      @Override
      public Component getVersionMessage(@Nonnull String serverVersion) {
@@ -174,7 +174,7 @@ index 580bae0d414d371a07a6bfeefc41fdd989dc0083..51d89d6bcbcc24a6be6a836263ebb1ed
          final Component history = getHistory();
  
          return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
-@@ -54,13 +54,13 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -56,13 +56,13 @@ public class PaperVersionFetcher implements VersionFetcher {
  
      private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
          int distance;
@@ -1671,7 +1671,7 @@ index 505546d32eea4682452dbac02311433157f6a30e..5c7b9ad379f3c272e15648dd16f4df92
  
      public static <V> CompletableFuture<List<V>> sequenceFailFast(List<? extends CompletableFuture<? extends V>> futures) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fe6d5051b139cd6079e288ffdf20e30fdd46fdda..26b6bc83e9f6b07878ef454067618c4884d5b54b 100644
+index c8876b000a03f18e7a140167ed4505a9843a8d14..c80a600b72972c2e8b7d472e2e11c312adaa06e1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1949,7 +1949,7 @@ index 7437f01ca8f416e2c9150250e324af4725a4efb6..bdcd0e38a3ba904811112f41d8bfbfc0
      int LARGE_MAX_STACK_SIZE = 64;
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4f164f238177b5e2b18c76b7cc14596ec93409d1..2856de51e1f12ea2d5a04dabbb212ca302156aa6 100644
+index e17bda0d13bae337cfad5ae31b118aa7a85499fc..69fe6b0c774ec1f15e49826a2dc36d9288e3ae86 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -338,6 +338,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -2022,7 +2022,7 @@ index 4f164f238177b5e2b18c76b7cc14596ec93409d1..2856de51e1f12ea2d5a04dabbb212ca3
              // Paper end
          }
      }
-@@ -3815,12 +3839,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3834,12 +3858,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
              return false;
          } else {
              AABB axisalignedbb = this.getBoundingBox().deflate(0.001D);
@@ -2043,7 +2043,7 @@ index 4f164f238177b5e2b18c76b7cc14596ec93409d1..2856de51e1f12ea2d5a04dabbb212ca3
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -3828,14 +3854,62 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3847,14 +3873,62 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
  
@@ -2112,7 +2112,7 @@ index 4f164f238177b5e2b18c76b7cc14596ec93409d1..2856de51e1f12ea2d5a04dabbb212ca3
  
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -3852,9 +3926,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3871,9 +3945,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                                  }
                              }
                          }
@@ -2790,10 +2790,10 @@ index e7ca5d6fb8922e7e8065864f736b06056be080a0..833ad6fbedfc275b3fde640b0e873f23
          final String id;
          private final GameRules.Category category;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b93056b91e7ebd49e6ddb53ccb6c05c056088df9..6f4e6105aa1d6546daa2424f57972fd29db25fa3 100644
+index f936e9f9a9fa655fa997d6862b5ed54c04169d35..8b8daa771288492b4a02cb40c1b376b65e210e5b 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 {
+@@ -176,6 +176,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
      public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here
  
@@ -2802,7 +2802,7 @@ index b93056b91e7ebd49e6ddb53ccb6c05c056088df9..6f4e6105aa1d6546daa2424f57972fd2
      // Paper start - fix and optimise world upgrading
      // copied from below
      public static ResourceKey<DimensionType> getDimensionKey(DimensionType manager) {
-@@ -450,6 +452,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -452,6 +454,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return null;
      }
  
@@ -2894,7 +2894,7 @@ index b93056b91e7ebd49e6ddb53ccb6c05c056088df9..6f4e6105aa1d6546daa2424f57972fd2
      public boolean isInWorldBounds(BlockPos pos) {
          return pos.isValidLocation(this); // Paper - use better/optimized check
      }
-@@ -985,13 +1072,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -987,13 +1074,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
              MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick
@@ -2910,7 +2910,7 @@ index b93056b91e7ebd49e6ddb53ccb6c05c056088df9..6f4e6105aa1d6546daa2424f57972fd2
              // Paper end
          }
      }
-@@ -1445,6 +1532,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1447,6 +1534,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      public ProfilerFiller getProfiler() {
@@ -2919,10 +2919,10 @@ index b93056b91e7ebd49e6ddb53ccb6c05c056088df9..6f4e6105aa1d6546daa2424f57972fd2
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index f316585ccf6baf5e7e514ba3a68b4344e781a82d..7db5d3e7eef3dfed51895d72c0cb2b1e8c286d5f 100644
+index bacd75f67f783f49208a74501cc7e6e7485010a4..dc613142603fca4cf5c8e47c084e1439d0450424 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -415,12 +415,12 @@ public final class NaturalSpawner {
+@@ -418,12 +418,12 @@ public final class NaturalSpawner {
          return spawnGroup == MobCategory.MONSTER && world.getBlockState(pos.below()).is(Blocks.NETHER_BRICKS) && structureAccessor.getStructureAt(pos, false, StructureFeature.NETHER_BRIDGE).isValid() ? StructureFeature.NETHER_BRIDGE.getSpecialEnemies() : chunkGenerator.getMobsAt(biome != null ? biome : world.getBiome(pos), structureAccessor, spawnGroup, pos);
      }
  
@@ -3589,10 +3589,10 @@ index fcb7bd9f3b6b6ada0f2e5692bce32ab76b8798a7..61c2096f2c034dbc3ad33b193b058c7d
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f925130552cb4ff2f813b1ddae9ac2f915e17bd5..978c52b6ab260c3392d16143778b1cfc6404920f 100644
+index 0adb686d690e1be0c5540625efbecc46bac5d045..c987e7c46afe6c41339e8e08bf2bfabe8c1ba098 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper
+@@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -3601,7 +3601,7 @@ index f925130552cb4ff2f813b1ddae9ac2f915e17bd5..978c52b6ab260c3392d16143778b1cfc
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
-@@ -1000,6 +1000,11 @@ public final class CraftServer implements Server {
+@@ -1018,6 +1018,11 @@ public final class CraftServer implements Server {
                  plugin.getDescription().getName(),
                  "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
              ));
diff --git a/patches/server/0003-Rebrand.patch b/patches/server/0003-Rebrand.patch
index 4c3190b46..2297d7a6e 100644
--- a/patches/server/0003-Rebrand.patch
+++ b/patches/server/0003-Rebrand.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ae0be22d1ad7a37e8f7f0b11a15d78559af72cbc..a0ae42e349bd6531bcf7cd195a10bf4f66eb1b76 100644
+index d28ed33187f146bbaad6ebd4247cd798d84b3173..f304212a962911fe9bf6a5dd2336ee9850f58f0a 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -32,7 +32,7 @@ repositories {
+@@ -31,7 +31,7 @@ repositories {
  }
  
  dependencies {
@@ -17,7 +17,7 @@ index ae0be22d1ad7a37e8f7f0b11a15d78559af72cbc..a0ae42e349bd6531bcf7cd195a10bf4f
      implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Airplane
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.12.1")
-@@ -64,6 +64,8 @@ dependencies {
+@@ -63,6 +63,8 @@ dependencies {
  
      implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
      implementation("io.netty:netty-all:4.1.65.Final") // Paper
@@ -26,7 +26,7 @@ index ae0be22d1ad7a37e8f7f0b11a15d78559af72cbc..a0ae42e349bd6531bcf7cd195a10bf4f
  
      implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
      implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Paper
-@@ -92,8 +94,7 @@ tasks.jar {
+@@ -91,8 +93,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -36,7 +36,7 @@ index ae0be22d1ad7a37e8f7f0b11a15d78559af72cbc..a0ae42e349bd6531bcf7cd195a10bf4f
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -234,7 +235,7 @@ tasks.test {
+@@ -233,7 +234,7 @@ tasks.test {
  fun TaskContainer.registerRunTask(
      name: String, block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -46,19 +46,21 @@ index ae0be22d1ad7a37e8f7f0b11a15d78559af72cbc..a0ae42e349bd6531bcf7cd195a10bf4f
      workingDir = rootProject.layout.projectDirectory.dir(
          providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run")
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 51d89d6bcbcc24a6be6a836263ebb1ed23e91cba..b6c1e50df4e0a69ac1e81613539bcc0731c67063 100644
+index 8642f3eaa4035243afd629b78ddb8cd2430323dd..1e401e34eff6a74d4593d19e5ca5d4afc0fbaae1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -18,7 +18,7 @@ import java.util.stream.StreamSupport;
+@@ -19,8 +19,8 @@ import java.util.stream.StreamSupport;
  
  public class PaperVersionFetcher implements VersionFetcher {
      private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
 -    private static final String GITHUB_BRANCH_NAME = "master";
+-    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads";
++    private static final String DOWNLOAD_PAGE = "https://purpur.pl3x.net/downloads/";
 +    private static final String JENKINS_URL = "https://ci.pl3x.net/job/Purpur/lastSuccessfulBuild/buildNumber"; // Purpur
      private static @Nullable String mcVer;
  
      @Override
-@@ -29,8 +29,8 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -31,8 +31,8 @@ public class PaperVersionFetcher implements VersionFetcher {
      @Nonnull
      @Override
      public Component getVersionMessage(@Nonnull String serverVersion) {
@@ -69,7 +71,7 @@ index 51d89d6bcbcc24a6be6a836263ebb1ed23e91cba..b6c1e50df4e0a69ac1e81613539bcc07
          final Component history = getHistory();
  
          return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
-@@ -43,7 +43,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -45,7 +45,7 @@ public class PaperVersionFetcher implements VersionFetcher {
                  String result = matcher.group();
                  mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-'
              } else {
@@ -78,7 +80,7 @@ index 51d89d6bcbcc24a6be6a836263ebb1ed23e91cba..b6c1e50df4e0a69ac1e81613539bcc07
                  org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString());
                  org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
              }
-@@ -54,13 +54,18 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -56,13 +56,18 @@ public class PaperVersionFetcher implements VersionFetcher {
  
      private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
          int distance;
@@ -102,7 +104,7 @@ index 51d89d6bcbcc24a6be6a836263ebb1ed23e91cba..b6c1e50df4e0a69ac1e81613539bcc07
  
          switch (distance) {
              case -1:
-@@ -78,15 +83,11 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -85,15 +90,11 @@ public class PaperVersionFetcher implements VersionFetcher {
          if (siteApiVersion == null) { return -1; }
          try {
              try (BufferedReader reader = Resources.asCharSource(
@@ -120,7 +122,7 @@ index 51d89d6bcbcc24a6be6a836263ebb1ed23e91cba..b6c1e50df4e0a69ac1e81613539bcc07
                  return latest - jenkinsBuild;
              } catch (JsonSyntaxException ex) {
                  ex.printStackTrace();
-@@ -98,6 +99,22 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -105,6 +106,22 @@ public class PaperVersionFetcher implements VersionFetcher {
          }
      }
  
@@ -157,7 +159,7 @@ index e0b1f0671d16ddddcb6725acd25a1d1d69e42701..8c3c68465197fafc14849dc38a572e30
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 26b6bc83e9f6b07878ef454067618c4884d5b54b..a942fe5cbaf298e9ece59f7e81d7142fbf654e2e 100644
+index c80a600b72972c2e8b7d472e2e11c312adaa06e1..0f7189ee1b16717ca2011e69e645a5960e8aa32e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -189,10 +191,10 @@ index 291e96aac85e86e1f5d2c295adb1b9e05b2f2528..d9bee4649ce376e8ef44720161bbeb41
              // Spigot end
              DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 978c52b6ab260c3392d16143778b1cfc6404920f..aa4bb2dc68bab8773271567633cfe6d234d98155 100644
+index c987e7c46afe6c41339e8e08bf2bfabe8c1ba098..e28807ab2613982c87d8c7daab3bea60c9f0c137 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper
+@@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch
index b42803217..f80125c7f 100644
--- a/patches/server/0004-Purpur-config-files.patch
+++ b/patches/server/0004-Purpur-config-files.patch
@@ -30,7 +30,7 @@ index f5d01bce4d5547b4aeca96b7962b2090f47ea541..05f1b6d103ec20f196b60944f5bc0073
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7037f868f0e925a79fbf6be8f3810d9e75133fda..2ac56ca31d57991aef4fd77212cd9a537753b8d7 100644
+index 84ed6b5e4f0b6ef998492db769275a509fa51b14..d694ee295d3197a928f8f0ff03413aa02bedc108 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -118,6 +118,11 @@ public class PaperConfig {
@@ -101,10 +101,10 @@ index d9bee4649ce376e8ef44720161bbeb4139e1132a..25cd8b550a81cf144fed62f32320cd2e
          io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6f4e6105aa1d6546daa2424f57972fd29db25fa3..4c55bb04ff41fabb47c6477ba33e0e0aabd1c843 100644
+index 8b8daa771288492b4a02cb40c1b376b65e210e5b..d59f402622b93abc44b331f42cccdb785689aeda 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -167,6 +167,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -168,6 +168,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
      public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
  
@@ -113,7 +113,7 @@ index 6f4e6105aa1d6546daa2424f57972fd29db25fa3..4c55bb04ff41fabb47c6477ba33e0e0a
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -315,6 +317,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -316,6 +318,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, final DimensionType dimensionmanager, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper - Anti-Xray - Pass executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), this.spigotConfig); // Paper
@@ -460,10 +460,10 @@ index 0000000000000000000000000000000000000000..6e7f56fe2b78d7a09d5d130f2c88338f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index aa4bb2dc68bab8773271567633cfe6d234d98155..597b6a011c1065b806d23db634bb47e8e97363e8 100644
+index e28807ab2613982c87d8c7daab3bea60c9f0c137..f486ad6d2cf29bf1df4dc9367fa4ebaaab425010 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -895,6 +895,7 @@ public final class CraftServer implements Server {
+@@ -907,6 +907,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -471,7 +471,7 @@ index aa4bb2dc68bab8773271567633cfe6d234d98155..597b6a011c1065b806d23db634bb47e8
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -929,6 +930,7 @@ public final class CraftServer implements Server {
+@@ -947,6 +948,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
@@ -479,7 +479,7 @@ index aa4bb2dc68bab8773271567633cfe6d234d98155..597b6a011c1065b806d23db634bb47e8
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -944,6 +946,7 @@ public final class CraftServer implements Server {
+@@ -962,6 +964,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -487,7 +487,7 @@ index aa4bb2dc68bab8773271567633cfe6d234d98155..597b6a011c1065b806d23db634bb47e8
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2526,6 +2529,18 @@ public final class CraftServer implements Server {
+@@ -2554,6 +2557,18 @@ public final class CraftServer implements Server {
              return com.destroystokyo.paper.PaperConfig.config;
          }
  
diff --git a/patches/server/0006-Component-related-conveniences.patch b/patches/server/0006-Component-related-conveniences.patch
index 35fdfe9fe..82619ab29 100644
--- a/patches/server/0006-Component-related-conveniences.patch
+++ b/patches/server/0006-Component-related-conveniences.patch
@@ -36,7 +36,7 @@ index 54dc872b1d448c8895313b216d6cd1c9836a5160..c1091ab7069fa3dd934409da23d404a7
      public void displayClientMessage(Component message, boolean actionBar) {
          this.sendMessage(message, actionBar ? ChatType.GAME_INFO : ChatType.CHAT, Util.NIL_UUID);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ad9fb50791779a5fe7d22268b71bd10d9c9ff3f0..1c1602f839828252748e1acacfe42c7cac194332 100644
+index ea1f7c8bf220982a086d4ae1663ae445b8c6cebd..dc5492b45bfa97c0e1237096764b79c88e846e4e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1395,6 +1395,62 @@ public abstract class PlayerList {
@@ -103,10 +103,10 @@ index ad9fb50791779a5fe7d22268b71bd10d9c9ff3f0..1c1602f839828252748e1acacfe42c7c
          this.server.sendMessage(message, sender);
          Iterator iterator = this.players.iterator();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2856de51e1f12ea2d5a04dabbb212ca302156aa6..a45461bd23d9b85a7675a89517d07def02c694e9 100644
+index 69fe6b0c774ec1f15e49826a2dc36d9288e3ae86..a00c38b224d6c5ff3bc0b75ad97e1e0cb1140af9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3598,6 +3598,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3617,6 +3617,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          return SlotAccess.NULL;
      }
  
diff --git a/patches/server/0007-Ridables.patch b/patches/server/0007-Ridables.patch
index 481202398..ec949a0ed 100644
--- a/patches/server/0007-Ridables.patch
+++ b/patches/server/0007-Ridables.patch
@@ -22,7 +22,7 @@ index 0cc0242d981586413bcc349df6e6fd3bc09710f1..ae394b3d8b8a157d345e102f5997058d
          super(x, y, z);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a942fe5cbaf298e9ece59f7e81d7142fbf654e2e..a9a481e137c5a67def8c83b0cddb3a9bc406a036 100644
+index 0f7189ee1b16717ca2011e69e645a5960e8aa32e..274e494904d36e5d77a8c65a41be85e5dce95e04 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1599,6 +1599,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -86,7 +86,7 @@ index d75bb089ee91bba87aba51ea95fcfe54b8c0a8ab..0f86e3896805e2f6a0e30c421522f031
                          if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                              ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a45461bd23d9b85a7675a89517d07def02c694e9..f7ee0eda331c4a9450bce5bd79cdf567583aa067 100644
+index a00c38b224d6c5ff3bc0b75ad97e1e0cb1140af9..af2287a9255a311ad4811edce7693e9cbe9d4741 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -135,7 +135,7 @@ index a45461bd23d9b85a7675a89517d07def02c694e9..f7ee0eda331c4a9450bce5bd79cdf567
              if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                  this.passengers = ImmutableList.of();
              } else {
-@@ -4314,4 +4328,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4333,4 +4347,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end
diff --git a/patches/server/0014-Bring-back-server-name.patch b/patches/server/0014-Bring-back-server-name.patch
index 0789f500d..559d518ed 100644
--- a/patches/server/0014-Bring-back-server-name.patch
+++ b/patches/server/0014-Bring-back-server-name.patch
@@ -17,10 +17,10 @@ index 0544ac93513d3a274bfb53bb6120bd598f4d603b..9ce5984fbeba4839290c9d213d441957
      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 597b6a011c1065b806d23db634bb47e8e97363e8..11686b723e405996072086af82b1d5559dde7b3e 100644
+index f486ad6d2cf29bf1df4dc9367fa4ebaaab425010..7dfd5688daf9d1af547773aa07c3733a707db556 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2695,4 +2695,11 @@ public final class CraftServer implements Server {
+@@ -2723,4 +2723,11 @@ public final class CraftServer implements Server {
      }
  
      // Paper end
diff --git a/patches/server/0017-Lagging-threshold.patch b/patches/server/0017-Lagging-threshold.patch
index 672124e42..110433bd7 100644
--- a/patches/server/0017-Lagging-threshold.patch
+++ b/patches/server/0017-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 827c079840eb8ad098db60176afa2e06c8ccc86b..85bab8904fd79018fd1a8639e1e77b5219f33ad8 100644
+index 9ca1ee5030e9139a6df25505ead8a52cceb4af38..44c5a1df4aa5d79e79315a4dc8792bc03fa62fee 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -306,6 +306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -41,10 +41,10 @@ index bc5f937e7480d954680c7b9f1d698aff3e28665d..c0e7027ad804d7b801ef8cb94963c113
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 11686b723e405996072086af82b1d5559dde7b3e..d82b7f25875ceef538b613af6091c9a13d40e67b 100644
+index 7dfd5688daf9d1af547773aa07c3733a707db556..9826257347888045b6f59d273c9c275653829d2b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2701,5 +2701,10 @@ public final class CraftServer implements Server {
+@@ -2729,5 +2729,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return this.getProperties().serverName;
      }
diff --git a/patches/server/0067-Add-canSaveToDisk-to-Entity.patch b/patches/server/0067-Add-canSaveToDisk-to-Entity.patch
index 0b67e9d2d..9f7cef87f 100644
--- a/patches/server/0067-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/server/0067-Add-canSaveToDisk-to-Entity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6dea19c28b66868ba10c4e51e3fca6f2ee6a366c..960568843ca01e140a1171d87dd969b6d1eb20d1 100644
+index 0d9a161e4e9e497104ebea60d89dbc702afe6fe0..160f08cc4cae0fbc7914e1589888a3fceb423b0a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4365,5 +4365,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4384,5 +4384,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      public boolean processClick(InteractionHand hand) {
          return false;
      }
diff --git a/patches/server/0071-Add-5-second-tps-average-in-tps.patch b/patches/server/0071-Add-5-second-tps-average-in-tps.patch
index 5c7d853a9..79b53a42d 100644
--- a/patches/server/0071-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0071-Add-5-second-tps-average-in-tps.patch
@@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
          setListData(vector);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a2bc085e75fd3355ff20dd22e5d1bf332db48479..41b58dae909445c677ce4b66a3f2020b9153d359 100644
+index 761f09ee70cc7c9eaeceead97b787badbf6dca2f..c4d33daf24df7c5955f282da312a2c9384de1ff4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -305,7 +305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -69,10 +69,10 @@ index a2bc085e75fd3355ff20dd22e5d1bf332db48479..41b58dae909445c677ce4b66a3f2020b
                          lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d82b7f25875ceef538b613af6091c9a13d40e67b..da98b04c22086df03a330cf747b2bf40182d2dea 100644
+index 9826257347888045b6f59d273c9c275653829d2b..64fa32a25e5e2d745d7605dfb1439f0e087dc304 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2483,6 +2483,7 @@ public final class CraftServer implements Server {
+@@ -2511,6 +2511,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {
diff --git a/patches/server/0082-Add-allow-water-in-end-world-option.patch b/patches/server/0082-Add-allow-water-in-end-world-option.patch
index 2c9096ebf..915227d25 100644
--- a/patches/server/0082-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0082-Add-allow-water-in-end-world-option.patch
@@ -27,10 +27,10 @@ index 69c992ef0c526adf35907de7726832605187beb6..6356d5fdb349063071c9119ae776c22e
  
                  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 4c55bb04ff41fabb47c6477ba33e0e0aabd1c843..25422752c79ea4ee547caa46fa4ed920622e682e 100644
+index d59f402622b93abc44b331f42cccdb785689aeda..4253e200927aeec8bc4805bd9b2cadcebdfcc1aa 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1583,4 +1583,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1585,4 +1585,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          }
  
      }
@@ -68,7 +68,7 @@ index df4f2c729f09d5229553308e4876f29de648543f..f2b0278679fa649bbc2904660e0dc9ab
          } else {
              world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState());
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e98257697af84bf7501ee40db0683ab8b9880ee6..a35d10d864418c06b8f4543d886ac14a1ba76a76 100644
+index c202cb7e325b8ace1ed3aa3ba86419d7571d0f0e..b2b7d0a89a6a0d3482caea8fcad1d46de7e4b8ee 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -244,6 +244,11 @@ public class PurpurConfig {
diff --git a/patches/server/0098-Stop-squids-floating-on-top-of-water.patch b/patches/server/0098-Stop-squids-floating-on-top-of-water.patch
index 032316799..2c9bd4a85 100644
--- a/patches/server/0098-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0098-Stop-squids-floating-on-top-of-water.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 960568843ca01e140a1171d87dd969b6d1eb20d1..901bd90ef1baf825c03738d6b361209b1294b257 100644
+index 160f08cc4cae0fbc7914e1589888a3fceb423b0a..d21d173ce17c7e8965c4cbce506e8c46eb21b615 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3877,11 +3877,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3896,11 +3896,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          this.yRotO = this.getYRot();
      }
  
diff --git a/patches/server/0101-Entities-can-use-portals-configuration.patch b/patches/server/0101-Entities-can-use-portals-configuration.patch
index b65a1f78c..137fe3c73 100644
--- a/patches/server/0101-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0101-Entities-can-use-portals-configuration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 901bd90ef1baf825c03738d6b361209b1294b257..93f5a5c57227921b6a9417f7369b69602afd2180 100644
+index d21d173ce17c7e8965c4cbce506e8c46eb21b615..e798ff01ad1cd7b94d644304d4949b0ef147dd51 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2734,7 +2734,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -17,7 +17,7 @@ index 901bd90ef1baf825c03738d6b361209b1294b257..93f5a5c57227921b6a9417f7369b6960
              if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
                  this.portalEntrancePos = pos.immutable();
              }
-@@ -3366,7 +3366,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3385,7 +3385,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      }
  
      public boolean canChangeDimensions() {
diff --git a/patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch
index 2f00e7dea..81adb5912 100644
--- a/patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch
+++ b/patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch
@@ -33,10 +33,10 @@ index 43841b5c77beb73169e2ff1645afe1234d8f74c7..d5d9f8e9c7119ae159a085aa414fc7f3
              entityageable.setBaby(true);
              entityageable.moveTo(this.getX(), this.getY(), this.getZ(), 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 25422752c79ea4ee547caa46fa4ed920622e682e..5e06dbb25359b593c6960652ee99f8227bf4deb0 100644
+index 4253e200927aeec8bc4805bd9b2cadcebdfcc1aa..e2d942fbc65c82e9e0d6b1ec81bb77b480ff7627 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -188,6 +188,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -189,6 +189,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
      // Paper end - fix and optimise world upgrading
  
@@ -86,7 +86,7 @@ index 25422752c79ea4ee547caa46fa4ed920622e682e..5e06dbb25359b593c6960652ee99f822
      public CraftWorld getWorld() {
          return this.world;
      }
-@@ -318,6 +361,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -319,6 +362,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), this.spigotConfig); // Paper
          this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((ServerLevel) this, ((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur
@@ -95,7 +95,7 @@ index 25422752c79ea4ee547caa46fa4ed920622e682e..5e06dbb25359b593c6960652ee99f822
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
          this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b285a01ab3dd34aefc5e082a60d762de454ac046..28d75a22b1197fb1451f0b1fe26c335494cea901 100644
+index 837197a340063bc8e3fb793e211828938e07b533..ac2c890ca61b5193a585eafb4e3f612ee8a2b8e3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -362,6 +362,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0200-Config-for-unverified-username-message.patch b/patches/server/0200-Config-for-unverified-username-message.patch
index 4469aa962..042985713 100644
--- a/patches/server/0200-Config-for-unverified-username-message.patch
+++ b/patches/server/0200-Config-for-unverified-username-message.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config for unverified username message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 01fee879c946b6640da34d5890d686f0152437dc..503db7080701bad3408c2feecde15cd45fcaeafa 100644
+index 494ca8fa8c742d4eac9fb11878d3b3170d850265..fd25d3bdc28d713159265911fab1b3d2e9375dbd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -306,7 +306,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -309,7 +309,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
                          ServerLoginPacketListenerImpl.this.gameProfile = ServerLoginPacketListenerImpl.this.createFakeProfile(gameprofile);
                          ServerLoginPacketListenerImpl.this.state = ServerLoginPacketListenerImpl.State.READY_TO_ACCEPT;
                      } else {
@@ -18,7 +18,7 @@ index 01fee879c946b6640da34d5890d686f0152437dc..503db7080701bad3408c2feecde15cd4
                      }
                  } catch (AuthenticationUnavailableException authenticationunavailableexception) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 238a33ff3fc9d70a625fec5c37ec83ccbe05792f..6f778d5725b05430598628ff34a7b99a8a400d93 100644
+index d9a818087f56237e0f31cf801c421ccc8dd6147e..cfce295c9dda1a558b19f8fdf4969c24f0d9f643 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -166,6 +166,7 @@ public class PurpurConfig {
diff --git a/patches/server/0204-API-for-any-mob-to-burn-daylight.patch b/patches/server/0204-API-for-any-mob-to-burn-daylight.patch
index ac4402080..76b84967f 100644
--- a/patches/server/0204-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0204-API-for-any-mob-to-burn-daylight.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <me@encode42.dev>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2be6fb58d3abc731dbf0ff911cad022b8c78875d..12662cb04b247bd46b3e1fab060e1c17a56e84a3 100644
+index d432cf2f9bbe539d572c226dbbe70354a09a9c22..6105519cb28da034a70c3330af7bae105b692866 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4378,5 +4378,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4397,5 +4397,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      public boolean canSaveToDisk() {
          return true;
      }
diff --git a/patches/server/0219-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0219-Redirect-System.out-calls-to-plugin-loggers.patch
index 0a7cb349c..29838b8b4 100644
--- a/patches/server/0219-Redirect-System.out-calls-to-plugin-loggers.patch
+++ b/patches/server/0219-Redirect-System.out-calls-to-plugin-loggers.patch
@@ -91,10 +91,10 @@ index 0000000000000000000000000000000000000000..f88da0b86a683b25d429ceea4a36d6dd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index da98b04c22086df03a330cf747b2bf40182d2dea..eadbc98e5833fca311ad5b52ba7a576d6e093039 100644
+index 64fa32a25e5e2d745d7605dfb1439f0e087dc304..1cdc15dc93b64887abbc5e7df1a91fc4705df169 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -287,7 +287,7 @@ public final class CraftServer implements Server {
+@@ -291,7 +291,7 @@ public final class CraftServer implements Server {
      public int reloadCount;
      private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
      public static Exception excessiveVelEx; // Paper - Velocity warnings
diff --git a/patches/server/0249-Added-the-ability-to-add-combustible-items.patch b/patches/server/0249-Added-the-ability-to-add-combustible-items.patch
index 42617aa01..c163b25fe 100644
--- a/patches/server/0249-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/server/0249-Added-the-ability-to-add-combustible-items.patch
@@ -51,10 +51,10 @@ index c5a6d8da56cb62cb96e2c9975abd32a93441859f..1d08c05181f310bc904f71a0d7085396
      private int maxStack = MAX_STACK;
      public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index eadbc98e5833fca311ad5b52ba7a576d6e093039..1ecad3983a64cfef99953357dd5bbde139fe969e 100644
+index 1cdc15dc93b64887abbc5e7df1a91fc4705df169..f0dd74a839295f6ac9afddc477759859c45ee0c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1383,6 +1383,19 @@ public final class CraftServer implements Server {
+@@ -1401,6 +1401,19 @@ public final class CraftServer implements Server {
          return true;
      }