diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch
index 265740354..fd7e300e7 100644
--- a/patches/server/0002-Purpur-config-files.patch
+++ b/patches/server/0002-Purpur-config-files.patch
@@ -362,10 +362,10 @@ index 0000000000000000000000000000000000000000..f06fed3ae5631d46a953617cfdd766a0
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..5f0732c2b8f85185b6dfc1db3119c22e8be7f5da
+index 0000000000000000000000000000000000000000..42e502cfcb8d2e775cbf738773caf1a087d2f3f4
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,93 @@
 +package org.purpurmc.purpur;
 +
 +import net.minecraft.core.registries.BuiltInRegistries;
@@ -373,6 +373,7 @@ index 0000000000000000000000000000000000000000..5f0732c2b8f85185b6dfc1db3119c22e
 +import net.minecraft.util.Mth;
 +import net.minecraft.world.entity.Entity;
 +import net.minecraft.world.entity.EntityType;
++import net.minecraft.world.entity.monster.Shulker;
 +import net.minecraft.world.item.DyeColor;
 +import net.minecraft.world.item.Item;
 +import net.minecraft.world.item.Items;
diff --git a/patches/server/0006-Ridables.patch b/patches/server/0006-Ridables.patch
index 30fb24040..03591f784 100644
--- a/patches/server/0006-Ridables.patch
+++ b/patches/server/0006-Ridables.patch
@@ -5159,10 +5159,10 @@ index f06fed3ae5631d46a953617cfdd766a02e628515..08f38c2a87feb138b202f0934abb3724
 +    }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 5f0732c2b8f85185b6dfc1db3119c22e8be7f5da..bb64706d04fb25dcd564799c26fad231086ff827 100644
+index 42e502cfcb8d2e775cbf738773caf1a087d2f3f4..2e35e494134e5294fd67a0bf9abbe3f68d5faea5 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -89,4 +89,744 @@ public class PurpurWorldConfig {
+@@ -90,4 +90,744 @@ public class PurpurWorldConfig {
          final Map<String, Object> value = PurpurConfig.getMap("world-settings." + worldName + "." + path, null);
          return value.isEmpty() ? fallback : value;
      }
diff --git a/patches/server/0007-Configurable-entity-base-attributes.patch b/patches/server/0007-Configurable-entity-base-attributes.patch
index 07bef3c8e..b2ec8de60 100644
--- a/patches/server/0007-Configurable-entity-base-attributes.patch
+++ b/patches/server/0007-Configurable-entity-base-attributes.patch
@@ -1637,18 +1637,10 @@ index d514faecb9e6b244aa043383fa072316da939518..a4ca761f6e8e6e8f86fc20ce5e3dcf92
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index bb64706d04fb25dcd564799c26fad231086ff827..65cbd35892ab48fccda9bccf2b4dd66be5c84a0d 100644
+index 2e35e494134e5294fd67a0bf9abbe3f68d5faea5..65cbd35892ab48fccda9bccf2b4dd66be5c84a0d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -5,6 +5,7 @@ import net.minecraft.resources.ResourceLocation;
- import net.minecraft.util.Mth;
- import net.minecraft.world.entity.Entity;
- import net.minecraft.world.entity.EntityType;
-+import net.minecraft.world.entity.monster.Shulker;
- import net.minecraft.world.item.DyeColor;
- import net.minecraft.world.item.Item;
- import net.minecraft.world.item.Items;
-@@ -104,125 +105,248 @@ public class PurpurWorldConfig {
+@@ -105,125 +105,248 @@ public class PurpurWorldConfig {
      public boolean allayRidable = false;
      public boolean allayRidableInWater = true;
      public boolean allayControllable = true;
@@ -1897,7 +1889,7 @@ index bb64706d04fb25dcd564799c26fad231086ff827..65cbd35892ab48fccda9bccf2b4dd66b
      }
  
      public boolean dolphinRidable = false;
-@@ -230,80 +354,175 @@ public class PurpurWorldConfig {
+@@ -231,80 +354,175 @@ public class PurpurWorldConfig {
      public int dolphinSpitCooldown = 20;
      public float dolphinSpitSpeed = 1.0F;
      public float dolphinSpitDamage = 2.0F;
@@ -2073,7 +2065,7 @@ index bb64706d04fb25dcd564799c26fad231086ff827..65cbd35892ab48fccda9bccf2b4dd66b
      }
  
      public boolean frogRidable = false;
-@@ -321,147 +540,342 @@ public class PurpurWorldConfig {
+@@ -322,147 +540,342 @@ public class PurpurWorldConfig {
      public boolean ghastRidableInWater = true;
      public boolean ghastControllable = true;
      public double ghastMaxY = 320D;
@@ -2416,7 +2408,7 @@ index bb64706d04fb25dcd564799c26fad231086ff827..65cbd35892ab48fccda9bccf2b4dd66b
      }
  
      public boolean phantomRidable = false;
-@@ -471,6 +885,10 @@ public class PurpurWorldConfig {
+@@ -472,6 +885,10 @@ public class PurpurWorldConfig {
      public float phantomFlameDamage = 1.0F;
      public int phantomFlameFireTime = 8;
      public boolean phantomAllowGriefing = false;
@@ -2427,7 +2419,7 @@ index bb64706d04fb25dcd564799c26fad231086ff827..65cbd35892ab48fccda9bccf2b4dd66b
      private void phantomSettings() {
          phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
          phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -479,191 +897,405 @@ public class PurpurWorldConfig {
+@@ -480,191 +897,405 @@ public class PurpurWorldConfig {
          phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
          phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
          phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);
@@ -2833,7 +2825,7 @@ index bb64706d04fb25dcd564799c26fad231086ff827..65cbd35892ab48fccda9bccf2b4dd66b
      }
  
      public boolean tadpoleRidable = false;
-@@ -678,64 +1310,137 @@ public class PurpurWorldConfig {
+@@ -679,64 +1310,137 @@ public class PurpurWorldConfig {
      public boolean traderLlamaRidable = false;
      public boolean traderLlamaRidableInWater = false;
      public boolean traderLlamaControllable = true;
@@ -2971,7 +2963,7 @@ index bb64706d04fb25dcd564799c26fad231086ff827..65cbd35892ab48fccda9bccf2b4dd66b
      }
  
      public boolean wardenRidable = false;
-@@ -750,83 +1455,183 @@ public class PurpurWorldConfig {
+@@ -751,83 +1455,183 @@ public class PurpurWorldConfig {
      public boolean witchRidable = false;
      public boolean witchRidableInWater = true;
      public boolean witchControllable = true;