diff --git a/patches/server/0567-Configurable-door-breaking-difficulty.patch b/patches/server/0567-Configurable-door-breaking-difficulty.patch
index cefcd9434..a17a550ea 100644
--- a/patches/server/0567-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0567-Configurable-door-breaking-difficulty.patch
@@ -6,15 +6,14 @@ Subject: [PATCH] Configurable door breaking difficulty
 Co-authored-by: Doc <nachito94@msn.com>
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 137e4a16c4013bbbd6fed4f09f076267b2f45707..2239ebc03a2f5814330631739060335cdf74b42d 100644
+index 137e4a16c4013bbbd6fed4f09f076267b2f45707..b452f3c15725a84dfd6358932146d1965a8a86f3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -109,6 +109,29 @@ public class PaperWorldConfig {
+@@ -108,6 +108,27 @@ public class PaperWorldConfig {
+     private void disableMobSpawnerSpawnEggTransformation() {
          disableMobSpawnerSpawnEggTransformation = getBoolean("game-mechanics.disable-mob-spawner-spawn-egg-transformation", disableMobSpawnerSpawnEggTransformation);
      }
- 
-+    public List<net.minecraft.world.Difficulty> zombieBreakDoors;
-+    public List<net.minecraft.world.Difficulty> vindicatorBreakDoors;
++    
 +    private final List<net.minecraft.world.entity.EntityType<?>> entitiesValidForBreakDoors = Arrays.asList(net.minecraft.world.entity.EntityType.ZOMBIE, net.minecraft.world.entity.EntityType.ZOMBIE_VILLAGER, net.minecraft.world.entity.EntityType.HUSK, net.minecraft.world.entity.EntityType.ZOMBIFIED_PIGLIN, net.minecraft.world.entity.EntityType.VINDICATOR);
 +    public java.util.Map<net.minecraft.world.entity.EntityType<?>, java.util.List<net.minecraft.world.Difficulty>> entitiesDifficultyBreakDoors = new it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap<>();
 +    private void setupEntityBreakingDoors() {
@@ -35,10 +34,9 @@ index 137e4a16c4013bbbd6fed4f09f076267b2f45707..2239ebc03a2f5814330631739060335c
 +            );
 +        }
 +    }
