Improve seed based feature search to not load chunk (#5760)

This is done by returning the center location of the chunk at the height
 of the input location when the target chunk isn't loaded already which
 is exact enough for most use cases and will get more precise once the
 player is close enough for the chunk being loaded anyways.

As this might lead to less precise locations a config option to enable
 the sync loading of the chunks is provided.

16 files changed, 60 insertions, 42 deletions

diff --git a/Spigot-Server-Patches/0596-Seed-based-feature-search.patch b/Spigot-Server-Patches/0596-Seed-based-feature-search.patch
index 00261682eb..29bb86682d 100644
--- a/Spigot-Server-Patches/0596-Seed-based-feature-search.patch
+++ b/Spigot-Server-Patches/0596-Seed-based-feature-search.patch
@@ -11,22 +11,29 @@ This is done by backporting Mojang's change in 1.17 which makes it so
 that the biome (generated by the seed) is checked first if the feature
 can be generated before actually to load the chunk.
 
-The only downside of this is that it breaks once the seed or generator
+Additionally to that the center location of the target chunk is simply
+returned if the chunk is not loaded to avoid the sync chunk load.
+As this can lead to less precise locations a toggle is provided to
+enable the sync loading of the target chunk again.
+
+The main downside of this is that it breaks once the seed or generator
 changes but this should usually not happen. A config option to disable
-this improvement is added though in case that should ever be necessary.
+this completely is added though in case that should ever be necessary.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 424754a0183b071d20c86f0420cec784a8992e2b..a98e25917193043633e2120beb4fe2d49d0e4500 100644
+index 424754a0183b071d20c86f0420cec784a8992e2b..97870622e41cca36d9c7493bfad796f35f3831f4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -337,6 +337,12 @@ public class PaperWorldConfig {
+@@ -337,6 +337,14 @@ public class PaperWorldConfig {
          }
      }
  
 +    public boolean seedBasedFeatureSearch = true;
++    public boolean seedBasedFeatureSearchLoadsChunks = false;
 +    private void seedBasedFeatureSearch() {
 +        seedBasedFeatureSearch = getBoolean("seed-based-feature-search", seedBasedFeatureSearch);
-+        log("Feature search is based on seed: " + seedBasedFeatureSearch);
++        seedBasedFeatureSearchLoadsChunks = getBoolean("seed-based-feature-search-loads-chunks", seedBasedFeatureSearchLoadsChunks);
++        log("Feature search is based on seed: " + seedBasedFeatureSearch + ", loads chunks:" + seedBasedFeatureSearchLoadsChunks);
 +    }
 +
      public int maxCollisionsPerEntity;
@@ -77,21 +84,32 @@ index 340508e0ba8b8883a3037ecaa2d4e09e61e709d3..3b1d9b26ba3249b1df0c15a22428e421
          return this.c.a(this.b, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this.a);
      }
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/StructureGenerator.java b/src/main/java/net/minecraft/world/level/levelgen/feature/StructureGenerator.java
-index ea7e3e15fa778c573d24f956f72f60579ea0b1a1..6df42ff26ff6e65ec2885122fe53dde857a3d1d2 100644
+index ea7e3e15fa778c573d24f956f72f60579ea0b1a1..e5c22e92a305050df0eae2da53217ea2c3249e03 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/feature/StructureGenerator.java
-@@ -176,6 +176,14 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
+@@ -176,7 +176,24 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
                              int j2 = i1 + k * l1;
                              ChunkCoordIntPair chunkcoordintpair = this.a(structuresettingsfeature, j, seededrandom, i2, j2);
                              if (!iworldreader.getWorldBorder().isChunkInBounds(chunkcoordintpair.x, chunkcoordintpair.z)) { continue; } // Paper
+-                            IChunkAccess ichunkaccess = iworldreader.getChunkAt(chunkcoordintpair.x, chunkcoordintpair.z, ChunkStatus.STRUCTURE_STARTS);
 +                            // Paper start - seed based feature search
