diff --git a/gradle.properties b/gradle.properties
index 610e00013..f1d9d38aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.18.2-R0.1-SNAPSHOT
 
-paperCommit = c642d25f6373ab1c65273d8a607ebd5c140a6b04
+paperCommit = ce059b4f993faf1327f5acb6745e469215009808
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch
index e2ec51944..facb61f47 100644
--- a/patches/api/0001-Pufferfish-API-Changes.patch
+++ b/patches/api/0001-Pufferfish-API-Changes.patch
@@ -409,10 +409,10 @@ index b937441d2fb46b108644c49fcf073859765aa02e..d95b01bfd0657cf089c0f5412453cca0
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index bea2e464861771383f8fcf143fa817340cb8ab1d..cbda2ba8cb80d4f24cf4b4cd74c1fea6669273df 100644
+index bab8bb3a52cdeef5f7052d4e3f404c42f37d117d..dba9041784e7d3051b5248cbc24e4879e60103c1 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -616,7 +616,9 @@ public final class SimplePluginManager implements PluginManager {
+@@ -622,7 +622,9 @@ public final class SimplePluginManager implements PluginManager {
  
      // Paper start
      private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
@@ -422,7 +422,7 @@ index bea2e464861771383f8fcf143fa817340cb8ab1d..cbda2ba8cb80d4f24cf4b4cd74c1fea6
          callEvent(new ServerExceptionEvent(new ServerPluginEnableDisableException(msg, ex, plugin)));
      }
      // Paper end
-@@ -675,9 +677,11 @@ public final class SimplePluginManager implements PluginManager {
+@@ -681,9 +683,11 @@ public final class SimplePluginManager implements PluginManager {
                              ));
                  }
              } catch (Throwable ex) {
diff --git a/patches/api/0004-Purpur-config-files.patch b/patches/api/0004-Purpur-config-files.patch
index 3a75cd2af..2e95658d1 100644
--- a/patches/api/0004-Purpur-config-files.patch
+++ b/patches/api/0004-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 7a3a2ff605e06e42ba2a0263e2c50eed5c24f8e9..187d610fbd9707256d0af2f343bee95829e4efc6 100644
+index 0eda17c8642aa49c2f57c409c3bd3234948feae9..3fe569f79ee2f408553bfda0340b1d96a47dd770 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1899,6 +1899,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1902,6 +1902,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
  
diff --git a/patches/api/0005-Purpur-client-support.patch b/patches/api/0005-Purpur-client-support.patch
index c14f6dbc9..ea21d7d32 100644
--- a/patches/api/0005-Purpur-client-support.patch
+++ b/patches/api/0005-Purpur-client-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8ca135d2e3682581855399e7c6d07a2d13244600..efe1db718cbdbd15167b98a30b5987bf66a35e74 100644
+index e65dc831974ca501f69d2cc43858b838e8866676..65424451fb7fd05d37beb70cb7023b0a5f27dc8b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2696,4 +2696,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2693,4 +2693,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end
diff --git a/patches/api/0010-AFK-API.patch b/patches/api/0010-AFK-API.patch
index 8dda9c72e..ecc989194 100644
--- a/patches/api/0010-AFK-API.patch
+++ b/patches/api/0010-AFK-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index efe1db718cbdbd15167b98a30b5987bf66a35e74..d14c86066b61f28d1078fb426643fdfc0de4ab0e 100644
+index 65424451fb7fd05d37beb70cb7023b0a5f27dc8b..24eb17f307c8c6523cd804e8b330c7ae7dfc6404 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2704,5 +2704,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2701,5 +2701,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();
diff --git a/patches/api/0011-Bring-back-server-name.patch b/patches/api/0011-Bring-back-server-name.patch
index e85445fb4..553df0e3f 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 dcfd22862c79ae01ca7707d9abf0a71cc0d4ad9d..02eda647b3edce330251c97483d861a080238e37 100644
+index 5dc245bfbc1d466ab96294bbc10ead1fcec4f841..010f9d3a42dd998c7f7837157ef18699ba445ec1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2334,4 +2334,15 @@ public final class Bukkit {
+@@ -2370,4 +2370,15 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -25,10 +25,10 @@ index dcfd22862c79ae01ca7707d9abf0a71cc0d4ad9d..02eda647b3edce330251c97483d861a0
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 187d610fbd9707256d0af2f343bee95829e4efc6..ef034c77723ffff8eb70326d4952f8f169cb1932 100644
+index 3fe569f79ee2f408553bfda0340b1d96a47dd770..8357f802f60f146cbc08ea7991a3b3a24d8bc233 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2038,4 +2038,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2072,4 +2072,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
      // Paper end
diff --git a/patches/api/0014-Lagging-threshold.patch b/patches/api/0014-Lagging-threshold.patch
index adb0fb923..9162ac269 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 02eda647b3edce330251c97483d861a080238e37..3f173ab53030057aed17462c1e6345b8f1780167 100644
+index 010f9d3a42dd998c7f7837157ef18699ba445ec1..a5eb36738e6cbb55dc3a28467b062f014395e013 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2344,5 +2344,14 @@ public final class Bukkit {
+@@ -2380,5 +2380,14 @@ public final class Bukkit {
      public static String getServerName() {
          return server.getServerName();
      }
@@ -24,10 +24,10 @@ index 02eda647b3edce330251c97483d861a080238e37..3f173ab53030057aed17462c1e6345b8
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ef034c77723ffff8eb70326d4952f8f169cb1932..519067033f702620e9ccda7d3474d3acc3e14876 100644
+index 8357f802f60f146cbc08ea7991a3b3a24d8bc233..dbca73bfab240b5d207e9904b69be1481096f874 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2046,5 +2046,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2080,5 +2080,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      String getServerName();
diff --git a/patches/api/0017-Player-invulnerabilities.patch b/patches/api/0017-Player-invulnerabilities.patch
index d20f96a6b..7847ad91c 100644
--- a/patches/api/0017-Player-invulnerabilities.patch
+++ b/patches/api/0017-Player-invulnerabilities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d14c86066b61f28d1078fb426643fdfc0de4ab0e..9a3dc0fc7f68f109ff9d6511a733bcfc72cd2a96 100644
+index 24eb17f307c8c6523cd804e8b330c7ae7dfc6404..7913e9440a1068374a7129dac7cc2a6bc4fb2527 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2723,5 +2723,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2720,5 +2720,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();
diff --git a/patches/api/0028-Rabid-Wolf-API.patch b/patches/api/0028-Rabid-Wolf-API.patch
index 69d76374e..187103cda 100644
--- a/patches/api/0028-Rabid-Wolf-API.patch
+++ b/patches/api/0028-Rabid-Wolf-API.patch
@@ -17,10 +17,10 @@ index 2a8c6da0f9ffa1f94cfd37d1068511c8941d27ce..aa0a081819672c14d9f04c07f4685768
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Wolf.java b/src/main/java/org/bukkit/entity/Wolf.java
-index 490395f38c4d9977d30a6f48585a4ea0e7faff0f..c944a5a0e60469d42ac435878bda186f2b57b0df 100644
+index 297b65a6cf7d25f02bbd824ea507c5c083e0abec..f5f751678f3d14d2dcb8727c7e9d9db1ab1a44a7 100644
 --- a/src/main/java/org/bukkit/entity/Wolf.java
 +++ b/src/main/java/org/bukkit/entity/Wolf.java
-@@ -57,4 +57,20 @@ public interface Wolf extends Tameable, Sittable {
+@@ -59,4 +59,20 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
       */
      boolean isInterested();
      // Paper end
diff --git a/patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch b/patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch
index c5ee3834a..64b0da475 100644
--- a/patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch
+++ b/patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch
@@ -5,7 +5,7 @@ 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 3f173ab53030057aed17462c1e6345b8f1780167..47c455b7ce0a08d9cd1732a326f7bdce20defe7c 100644
+index a5eb36738e6cbb55dc3a28467b062f014395e013..791a6f13f7048e2c42f945f752f88fddd6825078 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -415,7 +415,7 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index 3f173ab53030057aed17462c1e6345b8f1780167..47c455b7ce0a08d9cd1732a326f7bdce
      public static int broadcast(@NotNull String message, @NotNull String permission) {
          return server.broadcast(message, permission);
      }
-@@ -1529,7 +1529,7 @@ public final class Bukkit {
+@@ -1532,7 +1532,7 @@ public final class Bukkit {
       *
       * @see InventoryType#isCreatable()
       */
@@ -35,7 +35,7 @@ index 3f173ab53030057aed17462c1e6345b8f1780167..47c455b7ce0a08d9cd1732a326f7bdce
      @NotNull
      public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
          return server.createInventory(owner, type, title);
-@@ -1579,7 +1579,7 @@ public final class Bukkit {
+@@ -1582,7 +1582,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 3f173ab53030057aed17462c1e6345b8f1780167..47c455b7ce0a08d9cd1732a326f7bdce
      @NotNull
      public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException {
          return server.createInventory(owner, size, title);
-@@ -1606,7 +1606,7 @@ public final class Bukkit {
+@@ -1609,7 +1609,7 @@ public final class Bukkit {
       * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
       */
      @NotNull
@@ -53,7 +53,7 @@ index 3f173ab53030057aed17462c1e6345b8f1780167..47c455b7ce0a08d9cd1732a326f7bdce
      public static Merchant createMerchant(@Nullable String title) {
          return server.createMerchant(title);
      }
-@@ -1730,7 +1730,7 @@ public final class Bukkit {
+@@ -1733,7 +1733,7 @@ public final class Bukkit {
       * @deprecated in favour of {@link #motd()}
       */
      @NotNull
@@ -62,7 +62,7 @@ index 3f173ab53030057aed17462c1e6345b8f1780167..47c455b7ce0a08d9cd1732a326f7bdce
      public static String getMotd() {
          return server.getMotd();
      }
-@@ -1752,7 +1752,7 @@ public final class Bukkit {
+@@ -1755,7 +1755,7 @@ public final class Bukkit {
       * @deprecated in favour of {@link #shutdownMessage()}
       */
      @Nullable
@@ -72,7 +72,7 @@ index 3f173ab53030057aed17462c1e6345b8f1780167..47c455b7ce0a08d9cd1732a326f7bdce
          return server.getShutdownMessage();
      }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 519067033f702620e9ccda7d3474d3acc3e14876..ca1295dfbd1ca547ebf2a0315a45914f0cf51396 100644
+index dbca73bfab240b5d207e9904b69be1481096f874..9f602f664cc468012a86971b6cbab9549771e723 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -327,7 +327,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -93,7 +93,7 @@ index 519067033f702620e9ccda7d3474d3acc3e14876..ca1295dfbd1ca547ebf2a0315a45914f
      public int broadcast(@NotNull String message, @NotNull String permission);
      // Paper start
      /**
-@@ -1288,7 +1288,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1291,7 +1291,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @see InventoryType#isCreatable()
       */
@@ -102,7 +102,7 @@ index 519067033f702620e9ccda7d3474d3acc3e14876..ca1295dfbd1ca547ebf2a0315a45914f
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
  
-@@ -1332,7 +1332,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1335,7 +1335,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 519067033f702620e9ccda7d3474d3acc3e14876..ca1295dfbd1ca547ebf2a0315a45914f
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException;
  
-@@ -1355,7 +1355,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1358,7 +1358,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 519067033f702620e9ccda7d3474d3acc3e14876..ca1295dfbd1ca547ebf2a0315a45914f
      Merchant createMerchant(@Nullable String title);
  
      /**
-@@ -1458,7 +1458,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1461,7 +1461,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @deprecated in favour of {@link #motd()}
       */
      @NotNull
@@ -129,7 +129,7 @@ index 519067033f702620e9ccda7d3474d3acc3e14876..ca1295dfbd1ca547ebf2a0315a45914f
      String getMotd();
  
      // Paper start
-@@ -1476,7 +1476,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1479,7 +1479,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @deprecated in favour of {@link #shutdownMessage()}
       */
      @Nullable
@@ -170,7 +170,7 @@ index c8d37184d8e882a4084a1bfef85faa330588600b..46bae5c13ce2b973b114682f6a338981
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9a3dc0fc7f68f109ff9d6511a733bcfc72cd2a96..85bce5517a775af872a0e5d0a847e5137bbf8a34 100644
+index 7913e9440a1068374a7129dac7cc2a6bc4fb2527..bb2ffe33a285f2e453ffe195cc7217a047ae9c7a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -73,7 +73,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -281,7 +281,7 @@ index 9a3dc0fc7f68f109ff9d6511a733bcfc72cd2a96..85bce5517a775af872a0e5d0a847e513
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
  
      /**
-@@ -2236,7 +2236,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2233,7 +2233,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @deprecated in favour of {@link #locale()}
       */
      @NotNull
@@ -790,10 +790,10 @@ index fc3456bb79f2fe1504359455b937c162780110c2..c39ca39190c8eacff9e68ef2edd54d81
  
      /**
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9c43898d4 100644
+index 0f5c49d41c9460da0ba913b4ca8bef375f2c23df..7056cbce8405a4849694f2a8a7bef88c264c3da2 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
-@@ -108,7 +108,7 @@ public interface Team {
+@@ -117,7 +117,7 @@ public interface Team {
       * @deprecated in favour of {@link #displayName()}
       */
      @NotNull
@@ -802,7 +802,7 @@ index 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9
      String getDisplayName() throws IllegalStateException;
  
      /**
-@@ -120,7 +120,7 @@ public interface Team {
+@@ -129,7 +129,7 @@ public interface Team {
       * @throws IllegalStateException if this team has been unregistered
       * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)}
       */
@@ -811,7 +811,7 @@ index 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9
      void setDisplayName(@NotNull String displayName) throws IllegalStateException, IllegalArgumentException;
  
      /**
-@@ -131,7 +131,7 @@ public interface Team {
+@@ -140,7 +140,7 @@ public interface Team {
       * @deprecated in favour of {@link #prefix()}
       */
      @NotNull
@@ -820,7 +820,7 @@ index 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9
      String getPrefix() throws IllegalStateException;
  
      /**
-@@ -144,7 +144,7 @@ public interface Team {
+@@ -153,7 +153,7 @@ public interface Team {
       * @throws IllegalStateException if this team has been unregistered
       * @deprecated in favour of {@link #prefix(net.kyori.adventure.text.Component)}
       */
@@ -829,7 +829,7 @@ index 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9
      void setPrefix(@NotNull String prefix) throws IllegalStateException, IllegalArgumentException;
  
      /**
-@@ -155,7 +155,7 @@ public interface Team {
+@@ -164,7 +164,7 @@ public interface Team {
       * @deprecated in favour of {@link #suffix()}
       */
      @NotNull
@@ -838,7 +838,7 @@ index 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9
      String getSuffix() throws IllegalStateException;
  
      /**
-@@ -168,7 +168,7 @@ public interface Team {
+@@ -177,7 +177,7 @@ public interface Team {
       * @throws IllegalStateException if this team has been unregistered
       * @deprecated in favour of {@link #suffix(net.kyori.adventure.text.Component)}
       */
@@ -847,7 +847,7 @@ index 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9
      void setSuffix(@NotNull String suffix) throws IllegalStateException, IllegalArgumentException;
  
      /**
-@@ -182,7 +182,7 @@ public interface Team {
+@@ -191,7 +191,7 @@ public interface Team {
       * @deprecated in favour of {@link #color()}
       */
      @NotNull
@@ -856,7 +856,7 @@ index 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9
      ChatColor getColor() throws IllegalStateException;
  
      /**
-@@ -195,7 +195,7 @@ public interface Team {
+@@ -204,7 +204,7 @@ public interface Team {
       * no color
       * @deprecated in favour of {@link #color(net.kyori.adventure.text.format.NamedTextColor)}
       */
diff --git a/patches/api/0036-Flying-Fall-Damage-API.patch b/patches/api/0036-Flying-Fall-Damage-API.patch
index 994ad3c52..94d38f844 100644
--- a/patches/api/0036-Flying-Fall-Damage-API.patch
+++ b/patches/api/0036-Flying-Fall-Damage-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 85bce5517a775af872a0e5d0a847e5137bbf8a34..f2d260146f8ca9297d8ef257ffa1fdb3652a00e2 100644
+index bb2ffe33a285f2e453ffe195cc7217a047ae9c7a..094b3622db6d5744eb6831f070eaff603be30d8d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2744,5 +2744,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2741,5 +2741,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);
diff --git a/patches/api/0042-Added-the-ability-to-add-combustible-items.patch b/patches/api/0042-Added-the-ability-to-add-combustible-items.patch
index 5646dda67..64172a1fe 100644
--- a/patches/api/0042-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/api/0042-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 47c455b7ce0a08d9cd1732a326f7bdce20defe7c..689b16c3c582da7d35746b1d799426c0ecf593b7 100644
+index 791a6f13f7048e2c42f945f752f88fddd6825078..171eb247b083e2d665bfee0a2f7ed9e29f728abb 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2353,5 +2353,24 @@ public final class Bukkit {
+@@ -2389,5 +2389,24 @@ public final class Bukkit {
      public static boolean isLagging() {
          return server.isLagging();
      }
@@ -34,10 +34,10 @@ index 47c455b7ce0a08d9cd1732a326f7bdce20defe7c..689b16c3c582da7d35746b1d799426c0
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ca1295dfbd1ca547ebf2a0315a45914f0cf51396..4e26a6d95c1d8468c0b9cea8d49fafdc4f64d4f9 100644
+index 9f602f664cc468012a86971b6cbab9549771e723..e15b869241113633ed0ded1d49c805ef7b40460c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2053,5 +2053,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2087,5 +2087,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return True if lagging
       */
      boolean isLagging();
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch
index 6b5648167..cf52fb37e 100644
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -629,7 +629,7 @@ index 0000000000000000000000000000000000000000..020368da69b9a492155f6de6297f7473
 +}
 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..bd01a39767f65d959060b890afe7f9d8d426d70a
+index 0000000000000000000000000000000000000000..a820bfe38cb5765ee74c4fd7084d949477f83692
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 @@ -0,0 +1,293 @@
@@ -921,8 +921,8 @@ index 0000000000000000000000000000000000000000..bd01a39767f65d959060b890afe7f9d8
 +
 +    public static boolean disableMethodProfiler;
 +    private static void miscSettings() {
-+        disableMethodProfiler = config.getBoolean("misc.disable-method-profiler", true);
-+        config.setComment("misc", "Settings for things that don't belong elsewhere");
++        disableMethodProfiler = getBoolean("misc.disable-method-profiler", true);
++        setComment("misc", "Settings for things that don't belong elsewhere");
 +    }
 +
 +}
@@ -2427,7 +2427,7 @@ index 50fd3419deb668dda64b1056f03fb66da55e6960..c63ee396e990d11e2f613f3b5a478b48
              this.getRandomBlockPosition(j, 0, k, 15, blockposition);
              int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9df5b678ce4343d0bb54133393f6bbe40fe5366b..350a64a1864780c192436c7819991881a94d281c 100644
+index 1a87f61d534ed531132fb43a9d2a45a4b604a6fc..cc6ba95f01b82c42b4e5a0a70721ef00dd335e57 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1116,6 +1116,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -4121,7 +4121,7 @@ index b1992ed5136cc7dcf04219868b94b3c37ae36b4b..5b5339cba819368f4d6b7eaf404fa59b
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 16d3f2dce44fc374ec3ab5882135d06113681fb6..cca4ae47f80c45e64b4e0915d938e6e394a39b8e 100644
+index 15278bb897e6169bc5d02bf47b455634baec7be1..f4a82b1f2dc26f938d3dcb23ec32f135a1bfd163 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
@@ -4233,7 +4233,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..80553face9c70c2a3d897681e7761df8
  
          if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 8bd8b85445b2b0b6517590baef33bb4234bb2a38..59a6cb575e40465275184cb816c862c79995c729 100644
+index 5bffc9a0f6ef9d54abb359565d07509b177c2b82..9bccf9ae5f7a38eb5792697700f6d17cd5969cbe 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -38,6 +38,10 @@ import co.aikar.timings.MinecraftTimings;
@@ -4284,7 +4284,7 @@ index 8bd8b85445b2b0b6517590baef33bb4234bb2a38..59a6cb575e40465275184cb816c862c7
                  entity.activatedTick = MinecraftServer.currentTick;
              }
          }
-@@ -284,7 +303,7 @@ public class ActivationRange
+@@ -290,7 +309,7 @@ public class ActivationRange
          if ( entity instanceof LivingEntity )
          {
              LivingEntity living = (LivingEntity) entity;
diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch
index 72b3f4537..035d6f93d 100644
--- a/patches/server/0003-Purpur-config-files.patch
+++ b/patches/server/0003-Purpur-config-files.patch
@@ -64,7 +64,7 @@ index 00bbf33aa44e2d5a4e755a2d7c1a60de9e36674f..9d884da26e6515a85b0a8f8f611fafc1
          if (this.source.acceptsSuccess() && !this.silent) {
              this.source.sendMessage(message, Util.NIL_UUID);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 1ea4178976e1583b6b0f71b26d00c024bc2ef49c..0df8172bc3a5621c2d23b036ce2e5879650757b5 100644
+index db2c73390d846f6428546fe18b961147ac092ba2..a4a07a7cc9a33f01234e461aa3c19e1c2e4d6aef 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -231,6 +231,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -105,7 +105,7 @@ index 8026e8ca528071bf80fecb5e96370d1d2ae799db..f16e21045f3a6b8c0446c72825b463ee
          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 de1f35271ca1ab711d2d9301c4c695219c7e170d..805b3c13098ccaa5ad490fff5804fbb53dd808ed 100644
+index a2af4e9b32f9ebfb97255437a7028df8613d0d95..283856f60d27dcd041b16f313c6119127f4aeea6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -956,6 +956,7 @@ public final class CraftServer implements Server {
@@ -132,7 +132,7 @@ index de1f35271ca1ab711d2d9301c4c695219c7e170d..805b3c13098ccaa5ad490fff5804fbb5
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2705,6 +2708,18 @@ public final class CraftServer implements Server {
+@@ -2706,6 +2709,18 @@ public final class CraftServer implements Server {
              return com.destroystokyo.paper.PaperConfig.config;
          }
  
diff --git a/patches/server/0012-Bring-back-server-name.patch b/patches/server/0012-Bring-back-server-name.patch
index 696c2fb90..bcf79e145 100644
--- a/patches/server/0012-Bring-back-server-name.patch
+++ b/patches/server/0012-Bring-back-server-name.patch
@@ -17,10 +17,10 @@ index ebfaa8d5de5b905bd2dd7778728b8c9939d01252..8153f1aa510474d2f831799a1c149558
      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 805b3c13098ccaa5ad490fff5804fbb53dd808ed..be04422bdd987658f6c90b55816c277ddb72b25a 100644
+index 283856f60d27dcd041b16f313c6119127f4aeea6..a6f170413a486efb2d48af55604b130782f4f157 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2884,4 +2884,11 @@ public final class CraftServer implements Server {
+@@ -2893,4 +2893,11 @@ public final class CraftServer implements Server {
      }
  
      // Paper end
diff --git a/patches/server/0015-Lagging-threshold.patch b/patches/server/0015-Lagging-threshold.patch
index 82c127bfb..c9f827bbc 100644
--- a/patches/server/0015-Lagging-threshold.patch
+++ b/patches/server/0015-Lagging-threshold.patch
@@ -25,10 +25,10 @@ index 8e7f73cfdc4dd86babe6a17fe06c80a011f20d90..f4d9170b11ba4eab8763261bf4fd0288
                      }
                      // Spigot end
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index be04422bdd987658f6c90b55816c277ddb72b25a..7e8cecb3eca0b6d7d1dc7e3992cb069694332fd6 100644
+index a6f170413a486efb2d48af55604b130782f4f157..b62e5ce31a0a259e2abd96252598f91935ef6c4a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2890,5 +2890,10 @@ public final class CraftServer implements Server {
+@@ -2899,5 +2899,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return this.getProperties().serverName;
      }
diff --git a/patches/server/0066-Add-5-second-tps-average-in-tps.patch b/patches/server/0066-Add-5-second-tps-average-in-tps.patch
index 961dc3cca..3e344f529 100644
--- a/patches/server/0066-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0066-Add-5-second-tps-average-in-tps.patch
@@ -69,10 +69,10 @@ index 4395d8260c4ca727515d9c907cb79da2d36642b2..d011944a64c4e61b7285325a37ab05a5
                          lagging = recentTps[0] < org.purpurmc.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 7e8cecb3eca0b6d7d1dc7e3992cb069694332fd6..135feed0e4fcccd1c694aa89cd18f0969e49d18a 100644
+index b62e5ce31a0a259e2abd96252598f91935ef6c4a..137c90bd9df8c8f28d5b61b1ad12bebd7613de34 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2662,6 +2662,7 @@ public final class CraftServer implements Server {
+@@ -2663,6 +2663,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {
diff --git a/patches/server/0081-Squid-EAR-immunity.patch b/patches/server/0081-Squid-EAR-immunity.patch
index a0e280de0..d2b5ea51b 100644
--- a/patches/server/0081-Squid-EAR-immunity.patch
+++ b/patches/server/0081-Squid-EAR-immunity.patch
@@ -25,7 +25,7 @@ index a9a3f13a64cd7d9152f65285a5f5f48f5a31b7a3..e480e61419a9b83e98fcd0ba8a949c20
  
      public boolean spiderRidable = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index d3c84417596a56e38012f2d0cee4203a1b875ac2..b72234ede04005c8d2be1e339f5bcebd7790bb61 100644
+index 06467a5af27a9afeba383c4f9704f5106827af97..3b67e9a9e0a0dc8ca19ea7b20c676fae3cf64a11 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -15,6 +15,7 @@ import net.minecraft.world.entity.ambient.AmbientCreature;
@@ -36,7 +36,7 @@ index d3c84417596a56e38012f2d0cee4203a1b875ac2..b72234ede04005c8d2be1e339f5bcebd
  import net.minecraft.world.entity.animal.WaterAnimal;
  import net.minecraft.world.entity.animal.horse.Llama;
  import net.minecraft.world.entity.boss.EnderDragonPart;
-@@ -385,6 +386,7 @@ public class ActivationRange
+@@ -391,6 +392,7 @@ public class ActivationRange
       */
      public static boolean checkIfActive(Entity entity)
      {
diff --git a/patches/server/0123-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0123-Configurable-chance-for-wolves-to-spawn-rabid.patch
index caccdb3d9..ec5dcf767 100644
--- a/patches/server/0123-Configurable-chance-for-wolves-to-spawn-rabid.patch
+++ b/patches/server/0123-Configurable-chance-for-wolves-to-spawn-rabid.patch
@@ -7,7 +7,7 @@ Configurable chance to spawn a wolf that is rabid.
 Rabid wolves attack all players, mobs, and animals.
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index ed6a552fab01b1391cf98fdbb51f7f47f72de932..ae2ee87ccf3bf547750e8ed7c98029ed9de4806d 100644
+index 702a4b674013a455d179d88d3931f6c216c1ca89..61057ef26cf13a91a1c49d1a3c6383a0da75b77c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -11,15 +11,19 @@ import net.minecraft.network.syncher.EntityDataAccessor;
@@ -178,7 +178,7 @@ index ed6a552fab01b1391cf98fdbb51f7f47f72de932..ae2ee87ccf3bf547750e8ed7c98029ed
              this.interestedAngleO = this.interestedAngle;
              if (this.isInterested()) {
                  this.interestedAngle += (1.0F - this.interestedAngle) * 0.4F;
-@@ -452,6 +532,20 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -459,6 +539,20 @@ public class Wolf extends TamableAnimal implements NeutralMob {
  
                  return InteractionResult.SUCCESS;
              }
diff --git a/patches/server/0139-Config-to-always-tame-in-Creative.patch b/patches/server/0139-Config-to-always-tame-in-Creative.patch
index fa5e101e1..abf5f5920 100644
--- a/patches/server/0139-Config-to-always-tame-in-Creative.patch
+++ b/patches/server/0139-Config-to-always-tame-in-Creative.patch
@@ -20,10 +20,10 @@ index 5c64905e90ccca6e0b347241ddf9cc3f71058b8e..3bd7521b131b2b40f807bdc7ab95e64c
                      return;
                  }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 44ce32655ce8dcf14b3c2c4d8772ad38b00d0be0..8d49f4c9d5d9a0f4dc4a1c1dcdcc7bfc678d8de3 100644
+index 31930b5936dcaea92afc54a583efcd5c3cedac3b..9edd8b89abaa9a41dd50d859878703c02e514fd3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -494,7 +494,7 @@ public class Cat extends TamableAnimal {
+@@ -501,7 +501,7 @@ public class Cat extends TamableAnimal {
                  }
              } else if (this.isFood(itemstack)) {
                  this.usePlayerItem(player, hand, itemstack);
@@ -46,10 +46,10 @@ index c35644499f4501fb9d1f2ed3551949a38f3464ca..c266028b96dcdb4d6dbb161a5f16be0d
                      this.level.broadcastEntityEvent(this, (byte) 7);
                  } else {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 8ca97562ef182a461b4dccdd2eb68dc919fc3634..3ee87e888b048dd3272a633b40b5987276b30155 100644
+index 79fdf8f0512fb9bff730b0a3674aba2f121dbb6f..303ac9f3941d6759b42ac1cae2586b4df3d9faaf 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -531,7 +531,7 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -538,7 +538,7 @@ public class Wolf extends TamableAnimal implements NeutralMob {
                  }
  
                  // CraftBukkit - added event call and isCancelled check.
diff --git a/patches/server/0154-Sneak-to-bulk-process-composter.patch b/patches/server/0154-Sneak-to-bulk-process-composter.patch
index 89c268203..8cc112f89 100644
--- a/patches/server/0154-Sneak-to-bulk-process-composter.patch
+++ b/patches/server/0154-Sneak-to-bulk-process-composter.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Sneak to bulk process composter
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 891199d02539fa46454cd0aa7c133637e5dc8235..14465d6368ee5866bc04efe7f9e2023f60f39202 100644
+index 415b6c2bbf11c5a2ac75d18f52b93f80b9e14fe4..a0e5ec1a3129fdb4facfbef936b68c43d2d2f710 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -592,7 +592,7 @@ public class ServerPlayerGameMode {
+@@ -603,7 +603,7 @@ public class ServerPlayerGameMode {
              boolean flag1 = player.isSecondaryUseActive() && flag;
              ItemStack itemstack1 = stack.copy();
  
diff --git a/patches/server/0185-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0185-ShulkerBox-allow-oversized-stacks.patch
index f0d03b5e5..32ed3a79b 100644
--- a/patches/server/0185-ShulkerBox-allow-oversized-stacks.patch
+++ b/patches/server/0185-ShulkerBox-allow-oversized-stacks.patch
@@ -9,20 +9,20 @@ creating an itemstack using the TileEntity's NBT data (how it handles it for
 creative players) instead of routing it through the LootableBuilder.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 6918bf8f20149042e760a283dceeedfae3c97e3c..ac151f2e519a3544f38b9c6ef87c41a2bf4e9c4c 100644
+index 464e304c532c1af48914d3cfad86380e8b4a096d..302203e64277932ecb224edd3768dace07bd9d94 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -459,7 +459,7 @@ public class ServerPlayerGameMode {
-                     block.destroy(this.level, pos, iblockdata);
-                 }
+@@ -461,7 +461,7 @@ public class ServerPlayerGameMode {
  
+                 ItemStack mainHandStack = null; // Paper
+                 boolean isCorrectTool = false; // Paper
 -                if (this.isCreative()) {
 +                if (this.isCreative() || (this.level.purpurConfig.shulkerBoxAllowOversizedStacks && block instanceof net.minecraft.world.level.block.ShulkerBoxBlock)) { // Purpur
                      // return true; // CraftBukkit
                  } else {
                      ItemStack itemstack = this.player.getMainHandItem();
 diff --git a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
-index 7f1230d915c98b6f30b13a06c2788bc2f7b7e912..9439119a70a411b1a7d9cd6a0090e4133ac744a3 100644
+index 7f1230d915c98b6f30b13a06c2788bc2f7b7e912..d363d79a62c99371e03640814912f86d23108d18 100644
 --- a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
 @@ -123,7 +123,7 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
@@ -30,7 +30,7 @@ index 7f1230d915c98b6f30b13a06c2788bc2f7b7e912..9439119a70a411b1a7d9cd6a0090e413
          if (blockEntity instanceof ShulkerBoxBlockEntity) {
              ShulkerBoxBlockEntity shulkerBoxBlockEntity = (ShulkerBoxBlockEntity)blockEntity;
 -            if (!world.isClientSide && player.isCreative() && !shulkerBoxBlockEntity.isEmpty()) {
-+            if (world.purpurConfig.shulkerBoxAllowOversizedStacks || (player.isCreative() && !shulkerBoxBlockEntity.isEmpty())) { // Purpur
++            if (world.purpurConfig.shulkerBoxAllowOversizedStacks || (!world.isClientSide && player.isCreative() && !shulkerBoxBlockEntity.isEmpty())) { // Purpur
                  ItemStack itemStack = getColoredItemStack(this.getColor());
                  blockEntity.saveToItem(itemStack);
                  if (shulkerBoxBlockEntity.hasCustomName()) {
diff --git a/patches/server/0202-Armor-click-equip-options.patch b/patches/server/0202-Armor-click-equip-options.patch
index 3d7c8d09f..992ecd4d9 100644
--- a/patches/server/0202-Armor-click-equip-options.patch
+++ b/patches/server/0202-Armor-click-equip-options.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Armor click equip options
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index ac151f2e519a3544f38b9c6ef87c41a2bf4e9c4c..c42e6e74075f9513d3b3f2006fb5117743289516 100644
+index 302203e64277932ecb224edd3768dace07bd9d94..f9f7afa0bf2989aaef2f0e8456fe3c93a226b6d0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -509,7 +509,7 @@ public class ServerPlayerGameMode {
+@@ -520,7 +520,7 @@ public class ServerPlayerGameMode {
                  return interactionresultwrapper.getResult();
              } else {
                  player.setItemInHand(hand, itemstack1);
diff --git a/patches/server/0228-Added-the-ability-to-add-combustible-items.patch b/patches/server/0228-Added-the-ability-to-add-combustible-items.patch
index a2fc42474..a46251a43 100644
--- a/patches/server/0228-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/server/0228-Added-the-ability-to-add-combustible-items.patch
@@ -51,10 +51,10 @@ index 99c207457ec9d1a1b7d9e7becfcc8aae383e93ae..158945281178c80495f1dc2125ea21a2
      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 135feed0e4fcccd1c694aa89cd18f0969e49d18a..b76c09b3472d2ac213973a3d6b3fcd5a494204a6 100644
+index 137c90bd9df8c8f28d5b61b1ad12bebd7613de34..4e77c53b488e4e82454df66a852f7271e80526ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1426,6 +1426,19 @@ public final class CraftServer implements Server {
+@@ -1427,6 +1427,19 @@ public final class CraftServer implements Server {
          return true;
      }
  
diff --git a/patches/server/0231-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0231-Shift-right-click-to-use-exp-for-mending.patch
index 32da99eba..7a294ad48 100644
--- a/patches/server/0231-Shift-right-click-to-use-exp-for-mending.patch
+++ b/patches/server/0231-Shift-right-click-to-use-exp-for-mending.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Shift right click to use exp for mending
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index c42e6e74075f9513d3b3f2006fb5117743289516..1c4fe18c814a48997f5fd4cf07b796cde9838188 100644
+index f9f7afa0bf2989aaef2f0e8456fe3c93a226b6d0..00dee850e9ae93ed4e8209c67da2da6aac8ae22a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -536,6 +536,7 @@ public class ServerPlayerGameMode {
+@@ -547,6 +547,7 @@ public class ServerPlayerGameMode {
      public InteractionHand interactHand;
      public ItemStack interactItemStack;
      public InteractionResult useItemOn(ServerPlayer player, Level world, ItemStack stack, InteractionHand hand, BlockHitResult hitResult) {
@@ -16,7 +16,7 @@ index c42e6e74075f9513d3b3f2006fb5117743289516..1c4fe18c814a48997f5fd4cf07b796cd
          BlockPos blockposition = hitResult.getBlockPos();
          BlockState iblockdata = world.getBlockState(blockposition);
          InteractionResult enuminteractionresult = InteractionResult.PASS;
-@@ -629,4 +630,18 @@ public class ServerPlayerGameMode {
+@@ -640,4 +641,18 @@ public class ServerPlayerGameMode {
      public void setLevel(ServerLevel world) {
          this.level = world;
      }
@@ -36,7 +36,7 @@ index c42e6e74075f9513d3b3f2006fb5117743289516..1c4fe18c814a48997f5fd4cf07b796cd
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8b3f97a5d2707cb4470685aa95fbca405d365ad1..74edfa3738468feacfc7e82b4893a1efc9f3198f 100644
+index 80a8bd732d7840a441aae23a558c1aed68b2dce7..a0965856851a4a3337c55d9796952737bb63b26d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1979,6 +1979,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser