diff --git a/gradle.properties b/gradle.properties
index 86d141613..f2b7ca4a0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.18.1-R0.1-SNAPSHOT
 mcVersion = 1.18.1
 packageVersion = 1_18_R1
 
-paperCommit = 0a9602c4127beb7d8979d812bec0e587356d4bfb
+paperCommit = 9490475b02446b0839846c86fb52e4e27e0ab3a2
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0007-Ridables.patch b/patches/api/0007-Ridables.patch
index 1f4df6e67..f80815a76 100644
--- a/patches/api/0007-Ridables.patch
+++ b/patches/api/0007-Ridables.patch
@@ -22,10 +22,10 @@ index 2405254739a83b2fb517da7fa4ea0721c68f9f6d..dc0535d5ea5b2f4002a428ec64ea52fe
       * @deprecated removed in 1.16
       */
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 51ec2e4ec4239659272bba3d6ba2ad73926ebb88..a032bc5aaa0d7abffa9ec91fca397c47b2dac4a8 100644
+index c2c45a93887f99466a8ac4275355ac75c7f901c4..768cfcbf9b780a00aa93247ee43bd51eb636c2e7 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -802,4 +802,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -822,4 +822,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      boolean isInPowderedSnow();
      // Paper end
diff --git a/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch
index 1c47a3a35..539305aa7 100644
--- a/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch
+++ b/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch
@@ -752,16 +752,19 @@ index ec8443b67014c0129256c9227cc89686422b9217..6b41e09d6ed075aae5455929b5b29efb
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Dolphin.java b/src/main/java/org/bukkit/entity/Dolphin.java
-index f00eaadcdde7ceef95def2d8ec6eb63a76c177bd..a4a645799d82c730e3280519facf1347d26a859f 100644
+index 8ab329946daaff25646f3dd4582feb9e4c0685ca..52c96388a05c31c05373e03dbb67c8d237f8d894 100644
 --- a/src/main/java/org/bukkit/entity/Dolphin.java
 +++ b/src/main/java/org/bukkit/entity/Dolphin.java
-@@ -1,3 +1,6 @@
- package org.bukkit.entity;
+@@ -2,6 +2,9 @@ package org.bukkit.entity;
+ 
+ import org.bukkit.Location;
  
 +/**
 + * Represents a dolphin
 + */
- public interface Dolphin extends WaterMob { }
+ public interface Dolphin extends WaterMob { // Paper start - Dolphin API
+ 
+     /**
 diff --git a/src/main/java/org/bukkit/entity/DragonFireball.java b/src/main/java/org/bukkit/entity/DragonFireball.java
 index 6c475a3723721b33bb7709d8c1bbf487a10f9bbe..210d955e9bbb669c8ce644c935c1607ae8e7419b 100644
 --- a/src/main/java/org/bukkit/entity/DragonFireball.java
@@ -787,10 +790,10 @@ index 9e7f42caab1204036f4203354c115fd40c6def92..f76ddd80f9fc926f73b1cc50f0a2767a
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index a032bc5aaa0d7abffa9ec91fca397c47b2dac4a8..568836b589f4f81d8b3e715b39b90e5172215273 100644
+index 768cfcbf9b780a00aa93247ee43bd51eb636c2e7..5c65100b8f442c5e034531b0ae16b2e1fe5d3e0f 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -668,6 +668,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -688,6 +688,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      Pose getPose();
  
      // Spigot start
@@ -800,7 +803,7 @@ index a032bc5aaa0d7abffa9ec91fca397c47b2dac4a8..568836b589f4f81d8b3e715b39b90e51
      public class Spigot extends CommandSender.Spigot {
  
      }
-@@ -728,36 +731,50 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -748,36 +751,50 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
  
      /**
       * Check if entity is in rain
diff --git a/patches/api/0036-API-for-any-mob-to-burn-daylight.patch b/patches/api/0036-API-for-any-mob-to-burn-daylight.patch
index b1a8f600b..2b66fb0f1 100644
--- a/patches/api/0036-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/api/0036-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/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 568836b589f4f81d8b3e715b39b90e5172215273..b2504a24ee2cc142f7b07fa5a908c0c693f18b8b 100644
+index 5c65100b8f442c5e034531b0ae16b2e1fe5d3e0f..f0254799088d5343ef5c0c0a2841a6b51f17d14f 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -849,5 +849,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -869,5 +869,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if ridable in water
       */
      boolean isRidableInWater();
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch
index 328581696..38f3dee2d 100644
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -2536,7 +2536,7 @@ index 7437f01ca8f416e2c9150250e324af4725a4efb6..7ac51dbfce18a2bc52faa7a915abeccc
      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 eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0fab09101e 100644
+index 4584dcec835f97e94dcf12788b66703075dafe45..e0c91bc518168441fffa32f4c611a74800a8d2e2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -227,7 +227,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -2548,7 +2548,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
      private ChunkPos chunkPosition;
      private Vec3 deltaMovement;
      public float yRot; // Paper - private->public
-@@ -348,6 +348,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -349,6 +349,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          return this.originWorld;
      }
      // Paper end