++                            IChunkAccess ichunkaccess = null;
 +                            if (structuremanager.getWorld().paperConfig.seedBasedFeatureSearch) {
 +                                BiomeBase biomeBase = structuremanager.getWorld().getBiomeManager().getBiome(new BlockPosition(chunkcoordintpair.getBlockX() + 9, 0, chunkcoordintpair.getBlockZ() + 9));
 +                                if (!biomeBase.e().a(this)) {
 +                                    continue;
 +                                }
++                                if (!structuremanager.getWorld().paperConfig.seedBasedFeatureSearchLoadsChunks) {
++                                    ichunkaccess = structuremanager.getWorld().getChunkIfLoaded(chunkcoordintpair.x, chunkcoordintpair.z);
++                                    if (ichunkaccess == null) {
++                                        return chunkcoordintpair.asPosition().add(8, blockposition.getY(), 8);
++                                    }
++                                }
++                            }
++                            if (ichunkaccess == null) {
++                                ichunkaccess = iworldreader.getChunkAt(chunkcoordintpair.x, chunkcoordintpair.z, ChunkStatus.STRUCTURE_STARTS);
 +                            }
 +                            // Paper end
-                             IChunkAccess ichunkaccess = iworldreader.getChunkAt(chunkcoordintpair.x, chunkcoordintpair.z, ChunkStatus.STRUCTURE_STARTS);
                              StructureStart<?> structurestart = structuremanager.a(SectionPosition.a(ichunkaccess.getPos(), 0), this, ichunkaccess);
  
