Updated Upstream (Paper & Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e4f5e1c Bump netty

Pufferfish Changes:
pufferfish-gg/Pufferfish@a8543a4 #33 Fix anti-xray related crash bug
pufferfish-gg/Pufferfish@aefcb1a Updated Upstream (Paper)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19-R0.1-SNAPSHOT
 
-paperCommit = 90050ffd54647e2a9f166a90172c1c9fa90e52ff
+paperCommit = e4f5e1c9ab867701eb4b3347280ad2dc099b7db0
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0002-Fix-pufferfish-issues.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@Gmail.com>
 Date: Tue, 4 Jan 2022 23:05:41 -0600
-Subject: [PATCH] Add pufferfish added classes to junit exemptions
+Subject: [PATCH] Fix pufferfish issues
 
 
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index eefbd0a742b5875e0e9826b87c6bd4da66b2d7f7..4f01bbc22b2e94d5415c36c8cd828e0551e929aa 100644
+index 68b8f275f9c9e77a949ca29749a05b469bcdb910..a4a146d9c3e07bdf941d81147ca31daf4689a687 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,8 +9,12 @@ plugins {
@@ -38,7 +38,7 @@ index eefbd0a742b5875e0e9826b87c6bd4da66b2d7f7..4f01bbc22b2e94d5415c36c8cd828e05
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -44,12 +48,28 @@ dependencies {
+@@ -44,6 +48,14 @@ dependencies {
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
  
@@ -53,6 +53,7 @@ index eefbd0a742b5875e0e9826b87c6bd4da66b2d7f7..4f01bbc22b2e94d5415c36c8cd828e05
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("junit:junit:4.13.2")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
+@@ -52,6 +64,14 @@ dependencies {
  }
  
  val craftbukkitPackageVersion = "1_19_R1" // Paper
@@ -67,7 +68,7 @@ index eefbd0a742b5875e0e9826b87c6bd4da66b2d7f7..4f01bbc22b2e94d5415c36c8cd828e05
  tasks.jar {
      archiveClassifier.set("dev")
  
-@@ -62,7 +82,7 @@ tasks.jar {
+@@ -64,7 +84,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -2415,7 +2416,7 @@ index 3b144c820531122eb37d41be06c182b5f5dc0724..1eb912ad97f9663bf6bd336ad739f255
                          this.wasOnGround = this.entity.isOnGround();
                          this.teleportDelay = 0;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0dc7a827aeacc7fae53b1f975f45883da7db6a0c..b0cd9d5ec1a36af1710ebffb420e29a898e27bc8 100644
+index 0dc7a827aeacc7fae53b1f975f45883da7db6a0c..8043a1aa9d785c78e220ea54a6ffa7388f2d501e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -689,7 +689,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2445,7 +2446,7 @@ index 0dc7a827aeacc7fae53b1f975f45883da7db6a0c..b0cd9d5ec1a36af1710ebffb420e29a8
      // Paper start - optimise random block ticking
      private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
 -    private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom();
-+    private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - getter
++    // private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); // Pufferfish - moved to super
      // Paper end
  
 +    private int currentIceAndSnowTick = 0; protected void resetIceAndSnowTick() { this.currentIceAndSnowTick = this.randomTickRandom.nextInt(16); } // Pufferfish
@@ -3449,13 +3450,15 @@ index 468c635d31cfa8051666bbefce8df4b448e9ed93..17e869074b8cf29a8c3280499a27e951
          final String id;
          private final GameRules.Category category;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..683ab88e76b53331e5d9fbcb0e1ee65365008693 100644
+index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..e845d4af797b8eeb75ab094e1cb1062c7ab2d8b9 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -272,6 +272,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -272,6 +272,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      public abstract ResourceKey<LevelStem> getTypeKey();
  
++    protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter
++
 +    // Pufferfish start - ensure these get inlined
 +    private final int minBuildHeight, minSection, height, maxBuildHeight, maxSection;
 +    @Override public final int getMaxBuildHeight() { return this.maxBuildHeight; }
@@ -3468,7 +3471,7 @@ index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..683ab88e76b53331e5d9fbcb0e1ee653
      protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
-@@ -294,6 +303,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -294,6 +305,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          });
          final DimensionType dimensionmanager = (DimensionType) holder.value();
  
@@ -3482,7 +3485,7 @@ index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..683ab88e76b53331e5d9fbcb0e1ee653
          this.dimension = resourcekey;
          this.isClientSide = flag;
          if (dimensionmanager.coordinateScale() != 1.0D) {
-@@ -410,6 +426,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -410,6 +428,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return null;
      }
  
@@ -3574,7 +3577,7 @@ index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..683ab88e76b53331e5d9fbcb0e1ee653
      public boolean isInWorldBounds(BlockPos pos) {
          return pos.isInsideBuildHeightAndWorldBoundsHorizontal(this); // Paper - use better/optimized check
      }
-@@ -897,13 +998,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -897,13 +1000,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
              MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick
@@ -3590,7 +3593,7 @@ index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..683ab88e76b53331e5d9fbcb0e1ee653
              // Paper end
          }
      }
-@@ -1389,6 +1490,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1389,6 +1492,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      public ProfilerFiller getProfiler() {

patches/server/0002-Fix-pufferfish-issues.patch

@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <blake.galbreath@gmail.com>
+Date: Sun, 12 Jun 2022 09:18:57 -0500
+Subject: [PATCH] Fix pufferfish issues
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+index 8043a1aa9d785c78e220ea54a6ffa7388f2d501e..f8a813817d630993670092f0681a5bd8965cbb19 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -769,7 +769,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+     }
+     // Paper start - optimise random block ticking
+     private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
+-    // private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); // Pufferfish - moved to super
++    private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); // Pufferfish - moved to super // Purpur - dont break ABI
+     // Paper end
+ 
+     private int currentIceAndSnowTick = 0; protected void resetIceAndSnowTick() { this.currentIceAndSnowTick = this.randomTickRandom.nextInt(16); } // Pufferfish
+diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+index e845d4af797b8eeb75ab094e1cb1062c7ab2d8b9..ef13ff67ed29e277fe3bbfeb9c8f414bd305d119 100644
+--- a/src/main/java/net/minecraft/world/level/Level.java
++++ b/src/main/java/net/minecraft/world/level/Level.java
+@@ -272,7 +272,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+ 
+     public abstract ResourceKey<LevelStem> getTypeKey();
+ 
+-    protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter
++    //protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter // Purpur - dont break ABI
+ 
+     // Pufferfish start - ensure these get inlined
+     private final int minBuildHeight, minSection, height, maxBuildHeight, maxSection;
+diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+index ec23064d5a6d70508fad7cffc6126cfd6f7a62cb..b4e70dd36b426b9ca95e0a9953f1d7c89203db31 100644
+--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
++++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+@@ -136,7 +136,7 @@ public class LevelChunk extends ChunkAccess {
+         this.fluidTicks = fluidTickScheduler;
+         // CraftBukkit start
+         this.bukkitChunk = new org.bukkit.craftbukkit.CraftChunk(this);
+-        this.lightningTick = this.level.getThreadUnsafeRandom().nextInt(100000) << 1; // Pufferfish - initialize lightning tick
++        this.lightningTick = java.util.concurrent.ThreadLocalRandom.current().nextInt(100000) << 1; // Pufferfish - initialize lightning tick // Purpur - any random will do
+     }
+ 
+     public org.bukkit.Chunk bukkitChunk;

patches/server/0003-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 4f01bbc22b2e94d5415c36c8cd828e0551e929aa..347382587ca30b26ff26dd78622e9f2f20e64e6d 100644
+index a4a146d9c3e07bdf941d81147ca31daf4689a687..00d128eba3e778927bc33b71c1145051a0c142f5 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,7 +9,7 @@ plugins {
@@ -27,7 +27,7 @@ index 4f01bbc22b2e94d5415c36c8cd828e0551e929aa..347382587ca30b26ff26dd78622e9f2f
      runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
-@@ -82,7 +85,7 @@ tasks.jar {
+@@ -84,7 +87,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -36,7 +36,7 @@ index 4f01bbc22b2e94d5415c36c8cd828e0551e929aa..347382587ca30b26ff26dd78622e9f2f
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -170,7 +173,7 @@ fun TaskContainer.registerRunTask(
+@@ -172,7 +175,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {

patches/server/0004-Purpur-config-files.patch

@@ -84,7 +84,7 @@ index 85daf1de8ca0d48b348d1195c4243368999efee0..23454b660c123f4309d1b6eaab8f626f
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          // Paper end
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 683ab88e76b53331e5d9fbcb0e1ee65365008693..32518aa959e3ea95376ac2c1904aa51fb7e52508 100644
+index ef13ff67ed29e277fe3bbfeb9c8f414bd305d119..7e9e1fd5eb9f44c80d180534cd1211e8754b3afd 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -175,6 +175,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -96,7 +96,7 @@ index 683ab88e76b53331e5d9fbcb0e1ee65365008693..32518aa959e3ea95376ac2c1904aa51f
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -284,6 +286,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -286,6 +288,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper

patches/server/0008-Ridables.patch

@@ -34,7 +34,7 @@ index 783b81e5252a689683264a494a30fb668b43a986..d4b05231b6b631f382d7e5fe6c42eba3
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b0cd9d5ec1a36af1710ebffb420e29a898e27bc8..cabd856dc050359bbeb1e138535e44bf2a294d5c 100644
+index f8a813817d630993670092f0681a5bd8965cbb19..dade21560eb26011f8d59d277ffdc0b65d6e6c80 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -218,6 +218,7 @@ public class ServerLevel extends Level implements WorldGenLevel {

patches/server/0013-AFK-API.patch

@@ -276,7 +276,7 @@ index 1717eb5f8fdaf8432113a297602f2eaa10559583..ef8f2dd75b04534c454205cadf2bb5b0
  
      public static int barrelRows = 3;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c38d9583d8ce50670d78b60d92c90d1d5eb4bbfc..01a2d17790b3adbc63fe742b9e5c11dd2e0d2e68 100644
+index bf4c17c61dcc230286fe9ce4cb0855f0f710aad0..f4f1ebe68143270a940ac839c3b6df2775b3a0ca 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -89,6 +89,24 @@ public class PurpurWorldConfig {

patches/server/0020-Player-invulnerabilities.patch

@@ -146,7 +146,7 @@ index 16aa402f7b9ff8c2f1748bc4c82005ccf093ceb4..5cd36fef58afdc60d58acde8809f6507
      // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 01a2d17790b3adbc63fe742b9e5c11dd2e0d2e68..81524c4f676766c09125187876b46e0704294880 100644
+index f4f1ebe68143270a940ac839c3b6df2775b3a0ca..9dcdc3c57c774d260fb4849e7a90922101c0dd49 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -94,6 +94,8 @@ public class PurpurWorldConfig {

patches/server/0024-Silk-touch-spawners.patch

@@ -127,7 +127,7 @@ index 39bc91423c830d69eff1996881373296f322f06a..e0d8bd28576f16822a584f3514dbcb8f
              int i = 15 + worldserver.random.nextInt(15) + worldserver.random.nextInt(15);
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 93d89fb27044e5e97574122b0e7863694d245bf0..50b0cdb6c95fc076216b41018b2bd1a30a643efa 100644
+index 45f3d6daa4e3a90c55168da092595324af0a5a19..10b8183cf8af86676efd5486f09493eac59840d2 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -111,6 +111,38 @@ public class PurpurWorldConfig {

patches/server/0025-MC-168772-Fix-Add-turtle-egg-block-options.patch

@@ -50,7 +50,7 @@ index 7d25fb0fc64a4f559fe206198fde900afa06f258..1a12fee99a8b69fc6c01e1e217575c7c
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 50b0cdb6c95fc076216b41018b2bd1a30a643efa..4d9f7a90928fd4a3dd514799df3661f4ceb2ca36 100644
+index 10b8183cf8af86676efd5486f09493eac59840d2..39991fb579e6b0df221f62d544f4d0ab79d2a769 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -143,6 +143,15 @@ public class PurpurWorldConfig {

patches/server/0030-Zombie-horse-naturally-spawn.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cabd856dc050359bbeb1e138535e44bf2a294d5c..5f07e8669336d4ce27aa5f7837faf83682a9dff3 100644
+index dade21560eb26011f8d59d277ffdc0b65d6e6c80..1140edb12dba385ff572b2cd2ab1a4b32eab2a1a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -792,9 +792,15 @@ public class ServerLevel extends Level implements WorldGenLevel {

patches/server/0037-Add-option-to-set-armorstand-step-height.patch

@@ -17,7 +17,7 @@ index 150afceb491cfd254c0f1b84800e6df14cf26676..ba9e851eebb25edf94efe8dfbd591e26
          if (!this.canTick) {
              if (this.noTickPoseDirty) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 62bb7fafb686170f8ae6d2f7c7b10d04365e433c..7ab9864662b1a3de509e43b2177272078a7f3882 100644
+index 442e8dceeee7cd7e05bad5ce722b0dce121978ae..1c47c36d1fd31a270b28f1e92a6855a6a236ffa6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -89,6 +89,11 @@ public class PurpurWorldConfig {

patches/server/0045-Signs-editable-on-right-click.patch

@@ -35,7 +35,7 @@ index ed3d78494735ceda14ad0ea23adeadc374f3b35e..a0d23b7e244e7df8a462b801dee18fd4
                  } else {
                      return InteractionResult.PASS;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index fa3ae133ed06e4b57a4bc3ea2a32b5f1aef2636b..79e618ce91686370d439a5f6ed6a7f46f579ae74 100644
+index 7b48454ddf2d838e8c1d418f8218fbf9b1578d38..0584304bceb4d4da8854265700f3528e91a99980 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -148,6 +148,11 @@ public class PurpurWorldConfig {

patches/server/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch

@@ -18,7 +18,7 @@ index d089887030ac7c7a79abca97134ba9291e244059..4208833252a5b5c74d294dc3435869d7
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 79e618ce91686370d439a5f6ed6a7f46f579ae74..620a68fbef5d3bc8894ee83d9c52ec8ba58e98d3 100644
+index 0584304bceb4d4da8854265700f3528e91a99980..c21f24c3ecbde5dfd7a81f221e6e6ce157295660 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -148,6 +148,11 @@ public class PurpurWorldConfig {

patches/server/0047-Minecart-settings-and-WASD-controls.patch

@@ -148,7 +148,7 @@ index 939aca929038b90738c9b78c2fc3611088b18e72..2fe9daf2a1a4a007c983115503915981
      protected final float explosionResistance;
      protected final boolean isRandomlyTicking;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 620a68fbef5d3bc8894ee83d9c52ec8ba58e98d3..e42af09797a6e0ad976c4f734f1ad714bc377383 100644
+index c21f24c3ecbde5dfd7a81f221e6e6ce157295660..2611af43afada9bd46bed7cd342e818afeb95c1c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -94,6 +94,68 @@ public class PurpurWorldConfig {

patches/server/0048-Disable-loot-drops-on-death-by-cramming.patch

@@ -25,7 +25,7 @@ index 6c769141376f6995d6572d5e3cf3a999ff954e82..ccc034d345d4c7ea1b8317023e2e410d
          // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment
          org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops, () -> {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e42af09797a6e0ad976c4f734f1ad714bc377383..eb86bc06b2e7c6c7655d6111de96837ad921cbbb 100644
+index 2611af43afada9bd46bed7cd342e818afeb95c1c..85fdd1712640b4b3f87810294f49f1565e6fd750 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -94,6 +94,11 @@ public class PurpurWorldConfig {

patches/server/0049-Option-to-toggle-milk-curing-bad-omen.patch

@@ -28,7 +28,7 @@ index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af
  
          return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index eb86bc06b2e7c6c7655d6111de96837ad921cbbb..379d9c40fc04efc21a9a0f05f06e05959fca1630 100644
+index 85fdd1712640b4b3f87810294f49f1565e6fd750..f6292685e1a198d6e8ec4a1c77343a8d76565078 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -95,8 +95,10 @@ public class PurpurWorldConfig {

patches/server/0055-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch

@@ -18,7 +18,7 @@ index 1b31b32d42eeb54680b902cd7e82d10ba7daa5d0..5be708a76642d4133757c5d181b3c541
                  if (!this.level.isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) {
                      this.spawnAtLocation(this.getPickupItem(), 0.1F);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 379d9c40fc04efc21a9a0f05f06e05959fca1630..725d29b3e79e45d95635b73c9ea783ff2a04ad39 100644
+index f6292685e1a198d6e8ec4a1c77343a8d76565078..ca4c6ed817cb2b4b53ea48ecc962564d3576d7d9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -96,9 +96,11 @@ public class PurpurWorldConfig {

patches/server/0059-Implement-infinite-liquids.patch

@@ -81,7 +81,7 @@ index ac33ba631f4b0ae0e08bff5748440ef5b76c2117..29068ca2df90ab0351b91cd0aa3e224c
      @Override
      protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state,  BlockPos source) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9cab405a67c76e920754d0ba10978cf5476f1b82..111b93dd9f3eecb5b88d3d0382670dd864cca03e 100644
+index a361faa6723067fb0f9bac1fc9036d92cb0cd9ef..91c4776aab25fc42ff41a215015493f782e4d78c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -224,6 +224,13 @@ public class PurpurWorldConfig {

patches/server/0060-Make-lava-flow-speed-configurable.patch

@@ -18,7 +18,7 @@ index d96c52a55cad5f6127b17e1307fe341e8bdd1335..87643b76ea46ddfe0281e8a97a5b0996
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 111b93dd9f3eecb5b88d3d0382670dd864cca03e..8dadd94bf8950f58d4f810d13377a44c7114ccb3 100644
+index 91c4776aab25fc42ff41a215015493f782e4d78c..25e377ce3d916d931143bc54585d12c39e31f581 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -226,9 +226,13 @@ public class PurpurWorldConfig {

patches/server/0061-Add-player-death-exp-control-options.patch

@@ -31,7 +31,7 @@ index 74f14215280005a4d6fb35a77e2f1c4858250f2f..e0ea8b1b3ccde9616a721d677a8217b2
              return 0;
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8dadd94bf8950f58d4f810d13377a44c7114ccb3..b6a436b665134776c8f3f12acf082d07972d21d3 100644
+index 25e377ce3d916d931143bc54585d12c39e31f581..12ac9c973d39713b62106be8040a09b094ba38f4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -172,6 +172,8 @@ public class PurpurWorldConfig {

patches/server/0062-Configurable-void-damage-height-and-damage.patch

@@ -31,7 +31,7 @@ index bc19439abb1cbf548b1eda2a6527d9e825ea34ab..40c716bd22d54f7f669d570d1bebcb18
  
      protected void updateSwingTime() {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b6a436b665134776c8f3f12acf082d07972d21d3..6bd149c740ead63036c3cb80e6c74c1c2e0b9420 100644
+index 12ac9c973d39713b62106be8040a09b094ba38f4..7944d3ed8c17ee80ea9913188fb45feda274e036 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -97,10 +97,14 @@ public class PurpurWorldConfig {

patches/server/0064-Dispenser-curse-of-binding-protection.patch

@@ -43,7 +43,7 @@ index baa7e055d8ee4a153842128b07984b9f6deac6ca..014dd3aa8a7313d978d4781a1b7c6f53
              // CraftBukkit start
              Level world = pointer.getLevel();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6bd149c740ead63036c3cb80e6c74c1c2e0b9420..57231e4550121f836fd85f86ecb6fd1be7bdd457 100644
+index 7944d3ed8c17ee80ea9913188fb45feda274e036..3481c204c118d3990b158e9dbd1313e37e701184 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -227,6 +227,11 @@ public class PurpurWorldConfig {

patches/server/0065-Add-option-for-boats-to-eject-players-on-land.patch

@@ -17,7 +17,7 @@ index eb753323f67badb1bed28405c07b03078e322b44..c9ce0f1f798ee73e985798e7e7271aa5
              } else {
                  return Boat.Status.IN_AIR;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 57231e4550121f836fd85f86ecb6fd1be7bdd457..ed4bc851879b1a9af3450213b94fe8c26af95174 100644
+index 3481c204c118d3990b158e9dbd1313e37e701184..dacd070f4b0925a4c8649f5e8caafd01d00cba8f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -94,12 +94,14 @@ public class PurpurWorldConfig {

patches/server/0066-Mending-mends-most-damages-equipment-first.patch

@@ -73,7 +73,7 @@ index 22925b2f44fc510832ef07290d3109f0394f7d30..4afa30753a90d9bbd3c71b21cb4a8dea
      public static Map.Entry<EquipmentSlot, ItemStack> getRandomItemWith(Enchantment enchantment, LivingEntity entity) {
          return getRandomItemWith(enchantment, entity, (stack) -> {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ed4bc851879b1a9af3450213b94fe8c26af95174..b1c3c835c3bbba5b8cdbafbe3221e4427015ffec 100644
+index dacd070f4b0925a4c8649f5e8caafd01d00cba8f..0edb6ec9678f0fc8a1236622490ff67dfb93dd55 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -94,6 +94,7 @@ public class PurpurWorldConfig {

patches/server/0068-Implement-elytra-settings.patch

@@ -99,7 +99,7 @@ index 998758be827efbcb7693ed36ab1dffc0ef0369bf..5beaafec0759543d3bddf99028c97d0d
                          entityhuman.startAutoSpinAttack(20);
                          if (entityhuman.isOnGround()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b1c3c835c3bbba5b8cdbafbe3221e4427015ffec..f243cee2b81e27d2ff7fdc7356bf71d2e369ad2a 100644
+index 0edb6ec9678f0fc8a1236622490ff67dfb93dd55..3a15647c0ddc5a234f1cea5778e336caea3f3f24 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -111,6 +111,19 @@ public class PurpurWorldConfig {

patches/server/0069-Item-entity-immunities.patch

@@ -128,7 +128,7 @@ index fea44ba6a6584b4a510af6a58cab07eecec6b68b..f3bf5199bc7ddf8a3d0dc67a184e7690
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f243cee2b81e27d2ff7fdc7356bf71d2e369ad2a..ca30699fde62277e6794d4ba0b829287cfc7c651 100644
+index 3a15647c0ddc5a234f1cea5778e336caea3f3f24..fb1d389cdfa47726718552fd92cf0035858792df 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -124,6 +124,49 @@ public class PurpurWorldConfig {

patches/server/0076-Implement-bed-explosion-options.patch

@@ -27,7 +27,7 @@ index 654a859a37bf991c7a7fa8a44a3d20f8feb223db..e1d274a9be856f6fa5be00958c35b7d7
              }
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 485e7cfd0c0da45129c0b1a0cd95c5d14d0e0a06..9f4a29c8ea537a4cc733b3658a169f8f5a5334d3 100644
+index 9903ab606d08d51643dfbf45e48a2296f312e0de..5b393a3cad84a7618bf481be9480b095a561f155 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -287,6 +287,22 @@ public class PurpurWorldConfig {

patches/server/0077-Implement-respawn-anchor-explosion-options.patch

@@ -18,7 +18,7 @@ index c2f3d3a09327e7cb7d3167609eb3ce68eadf6443..12b25aec1167620ed7048c0c8631b0b5
  
      public static boolean canSetSpawn(Level world) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9f4a29c8ea537a4cc733b3658a169f8f5a5334d3..91cc596ef1f5b5ce16c16125520038e2d6a69eaa 100644
+index 5b393a3cad84a7618bf481be9480b095a561f155..8cef70934821898e8445edc247adf718e224ec3c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -324,6 +324,22 @@ public class PurpurWorldConfig {

patches/server/0078-Add-allow-water-in-end-world-option.patch

@@ -27,10 +27,10 @@ index 73f1211470d9626c82c8345037da19aed9db3f23..40c7bf266eccc43faa081ade9402bee5
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 32518aa959e3ea95376ac2c1904aa51fb7e52508..39454ba18ef3ec312b367a397c0e555f0d5f5ae6 100644
+index 7e9e1fd5eb9f44c80d180534cd1211e8754b3afd..072c72385c2ec279d03daed003a992b381178fbb 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1569,4 +1569,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1571,4 +1571,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return null;
      }
      // Paper end

patches/server/0080-Entity-lifespan.patch

@@ -95,7 +95,7 @@ index 1e4629de69b762f89efe54a93f28292d3657bccb..fe97b5b327af1189b166243c42be9989
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 91cc596ef1f5b5ce16c16125520038e2d6a69eaa..a589ef8be5335bcb5fe8322e21ec407957d0ce63 100644
+index 8cef70934821898e8445edc247adf718e224ec3c..16639d1ec58413298c7e12d64838d21f8d5fdedd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -124,6 +124,11 @@ public class PurpurWorldConfig {

patches/server/0081-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch

@@ -56,7 +56,7 @@ index dc6177e8d5c6f6615ccbfa55a2e0a8c891fc6b52..d75a3d62eeb151c2451b20feb7fd088c
                      }
                  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a589ef8be5335bcb5fe8322e21ec407957d0ce63..a28d11edcf87f3e01477e8d7aa70b8a822b76fa6 100644
+index 16639d1ec58413298c7e12d64838d21f8d5fdedd..e44b6b03e90a52f5b3e411fb78a3050287a23431 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -243,6 +243,7 @@ public class PurpurWorldConfig {

patches/server/0085-Redstone-deactivates-spawners.patch

@@ -17,7 +17,7 @@ index ee619590aa49323059947fbaee9e88d61df99789..deffa277272c34adb39d7c3e69e91502
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9b5a45643f288cab8725d1d9050b9d97ea9f97ae..c568340555c9c0c45432dea6dbc29adac98c3d92 100644
+index d224e0586472779ee0205a939e2f0173fa0aed8d..6da346a866493631914f16ae2a4f60632fd1b897 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -352,6 +352,11 @@ public class PurpurWorldConfig {

patches/server/0086-Totems-work-in-inventory.patch

@@ -29,7 +29,7 @@ index d75a3d62eeb151c2451b20feb7fd088c513a2571..2b7d14e3de4520188c1701ac00044a64
              event.setCancelled(itemstack == null);
              this.level.getCraftServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c568340555c9c0c45432dea6dbc29adac98c3d92..bce43c499ef75131ae637ae8d089517f34602357 100644
+index 6da346a866493631914f16ae2a4f60632fd1b897..529193b0b6b0e2883688c3b1e3ca4bbe315267f8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -244,6 +244,7 @@ public class PurpurWorldConfig {

patches/server/0089-Dispensers-place-anvils-option.patch

@@ -41,7 +41,7 @@ index 3d2b5f040715a0e4fac0e6786bd11a4d715330ce..9aef3cfd930594c1a2c92a02a18133d0
  
      static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 59597a70f60ccad348dfe56985358cbae8c558e7..85b4f00796521d007a1b741c5dcc47a6e359d71a 100644
+index 5761da1c9f712c93b40bb9c67910fb6736150b10..b44d77391406d9046c13d9aa4330b5649708ec70 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -313,8 +313,10 @@ public class PurpurWorldConfig {

patches/server/0090-Allow-anvil-colors.patch

@@ -27,7 +27,7 @@ index c1ed57bae737fca803c2dd8666207dbffc6758c3..10cd589e427f847936f29e33edee3923
              }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 85b4f00796521d007a1b741c5dcc47a6e359d71a..4d474c2d2f6c1a7a28daba2d9886cf6e5e12b343 100644
+index b44d77391406d9046c13d9aa4330b5649708ec70..fdad39e4a639c46e3ce15bbf77a854f532a4d655 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -296,6 +296,11 @@ public class PurpurWorldConfig {

patches/server/0095-Entities-can-use-portals-configuration.patch

@@ -27,7 +27,7 @@ index d0e0811601684199206f4c6e23e077a2c987e86b..8873e947665a877255d92548f7e894f6
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 68451f2c85e723dcb4835b4c0aeaffaf2f79bc3a..c3546d8e36fecfd5d6c6c767de30fc6634a72416 100644
+index 8f15e760ab50bc8add8de89a4922e99613dfb076..a4a590c456b5e3554605f3428f93d3a8e1bd5ba9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -97,6 +97,7 @@ public class PurpurWorldConfig {

patches/server/0098-Allow-toggling-special-MobSpawners-per-world.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
 In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5f07e8669336d4ce27aa5f7837faf83682a9dff3..476047528dc9dbb7983f47e960f4d3e2fa1044ee 100644
+index 1140edb12dba385ff572b2cd2ab1a4b32eab2a1a..ea71f71918c19d03f584939d17901d2ffff7ad0e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -505,7 +505,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -67,7 +67,7 @@ index daa7c4bd8a3f6c28f02b7117b061f0def29e3743..d4699d7eefafffd2d4e0a03d62d5094f
              if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
                  blockposition1 = blockposition2;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7a7bd0fbac184b10dfd2d4a1b210c7c40efc4437..9805b0f7821049c124159cc9fd26cec2bfdae7d2 100644
+index 88b49ee7171c0ad7be83eeac2aba2573e9707e4f..35529a02afe42607ebcd6ab532324561429ab14a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -68,6 +68,12 @@ public class PurpurWorldConfig {