@@ -2560,7 +2560,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
      public float getBukkitYaw() {
          return this.yRot;
      }
-@@ -371,17 +376,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -372,17 +377,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          this.isLegacyTrackingEntity = isLegacyTrackingEntity;
      }
  
@@ -2598,7 +2598,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
          for (Entity passenger : passengers) {
              org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
              int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
-@@ -390,6 +414,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -391,6 +415,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
                  range = passengerRange;
              }
          }
@@ -2608,7 +2608,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
  
          return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
      }
-@@ -3860,16 +3887,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3867,16 +3894,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      }
  
      public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> tag, double speed) {
@@ -2634,7 +2634,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -3877,14 +3906,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3884,14 +3913,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
  
@@ -2702,7 +2702,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
  
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -3906,9 +3982,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3913,9 +3989,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
                                  // CraftBukkit end
                              }
                          }
@@ -2728,7 +2728,7 @@ index 419a7e9614af2328ed401fc954196056243a984c..9bc568a2b0df13f55ee8670839b9e6a6
      public final String id;
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 44a32fd2c08a09af0bba01547847b8594a7cd077..eeef768b8a4235276812ac060da5505274688a57 100644
+index 25338fe4cfdc683ca4c01487e166a1649c6f640b..a6681690e1e556440320c492bf2a8e617008baa1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -139,7 +139,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch
index dac641018..2cecc4c58 100644
--- a/patches/server/0003-Purpur-config-files.patch
+++ b/patches/server/0003-Purpur-config-files.patch
@@ -172,7 +172,7 @@ index 55bae3efbc630be6d40d415509de4c3e744a5004..9d649923e28f4839106b336fce41bd3f
                          .withRequiredArg()
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..720233b1dce48d23c5852765c8614ee86dc14695
+index 0000000000000000000000000000000000000000..96802b86828522006d4a25ab61e6630173688679
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -0,0 +1,170 @@
@@ -250,8 +250,8 @@ index 0000000000000000000000000000000000000000..720233b1dce48d23c5852765c8614ee8
 +        commands = new HashMap<>();
 +        commands.put("purpur", new PurpurCommand("purpur"));
 +
-+        version = getInt("config-version", 25);
-+        set("config-version", 25);
++        version = getInt("config-version", 26);
++        set("config-version", 26);
 +
 +        readConfig(PurpurConfig.class, null);
 +    }
diff --git a/patches/server/0005-Component-related-conveniences.patch b/patches/server/0005-Component-related-conveniences.patch
index e28937e1a..2f1675960 100644
--- a/patches/server/0005-Component-related-conveniences.patch
+++ b/patches/server/0005-Component-related-conveniences.patch
@@ -123,10 +123,10 @@ index a828cad27fcd39f8bfbaefa97052a2a3b6650ee7..19d6165f266fcc39bc3533042109ef1b
          return this.isFireSource;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 04298bb935eacab6245afc0ae465ef0fab09101e..0f9758851ed05dd27496653cb0c00e6b0711a408 100644
+index e0c91bc518168441fffa32f4c611a74800a8d2e2..452d56e6e0c6682f0d55697b3e9e94d53e186f92 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3650,6 +3650,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3657,6 +3657,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          return SlotAccess.NULL;
      }
  
diff --git a/patches/server/0006-Ridables.patch b/patches/server/0006-Ridables.patch
index 286a72e89..83f22dff6 100644
--- a/patches/server/0006-Ridables.patch
+++ b/patches/server/0006-Ridables.patch
@@ -86,7 +86,7 @@ index 38de81f8696ed658d002427d002f22b28e3a6122..39bf75a7ba276f25e39573f084786dd5
                          if ((entity instanceof Bucketable && entity instanceof LivingEntity && 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((LivingEntity) entity));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0f9758851ed05dd27496653cb0c00e6b0711a408..622bc5a8e7e105ee9368f67be3ae7740ecaaf256 100644
+index 452d56e6e0c6682f0d55697b3e9e94d53e186f92..ab905ab075fd6966a95db45fc183d630bbf414ec 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -297,7 +297,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -98,7 +98,7 @@ index 0f9758851ed05dd27496653cb0c00e6b0711a408..622bc5a8e7e105ee9368f67be3ae7740
      private float eyeHeight;
      public boolean isInPowderSnow;
      public boolean wasInPowderSnow;
-@@ -2657,6 +2657,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -2664,6 +2664,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
                  this.passengers = ImmutableList.copyOf(list);
              }
  
@@ -111,7 +111,7 @@ index 0f9758851ed05dd27496653cb0c00e6b0711a408..622bc5a8e7e105ee9368f67be3ae7740
          }
          return true; // CraftBukkit
      }