+                             if (structurestart != null && structurestart.e()) {
diff --git a/Spigot-Server-Patches/0597-Add-Wandering-Trader-spawn-rate-config-options.patch b/Spigot-Server-Patches/0597-Add-Wandering-Trader-spawn-rate-config-options.patch
index 7ec0e046ea..0b28af3165 100644
--- a/Spigot-Server-Patches/0597-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/Spigot-Server-Patches/0597-Add-Wandering-Trader-spawn-rate-config-options.patch
@@ -11,10 +11,10 @@ in IWorldServerData are removed as they were only used in certain places, with h
 values used in other places.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a98e25917193043633e2120beb4fe2d49d0e4500..b4d76494851601d61a69e2f060727a68f4461267 100644
+index 97870622e41cca36d9c7493bfad796f35f3831f4..5a451cc855de57f79a57670ba38e3af2343cb510 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -697,4 +697,17 @@ public class PaperWorldConfig {
+@@ -699,4 +699,17 @@ public class PaperWorldConfig {
              log("The Ender Dragon will be removed if she already exists without a portal.");
          }
      }
diff --git a/Spigot-Server-Patches/0605-Climbing-should-not-bypass-cramming-gamerule.patch b/Spigot-Server-Patches/0605-Climbing-should-not-bypass-cramming-gamerule.patch
index 4c501b7baa..60b685ee18 100644
--- a/Spigot-Server-Patches/0605-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/Spigot-Server-Patches/0605-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b4d76494851601d61a69e2f060727a68f4461267..6262246c4018c660705fbad028f297fc44e7197f 100644
+index 5a451cc855de57f79a57670ba38e3af2343cb510..7d3207a9af8360ddad228281d6aa65e1a0d24157 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -710,4 +710,9 @@ public class PaperWorldConfig {
+@@ -712,4 +712,9 @@ public class PaperWorldConfig {
          wanderingTraderSpawnChanceMin = getInt("wandering-trader.spawn-chance-min", wanderingTraderSpawnChanceMin);
          wanderingTraderSpawnChanceMax = getInt("wandering-trader.spawn-chance-max", wanderingTraderSpawnChanceMax);
      }
@@ -19,7 +19,7 @@ index b4d76494851601d61a69e2f060727a68f4461267..6262246c4018c660705fbad028f297fc
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2a3025793db52a18e58f832c9da78c6c3b39d33c..d801486565865cf3b56e9d80b7c1643e9b0f4597 100644
+index bb1a3fb7d0c0b770636971877bed045005787e64..f35afa4d8d087649f57020e4f89185cffcb1ed3a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1575,6 +1575,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -36,7 +36,7 @@ index 2a3025793db52a18e58f832c9da78c6c3b39d33c..d801486565865cf3b56e9d80b7c1643e
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index a5b731bab16bf05351fee7e64ab6ae4d830309f7..358bb6244b7b9e785c7dcc3725ee00cfbb917cec 100644
+index 60dfa764898b59b60aec2da9580a80634e624dbe..b56c801c02e4f206b72db7dd74672727104bf246 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -137,7 +137,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
diff --git a/Spigot-Server-Patches/0610-Fix-curing-zombie-villager-discount-exploit.patch b/Spigot-Server-Patches/0610-Fix-curing-zombie-villager-discount-exploit.patch
index bcd571f1ce..8207906b97 100644
--- a/Spigot-Server-Patches/0610-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/Spigot-Server-Patches/0610-Fix-curing-zombie-villager-discount-exploit.patch
@@ -8,10 +8,10 @@ and curing a villager on repeat by simply resetting the relevant part of
 the reputation when it is cured.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6262246c4018c660705fbad028f297fc44e7197f..9ebe8771c2d5e843756868824740ef599ca8455f 100644
+index 7d3207a9af8360ddad228281d6aa65e1a0d24157..a3b3e3e04b7a5e3a351992e06870cc91fbd8adc8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -715,4 +715,9 @@ public class PaperWorldConfig {
+@@ -717,4 +717,9 @@ public class PaperWorldConfig {
      private void fixClimbingBypassingCrammingRule() {
          fixClimbingBypassingCrammingRule = getBoolean("fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule);
      }
diff --git a/Spigot-Server-Patches/0626-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/Spigot-Server-Patches/0626-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index 5a7b73fbca..115f473843 100644
--- a/Spigot-Server-Patches/0626-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/Spigot-Server-Patches/0626-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow disabling mob spawner spawn egg transformation
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9ebe8771c2d5e843756868824740ef599ca8455f..a555d040fdc58f7c89ef78e3e6851916fdd8462a 100644
+index a3b3e3e04b7a5e3a351992e06870cc91fbd8adc8..b48067c71f9de18ba40e970e2832f6245984a218 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -720,4 +720,9 @@ public class PaperWorldConfig {
+@@ -722,4 +722,9 @@ public class PaperWorldConfig {
      private void fixCuringExploit() {
          fixCuringZombieVillagerDiscountExploit = getBoolean("game-mechanics.fix-curing-zombie-villager-discount-exploit", fixCuringZombieVillagerDiscountExploit);
      }
diff --git a/Spigot-Server-Patches/0635-Added-world-settings-for-mobs-picking-up-loot.patch b/Spigot-Server-Patches/0635-Added-world-settings-for-mobs-picking-up-loot.patch
index 2685a66e73..10e2cd6329 100644
--- a/Spigot-Server-Patches/0635-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/Spigot-Server-Patches/0635-Added-world-settings-for-mobs-picking-up-loot.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added world settings for mobs picking up loot
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a555d040fdc58f7c89ef78e3e6851916fdd8462a..c42e5d9f9c9f67988383c4c25123d8a629ede9e3 100644
+index b48067c71f9de18ba40e970e2832f6245984a218..23a23e2ea133ce81d3dedc4ffd17435a995497ef 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -361,6 +361,14 @@ public class PaperWorldConfig {
+@@ -363,6 +363,14 @@ public class PaperWorldConfig {
          log("Creeper lingering effect: " + disableCreeperLingeringEffect);
      }
  
diff --git a/Spigot-Server-Patches/0640-Configurable-door-breaking-difficulty.patch b/Spigot-Server-Patches/0640-Configurable-door-breaking-difficulty.patch
index 5ae39b3398..d52bdc76ed 100644
--- a/Spigot-Server-Patches/0640-Configurable-door-breaking-difficulty.patch
+++ b/Spigot-Server-Patches/0640-Configurable-door-breaking-difficulty.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable door breaking difficulty
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c42e5d9f9c9f67988383c4c25123d8a629ede9e3..946c12abc0e25ccfe09ee64a7ac8b045ba5c46a9 100644
+index 23a23e2ea133ce81d3dedc4ffd17435a995497ef..497f32e4e1c82c0403669b612d07098c625288ce 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -5,8 +5,12 @@ import java.util.EnumMap;
@@ -33,7 +33,7 @@ index c42e5d9f9c9f67988383c4c25123d8a629ede9e3..946c12abc0e25ccfe09ee64a7ac8b045
      public int cactusMaxHeight;
      public int reedMaxHeight;
      public int bambooMaxHeight;
-@@ -733,4 +742,23 @@ public class PaperWorldConfig {
+@@ -735,4 +744,23 @@ public class PaperWorldConfig {
      private void disableMobSpawnerSpawnEggTransformation() {
          disableMobSpawnerSpawnEggTransformation = getBoolean("game-mechanics.disable-mob-spawner-spawn-egg-transformation", disableMobSpawnerSpawnEggTransformation);
      }
diff --git a/Spigot-Server-Patches/0645-Entity-load-save-limit-per-chunk.patch b/Spigot-Server-Patches/0645-Entity-load-save-limit-per-chunk.patch
index a168fe3f5f..b122f40024 100644
--- a/Spigot-Server-Patches/0645-Entity-load-save-limit-per-chunk.patch
+++ b/Spigot-Server-Patches/0645-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 946c12abc0e25ccfe09ee64a7ac8b045ba5c46a9..bda4eeb032bea452ea368c679f96b2bd93118730 100644
+index 497f32e4e1c82c0403669b612d07098c625288ce..d052d53771d868e6fa25d8854fc675a808722c65 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -9,6 +9,7 @@ import java.util.stream.Collectors;
@@ -20,7 +20,7 @@ index 946c12abc0e25ccfe09ee64a7ac8b045ba5c46a9..bda4eeb032bea452ea368c679f96b2bd
  import net.minecraft.world.entity.monster.EntityVindicator;
  import net.minecraft.world.entity.monster.EntityZombie;
  import org.bukkit.Bukkit;
-@@ -761,4 +762,18 @@ public class PaperWorldConfig {
+@@ -763,4 +764,18 @@ public class PaperWorldConfig {
              EnumDifficulty.class
          );
      }
diff --git a/Spigot-Server-Patches/0648-Collision-option-for-requiring-a-player-participant.patch b/Spigot-Server-Patches/0648-Collision-option-for-requiring-a-player-participant.patch
index 2ffec6957f..430ba158ec 100644
--- a/Spigot-Server-Patches/0648-Collision-option-for-requiring-a-player-participant.patch
+++ b/Spigot-Server-Patches/0648-Collision-option-for-requiring-a-player-participant.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bda4eeb032bea452ea368c679f96b2bd93118730..5801fe872aff240dc8209069b978d6a4dba30f06 100644
+index d052d53771d868e6fa25d8854fc675a808722c65..c293efaa70c67d7a4227d779eac5d3a510a79ee0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -716,6 +716,18 @@ public class PaperWorldConfig {
+@@ -718,6 +718,18 @@ public class PaperWorldConfig {
          }
      }
  
@@ -28,7 +28,7 @@ index bda4eeb032bea452ea368c679f96b2bd93118730..5801fe872aff240dc8209069b978d6a4
      public int wanderingTraderSpawnDayTicks = 24000;
      public int wanderingTraderSpawnChanceFailureIncrement = 25;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d801486565865cf3b56e9d80b7c1643e9b0f4597..f7223f214f911dd25abcf3a52745588ec630241d 100644
+index f35afa4d8d087649f57020e4f89185cffcb1ed3a..a76d32a978ec6fe749ffc0bd50004bda059b6196 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1467,6 +1467,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
diff --git a/Spigot-Server-Patches/0658-Add-toggle-for-always-placing-the-dragon-egg.patch b/Spigot-Server-Patches/0658-Add-toggle-for-always-placing-the-dragon-egg.patch
index a722e61d82..8f200eeb9d 100644
--- a/Spigot-Server-Patches/0658-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/Spigot-Server-Patches/0658-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 849603de7c918788f1f80d7effb93658a69b0fd6..1ceacb6bbfe99069763845a8aef48a3fb4841e32 100644
+index af7e93cb64eff1448653b27c2c9aea2d278d3ab7..cfe617e1a08b9c6e6c12bfe89bc9effd819eaff1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -794,4 +794,9 @@ public class PaperWorldConfig {
+@@ -796,4 +796,9 @@ public class PaperWorldConfig {
              if (value != -1) entityPerChunkSaveLimits.put(type, value);
          });
      }
diff --git a/Spigot-Server-Patches/0665-added-option-to-disable-pathfinding-updates-on-block.patch b/Spigot-Server-Patches/0665-added-option-to-disable-pathfinding-updates-on-block.patch
index 8b4e9bfbd5..972a1dc051 100644
--- a/Spigot-Server-Patches/0665-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/Spigot-Server-Patches/0665-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 1ceacb6bbfe99069763845a8aef48a3fb4841e32..d2f6e1308a4dfec663770e2c7f4de0cf22402a97 100644
+index cfe617e1a08b9c6e6c12bfe89bc9effd819eaff1..f1d384d2e235c52a00f4b6d5643ef3c1d163e94b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -799,4 +799,9 @@ public class PaperWorldConfig {
+@@ -801,4 +801,9 @@ public class PaperWorldConfig {
      private void enderDragonsDeathAlwaysPlacesDragonEgg() {
          enderDragonsDeathAlwaysPlacesDragonEgg = getBoolean("ender-dragons-death-always-places-dragon-egg", enderDragonsDeathAlwaysPlacesDragonEgg);
      }
@@ -19,7 +19,7 @@ index 1ceacb6bbfe99069763845a8aef48a3fb4841e32..d2f6e1308a4dfec663770e2c7f4de0cf
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index c7a661d4f43fad04ebada1bbebf4e4274fc9c452..325eba4e30ddcdfd038a215fbfde3bdc3e7c9b2a 100644
+index 9720f60d6a58df5f5a9b2c92e2209537aab7f010..fd204ab68d8245503c0a8c4e7ce1a0a6bac7d138 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -1684,6 +1684,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0678-MC-29274-Fix-Wither-hostility-towards-players.patch b/Spigot-Server-Patches/0678-MC-29274-Fix-Wither-hostility-towards-players.patch
index 53f85dfd86..68805931e4 100644
--- a/Spigot-Server-Patches/0678-MC-29274-Fix-Wither-hostility-towards-players.patch
+++ b/Spigot-Server-Patches/0678-MC-29274-Fix-Wither-hostility-towards-players.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] MC-29274: Fix Wither hostility towards players
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d2f6e1308a4dfec663770e2c7f4de0cf22402a97..3e6132211912d29e34c94042b0819f11a3bd123e 100644
+index f1d384d2e235c52a00f4b6d5643ef3c1d163e94b..7ddeecc6496926350d59d9b8725a4b161750f1e1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -804,4 +804,10 @@ public class PaperWorldConfig {
+@@ -806,4 +806,10 @@ public class PaperWorldConfig {
      private void setUpdatePathfindingOnBlockUpdate() {
          updatePathfindingOnBlockUpdate = getBoolean("update-pathfinding-on-block-update", this.updatePathfindingOnBlockUpdate);
      }
diff --git a/Spigot-Server-Patches/0688-Allow-using-signs-inside-spawn-protection.patch b/Spigot-Server-Patches/0688-Allow-using-signs-inside-spawn-protection.patch
index 7dadc01663..2cec392ea8 100644
--- a/Spigot-Server-Patches/0688-Allow-using-signs-inside-spawn-protection.patch
+++ b/Spigot-Server-Patches/0688-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 3e6132211912d29e34c94042b0819f11a3bd123e..921253a06daa414aed7dc6824effc65db09ea7a5 100644
+index 7ddeecc6496926350d59d9b8725a4b161750f1e1..0dd0795af0d0deeff5637a2a1a4a165dec26af15 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 {
+@@ -812,4 +812,9 @@ public class PaperWorldConfig {
          fixWitherTargetingBug = getBoolean("fix-wither-targeting-bug", false);
          log("Withers properly target players: " + fixWitherTargetingBug);
      }
diff --git a/Spigot-Server-Patches/0747-Limit-item-frame-cursors-on-maps.patch b/Spigot-Server-Patches/0747-Limit-item-frame-cursors-on-maps.patch
index 0a2f9144f8..93cb1e1686 100644
--- a/Spigot-Server-Patches/0747-Limit-item-frame-cursors-on-maps.patch
+++ b/Spigot-Server-Patches/0747-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 921253a06daa414aed7dc6824effc65db09ea7a5..37f866629b7eed39ced4352c94e56c8de8ccfeb9 100644
+index 0dd0795af0d0deeff5637a2a1a4a165dec26af15..467f4bd13c58f6724cdda580b95a0d58f516ec12 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -815,4 +815,9 @@ public class PaperWorldConfig {
+@@ -817,4 +817,9 @@ public class PaperWorldConfig {
      private void allowUsingSignsInsideSpawnProtection() {
          allowUsingSignsInsideSpawnProtection = getBoolean("allow-using-signs-inside-spawn-protection", allowUsingSignsInsideSpawnProtection);
      }
diff --git a/Spigot-Server-Patches/0750-Add-option-to-fix-items-merging-through-walls.patch b/Spigot-Server-Patches/0750-Add-option-to-fix-items-merging-through-walls.patch
index 6108117dfa..a407870cd4 100644
--- a/Spigot-Server-Patches/0750-Add-option-to-fix-items-merging-through-walls.patch
+++ b/Spigot-Server-Patches/0750-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 37f866629b7eed39ced4352c94e56c8de8ccfeb9..795b76379eb698aa0ed83c000ea0679a844792d5 100644
+index 467f4bd13c58f6724cdda580b95a0d58f516ec12..25db335f457eefd13798394ebfb6b6684be26610 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -820,4 +820,9 @@ public class PaperWorldConfig {
+@@ -822,4 +822,9 @@ public class PaperWorldConfig {
      private void mapItemFrameCursorLimit() {
          mapItemFrameCursorLimit = getInt("map-item-frame-cursor-limit", mapItemFrameCursorLimit);
      }
diff --git a/Spigot-Server-Patches/0752-Fix-invulnerable-end-crystals.patch b/Spigot-Server-Patches/0752-Fix-invulnerable-end-crystals.patch
index 7d36d72742..454fc3b3de 100644
--- a/Spigot-Server-Patches/0752-Fix-invulnerable-end-crystals.patch
+++ b/Spigot-Server-Patches/0752-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 795b76379eb698aa0ed83c000ea0679a844792d5..1a368df78feb4afdf522527af5ed1652afffcd15 100644
+index 25db335f457eefd13798394ebfb6b6684be26610..5c91c007691efeea1d4383efcd1ca06990d0660c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -825,4 +825,9 @@ public class PaperWorldConfig {
+@@ -827,4 +827,9 @@ public class PaperWorldConfig {
      private void fixItemsMergingThroughWalls() {
          fixItemsMergingThroughWalls = getBoolean("fix-items-merging-through-walls", fixItemsMergingThroughWalls);
      }