-+
+ 
      public short keepLoadedRange;
      private void keepLoadedRange() {
-         keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 index 920c2101ebbdc07c7fd15903a3d641aa55f8336d..430492facbaa80471875da07bf4b9b601777d1fd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
diff --git a/patches/server/0579-Configurable-max-leash-distance.patch b/patches/server/0579-Configurable-max-leash-distance.patch
index a523d3a0f..a02efb1a4 100644
--- a/patches/server/0579-Configurable-max-leash-distance.patch
+++ b/patches/server/0579-Configurable-max-leash-distance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable max leash distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 527f93261ae1a8c4db55156ab1bd8294367eea6d..97e89ea805e4e696541edd30afc27164f4beb947 100644
+index 4d3625e1bf1acdfdf226f788209e6b35793d7153..86d90de48281b2cf5f09206dd994133992904560 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -305,6 +305,12 @@ public class PaperWorldConfig {
+@@ -303,6 +303,12 @@ public class PaperWorldConfig {
          }
      }
  
diff --git a/patches/server/0582-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0582-Add-toggle-for-always-placing-the-dragon-egg.patch
index 88826037a..d1088a50a 100644
--- a/patches/server/0582-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0582-Add-toggle-for-always-placing-the-dragon-egg.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for always placing the dragon egg
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 97e89ea805e4e696541edd30afc27164f4beb947..317a98ee12653550dd1421ae2056af7e84ada1fc 100644
+index 86d90de48281b2cf5f09206dd994133992904560..0f6c8e1781054efc35ab737ca3fb4ce433210581 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -771,6 +771,11 @@ public class PaperWorldConfig {
+@@ -769,6 +769,11 @@ public class PaperWorldConfig {
          perPlayerMobSpawns = getBoolean("per-player-mob-spawns", true);
      }
  
diff --git a/patches/server/0588-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0588-added-option-to-disable-pathfinding-updates-on-block.patch
index cb69a175c..428d3de82 100644
--- a/patches/server/0588-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0588-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 317a98ee12653550dd1421ae2056af7e84ada1fc..187e1d7a7c61bb1836e2c67b7346b22334e88421 100644
+index 0f6c8e1781054efc35ab737ca3fb4ce433210581..698b46b78dd167c01bbe1ab077046be008f9cde1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -776,6 +776,11 @@ public class PaperWorldConfig {
+@@ -774,6 +774,11 @@ public class PaperWorldConfig {
          enderDragonsDeathAlwaysPlacesDragonEgg = getBoolean("ender-dragons-death-always-places-dragon-egg", enderDragonsDeathAlwaysPlacesDragonEgg);
      }
  
diff --git a/patches/server/0607-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0607-Allow-using-signs-inside-spawn-protection.patch
index 28e7dea4d..de8ad10d1 100644
--- a/patches/server/0607-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0607-Allow-using-signs-inside-spawn-protection.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 187e1d7a7c61bb1836e2c67b7346b22334e88421..f97b528ae7eea588066b4d905afe0ef90e16fb3e 100644
+index 698b46b78dd167c01bbe1ab077046be008f9cde1..03468b1d7bbc3528c959368d89ccb3374a17788e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -810,4 +810,9 @@ public class PaperWorldConfig {
+@@ -808,4 +808,9 @@ public class PaperWorldConfig {
              delayChunkUnloadsBy *= 20;
          }
      }
diff --git a/patches/server/0616-Entity-load-save-limit-per-chunk.patch b/patches/server/0616-Entity-load-save-limit-per-chunk.patch
index dcba5dfb9..69a570fb6 100644
--- a/patches/server/0616-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0616-Entity-load-save-limit-per-chunk.patch
@@ -9,7 +9,7 @@ defaults are only included for certain entites, this allows setting
 limits for any entity type.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f97b528ae7eea588066b4d905afe0ef90e16fb3e..144ae8b70325ccb8121083223bc1da7338c39e18 100644
+index 03468b1d7bbc3528c959368d89ccb3374a17788e..5837fe5ad3a5f77fab81153155b4e6fd8303bbf0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -8,6 +8,8 @@ import it.unimi.dsi.fastutil.objects.Reference2IntMap;
@@ -21,7 +21,7 @@ index f97b528ae7eea588066b4d905afe0ef90e16fb3e..144ae8b70325ccb8121083223bc1da73
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
-@@ -144,6 +146,38 @@ public class PaperWorldConfig {
+@@ -142,6 +144,38 @@ public class PaperWorldConfig {
          }
      }
  
diff --git a/patches/server/0658-Limit-item-frame-cursors-on-maps.patch b/patches/server/0658-Limit-item-frame-cursors-on-maps.patch
index 3840df592..b40b9663a 100644
--- a/patches/server/0658-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0658-Limit-item-frame-cursors-on-maps.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Limit item frame cursors on maps
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 144ae8b70325ccb8121083223bc1da7338c39e18..aa84985596c0d20db1009e60184aabeaefdcb993 100644
+index 5837fe5ad3a5f77fab81153155b4e6fd8303bbf0..9b960f9bb3332f06d2c82be430961772846fbf61 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -849,4 +849,9 @@ public class PaperWorldConfig {
+@@ -847,4 +847,9 @@ public class PaperWorldConfig {
      private void allowUsingSignsInsideSpawnProtection() {
          allowUsingSignsInsideSpawnProtection = getBoolean("allow-using-signs-inside-spawn-protection", allowUsingSignsInsideSpawnProtection);
      }
diff --git a/patches/server/0663-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0663-Add-option-to-fix-items-merging-through-walls.patch
index 6373f0457..cc1754d30 100644
--- a/patches/server/0663-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0663-Add-option-to-fix-items-merging-through-walls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to fix items merging through walls
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index aa84985596c0d20db1009e60184aabeaefdcb993..f310d03af2da1ba22b8217bedc4fd393b2bc62eb 100644
+index 9b960f9bb3332f06d2c82be430961772846fbf61..0b76862934d679673d58b193df00ab4870b08d35 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -854,4 +854,9 @@ public class PaperWorldConfig {
+@@ -852,4 +852,9 @@ public class PaperWorldConfig {
      private void mapItemFrameCursorLimit() {
          mapItemFrameCursorLimit = getInt("map-item-frame-cursor-limit", mapItemFrameCursorLimit);
      }
diff --git a/patches/server/0665-Fix-invulnerable-end-crystals.patch b/patches/server/0665-Fix-invulnerable-end-crystals.patch
index ac80dfa3f..c8bc68b8d 100644
--- a/patches/server/0665-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0665-Fix-invulnerable-end-crystals.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix invulnerable end crystals
 MC-108513
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f310d03af2da1ba22b8217bedc4fd393b2bc62eb..b156e8ce8c14cc283ebed5c41473659df0b7e53e 100644
+index 0b76862934d679673d58b193df00ab4870b08d35..5015a49861bf6dfe32ba86415f22a7b3fd13aa9b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -859,4 +859,9 @@ public class PaperWorldConfig {
+@@ -857,4 +857,9 @@ public class PaperWorldConfig {
      private void fixItemsMergingThroughWalls() {
          fixItemsMergingThroughWalls = getBoolean("fix-items-merging-through-walls", fixItemsMergingThroughWalls);
      }
diff --git a/patches/server/0671-add-per-world-spawn-limits.patch b/patches/server/0671-add-per-world-spawn-limits.patch
index 54c3d6619..aa1344bd7 100644
--- a/patches/server/0671-add-per-world-spawn-limits.patch
+++ b/patches/server/0671-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b156e8ce8c14cc283ebed5c41473659df0b7e53e..a6884fa04f417019737c1b0346414b21b8ff1f71 100644
+index 5015a49861bf6dfe32ba86415f22a7b3fd13aa9b..bf0ee7904c6c58a2bc44279be03fdf28abbabbc2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -53,6 +53,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index b156e8ce8c14cc283ebed5c41473659df0b7e53e..a6884fa04f417019737c1b0346414b21
          }
  
          if (needsSave) {
-@@ -687,6 +692,21 @@ public class PaperWorldConfig {
+@@ -685,6 +690,21 @@ public class PaperWorldConfig {
          zombieVillagerInfectionChance = getDouble("zombie-villager-infection-chance", zombieVillagerInfectionChance);
      }
  
diff --git a/patches/server/0679-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0679-Fix-commands-from-signs-not-firing-command-events.patch
index 75c8898f5..f2d12f7c9 100644
--- a/patches/server/0679-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0679-Fix-commands-from-signs-not-firing-command-events.patch
@@ -10,10 +10,10 @@ This patch changes sign command logic so that `run_command` click events:
   - sends failure messages to the player who clicked the sign
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a6884fa04f417019737c1b0346414b21b8ff1f71..f72335e341d2017fe439af1ea697ba3553602026 100644
+index bf0ee7904c6c58a2bc44279be03fdf28abbabbc2..3c56c37bcbfcad72cf9aa099eb9d5d3c40164c2e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -884,4 +884,9 @@ public class PaperWorldConfig {
+@@ -882,4 +882,9 @@ public class PaperWorldConfig {
      private void fixInvulnerableEndCrystalExploit() {
          fixInvulnerableEndCrystalExploit = getBoolean("unsupported-settings.fix-invulnerable-end-crystal-exploit", fixInvulnerableEndCrystalExploit);
      }
diff --git a/patches/server/0682-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0682-Add-config-for-mobs-immune-to-default-effects.patch
index 4ba85708a..c23fc59f8 100644
--- a/patches/server/0682-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0682-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f72335e341d2017fe439af1ea697ba3553602026..14080b9d06b3d2481d434775befeeadec2e7305d 100644
+index 3c56c37bcbfcad72cf9aa099eb9d5d3c40164c2e..7bfbecb18241adcca49b9d70a903a8b7d1e65bfa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -682,6 +682,21 @@ public class PaperWorldConfig {
+@@ -680,6 +680,21 @@ public class PaperWorldConfig {
          log("Hopper Ignore Container Entities inside Occluding Blocks: " + (hoppersIgnoreOccludingBlocks ? "enabled" : "disabled"));
      }
  
diff --git a/patches/server/0684-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0684-Don-t-apply-cramming-damage-to-players.patch
index 9039fbc4a..f3bd2f47a 100644
--- a/patches/server/0684-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0684-Don-t-apply-cramming-damage-to-players.patch
@@ -11,10 +11,10 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 14080b9d06b3d2481d434775befeeadec2e7305d..7b965af336b6ab42ddf751d630e5c6ef5afd44f8 100644
+index 7bfbecb18241adcca49b9d70a903a8b7d1e65bfa..a4a1503624ceb2fd07614d10e1bf45b469e311e1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -904,4 +904,9 @@ public class PaperWorldConfig {
+@@ -902,4 +902,9 @@ public class PaperWorldConfig {
      private void showSignClickCommandFailureMessagesToPlayer() {
          showSignClickCommandFailureMessagesToPlayer = getBoolean("show-sign-click-command-failure-msgs-to-player", showSignClickCommandFailureMessagesToPlayer);
      }
diff --git a/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch
index c0e10037e..82b3bc02b 100644
--- a/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch
@@ -28,7 +28,7 @@ index b47b7dce26805badd422c1867733ff4bfd00e9f4..b27021a42cbed3f0648a8d0903d00d03
       * Get a named timer for the specified tile entity type to track type specific timings.
       * @param entity
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7b965af336b6ab42ddf751d630e5c6ef5afd44f8..b68610dfe559fcfafcdcbbcd8fe0aeed5a793da7 100644
+index a4a1503624ceb2fd07614d10e1bf45b469e311e1..2bc1ff0c1bd659894766f47c014c8e708a0a2521 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -9,8 +9,10 @@ import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap;
@@ -42,7 +42,7 @@ index 7b965af336b6ab42ddf751d630e5c6ef5afd44f8..b68610dfe559fcfafcdcbbcd8fe0aeed
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -909,4 +911,57 @@ public class PaperWorldConfig {
+@@ -907,4 +909,57 @@ public class PaperWorldConfig {
      private void playerCrammingDamage() {
          allowPlayerCrammingDamage = getBoolean("allow-player-cramming-damage", allowPlayerCrammingDamage);
      }
diff --git a/patches/server/0702-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0702-Configurable-item-frame-map-cursor-update-interval.patch
index 09bf382ad..a424ebc95 100644
--- a/patches/server/0702-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0702-Configurable-item-frame-map-cursor-update-interval.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable item frame map cursor update interval
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 12b7610525d5ce090b2d2b6a44d782a71b50de11..44a15a6bcfc1c46b5b2937142ddc4a1f616d353e 100644
+index 72d47018289f4174bf8655f15dce67490d36e05b..5ad6c46a5df9c4687a192198a8702d937a968ec8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -897,6 +897,11 @@ public class PaperWorldConfig {
+@@ -895,6 +895,11 @@ public class PaperWorldConfig {
          mapItemFrameCursorLimit = getInt("map-item-frame-cursor-limit", mapItemFrameCursorLimit);
      }
  
diff --git a/patches/server/0784-Preserve-overstacked-loot.patch b/patches/server/0784-Preserve-overstacked-loot.patch
index ca1123b8e..8bdd005f3 100644
--- a/patches/server/0784-Preserve-overstacked-loot.patch
+++ b/patches/server/0784-Preserve-overstacked-loot.patch
@@ -10,10 +10,10 @@ chunk bans via the large amount of NBT created by unstacking the items.
 Fixes GH-5140 and GH-4748.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 44a15a6bcfc1c46b5b2937142ddc4a1f616d353e..56a65d42b37f792eca53dacc1d307ddc2219a000 100644
+index 5ad6c46a5df9c4687a192198a8702d937a968ec8..a17f4bd04d3e6b4eead0d1213c16db4648ba8715 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -922,6 +922,11 @@ public class PaperWorldConfig {
+@@ -920,6 +920,11 @@ public class PaperWorldConfig {
          allowPlayerCrammingDamage = getBoolean("allow-player-cramming-damage", allowPlayerCrammingDamage);
      }
  
diff --git a/patches/server/0791-Configurable-feature-seeds.patch b/patches/server/0791-Configurable-feature-seeds.patch
index 23197aa95..db577ed07 100644
--- a/patches/server/0791-Configurable-feature-seeds.patch
+++ b/patches/server/0791-Configurable-feature-seeds.patch
@@ -19,10 +19,10 @@ index ee72086b2dee2bd6415803e77825b2b1cb83cd3d..309dbf5fce3ce940d5e1b57d267b9d6b
              }
              final Object val = config.get(key);
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 56a65d42b37f792eca53dacc1d307ddc2219a000..9455842bcf2f5bca085aea4c27843a88c857d0c8 100644
+index a17f4bd04d3e6b4eead0d1213c16db4648ba8715..ef754b706fff197075c09008496afd162642ad60 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -967,6 +967,55 @@ public class PaperWorldConfig {
+@@ -965,6 +965,55 @@ public class PaperWorldConfig {
          return table;
      }
  
diff --git a/patches/server/0802-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0802-Hide-unnecessary-itemmeta-from-clients.patch
index cf4facb71..5bacab54c 100644
--- a/patches/server/0802-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0802-Hide-unnecessary-itemmeta-from-clients.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Hide unnecessary itemmeta from clients
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9455842bcf2f5bca085aea4c27843a88c857d0c8..672ae50ee14c1460c89cba7553110ce772edf18a 100644
+index ef754b706fff197075c09008496afd162642ad60..aa265bb42daa42e23d3935fa8f81052c1504ef3c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -937,6 +937,13 @@ public class PaperWorldConfig {
+@@ -935,6 +935,13 @@ public class PaperWorldConfig {
          behaviorTickRates = loadTickRates("behavior");
      }
  
diff --git a/patches/server/0823-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0823-Configurable-max-block-light-for-monster-spawning.patch
index c03831e7e..22e9f1ed0 100644
--- a/patches/server/0823-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0823-Configurable-max-block-light-for-monster-spawning.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable max block light for monster spawning
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 672ae50ee14c1460c89cba7553110ce772edf18a..0fc0af30a1f2b150d1e8858aa76ca59d7ce095f8 100644
+index aa265bb42daa42e23d3935fa8f81052c1504ef3c..fd584cdfc5ba9dec9806ab50e602a03a58f5c4f7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -1035,4 +1035,9 @@ public class PaperWorldConfig {
+@@ -1033,4 +1033,9 @@ public class PaperWorldConfig {
          Integer rate = table.get(columnKey, rowKey);
          return rate != null && rate > -1 ? rate : def;
      }
diff --git a/patches/server/0832-Make-water-animal-spawn-height-configurable.patch b/patches/server/0832-Make-water-animal-spawn-height-configurable.patch
index f48b4bc87..2666cdf9e 100644
--- a/patches/server/0832-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0832-Make-water-animal-spawn-height-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make water animal spawn height configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0fc0af30a1f2b150d1e8858aa76ca59d7ce095f8..cd486a7f9fb59f3c0690d90476e587d10d1be25c 100644
+index fd584cdfc5ba9dec9806ab50e602a03a58f5c4f7..8430f99895021db64cbed7671c1d9c56021c31e1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -389,6 +389,24 @@ public class PaperWorldConfig {
+@@ -387,6 +387,24 @@ public class PaperWorldConfig {
          mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
      }
  
diff --git a/patches/server/0838-Add-configurable-height-for-slime-spawn.patch b/patches/server/0838-Add-configurable-height-for-slime-spawn.patch
index d1cfb26ad..2823bac70 100644
--- a/patches/server/0838-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0838-Add-configurable-height-for-slime-spawn.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add configurable height for slime spawn
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cd486a7f9fb59f3c0690d90476e587d10d1be25c..730a39399852f5588d6a0e2b09feae6546842da4 100644
+index 8430f99895021db64cbed7671c1d9c56021c31e1..4598c54007a90e9ebf9294f3e99c9f340c4b4fe8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -427,6 +427,16 @@ public class PaperWorldConfig {
+@@ -425,6 +425,16 @@ public class PaperWorldConfig {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
      }