-@@ -2697,6 +2703,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -2704,6 +2710,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
                  return false;
              }
              // Spigot end
@@ -126,7 +126,7 @@ index 0f9758851ed05dd27496653cb0c00e6b0711a408..622bc5a8e7e105ee9368f67be3ae7740
              if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                  this.passengers = ImmutableList.of();
              } else {
-@@ -4382,4 +4396,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -4389,4 +4403,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end
@@ -201,7 +201,7 @@ index 645c1dc9bd09b135a641759c76ce8d957b9bd488..912767ed261e44c0192c5a07e2c20261
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index eeef768b8a4235276812ac060da5505274688a57..c7a6756521cc7c188910304f62a579b6724853e2 100644
+index a6681690e1e556440320c492bf2a8e617008baa1..67912e15aa060261b1ec2c13abcab309d6af8813 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -216,9 +216,9 @@ public abstract class LivingEntity extends Entity {
@@ -4923,10 +4923,10 @@ index 4759a6b3d3cd7973744562adf97d110d359ebce3..cfb43f277c013680a0e51fb93796e38f
  
      Projectile(EntityType<? extends Projectile> type, Level world) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 69223b13e894d86d9529f2ef8b60a08a1f7a9267..c2581fb017f6579e59bd25e46b781aa95985abb2 100644
+index a3673e2943f251e056ecf84a9bff2de12efdb52a..e14754778ca53d30fdfe7c06e31b02f88a82b765 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1293,4 +1293,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1304,4 +1304,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed.
      }
      // Paper end
@@ -4999,7 +4999,7 @@ index 519b17fac445b7118f5493508bddccd368dadcde..cd6db807c50f9b6269b54a69b6601837
              event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 720233b1dce48d23c5852765c8614ee86dc14695..85208c8d1058d46f3b2500efa752647138c74751 100644
+index 96802b86828522006d4a25ab61e6630173688679..ebdd323b4aa341b5adc84a6260b9f76222395fb4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -167,4 +167,9 @@ public class PurpurConfig {
diff --git a/patches/server/0049-Fix-the-dead-lagging-the-server.patch b/patches/server/0049-Fix-the-dead-lagging-the-server.patch
index b3b34192d..0bc52110b 100644
--- a/patches/server/0049-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0049-Fix-the-dead-lagging-the-server.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 27d95f88ef904402c1277818734310c9e37f9cde..ec4f6a2589999e1f2294f50742ece72236a9c7bd 100644
+index ab53a0d7f9a63d85e0c8d213b76a948ebb111b24..cfa1e7eb6d1a4af2acb035dbe0852cdf62d87564 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1769,6 +1769,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -1770,6 +1770,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();
          this.setYHeadRot(yaw); // Paper - Update head rotation
@@ -17,7 +17,7 @@ index 27d95f88ef904402c1277818734310c9e37f9cde..ec4f6a2589999e1f2294f50742ece722
  
      public void absMoveTo(double x, double y, double z) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 726909f539a72bebacde7547d8dfabff0a2469e1..63561520a1e4ff37b5ba012dfffb01ad052c1b45 100644
+index 5d4c6f66d881525894ed8a3eac1aaadbc0d261c7..a7c7f3ac0e69f717ee37f9b840b04146661fcf67 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2930,7 +2930,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0061-Configurable-void-damage-height-and-damage.patch b/patches/server/0061-Configurable-void-damage-height-and-damage.patch
index 6f467c2ad..35ba475e1 100644
--- a/patches/server/0061-Configurable-void-damage-height-and-damage.patch
+++ b/patches/server/0061-Configurable-void-damage-height-and-damage.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable void damage height and damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ec4f6a2589999e1f2294f50742ece72236a9c7bd..bdafda2a5fd64dce2e13135fb932bfb0961b27eb 100644
+index cfa1e7eb6d1a4af2acb035dbe0852cdf62d87564..c1d6e5db593142188e3e7f4174bcaf5bd9b44527 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -815,7 +815,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -816,7 +816,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
  
      public void checkOutOfWorld() {
          // Paper start - Configurable nether ceiling damage
@@ -18,7 +18,7 @@ index ec4f6a2589999e1f2294f50742ece72236a9c7bd..bdafda2a5fd64dce2e13135fb932bfb0
              && this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) {
              // Paper end
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 63561520a1e4ff37b5ba012dfffb01ad052c1b45..08a7a0fcb64643969c334c26fa58f9ff74943640 100644
+index a7c7f3ac0e69f717ee37f9b840b04146661fcf67..bc97a1f4f7c81693ea2e9cc9b5d82a172033d230 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2422,7 +2422,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0062-Add-canSaveToDisk-to-Entity.patch b/patches/server/0062-Add-canSaveToDisk-to-Entity.patch
index 68e56a420..2a5b9b9b9 100644
--- a/patches/server/0062-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/server/0062-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 bdafda2a5fd64dce2e13135fb932bfb0961b27eb..6601e18fef636dcc8ea3bfa98c8a768066954ff8 100644
+index c1d6e5db593142188e3e7f4174bcaf5bd9b44527..f4395b55dac3b6a5501fbe8c88006a008af0fde3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4437,5 +4437,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -4444,5 +4444,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      public boolean processClick(InteractionHand hand) {
          return false;
      }
diff --git a/patches/server/0092-Stop-squids-floating-on-top-of-water.patch b/patches/server/0092-Stop-squids-floating-on-top-of-water.patch
index 519fc821c..c9a7c7983 100644
--- a/patches/server/0092-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0092-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 6601e18fef636dcc8ea3bfa98c8a768066954ff8..8a70a018d3b3942e412f1b6ca0ecc11355ec8759 100644
+index f4395b55dac3b6a5501fbe8c88006a008af0fde3..bc89ad23c1ec02a1f5a1e03b3f6f9982cc0fa1f2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3929,6 +3929,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3936,6 +3936,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          this.yRotO = this.getYRot();
      }
  
diff --git a/patches/server/0094-Entities-can-use-portals-configuration.patch b/patches/server/0094-Entities-can-use-portals-configuration.patch
index 5f7fbe72e..23d7e7a43 100644
--- a/patches/server/0094-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0094-Entities-can-use-portals-configuration.patch
@@ -5,10 +5,10 @@ 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 8a70a018d3b3942e412f1b6ca0ecc11355ec8759..dd5b304376b5c18324bc9ba02ef52a53f4f694f5 100644
+index bc89ad23c1ec02a1f5a1e03b3f6f9982cc0fa1f2..7f9cf9fdb548e1e728c39a36d47b0b8c71aea82d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2757,7 +2757,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -2764,7 +2764,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      public void handleInsidePortal(BlockPos pos) {
          if (this.isOnPortalCooldown()) {
              this.setPortalCooldown();
@@ -17,7 +17,7 @@ index 8a70a018d3b3942e412f1b6ca0ecc11355ec8759..dd5b304376b5c18324bc9ba02ef52a53
              if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
                  this.portalEntrancePos = pos.immutable();
              }
-@@ -3418,7 +3418,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3425,7 +3425,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      }
  
      public boolean canChangeDimensions() {
diff --git a/patches/server/0104-Stonecutter-damage.patch b/patches/server/0104-Stonecutter-damage.patch
index 150342b52..b567eacc6 100644
--- a/patches/server/0104-Stonecutter-damage.patch
+++ b/patches/server/0104-Stonecutter-damage.patch
@@ -24,10 +24,10 @@ index 19d6165f266fcc39bc3533042109ef1b725ecb77..32bf8264fecb8873f3ffa0e57a4bb48b
      private boolean bypassArmor;
      private boolean bypassInvul;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index dd5b304376b5c18324bc9ba02ef52a53f4f694f5..a11c8d2441df95024a93b59e9ce7b942559913db 100644
+index 7f9cf9fdb548e1e728c39a36d47b0b8c71aea82d..13f5699077a37670abf916a7a34554f898e28aa8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1057,7 +1057,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -1058,7 +1058,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
                  }
                  // CraftBukkit end
  
@@ -95,7 +95,7 @@ index cd6db807c50f9b6269b54a69b6601837aebd28ed..bf888a3dc060476d386d23244e2db6be
                  throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.msgId));
              }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 77919711992c28baecb1c0f178232ed8bb06e9fe..437d2a45f66c2f0f6304365fbc238c24c1571a9f 100644
+index 8455ff2aa26039940dd42e43205ad9a2164cd41f..7fd2d06df6a3b04b370204403a677109b202c355 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -187,6 +187,11 @@ public class PurpurConfig {
diff --git a/patches/server/0136-Movement-options-for-armor-stands.patch b/patches/server/0136-Movement-options-for-armor-stands.patch
index 6f68385b5..5bebbb488 100644
--- a/patches/server/0136-Movement-options-for-armor-stands.patch
+++ b/patches/server/0136-Movement-options-for-armor-stands.patch
@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a11c8d2441df95024a93b59e9ce7b942559913db..a1f58530ddac54bcf34fe2373e8fb85146e1b10f 100644
+index 13f5699077a37670abf916a7a34554f898e28aa8..f46bfd8c8c5d05610d96174b2817c1a668aa0321 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1621,7 +1621,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -1622,7 +1622,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          return this.isInWater() || flag;
      }
  
diff --git a/patches/server/0137-Fix-stuck-in-portals.patch b/patches/server/0137-Fix-stuck-in-portals.patch
index 8fa9f1dc0..ff46baa1d 100644
--- a/patches/server/0137-Fix-stuck-in-portals.patch
+++ b/patches/server/0137-Fix-stuck-in-portals.patch
@@ -17,10 +17,10 @@ index 951e45f7b17f6f903c99634177395464a1889c0f..d31ae3a1df1a457d7ae55bc82e9c870c
                  // CraftBukkit end
                  this.setLevel(worldserver);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a1f58530ddac54bcf34fe2373e8fb85146e1b10f..e8c5c8d8dfb17492b116c5f02fe06446b31b0e91 100644
+index f46bfd8c8c5d05610d96174b2817c1a668aa0321..22263b4ebc98011141afea62fdd75b305255a9c7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2754,12 +2754,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -2761,12 +2761,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          return Vec3.directionFromRotation(this.getRotationVector());
      }
  
diff --git a/patches/server/0158-Drowning-Settings.patch b/patches/server/0158-Drowning-Settings.patch
index 81cdf8670..9623c6e3f 100644
--- a/patches/server/0158-Drowning-Settings.patch
+++ b/patches/server/0158-Drowning-Settings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e8c5c8d8dfb17492b116c5f02fe06446b31b0e91..a0f999ee0560e7ce773665e70abddfc2e6b580bb 100644
+index 22263b4ebc98011141afea62fdd75b305255a9c7..8df3bf860fcdb9d3df9dea28c02e37183b6f338c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2988,7 +2988,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -2995,7 +2995,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      }
  
      public int getMaxAirSupply() {
@@ -18,7 +18,7 @@ index e8c5c8d8dfb17492b116c5f02fe06446b31b0e91..a0f999ee0560e7ce773665e70abddfc2
  
      public int getAirSupply() {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b4cc6b9c94eda63caa4c176a96d7c8babe1284bd..3de96928961351c25af561068643a016c197667b 100644
+index 8002bcf918974ab49e7dd1800243be273a5afbe1..327473c23f5cbc0a1ae6c5660a9db0cac8a97537 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -418,7 +418,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0169-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0169-Configurable-damage-settings-for-magma-blocks.patch
index 023c9c133..aa9f24670 100644
--- a/patches/server/0169-Configurable-damage-settings-for-magma-blocks.patch
+++ b/patches/server/0169-Configurable-damage-settings-for-magma-blocks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable damage settings for magma blocks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a0f999ee0560e7ce773665e70abddfc2e6b580bb..97e27e2824a18cfbe8bba5599102702a99f3bf11 100644
+index 8df3bf860fcdb9d3df9dea28c02e37183b6f338c..a0dfd64a6bd7da1e15abf12e82648d7d781152f5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1057,7 +1057,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -1058,7 +1058,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
                  }
                  // CraftBukkit end
  
diff --git a/patches/server/0187-API-for-any-mob-to-burn-daylight.patch b/patches/server/0187-API-for-any-mob-to-burn-daylight.patch
index 92d67e51c..550302624 100644
--- a/patches/server/0187-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0187-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 97e27e2824a18cfbe8bba5599102702a99f3bf11..e9c30922573745d5e5007d2d3221b62d81534fe9 100644
+index a0dfd64a6bd7da1e15abf12e82648d7d781152f5..cfe2230245d6b04619c886a46e3b4aca4c01e50b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4450,5 +4450,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -4457,5 +4457,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      public boolean canSaveToDisk() {
          return true;
      }
@@ -29,7 +29,7 @@ index 97e27e2824a18cfbe8bba5599102702a99f3bf11..e9c30922573745d5e5007d2d3221b62d
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d1ba2930cbbab31d9a1d726db1fd99295555867a..ef2efc00ebd610cf0e393b6b604c48cdac2d4bbc 100644
+index 461837b2c964c87542e01a0c1f7b379c01c2d76e..3abdaa13e39d647725b621d109f096b390bf04d9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -260,6 +260,7 @@ public abstract class LivingEntity extends Entity {
@@ -333,7 +333,7 @@ index 4b288fe8923bb4beefb88e8196bfb4d5d2b10b8b..e4e357af439c9a02b8013ce3349ff582
          // Paper end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index e888e630176f30d773155019fb17aed8095538a1..0e3dac205fe9d19ba7dccbd55fcc26ede795c460 100644
+index b6ae2d263d107d5a81ea6a66fcd229b2584a9959..22f19467e0d5e0ab96e1f696d7aa22c4e6c361f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -197,6 +197,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0191-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0191-Add-toggle-for-end-portal-safe-teleporting.patch
index f71e90746..5537caed6 100644
--- a/patches/server/0191-Add-toggle-for-end-portal-safe-teleporting.patch
+++ b/patches/server/0191-Add-toggle-for-end-portal-safe-teleporting.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e9c30922573745d5e5007d2d3221b62d81534fe9..b211f2200486f45368c09fb15c40c948b98fac12 100644
+index cfe2230245d6b04619c886a46e3b4aca4c01e50b..3d2e00dd971b21848679c4e386e6357592320dd0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2805,7 +2805,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -2812,7 +2812,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
              }
  
              this.processPortalCooldown();
diff --git a/patches/server/0204-Structure-seed-options.patch b/patches/server/0204-Structure-seed-options.patch
index 9f8736e50..11243dbb5 100644
--- a/patches/server/0204-Structure-seed-options.patch
+++ b/patches/server/0204-Structure-seed-options.patch
@@ -4,22 +4,6 @@ Date: Thu, 1 Jul 2021 19:25:05 -0500
 Subject: [PATCH] Structure seed options
 
 
-diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index e4591c0b3c8547cc6f4e2a0891fc378ee4334d9e..b2c93ce627cf0a50b4b0a60d2d4206e6c6904e0a 100644
---- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -87,7 +87,10 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource {
-         this.biomeSource = populationSource;
-         this.runtimeBiomeSource = biomeSource;
-         this.settings = structuresConfig;
--        this.strongholdSeed = worldSeed;
-+        // Purpur start
-+        int salt = org.purpurmc.purpur.PurpurConfig.seedStructureStronghold;
-+        this.strongholdSeed = worldSeed + (salt != -1 ? salt : 0);
-+        // Purpur end
-     }
- 
-     private void generateStrongholds() {
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java
 index c4ec2e41314da9501dc62baa024607b2782d2c73..54341db6faf66c8e84156ee3a310fd0d6561b632 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java
@@ -52,20 +36,26 @@ index 45f11284bf65081b3b2e8da85114efbe5efd5b42..354a923350cbfc76645136858e8e9628
          double d = (double)(context.config()).probability;
          return worldgenRandom.nextDouble() >= d ? false : context.validBiome().test(context.chunkGenerator().getNoiseBiome(QuartPos.fromBlock(context.chunkPos().getMiddleBlockX()), QuartPos.fromBlock(50), QuartPos.fromBlock(context.chunkPos().getMiddleBlockZ())));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index e518d572c75dd3b04a0296ebdd3a2d790d419787..80e00f96b4561c4d6bc69a01a25d568aff44f45f 100644
+index 6f39a81f03f1ba01ea92529d5bd81d8c4421479e..5cb901ebb8fbc6bf3695386a100171a858ee3dc4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -212,6 +212,17 @@ public class PurpurConfig {
+@@ -212,6 +212,23 @@ public class PurpurConfig {
          deathMessageOnlyBroadcastToAffectedPlayer = getBoolean("settings.broadcasts.death.only-broadcast-to-affected-player", deathMessageOnlyBroadcastToAffectedPlayer);
      }
  
 +    public static int seedStructureBuriedTreasure = -1;
 +    public static int seedStructureMineshaft = -1;
-+    public static int seedStructureStronghold = -1;
 +    private static void seedSettings() {
 +        seedStructureBuriedTreasure = getInt("settings.seed.structure.buried_treasure", seedStructureBuriedTreasure);
 +        seedStructureMineshaft = getInt("settings.seed.structure.mineshaft", seedStructureMineshaft);
-+        seedStructureStronghold = getInt("settings.seed.structure.stronghold", seedStructureStronghold);
++        if (version < 26) {
++            int stronghold = getInt("settings.seed.structure.stronghold", -1);
++            set("settings.seed.structure.stronghold", null);
++            if (stronghold != -1) {
++                org.spigotmc.SpigotConfig.config.set("world-settings.default.seed-stronghold", stronghold);
++                org.spigotmc.SpigotConfig.save();
++            }
++        }
 +        // hide these from timings report
 +        if (!TimingsManager.hiddenConfigs.contains("settings.seed")) TimingsManager.hiddenConfigs.add("settings.seed");
 +    }
diff --git a/patches/server/0214-Add-compass-command.patch b/patches/server/0214-Add-compass-command.patch
index 859fd7ce5..6ffed27de 100644
--- a/patches/server/0214-Add-compass-command.patch
+++ b/patches/server/0214-Add-compass-command.patch
@@ -59,10 +59,10 @@ index 6d643998ee32de7f96b94e10fbd0b08a75628978..e2e83d8b39ddb154c0e69b63d5b99664
      // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 3d857d6dcc93e622311252e1bfa66106fbbdb372..e5d6d1c583ac82bf957cbbceafa62a9c80d08de2 100644
+index 04766db12cc667ce312146aa7403fa9788e459cf..1b3121b780aceac7689ece96f1e8476e2d9ab104 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -257,6 +257,11 @@ public class PurpurConfig {
+@@ -263,6 +263,11 @@ public class PurpurConfig {
      public static String commandTPSBarTextColorMedium = "<gradient:#ffff55:#ffaa00><text></gradient>";
      public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
      public static int commandTPSBarTickInterval = 20;
@@ -74,7 +74,7 @@ index 3d857d6dcc93e622311252e1bfa66106fbbdb372..e5d6d1c583ac82bf957cbbceafa62a9c
      public static boolean commandGamemodeRequiresPermission = false;
      public static boolean hideHiddenPlayersFromEntitySelector = false;
      public static String uptimeFormat = "<days><hours><minutes><seconds>";
-@@ -279,6 +284,13 @@ public class PurpurConfig {
+@@ -285,6 +290,13 @@ public class PurpurConfig {
          commandTPSBarTextColorMedium = getString("settings.command.tpsbar.text-color.medium", commandTPSBarTextColorMedium);
          commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
          commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);
@@ -89,7 +89,7 @@ index 3d857d6dcc93e622311252e1bfa66106fbbdb372..e5d6d1c583ac82bf957cbbceafa62a9c
          hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
          uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a60b0799765cd2cb06cb958aad49f81c5c4b39e5..e61687112a49037c9b0c1677e09bb76ed24c02bb 100644
+index a3d23ed9223b78311d5f1441c0ce2341515c976c..a0b11159a84b901696c288c7e48e6b11430761d1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -214,6 +214,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0236-Config-for-grindstones.patch b/patches/server/0236-Config-for-grindstones.patch
index e512132b0..5058cf8b5 100644
--- a/patches/server/0236-Config-for-grindstones.patch
+++ b/patches/server/0236-Config-for-grindstones.patch
@@ -57,10 +57,10 @@ index 0bdf874ddb951daf8d469575a44144504472d12d..855ff86696d27f7029ec8bd255820707
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index e5d6d1c583ac82bf957cbbceafa62a9c80d08de2..bc02b09176ac2b3b1a8307ef5db34d576c42d70e 100644
+index 1b3121b780aceac7689ece96f1e8476e2d9ab104..50b946518a1cc4ba2483cf2753037dc07429229c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -311,6 +311,9 @@ public class PurpurConfig {
+@@ -317,6 +317,9 @@ public class PurpurConfig {
      public static int beeInsideBeeHive = 3;
      public static boolean anvilCumulativeCost = true;
      public static int lightningRodRange = 128;
@@ -70,7 +70,7 @@ index e5d6d1c583ac82bf957cbbceafa62a9c80d08de2..bc02b09176ac2b3b1a8307ef5db34d57
      private static void blockSettings() {
          if (version < 3) {
              boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -345,6 +348,19 @@ public class PurpurConfig {
+@@ -351,6 +354,19 @@ public class PurpurConfig {
          beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
          anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
          lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange);
diff --git a/patches/server/0237-UPnP-Port-Forwarding.patch b/patches/server/0237-UPnP-Port-Forwarding.patch
index 38038e3d6..f1712d8ca 100644
--- a/patches/server/0237-UPnP-Port-Forwarding.patch
+++ b/patches/server/0237-UPnP-Port-Forwarding.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] UPnP Port Forwarding
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ba2c31e1b9f9bac1762ae53a12ebfb2da43612d1..23bf348c31bebf508467c124c42aed68ea5f2913 100644
+index d9e94136d8f5a3f41d2d205808105e24e2790a50..76c7430b7d167908911dc8ebb267532260374ea6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -309,6 +309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -67,10 +67,10 @@ index 9e83f2dea73461f698185f5ffdb6060e422b9494..6b503d7bdd0eb202ff3466dc1f691102
          // CraftBukkit start
          // this.setPlayerList(new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage)); // Spigot - moved up
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index bc02b09176ac2b3b1a8307ef5db34d576c42d70e..966f09b29a0a83c54fd7b8bfa4c8cf2df09a0900 100644
+index 50b946518a1cc4ba2483cf2753037dc07429229c..c1328d9de75b8394848ad4a0a31e080173e494c2 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -410,4 +410,9 @@ public class PurpurConfig {
+@@ -416,4 +416,9 @@ public class PurpurConfig {
      private static void tpsCatchup() {
          tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup);
      }
diff --git a/patches/server/0247-Option-to-prevent-spiders-from-climbing-world-border.patch b/patches/server/0247-Option-to-prevent-spiders-from-climbing-world-border.patch
index 24dd6b304..78b95f6fb 100644
--- a/patches/server/0247-Option-to-prevent-spiders-from-climbing-world-border.patch
+++ b/patches/server/0247-Option-to-prevent-spiders-from-climbing-world-border.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option to prevent spiders from climbing world border
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b211f2200486f45368c09fb15c40c948b98fac12..a47965094ed7bd00228211dc7cc2033335238798 100644
+index 3d2e00dd971b21848679c4e386e6357592320dd0..44e693e88e03cd34ac0fd293e611a0ebf1221f53 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -239,6 +239,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -16,7 +16,7 @@ index b211f2200486f45368c09fb15c40c948b98fac12..a47965094ed7bd00228211dc7cc20333
      public boolean hurtMarked;
      protected Vec3 stuckSpeedMultiplier;
      @Nullable
-@@ -1320,7 +1321,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -1321,7 +1322,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
              io.papermc.paper.util.CollisionUtil.getCollisions(world, this, collisionBox, potentialCollisions, false, true,
                  false, false, null, null);
  
diff --git a/patches/server/0252-Configurable-valid-characters-for-usernames.patch b/patches/server/0252-Configurable-valid-characters-for-usernames.patch
index 8de0e59b0..2737ab2cf 100644
--- a/patches/server/0252-Configurable-valid-characters-for-usernames.patch
+++ b/patches/server/0252-Configurable-valid-characters-for-usernames.patch
@@ -18,10 +18,10 @@ index 5f154db373026ca78b812f9247dc9288d6826cb0..547158e80c501aec66f4ffc96c0a496a
              char c = in.charAt(i);
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 966f09b29a0a83c54fd7b8bfa4c8cf2df09a0900..effaa275749729dce59ab28de51609656bb9d4b5 100644
+index c1328d9de75b8394848ad4a0a31e080173e494c2..f20565c61c56bd0a866cd1dd99dc088614f2c74c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -415,4 +415,11 @@ public class PurpurConfig {
+@@ -421,4 +421,11 @@ public class PurpurConfig {
      private static void networkSettings() {
          useUPnP = getBoolean("settings.network.upnp-port-forwarding", useUPnP);
      }
diff --git a/patches/server/0253-Shears-can-have-looting-enchantment.patch b/patches/server/0253-Shears-can-have-looting-enchantment.patch
index cd758d3a0..ef40a10d2 100644
--- a/patches/server/0253-Shears-can-have-looting-enchantment.patch
+++ b/patches/server/0253-Shears-can-have-looting-enchantment.patch
@@ -158,10 +158,10 @@ index 6b8a1535086aae7e4e3229d05615fb903188f507..60af917083de1b790b1d93d61835a669
      public int getMinCost(int level) {
          return 15 + (level - 1) * 9;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index effaa275749729dce59ab28de51609656bb9d4b5..013c3c41c6db66d44409fcd9df70704583efe113 100644
+index f20565c61c56bd0a866cd1dd99dc088614f2c74c..93429c792513f213dcc0c18373774943c0b0d7ad 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -365,6 +365,7 @@ public class PurpurConfig {
+@@ -371,6 +371,7 @@ public class PurpurConfig {
  
      public static boolean allowInfinityMending = false;
      public static boolean allowCrossbowInfinity = false;
@@ -169,7 +169,7 @@ index effaa275749729dce59ab28de51609656bb9d4b5..013c3c41c6db66d44409fcd9df707045
      public static boolean allowUnsafeEnchants = false;
      private static void enchantmentSettings() {
          if (version < 5) {
-@@ -374,6 +375,7 @@ public class PurpurConfig {
+@@ -380,6 +381,7 @@ public class PurpurConfig {
          }
          allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
          allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);
diff --git a/patches/server/0261-Configurable-food-attributes.patch b/patches/server/0261-Configurable-food-attributes.patch
index b83fd06bc..3b5a8648d 100644
--- a/patches/server/0261-Configurable-food-attributes.patch
+++ b/patches/server/0261-Configurable-food-attributes.patch
@@ -69,10 +69,10 @@ index 513343d225a71e242b0f237eefcd25147709d9d1..1f65bba67cd4fab1dee115f24b213075
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 013c3c41c6db66d44409fcd9df70704583efe113..b73d039acf0bedf98702f5e4185d190e68f6cf7c 100644
+index 93429c792513f213dcc0c18373774943c0b0d7ad..a9dcc82be19c89c3d66c1662a0273fd763507287 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -424,4 +424,57 @@ public class PurpurConfig {
+@@ -430,4 +430,57 @@ public class PurpurConfig {
          String setPattern = getString("settings.username-valid-characters", defaultPattern);
          usernameValidCharactersPattern = java.util.regex.Pattern.compile(setPattern == null || setPattern.isBlank() ? defaultPattern : setPattern);
      }
diff --git a/patches/server/0262-Max-joins-per-second.patch b/patches/server/0262-Max-joins-per-second.patch
index 8e0e24492..d554c286b 100644
--- a/patches/server/0262-Max-joins-per-second.patch
+++ b/patches/server/0262-Max-joins-per-second.patch
@@ -31,10 +31,10 @@ index 81dde0efc1a06420c0791520b9e40b24dd1f0318..bf053d317981a49b33f5d1f80feabbc4
          }
          // Paper end
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index b73d039acf0bedf98702f5e4185d190e68f6cf7c..672cdb5d3a48ca66fb62c49f7b5ce88dea781b97 100644
+index a9dcc82be19c89c3d66c1662a0273fd763507287..b211c90a7e0a614760e2a6f7c27cbfd6fe1cf9bd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -414,8 +414,10 @@ public class PurpurConfig {
+@@ -420,8 +420,10 @@ public class PurpurConfig {
      }
  
      public static boolean useUPnP = false;