475 files changed, 270 insertions, 234 deletions

diff --git a/build-data/paper.at b/build-data/paper.at
index 0b90f95521..5394004025 100644
--- a/build-data/paper.at
+++ b/build-data/paper.at
@@ -272,5 +272,18 @@ public net.minecraft.world.level.chunk.LevelChunkSection states
 # Player.setPlayerProfile API
 public-f net.minecraft.world.entity.player.Player gameProfile
 
+# Generator Settings
+public net.minecraft.world.level.levelgen.SurfaceRules$Condition
+public net.minecraft.world.level.levelgen.SurfaceRules$Context
+public net.minecraft.world.level.levelgen.SurfaceRules$Context blockX
+public net.minecraft.world.level.levelgen.SurfaceRules$Context blockY
+public net.minecraft.world.level.levelgen.SurfaceRules$Context blockZ
+public net.minecraft.world.level.levelgen.SurfaceRules$Context context
+public net.minecraft.world.level.levelgen.SurfaceRules$Context system
+public net.minecraft.world.level.levelgen.SurfaceRules$LazyYCondition
+public net.minecraft.world.level.levelgen.SurfaceRules$VerticalGradientConditionSource
+public net.minecraft.world.level.levelgen.SurfaceRules$SurfaceRule
+public net.minecraft.world.level.levelgen.SurfaceSystem getOrCreateRandomFactory(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/world/level/levelgen/PositionalRandomFactory;
+
 # Fix removing recipes
 public net.minecraft.world.item.crafting.RecipeManager byName
diff --git a/patches/removed/1.18/0344-Generator-Settings.patch b/patches/removed/1.18/0344-Generator-Settings.patch
deleted file mode 100644
index f9a9c8e603..0000000000
--- a/patches/removed/1.18/0344-Generator-Settings.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Byteflux <[email protected]>
-Date: Wed, 2 Mar 2016 02:17:54 -0600
-Subject: [PATCH] Generator Settings
-
-#NOTE: Bedrock generation has moved a bunch, needs to be redone or dropped
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d9437b3ef3919bff5d2eebd8b5e016ddb7a0e793..d3da5175ce1075511229ea52f1237898bcae9a11 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -457,5 +457,10 @@ public class PaperWorldConfig {
-     private void disableRelativeProjectileVelocity() {
-         disableRelativeProjectileVelocity = getBoolean("game-mechanics.disable-relative-projectile-velocity", false);
-     }
-+
-+    public boolean generateFlatBedrock;
-+    private void generatorSettings() {
-+        generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", false);
-+    }
- }
- 
-diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index fcd25c4476e2afcf4e676dca7a8abad9cc112bef..41253d8adf85cf318fcb1cee36ac1763f440fca6 100644
---- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -726,7 +726,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-             }
- 
-             this.markPositionReplaceable(pos);
--            return Either.left(new ProtoChunk(pos, UpgradeData.EMPTY, this.level));
-+            return Either.left(new ProtoChunk(pos, UpgradeData.EMPTY, this.level, this.level)); // Paper - add level
-             // Paper start - Async chunk io
-         };
-         CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> ret = new CompletableFuture<>();
-diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-index 974ab04b08bbd3c27a394b37c1af112be5f28f43..149ac5ec368b53a9a5e9208bd49a3c9453625d9c 100644
---- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-@@ -29,6 +29,17 @@ public interface ChunkAccess extends BlockGetter, FeatureAccess {
-         return GameEventDispatcher.NOOP;
-     }
- 
-+    // Paper start
-+    default boolean generateFlatBedrock() {
-+        if (this.getLevel() != null) {
-+            return this.getLevel().paperConfig.generateFlatBedrock;
-+        }
-+        return false;
-+    }
-+
-+    net.minecraft.world.level.Level getLevel();
-+    // Paper end
-+
-     BlockState getType(final int x, final int y, final int z); // Paper
-     @Nullable
-     BlockState setBlockState(BlockPos pos, BlockState state, boolean moved);
-diff --git a/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java
-index 452b513e8b89d865a396066adaf4feb1140e1c62..8245c5834ec69beb8e3b95fb3900601009a9273f 100644
---- a/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java
-@@ -25,7 +25,7 @@ public class ImposterProtoChunk extends ProtoChunk {
-     private final LevelChunk wrapped;
- 
-     public ImposterProtoChunk(LevelChunk wrapped) {
--        super(wrapped.getPos(), UpgradeData.EMPTY, wrapped);
-+        super(wrapped.getPos(), UpgradeData.EMPTY, wrapped, wrapped.level); // Paper - add level
-         this.wrapped = wrapped;
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
-index 873fea54aecca411b6dee1ed3566f93c4fb9670f..7dc3d806a680150c6a2fffa1436fd63bbdc31eb3 100644
---- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
-@@ -63,16 +63,45 @@ public class ProtoChunk implements ChunkAccess {
-     private long inhabitedTime;
-     private final Map<GenerationStep.Carving, BitSet> carvingMasks = new Object2ObjectArrayMap<>();
-     private volatile boolean isLightCorrect;
-+    // Paper start - Add level
-+    final net.minecraft.world.level.Level level;
-+    @Override
-+    public net.minecraft.world.level.Level getLevel() {
-+        return this.level;
-+    }
-+    // Paper end
-+    private static boolean PRINTED_OUTDATED_CTOR_MSG = false; // Paper - Add level
- 
-+    @Deprecated // Paper start - add level
-     public ProtoChunk(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor world) {
-+        // Paper start
-+        this(pos, upgradeData, world, null);
-+        if (!PRINTED_OUTDATED_CTOR_MSG) {
-+            new IllegalArgumentException("Must use ProtoChunk constructor with the ServerLevel parameter").printStackTrace();
-+            PRINTED_OUTDATED_CTOR_MSG = true;
-+        }
-+    }
-+    public ProtoChunk(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor world, net.minecraft.server.level.ServerLevel level) {
-+        // Paper end
-         this(pos, upgradeData, (LevelChunkSection[])null, new ProtoTickList<>((block) -> {
-             return block == null || block.defaultBlockState().isAir();
-         }, pos, world), new ProtoTickList<>((fluid) -> {
-             return fluid == null || fluid == Fluids.EMPTY;
--        }, pos, world), world);
-+        }, pos, world), world, level); // Paper - add level
-     }
- 
-+    @Deprecated // Paper start - add level
-     public ProtoChunk(ChunkPos pos, UpgradeData upgradeData, @Nullable LevelChunkSection[] levelChunkSections, ProtoTickList<Block> blockTickScheduler, ProtoTickList<Fluid> fluidTickScheduler, LevelHeightAccessor world) {
-+        // Paper start
-+        this(pos, upgradeData, levelChunkSections, blockTickScheduler, fluidTickScheduler, world, null);
-+        if (!PRINTED_OUTDATED_CTOR_MSG) {
-+            new IllegalArgumentException("Must use ProtoChunk constructor with the ServerLevel parameter").printStackTrace();
-+            PRINTED_OUTDATED_CTOR_MSG = true;
-+        }
-+    }
-+    public ProtoChunk(ChunkPos pos, UpgradeData upgradeData, @Nullable LevelChunkSection[] levelChunkSections, ProtoTickList<Block> blockTickScheduler, ProtoTickList<Fluid> fluidTickScheduler, LevelHeightAccessor world, net.minecraft.server.level.ServerLevel level) {
-+        this.level = level;
-+        // Paper end
-         this.chunkPos = pos;
-         this.upgradeData = upgradeData;
-         this.blockTicks = blockTickScheduler;
-diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index 1eaedda19b05e1ec429fa505c72c9e2743eb32b7..83fa00de1a7cb690c763cec9c8d4b3fcd44e7c74 100644
---- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-@@ -208,7 +208,7 @@ public class ChunkSerializer {
-                 // CraftBukkit end
-             });
-         } else {
--            ProtoChunk protochunk = new ProtoChunk(pos, chunkconverter, achunksection, protochunkticklist, protochunkticklist1, world);
-+            ProtoChunk protochunk = new ProtoChunk(pos, chunkconverter, achunksection, protochunkticklist, protochunkticklist1, world, world); // Paper - add level
- 
-             protochunk.setBiomes(biomestorage);
-             object = protochunk;
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
-index 32363a57a4b4f6912f03732ce6a0bb005449f525..5cc63122b8e2c955b2d756000c1677d51e8d8629 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
-@@ -323,7 +323,7 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
- 
-                 if (flag1) {
-                     for (l1 = 0; l1 < 5; ++l1) {
--                        if (l1 <= random.nextInt(5)) {
-+                        if (l1 <= (chunk.generateFlatBedrock() ? 0 : random.nextInt(5))) { // Paper - Configurable flat bedrock roof
-                             chunk.setBlockState(blockposition_mutableblockposition.set(blockposition.getX(), i1 - l1, blockposition.getZ()), Blocks.BEDROCK.defaultBlockState(), false);
-                         }
-                     }
-@@ -331,7 +331,7 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
- 
-                 if (flag2) {
-                     for (l1 = 4; l1 >= 0; --l1) {
--                        if (l1 <= random.nextInt(5)) {
-+                        if (l1 <= (chunk.generateFlatBedrock() ? 0 : random.nextInt(5))) { // Paper - Configurable flat bedrock floor{
-                             chunk.setBlockState(blockposition_mutableblockposition.set(blockposition.getX(), l + l1, blockposition.getZ()), Blocks.BEDROCK.defaultBlockState(), false);
-                         }
-                     }
diff --git a/patches/server/0345-Flat-bedrock-generator-settings.patch b/patches/server/0345-Flat-bedrock-generator-settings.patch
new file mode 100644
index 0000000000..1873598068
--- /dev/null
+++ b/patches/server/0345-Flat-bedrock-generator-settings.patch
@@ -0,0 +1,183 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Byteflux <[email protected]>
+Date: Wed, 2 Mar 2016 02:17:54 -0600
+Subject: [PATCH] Flat bedrock generator settings
+
+Co-authored-by: Noah van der Aa <[email protected]>
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index 275c9e6c60dc78bc2acc6fc8a78727d2030babdd..fa620165fcdd71ee596142260b77688a42b99b78 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -462,5 +462,10 @@ public class PaperWorldConfig {
+     private void pillagerSettings() {
+         disablePillagerPatrols = getBoolean("game-mechanics.disable-pillager-patrols", disablePillagerPatrols);
+     }
++
++    public boolean generateFlatBedrock = false;
++    private void generatorSettings() {
++        generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", this.generateFlatBedrock);
++    }
+ }
+ 
+diff --git a/src/main/java/net/minecraft/data/worldgen/SurfaceRuleData.java b/src/main/java/net/minecraft/data/worldgen/SurfaceRuleData.java
+index 514493f20bcd0a697d6787e11ec7042e601e1de2..66379a83e7fe7b9d1262e1ef4a7fa986adeb82ba 100644
+--- a/src/main/java/net/minecraft/data/worldgen/SurfaceRuleData.java
++++ b/src/main/java/net/minecraft/data/worldgen/SurfaceRuleData.java
+@@ -54,6 +54,50 @@ public class SurfaceRuleData {
+         return overworldLike(true, false, true);
+     }
+ 
++    // Paper start
++    // Taken from SurfaceRules$VerticalGradientConditionSource
++    private final record PaperBedrockConditionSource(String randomName, VerticalAnchor trueAtAndBelow, VerticalAnchor falseAtAndAbove, boolean invert) implements SurfaceRules.ConditionSource {
++        @Override
++        public com.mojang.serialization.Codec<? extends SurfaceRules.ConditionSource> codec() {
++            return CODEC;
++        }
++
++        @Override
++        public SurfaceRules.Condition apply(SurfaceRules.Context context) {
++            boolean hasFlatBedrock = context.context.getWorld().paperConfig.generateFlatBedrock;
++            int trueAtY = this.trueAtAndBelow().resolveY(context.context);
++            int falseAtY = this.falseAtAndAbove().resolveY(context.context);
++
++            int y = invert ? Math.max(falseAtY, trueAtY) - 1 : Math.min(falseAtY, trueAtY) ;
++            final int i = hasFlatBedrock ? y : trueAtY;
++            final int j = hasFlatBedrock ? y : falseAtY;
++            final net.minecraft.world.level.levelgen.PositionalRandomFactory positionalRandomFactory = context.system.getOrCreateRandomFactory(new net.minecraft.resources.ResourceLocation(this.randomName()));
++
++            class VerticalGradientCondition extends SurfaceRules.LazyYCondition {
++                VerticalGradientCondition(SurfaceRules.Context context) {
++                    super(context);
++                }
++
++                @Override
++                protected boolean compute() {
++                    int y = this.context.blockY;
++                    if (y <= i) {
++                        return true;
++                    } else if (y >= j) {
++                        return false;
++                    } else {
++                        double d = net.minecraft.util.Mth.map((double) y, (double) i, (double) j, 1.0D, 0.0D);
++                        net.minecraft.world.level.levelgen.RandomSource randomSource = positionalRandomFactory.at(this.context.blockX, i, this.context.blockZ);
++                        return (double) randomSource.nextFloat() < d;
++                    }
++                }
++            }
++
++            return new VerticalGradientCondition(context);
++        }
++    }
++    // Paper end
++
+     public static SurfaceRules.RuleSource overworldLike(boolean surface, boolean bedrockRoof, boolean bedrockFloor) {
+         SurfaceRules.ConditionSource conditionSource = SurfaceRules.yBlockCheck(VerticalAnchor.absolute(97), 2);
+         SurfaceRules.ConditionSource conditionSource2 = SurfaceRules.yBlockCheck(VerticalAnchor.absolute(256), 0);
+@@ -82,11 +126,11 @@ public class SurfaceRuleData {
+         SurfaceRules.RuleSource ruleSource9 = SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.WOODED_BADLANDS), SurfaceRules.ifTrue(conditionSource, SurfaceRules.sequence(SurfaceRules.ifTrue(conditionSource14, COARSE_DIRT), SurfaceRules.ifTrue(conditionSource15, COARSE_DIRT), SurfaceRules.ifTrue(conditionSource16, COARSE_DIRT), ruleSource))), SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.SWAMP), SurfaceRules.ifTrue(conditionSource5, SurfaceRules.ifTrue(SurfaceRules.not(conditionSource6), SurfaceRules.ifTrue(SurfaceRules.noiseCondition(Noises.SWAMP, 0.0D), WATER)))))), SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.BADLANDS, Biomes.ERODED_BADLANDS, Biomes.WOODED_BADLANDS), SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.sequence(SurfaceRules.ifTrue(conditionSource2, ORANGE_TERRACOTTA), SurfaceRules.ifTrue(conditionSource4, SurfaceRules.sequence(SurfaceRules.ifTrue(conditionSource14, TERRACOTTA), SurfaceRules.ifTrue(conditionSource15, TERRACOTTA), SurfaceRules.ifTrue(conditionSource16, TERRACOTTA), SurfaceRules.bandlands())), SurfaceRules.ifTrue(conditionSource7, SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.ON_CEILING, RED_SANDSTONE), RED_SAND)), SurfaceRules.ifTrue(SurfaceRules.not(conditionSource10), ORANGE_TERRACOTTA), SurfaceRules.ifTrue(conditionSource9, WHITE_TERRACOTTA), ruleSource3)), SurfaceRules.ifTrue(conditionSource3, SurfaceRules.sequence(SurfaceRules.ifTrue(conditionSource6, SurfaceRules.ifTrue(SurfaceRules.not(conditionSource4), ORANGE_TERRACOTTA)), SurfaceRules.bandlands())), SurfaceRules.ifTrue(SurfaceRules.UNDER_FLOOR, SurfaceRules.ifTrue(conditionSource9, WHITE_TERRACOTTA)))), SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.ifTrue(conditionSource7, SurfaceRules.sequence(SurfaceRules.ifTrue(conditionSource11, SurfaceRules.ifTrue(conditionSource10, SurfaceRules.sequence(SurfaceRules.ifTrue(conditionSource8, AIR), SurfaceRules.ifTrue(SurfaceRules.temperature(), ICE), WATER))), ruleSource8))), SurfaceRules.ifTrue(conditionSource9, SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.ifTrue(conditionSource11, SurfaceRules.ifTrue(conditionSource10, WATER))), SurfaceRules.ifTrue(SurfaceRules.UNDER_FLOOR, ruleSource7), SurfaceRules.ifTrue(conditionSource13, SurfaceRules.ifTrue(SurfaceRules.stoneDepthCheck(0, true, true, CaveSurface.FLOOR), SANDSTONE)))), SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.FROZEN_PEAKS, Biomes.JAGGED_PEAKS), STONE), SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.WARM_OCEAN, Biomes.LUKEWARM_OCEAN, Biomes.DEEP_LUKEWARM_OCEAN), ruleSource2), ruleSource3)));
+         Builder<SurfaceRules.RuleSource> builder = ImmutableList.builder();
+         if (bedrockRoof) {
+-            builder.add(SurfaceRules.ifTrue(SurfaceRules.not(SurfaceRules.verticalGradient("bedrock_roof", VerticalAnchor.belowTop(5), VerticalAnchor.top())), BEDROCK));
++            builder.add(SurfaceRules.ifTrue(SurfaceRules.not(new PaperBedrockConditionSource("bedrock_roof", VerticalAnchor.belowTop(5), VerticalAnchor.top(), true)), BEDROCK)); // Paper
+         }
+ 
+         if (bedrockFloor) {
+-            builder.add(SurfaceRules.ifTrue(SurfaceRules.verticalGradient("bedrock_floor", VerticalAnchor.bottom(), VerticalAnchor.aboveBottom(5)), BEDROCK));
++            builder.add(SurfaceRules.ifTrue(new PaperBedrockConditionSource("bedrock_floor", VerticalAnchor.bottom(), VerticalAnchor.aboveBottom(5), false), BEDROCK)); // Paper
+         }
+ 
+         SurfaceRules.RuleSource ruleSource10 = SurfaceRules.ifTrue(SurfaceRules.abovePreliminarySurface(), ruleSource9);
+@@ -111,7 +155,7 @@ public class SurfaceRuleData {
+         SurfaceRules.ConditionSource conditionSource11 = SurfaceRules.noiseCondition(Noises.NETHER_WART, 1.17D);
+         SurfaceRules.ConditionSource conditionSource12 = SurfaceRules.noiseCondition(Noises.NETHER_STATE_SELECTOR, 0.0D);
+         SurfaceRules.RuleSource ruleSource = SurfaceRules.ifTrue(conditionSource9, SurfaceRules.ifTrue(conditionSource3, SurfaceRules.ifTrue(conditionSource4, GRAVEL)));
+-        return SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.verticalGradient("bedrock_floor", VerticalAnchor.bottom(), VerticalAnchor.aboveBottom(5)), BEDROCK), SurfaceRules.ifTrue(SurfaceRules.not(SurfaceRules.verticalGradient("bedrock_roof", VerticalAnchor.belowTop(5), VerticalAnchor.top())), BEDROCK), SurfaceRules.ifTrue(conditionSource5, NETHERRACK), SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.BASALT_DELTAS), SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.UNDER_CEILING, BASALT), SurfaceRules.ifTrue(SurfaceRules.UNDER_FLOOR, SurfaceRules.sequence(ruleSource, SurfaceRules.ifTrue(conditionSource12, BASALT), BLACKSTONE)))), SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.SOUL_SAND_VALLEY), SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.UNDER_CEILING, SurfaceRules.sequence(SurfaceRules.ifTrue(conditionSource12, SOUL_SAND), SOUL_SOIL)), SurfaceRules.ifTrue(SurfaceRules.UNDER_FLOOR, SurfaceRules.sequence(ruleSource, SurfaceRules.ifTrue(conditionSource12, SOUL_SAND), SOUL_SOIL)))), SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.not(conditionSource2), SurfaceRules.ifTrue(conditionSource6, LAVA)), SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.WARPED_FOREST), SurfaceRules.ifTrue(SurfaceRules.not(conditionSource10), SurfaceRules.ifTrue(conditionSource, SurfaceRules.sequence(SurfaceRules.ifTrue(conditionSource11, WARPED_WART_BLOCK), WARPED_NYLIUM)))), SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.CRIMSON_FOREST), SurfaceRules.ifTrue(SurfaceRules.not(conditionSource10), SurfaceRules.ifTrue(conditionSource, SurfaceRules.sequence(SurfaceRules.ifTrue(conditionSource11, NETHER_WART_BLOCK), CRIMSON_NYLIUM)))))), SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.NETHER_WASTES), SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.UNDER_FLOOR, SurfaceRules.ifTrue(conditionSource7, SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.not(conditionSource6), SurfaceRules.ifTrue(conditionSource3, SurfaceRules.ifTrue(conditionSource4, SOUL_SAND))), NETHERRACK))), SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.ifTrue(conditionSource, SurfaceRules.ifTrue(conditionSource4, SurfaceRules.ifTrue(conditionSource8, SurfaceRules.sequence(SurfaceRules.ifTrue(conditionSource2, GRAVEL), SurfaceRules.ifTrue(SurfaceRules.not(conditionSource6), GRAVEL)))))))), NETHERRACK);
++        return SurfaceRules.sequence(SurfaceRules.ifTrue(new PaperBedrockConditionSource("bedrock_floor", VerticalAnchor.bottom(), VerticalAnchor.aboveBottom(5), false), BEDROCK), SurfaceRules.ifTrue(SurfaceRules.not(new PaperBedrockConditionSource("bedrock_roof", VerticalAnchor.belowTop(5), VerticalAnchor.top(), true)), BEDROCK), SurfaceRules.ifTrue(conditionSource5, NETHERRACK), SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.BASALT_DELTAS), SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.UNDER_CEILING, BASALT), SurfaceRules.ifTrue(SurfaceRules.UNDER_FLOOR, SurfaceRules.sequence(ruleSource, SurfaceRules.ifTrue(conditionSource12, BASALT), BLACKSTONE)))), SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.SOUL_SAND_VALLEY), SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.UNDER_CEILING, SurfaceRules.sequence(SurfaceRules.ifTrue(conditionSource12, SOUL_SAND), SOUL_SOIL)), SurfaceRules.ifTrue(SurfaceRules.UNDER_FLOOR, SurfaceRules.sequence(ruleSource, SurfaceRules.ifTrue(conditionSource12, SOUL_SAND), SOUL_SOIL)))), SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.not(conditionSource2), SurfaceRules.ifTrue(conditionSource6, LAVA)), SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.WARPED_FOREST), SurfaceRules.ifTrue(SurfaceRules.not(conditionSource10), SurfaceRules.ifTrue(conditionSource, SurfaceRules.sequence(SurfaceRules.ifTrue(conditionSource11, WARPED_WART_BLOCK), WARPED_NYLIUM)))), SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.CRIMSON_FOREST), SurfaceRules.ifTrue(SurfaceRules.not(conditionSource10), SurfaceRules.ifTrue(conditionSource, SurfaceRules.sequence(SurfaceRules.ifTrue(conditionSource11, NETHER_WART_BLOCK), CRIMSON_NYLIUM)))))), SurfaceRules.ifTrue(SurfaceRules.isBiome(Biomes.NETHER_WASTES), SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.UNDER_FLOOR, SurfaceRules.ifTrue(conditionSource7, SurfaceRules.sequence(SurfaceRules.ifTrue(SurfaceRules.not(conditionSource6), SurfaceRules.ifTrue(conditionSource3, SurfaceRules.ifTrue(conditionSource4, SOUL_SAND))), NETHERRACK))), SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.ifTrue(conditionSource, SurfaceRules.ifTrue(conditionSource4, SurfaceRules.ifTrue(conditionSource8, SurfaceRules.sequence(SurfaceRules.ifTrue(conditionSource2, GRAVEL), SurfaceRules.ifTrue(SurfaceRules.not(conditionSource6), GRAVEL)))))))), NETHERRACK);
+     }
+ 
+     public static SurfaceRules.RuleSource end() {
+diff --git a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
+index 74ab13e89ee4a8f8c367706d86382f08e62520b3..09d814317443a86210245ab3a7902f2078f08131 100644
+--- a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
++++ b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
+@@ -231,7 +231,7 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
+     @Override
+     public void buildSurface(WorldGenRegion region, StructureFeatureManager structures, ChunkAccess chunk) {
+         if (!SharedConstants.debugVoidTerrain(chunk.getPos())) {
+-            WorldGenerationContext worldgenerationcontext = new WorldGenerationContext(this, region);
++            WorldGenerationContext worldgenerationcontext = new WorldGenerationContext(this, region, structures.getWorld()); // Paper
+             NoiseGeneratorSettings generatorsettingbase = (NoiseGeneratorSettings) this.settings.get();
+             NoiseChunk noisechunk = chunk.getOrCreateNoiseChunk(this.sampler, () -> {
+                 return new Beardifier(structures, chunk);
+@@ -253,7 +253,7 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
+             return new Beardifier(structureAccessor, chunk);
+         }, (NoiseGeneratorSettings) this.settings.get(), this.globalFluidPicker, Blender.of(chunkRegion));
+         Aquifer aquifer = noisechunk.aquifer();
+-        CarvingContext carvingcontext = new CarvingContext(this, chunkRegion.registryAccess(), chunk.getHeightAccessorForGeneration(), noisechunk);
++        CarvingContext carvingcontext = new CarvingContext(this, chunkRegion.registryAccess(), chunk.getHeightAccessorForGeneration(), noisechunk, structureAccessor.getWorld()); // Paper
+         CarvingMask carvingmask = ((ProtoChunk) chunk).getOrCreateCarvingMask(generationStep);
+ 
+         for (int j = -8; j <= 8; ++j) {
+diff --git a/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java b/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java
+index b99283c31193e2110f6e3f39c23dbfc2442bab2b..eed55a3f95d30bcd4184b8dfd597af7da26281a2 100644
+--- a/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java
++++ b/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java
+@@ -6,10 +6,13 @@ import net.minecraft.world.level.chunk.ChunkGenerator;
+ public class WorldGenerationContext {
+     private final int minY;
+     private final int height;
++    private final net.minecraft.world.level.Level level; // Paper
+ 
+-    public WorldGenerationContext(ChunkGenerator generator, LevelHeightAccessor world) {
++    public WorldGenerationContext(ChunkGenerator generator, LevelHeightAccessor world) { this(generator, world, null); } // Paper
++    public WorldGenerationContext(ChunkGenerator generator, LevelHeightAccessor world, @org.jetbrains.annotations.Nullable net.minecraft.world.level.Level level) { // Paper
+         this.minY = Math.max(world.getMinBuildHeight(), generator.getMinY());
+         this.height = Math.min(world.getHeight(), generator.getGenDepth());
++        this.level = level; // Paper
+     }
+ 
+     public int getMinGenY() {
+@@ -19,4 +22,13 @@ public class WorldGenerationContext {
+     public int getGenDepth() {
+         return this.height;
+     }
++
++    // Paper start
++    public net.minecraft.world.level.Level getWorld() {
++        if (this.level == null) {
++            throw new NullPointerException("WorldGenerationContext was initialized without a Level, but WorldGenerationContext#getWorld was called");
++        }
++        return this.level;
++    }
++    // Paper end
+ }
+diff --git a/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java b/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java
+index 0709cdae1be12a64b7105b50b7593b186797ca5b..bacc7a8de19f5938daf79f1829780efb6c2fcce4 100644
+--- a/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java
++++ b/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java
+@@ -17,8 +17,8 @@ public class CarvingContext extends WorldGenerationContext {
+     private final RegistryAccess registryAccess;
+     private final NoiseChunk noiseChunk;
+ 
+-    public CarvingContext(NoiseBasedChunkGenerator chunkGenerator, RegistryAccess registryManager, LevelHeightAccessor heightLimitView, NoiseChunk chunkNoiseSampler) {
+-        super(chunkGenerator, heightLimitView);
++    public CarvingContext(NoiseBasedChunkGenerator chunkGenerator, RegistryAccess registryManager, LevelHeightAccessor heightLimitView, NoiseChunk chunkNoiseSampler, @org.jetbrains.annotations.Nullable net.minecraft.world.level.Level level) { // Paper
++        super(chunkGenerator, heightLimitView, level); // Paper
+         this.generator = chunkGenerator;
+         this.registryAccess = registryManager;
+         this.noiseChunk = chunkNoiseSampler;
+diff --git a/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java b/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java
+index 640c2683c842655bbaee8f293f1c2613ef44844e..53d818b0cc602f827d0b907e293515f6810c6792 100644
+--- a/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java
++++ b/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java
+@@ -18,7 +18,7 @@ public class PlacementContext extends WorldGenerationContext {
+     private final Optional<PlacedFeature> topFeature;
+ 
+     public PlacementContext(WorldGenLevel world, ChunkGenerator generator, Optional<PlacedFeature> placedFeature) {
+-        super(generator, world);
++        super(generator, world, world.getLevel()); // Paper
+         this.level = world;
+         this.generator = generator;
+         this.topFeature = placedFeature;
diff --git a/patches/server/0345-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0346-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index 7409939936..7409939936 100644
--- a/patches/server/0345-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/server/0346-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0346-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0347-MC-145656-Fix-Follow-Range-Initial-Target.patch
index ef277110ec..bfb189d48d 100644
--- a/patches/server/0346-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/server/0347-MC-145656-Fix-Follow-Range-Initial-Target.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] MC-145656 Fix Follow Range Initial Target
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 275c9e6c60dc78bc2acc6fc8a78727d2030babdd..5628ddebd2a24dc8461c1bd4b0571aa5efd3b418 100644
+index fa620165fcdd71ee596142260b77688a42b99b78..8aa327e49f9764dc7240413fe2c66d1956fd2e59 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -462,5 +462,10 @@ public class PaperWorldConfig {
-     private void pillagerSettings() {
-         disablePillagerPatrols = getBoolean("game-mechanics.disable-pillager-patrols", disablePillagerPatrols);
+@@ -467,5 +467,10 @@ public class PaperWorldConfig {
+     private void generatorSettings() {
+         generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", this.generateFlatBedrock);
      }
 +
 +    public boolean entitiesTargetWithFollowRange = false;
diff --git a/patches/server/0347-Duplicate-UUID-Resolve-Option.patch b/patches/server/0348-Duplicate-UUID-Resolve-Option.patch
index e70621fbaa..96217e6982 100644
--- a/patches/server/0347-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0348-Duplicate-UUID-Resolve-Option.patch
@@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5628ddebd2a24dc8461c1bd4b0571aa5efd3b418..a0b04a04f90ef79edae77e6ab4cddd2a7d299abf 100644
+index e55647f5fb58aeca93bbb70fa8d06c1e356fe633..0b99f20ec760692a350acd4f78dd060e30d88b50 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -443,6 +443,45 @@ public class PaperWorldConfig {
diff --git a/patches/server/0348-Optimize-Hoppers.patch b/patches/server/0349-Optimize-Hoppers.patch
index bcbbf8c1d5..655aef5fad 100644
--- a/patches/server/0348-Optimize-Hoppers.patch
+++ b/patches/server/0349-Optimize-Hoppers.patch
@@ -13,10 +13,10 @@ Subject: [PATCH] Optimize Hoppers
 * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a0b04a04f90ef79edae77e6ab4cddd2a7d299abf..7dbb7f0e476c82fcbec7b51b62be18adab2fac72 100644
+index 0b99f20ec760692a350acd4f78dd060e30d88b50..fc2eaf571212586205f0edc57076a5ebc5e01ec0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -506,5 +506,17 @@ public class PaperWorldConfig {
+@@ -511,5 +511,17 @@ public class PaperWorldConfig {
      private void entitiesTargetWithFollowRange() {
          entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange);
      }
diff --git a/patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0350-PlayerDeathEvent-shouldDropExperience.patch
index c4f047485d..c4f047485d 100644
--- a/patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0350-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0350-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0351-Prevent-bees-loading-chunks-checking-hive-position.patch
index 1a6db3ffe9..1a6db3ffe9 100644
--- a/patches/server/0350-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0351-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0351-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0352-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index d646992d77..d646992d77 100644
--- a/patches/server/0351-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/server/0352-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0352-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0353-Guard-against-serializing-mismatching-chunk-coordina.patch
index 369500bf2c..369500bf2c 100644
--- a/patches/server/0352-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/0353-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0353-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0354-Optimise-IEntityAccess-getPlayerByUUID.patch
index 310c2e3737..310c2e3737 100644
--- a/patches/server/0353-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/patches/server/0354-Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/patches/server/0354-Fix-items-not-falling-correctly.patch b/patches/server/0355-Fix-items-not-falling-correctly.patch
index e5f37676a4..e5f37676a4 100644
--- a/patches/server/0354-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0355-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0355-Lag-compensate-eating.patch b/patches/server/0356-Lag-compensate-eating.patch
index c9c15b8277..c9c15b8277 100644
--- a/patches/server/0355-Lag-compensate-eating.patch
+++ b/patches/server/0356-Lag-compensate-eating.patch
diff --git a/patches/server/0356-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0357-Optimize-call-to-getFluid-for-explosions.patch
index cda154255f..cda154255f 100644
--- a/patches/server/0356-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0357-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0357-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0358-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index 602eb2b818..602eb2b818 100644
--- a/patches/server/0357-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/patches/server/0358-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0358-Add-effect-to-block-break-naturally.patch b/patches/server/0359-Add-effect-to-block-break-naturally.patch
index ebb75c4859..ebb75c4859 100644
--- a/patches/server/0358-Add-effect-to-block-break-naturally.patch
+++ b/patches/server/0359-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0359-Entity-Activation-Range-2.0.patch b/patches/server/0360-Entity-Activation-Range-2.0.patch
index 3ef1236c1b..3ef1236c1b 100644
--- a/patches/server/0359-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0360-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0360-Increase-Light-Queue-Size.patch b/patches/server/0361-Increase-Light-Queue-Size.patch
index 2697c5a05d..1b3abd00bd 100644
--- a/patches/server/0360-Increase-Light-Queue-Size.patch
+++ b/patches/server/0361-Increase-Light-Queue-Size.patch
@@ -14,10 +14,10 @@ light engine on shutdown...
 The queue size only puts a cap on max loss, doesn't solve that problem.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7dbb7f0e476c82fcbec7b51b62be18adab2fac72..c81364946460a6366bf70457c2025d4275f50f77 100644
+index fc2eaf571212586205f0edc57076a5ebc5e01ec0..a6f282df404b2babd436dbace0246997cc6e2af2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -518,5 +518,10 @@ public class PaperWorldConfig {
+@@ -523,5 +523,10 @@ public class PaperWorldConfig {
          hoppersIgnoreOccludingBlocks = getBoolean("hopper.ignore-occluding-blocks", hoppersIgnoreOccludingBlocks);
          log("Hopper Ignore Occluding Blocks: " + (hoppersIgnoreOccludingBlocks ? "enabled" : "disabled"));
      }
diff --git a/patches/server/0361-Fix-Light-Command.patch b/patches/server/0362-Fix-Light-Command.patch
index e572cdca65..e572cdca65 100644
--- a/patches/server/0361-Fix-Light-Command.patch
+++ b/patches/server/0362-Fix-Light-Command.patch
diff --git a/patches/server/0362-Anti-Xray.patch b/patches/server/0363-Anti-Xray.patch
index e3202fb8f8..8899542a7a 100644
--- a/patches/server/0362-Anti-Xray.patch
+++ b/patches/server/0363-Anti-Xray.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Anti-Xray
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c81364946460a6366bf70457c2025d4275f50f77..b18d35bc67f3124ca8f4a67e3dadabef52e2588a 100644
+index a6f282df404b2babd436dbace0246997cc6e2af2..6b8f7fec3307bc643a1bdd1fb9f0572fdb9da560 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,11 +1,13 @@
@@ -22,7 +22,7 @@ index c81364946460a6366bf70457c2025d4275f50f77..b18d35bc67f3124ca8f4a67e3dadabef
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
-@@ -523,5 +525,40 @@ public class PaperWorldConfig {
+@@ -528,5 +530,40 @@ public class PaperWorldConfig {
      private void lightQueueSize() {
          lightQueueSize = getInt("light-queue-size", lightQueueSize);
      }
diff --git a/patches/server/0363-Implement-alternative-item-despawn-rate.patch b/patches/server/0364-Implement-alternative-item-despawn-rate.patch
index dc64e0960b..74fb179ec7 100644
--- a/patches/server/0363-Implement-alternative-item-despawn-rate.patch
+++ b/patches/server/0364-Implement-alternative-item-despawn-rate.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement alternative item-despawn-rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b18d35bc67f3124ca8f4a67e3dadabef52e2588a..977b4f05eaafaf5c19b84d1cbeb853e66e7aab4f 100644
+index 6b8f7fec3307bc643a1bdd1fb9f0572fdb9da560..5a1e82727e4861681736c2bb3ed01637c4c42e4d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -560,5 +560,52 @@ public class PaperWorldConfig {
+@@ -565,5 +565,52 @@ public class PaperWorldConfig {
              Bukkit.getLogger().warning("You have enabled permission-based Anti-Xray checking - depending on your permission plugin, this may cause performance issues");
          }
      }
diff --git a/patches/server/0364-Tracking-Range-Improvements.patch b/patches/server/0365-Tracking-Range-Improvements.patch
index ff01a96da0..ff01a96da0 100644
--- a/patches/server/0364-Tracking-Range-Improvements.patch
+++ b/patches/server/0365-Tracking-Range-Improvements.patch
diff --git a/patches/server/0365-Fix-items-vanishing-through-end-portal.patch b/patches/server/0366-Fix-items-vanishing-through-end-portal.patch
index 7c4a1c1564..7c4a1c1564 100644
--- a/patches/server/0365-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0366-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0366-implement-optional-per-player-mob-spawns.patch b/patches/server/0367-implement-optional-per-player-mob-spawns.patch
index 66324526fe..3743a025d8 100644
--- a/patches/server/0366-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0367-implement-optional-per-player-mob-spawns.patch
@@ -25,10 +25,10 @@ index fe79c0add4f7cb18d487c5bb9415c40c5b551ea2..8d9ddad1879e7616d980ca70de8aecac
          poiUnload = Timings.ofSafe(name + "Chunk unload - POI");
          chunkUnload = Timings.ofSafe(name + "Chunk unload - Chunk");
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 977b4f05eaafaf5c19b84d1cbeb853e66e7aab4f..6e93a6e97dd03c0c0ed9673fa932ba81a42b1139 100644
+index 5a1e82727e4861681736c2bb3ed01637c4c42e4d..2a0319d45de0bfb246313a6e533d26aa24c28df1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -608,4 +608,12 @@ public class PaperWorldConfig {
+@@ -613,4 +613,12 @@ public class PaperWorldConfig {
              }
          }
      }
diff --git a/patches/server/0367-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0368-Avoid-hopper-searches-if-there-are-no-items.patch
index dbe0e97396..dbe0e97396 100644
--- a/patches/server/0367-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/patches/server/0368-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/patches/server/0368-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0369-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index e9d7e64447..e9d7e64447 100644
--- a/patches/server/0368-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0369-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0369-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0370-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index dd76a8c686..dd76a8c686 100644
--- a/patches/server/0369-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0370-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0370-Add-debug-for-sync-chunk-loads.patch b/patches/server/0371-Add-debug-for-sync-chunk-loads.patch
index 1d43ed1c38..1d43ed1c38 100644
--- a/patches/server/0370-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0371-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0371-Allow-overriding-the-java-version-check.patch b/patches/server/0372-Allow-overriding-the-java-version-check.patch
index 02e2bfbd5e..02e2bfbd5e 100644
--- a/patches/server/0371-Allow-overriding-the-java-version-check.patch
+++ b/patches/server/0372-Allow-overriding-the-java-version-check.patch
diff --git a/patches/server/0372-Add-ThrownEggHatchEvent.patch b/patches/server/0373-Add-ThrownEggHatchEvent.patch
index c026427598..c026427598 100644
--- a/patches/server/0372-Add-ThrownEggHatchEvent.patch
+++ b/patches/server/0373-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0373-Entity-Jump-API.patch b/patches/server/0374-Entity-Jump-API.patch
index 336c3cf125..336c3cf125 100644
--- a/patches/server/0373-Entity-Jump-API.patch
+++ b/patches/server/0374-Entity-Jump-API.patch
diff --git a/patches/server/0374-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0375-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 1b8d05c00b..7e5fef3cac 100644
--- a/patches/server/0374-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0375-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6e93a6e97dd03c0c0ed9673fa932ba81a42b1139..2ea220c4d3247c78f97c57f205b0019d5016d09e 100644
+index 2a0319d45de0bfb246313a6e533d26aa24c28df1..38aa300d296124729297aa5c6975f797961d7063 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -521,6 +521,11 @@ public class PaperWorldConfig {
+@@ -526,6 +526,11 @@ public class PaperWorldConfig {
          log("Hopper Ignore Occluding Blocks: " + (hoppersIgnoreOccludingBlocks ? "enabled" : "disabled"));
      }
  
diff --git a/patches/server/0375-Make-the-GUI-graph-fancier.patch b/patches/server/0376-Make-the-GUI-graph-fancier.patch
index f6061a031e..f6061a031e 100644
--- a/patches/server/0375-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0376-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0376-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0377-add-hand-to-BlockMultiPlaceEvent.patch
index a191025dfe..a191025dfe 100644
--- a/patches/server/0376-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0377-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0377-Prevent-teleporting-dead-entities.patch b/patches/server/0378-Prevent-teleporting-dead-entities.patch
index ea7c12d145..ea7c12d145 100644
--- a/patches/server/0377-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0378-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0378-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0379-Validate-tripwire-hook-placement-before-update.patch
index 9c50f803d4..9c50f803d4 100644
--- a/patches/server/0378-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/server/0379-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0379-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0380-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index 73410ca6fe..eaa656dbb1 100644
--- a/patches/server/0379-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/server/0380-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to allow iron golems to spawn in air
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2ea220c4d3247c78f97c57f205b0019d5016d09e..f8cabe3a0388e78f4a5b47b5f33224ae17c8fcb0 100644
+index 38aa300d296124729297aa5c6975f797961d7063..fbfff8b0647bdd1caf8b4ff0841a230417bebdb6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -423,6 +423,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0380-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0381-Configurable-chance-of-villager-zombie-infection.patch
index 0b7259d5ad..5fe457cd3e 100644
--- a/patches/server/0380-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0381-Configurable-chance-of-villager-zombie-infection.patch
@@ -8,10 +8,10 @@ This allows you to solve an issue in vanilla behavior where:
 * On normal difficulty they will have a 50% of getting infected or dying.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f8cabe3a0388e78f4a5b47b5f33224ae17c8fcb0..54f21ef0614d0282253baf8d3c00375c8cf22578 100644
+index fbfff8b0647bdd1caf8b4ff0841a230417bebdb6..5c6fdf9668a08cf0ff48309b9fbbefefadf5ecee 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -531,6 +531,11 @@ public class PaperWorldConfig {
+@@ -536,6 +536,11 @@ public class PaperWorldConfig {
          nerfNetherPortalPigmen = getBoolean("game-mechanics.nerf-pigmen-from-nether-portals", nerfNetherPortalPigmen);
      }
  
diff --git a/patches/server/0381-Optimise-Chunk-getFluid.patch b/patches/server/0382-Optimise-Chunk-getFluid.patch
index 9c772f1f61..9c772f1f61 100644
--- a/patches/server/0381-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0382-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0382-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0383-Set-spigots-verbose-world-setting-to-false-by-def.patch
index 4b0c8ea948..4b0c8ea948 100644
--- a/patches/server/0382-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0383-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0383-Add-tick-times-API-and-mspt-command.patch b/patches/server/0384-Add-tick-times-API-and-mspt-command.patch
index c58f7b3e41..c58f7b3e41 100644
--- a/patches/server/0383-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0384-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0384-Expose-MinecraftServer-isRunning.patch b/patches/server/0385-Expose-MinecraftServer-isRunning.patch
index fa5dde5768..fa5dde5768 100644
--- a/patches/server/0384-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0385-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0385-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0386-Add-Raw-Byte-ItemStack-Serialization.patch
index 318f55574a..318f55574a 100644
--- a/patches/server/0385-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0386-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0386-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0387-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 4661191674..c5ca876174 100644
--- a/patches/server/0386-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0387-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -10,10 +10,10 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 54f21ef0614d0282253baf8d3c00375c8cf22578..4934ad2cce62856429ffb5a7c7ccda55b5f6bf0b 100644
+index 4857b84a3bf406346448942ff91938b9e145c3bc..64b1e860a946ba3a2f3cbbe4b69dab52ede2139b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -505,10 +505,21 @@ public class PaperWorldConfig {
+@@ -505,8 +505,18 @@ public class PaperWorldConfig {
      }
  
      public boolean disablePillagerPatrols = false;
@@ -31,10 +31,7 @@ index 54f21ef0614d0282253baf8d3c00375c8cf22578..4934ad2cce62856429ffb5a7c7ccda55
 +        patrolStartDay = getInt("game-mechanics.pillager-patrols.start.day", patrolStartDay);
      }
  
-+
-     public boolean entitiesTargetWithFollowRange = false;
-     private void entitiesTargetWithFollowRange() {
-         entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange);
+     public boolean generateFlatBedrock = false;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 index 01b9edc8aaf472650f171f1b88229807bcfdc145..06d13cca9179156a14571785e8ed3c4d8f956ccd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
diff --git a/patches/server/0387-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0388-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index d902e4aeda..d902e4aeda 100644
--- a/patches/server/0387-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0388-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0388-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0389-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index 5472a4dd1d..5472a4dd1d 100644
--- a/patches/server/0388-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0389-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0389-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0390-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 4801094d00..4801094d00 100644
--- a/patches/server/0389-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0390-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0390-Don-t-tick-dead-players.patch b/patches/server/0391-Don-t-tick-dead-players.patch
index 2bfc8b4078..2bfc8b4078 100644
--- a/patches/server/0390-Don-t-tick-dead-players.patch
+++ b/patches/server/0391-Don-t-tick-dead-players.patch
diff --git a/patches/server/0391-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0392-Dead-Player-s-shouldn-t-be-able-to-move.patch
index b069a347d2..b069a347d2 100644
--- a/patches/server/0391-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0392-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0392-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0393-Optimize-Collision-to-not-load-chunks.patch
index bac7f60c82..bac7f60c82 100644
--- a/patches/server/0392-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0393-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0393-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0394-Don-t-move-existing-players-to-world-spawn.patch
index f59f642d8b..f59f642d8b 100644
--- a/patches/server/0393-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0394-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0394-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0395-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 0f741cb320..0f741cb320 100644
--- a/patches/server/0394-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0395-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0395-Improved-Watchdog-Support.patch b/patches/server/0396-Improved-Watchdog-Support.patch
index 98e58095e1..98e58095e1 100644
--- a/patches/server/0395-Improved-Watchdog-Support.patch
+++ b/patches/server/0396-Improved-Watchdog-Support.patch
diff --git a/patches/server/0396-Optimize-Pathfinding.patch b/patches/server/0397-Optimize-Pathfinding.patch
index cb063274e6..cb063274e6 100644
--- a/patches/server/0396-Optimize-Pathfinding.patch
+++ b/patches/server/0397-Optimize-Pathfinding.patch
diff --git a/patches/server/0397-Reduce-Either-Optional-allocation.patch b/patches/server/0398-Reduce-Either-Optional-allocation.patch
index 0f4641263b..0f4641263b 100644
--- a/patches/server/0397-Reduce-Either-Optional-allocation.patch
+++ b/patches/server/0398-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0398-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0399-Reduce-memory-footprint-of-NBTTagCompound.patch
index a47c3ab7a6..a47c3ab7a6 100644
--- a/patches/server/0398-Reduce-memory-footprint-of-NBTTagCompound.patch
+++ b/patches/server/0399-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0399-Prevent-opening-inventories-when-frozen.patch b/patches/server/0400-Prevent-opening-inventories-when-frozen.patch
index a16fd79371..a16fd79371 100644
--- a/patches/server/0399-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0400-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0400-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0401-Optimise-ArraySetSorted-removeIf.patch
index 1f9f1e2e4e..1f9f1e2e4e 100644
--- a/patches/server/0400-Optimise-ArraySetSorted-removeIf.patch
+++ b/patches/server/0401-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0401-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0402-Don-t-run-entity-collision-code-if-not-needed.patch
index 26127f5601..26127f5601 100644
--- a/patches/server/0401-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0402-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0402-Implement-Player-Client-Options-API.patch b/patches/server/0403-Implement-Player-Client-Options-API.patch
index 9a7b8bce1c..9a7b8bce1c 100644
--- a/patches/server/0402-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0403-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0403-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0404-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index cd2777bf53..cd2777bf53 100644
--- a/patches/server/0403-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/server/0404-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0404-Broadcast-join-message-to-console.patch b/patches/server/0405-Broadcast-join-message-to-console.patch
index 2dc0451917..2dc0451917 100644
--- a/patches/server/0404-Broadcast-join-message-to-console.patch
+++ b/patches/server/0405-Broadcast-join-message-to-console.patch
diff --git a/patches/server/0405-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0406-Fix-Chunk-Post-Processing-deadlock-risk.patch
index f03855bee7..f03855bee7 100644
--- a/patches/server/0405-Fix-Chunk-Post-Processing-deadlock-risk.patch
+++ b/patches/server/0406-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/0406-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0407-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index e582ea09fe..e582ea09fe 100644
--- a/patches/server/0406-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0407-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0407-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0408-Load-Chunks-for-Login-Asynchronously.patch
index 01f626cf50..01f626cf50 100644
--- a/patches/server/0407-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/server/0408-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/patches/server/0408-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0409-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 1cd8d81c83..1cd8d81c83 100644
--- a/patches/server/0408-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0409-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0409-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0410-Add-PlayerAttackEntityCooldownResetEvent.patch
index 8256db4306..8256db4306 100644
--- a/patches/server/0409-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0410-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0410-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0411-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 8a5268c81a..8a5268c81a 100644
--- a/patches/server/0410-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0411-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0411-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0412-Add-phantom-creative-and-insomniac-controls.patch
index 4a32ba2cf4..c7a7ba2bd9 100644
--- a/patches/server/0411-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0412-Add-phantom-creative-and-insomniac-controls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add phantom creative and insomniac controls
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4934ad2cce62856429ffb5a7c7ccda55b5f6bf0b..04fc04422ae90ca636319e9c1a439ccbd0980a3a 100644
+index 5140fc524b9995312324e494a42fa4334ac518c7..6aa85780d08a617195cd8521331e91b212f12f0c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -642,4 +642,11 @@ public class PaperWorldConfig {
+@@ -646,4 +646,11 @@ public class PaperWorldConfig {
          }
          perPlayerMobSpawns = getBoolean("per-player-mob-spawns", true);
      }
diff --git a/patches/server/0412-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0413-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index a1d367c4eb..a1d367c4eb 100644
--- a/patches/server/0412-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0413-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0413-Villager-Restocks-API.patch b/patches/server/0414-Villager-Restocks-API.patch
index 17ee27bb66..17ee27bb66 100644
--- a/patches/server/0413-Villager-Restocks-API.patch
+++ b/patches/server/0414-Villager-Restocks-API.patch
diff --git a/patches/server/0414-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0415-Validate-PickItem-Packet-and-kick-for-invalid.patch
index be3a22b04c..be3a22b04c 100644
--- a/patches/server/0414-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0415-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0415-Expose-game-version.patch b/patches/server/0416-Expose-game-version.patch
index b95057d6ec..b95057d6ec 100644
--- a/patches/server/0415-Expose-game-version.patch
+++ b/patches/server/0416-Expose-game-version.patch
diff --git a/patches/server/0416-Optimize-Voxel-Shape-Merging.patch b/patches/server/0417-Optimize-Voxel-Shape-Merging.patch
index 7bfe849396..7bfe849396 100644
--- a/patches/server/0416-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/0417-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0417-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0418-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 499c804b42..499c804b42 100644
--- a/patches/server/0417-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0418-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0418-misc-debugging-dumps.patch b/patches/server/0419-misc-debugging-dumps.patch
index c33ba2d26e..c33ba2d26e 100644
--- a/patches/server/0418-misc-debugging-dumps.patch
+++ b/patches/server/0419-misc-debugging-dumps.patch
diff --git a/patches/server/0419-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0420-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index bac12a065d..bac12a065d 100644
--- a/patches/server/0419-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0420-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0420-Implement-Mob-Goal-API.patch b/patches/server/0421-Implement-Mob-Goal-API.patch
index a84ff862f1..a84ff862f1 100644
--- a/patches/server/0420-Implement-Mob-Goal-API.patch
+++ b/patches/server/0421-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0421-Add-villager-reputation-API.patch b/patches/server/0422-Add-villager-reputation-API.patch
index 1ef3464e02..1ef3464e02 100644
--- a/patches/server/0421-Add-villager-reputation-API.patch
+++ b/patches/server/0422-Add-villager-reputation-API.patch
diff --git a/patches/server/0422-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0423-Option-for-maximum-exp-value-when-merging-orbs.patch
index a88c0e2f9f..e11db26db3 100644
--- a/patches/server/0422-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0423-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 04fc04422ae90ca636319e9c1a439ccbd0980a3a..23badcb54f89dc75d60017b7742568b30811c3f3 100644
+index 6aa85780d08a617195cd8521331e91b212f12f0c..e661a3d19f6e9fc7e7e55574222865487d7a817a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -649,4 +649,10 @@ public class PaperWorldConfig {
+@@ -653,4 +653,10 @@ public class PaperWorldConfig {
          phantomIgnoreCreative = getBoolean("phantoms-do-not-spawn-on-creative-players", phantomIgnoreCreative);
          phantomOnlyAttackInsomniacs = getBoolean("phantoms-only-attack-insomniacs", phantomOnlyAttackInsomniacs);
      }
diff --git a/patches/server/0423-ExperienceOrbMergeEvent.patch b/patches/server/0424-ExperienceOrbMergeEvent.patch
index 9ca6a034ef..9ca6a034ef 100644
--- a/patches/server/0423-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0424-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0424-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0425-Fix-PotionEffect-ignores-icon-flag.patch
index e542865e62..e542865e62 100644
--- a/patches/server/0424-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0425-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0425-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0426-Optimize-brigadier-child-sorting-performance.patch
index 3dd2ebd6a4..3dd2ebd6a4 100644
--- a/patches/server/0425-Optimize-brigadier-child-sorting-performance.patch
+++ b/patches/server/0426-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0426-Potential-bed-API.patch b/patches/server/0427-Potential-bed-API.patch
index 8b5848a992..8b5848a992 100644
--- a/patches/server/0426-Potential-bed-API.patch
+++ b/patches/server/0427-Potential-bed-API.patch
diff --git a/patches/server/0427-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0428-Wait-for-Async-Tasks-during-shutdown.patch
index e7b63cb21a..e7b63cb21a 100644
--- a/patches/server/0427-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0428-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0428-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0429-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index dc78ba0edd..dc78ba0edd 100644
--- a/patches/server/0428-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0429-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0429-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0430-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 9f9fee10fb..9f9fee10fb 100644
--- a/patches/server/0429-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0430-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0430-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0431-Reduce-MutableInt-allocations-from-light-engine.patch
index 881c2f0231..881c2f0231 100644
--- a/patches/server/0430-Reduce-MutableInt-allocations-from-light-engine.patch
+++ b/patches/server/0431-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0431-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0432-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index fd0544bc97..fd0544bc97 100644
--- a/patches/server/0431-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0432-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0432-Ensure-safe-gateway-teleport.patch b/patches/server/0433-Ensure-safe-gateway-teleport.patch
index c81dcd4074..c81dcd4074 100644
--- a/patches/server/0432-Ensure-safe-gateway-teleport.patch
+++ b/patches/server/0433-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0433-Add-option-for-console-having-all-permissions.patch b/patches/server/0434-Add-option-for-console-having-all-permissions.patch
index 3c76e7d308..3c76e7d308 100644
--- a/patches/server/0433-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0434-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0434-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0435-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index dda84a76de..dda84a76de 100644
--- a/patches/server/0434-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0435-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0435-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0436-Use-distance-map-to-optimise-entity-tracker.patch
index 28331c2900..28331c2900 100644
--- a/patches/server/0435-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0436-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0436-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0437-Optimize-ServerLevels-chunk-level-checking-methods.patch
index de7b0077aa..de7b0077aa 100644
--- a/patches/server/0436-Optimize-ServerLevels-chunk-level-checking-methods.patch
+++ b/patches/server/0437-Optimize-ServerLevels-chunk-level-checking-methods.patch
diff --git a/patches/server/0437-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0438-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index ca87225a24..592d67ecca 100644
--- a/patches/server/0437-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/patches/server/0438-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -17,10 +17,10 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 23badcb54f89dc75d60017b7742568b30811c3f3..1b31b68ed00df972eb32b9749993478fbd9fab6b 100644
+index e661a3d19f6e9fc7e7e55574222865487d7a817a..d7e2d0625fe113387f9475688d38be515673d986 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -655,4 +655,13 @@ public class PaperWorldConfig {
+@@ -659,4 +659,13 @@ public class PaperWorldConfig {
          expMergeMaxValue = getInt("experience-merge-max-value", -1);
          log("Experience Merge Max Value: " + expMergeMaxValue);
      }
diff --git a/patches/server/0438-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0439-Fix-villager-trading-demand-MC-163962.patch
index 7c1bab1183..7c1bab1183 100644
--- a/patches/server/0438-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/server/0439-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0439-Maps-shouldn-t-load-chunks.patch b/patches/server/0440-Maps-shouldn-t-load-chunks.patch
index c1f48bd1ba..c1f48bd1ba 100644
--- a/patches/server/0439-Maps-shouldn-t-load-chunks.patch
+++ b/patches/server/0440-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0440-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0441-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 7361ae68fa..7361ae68fa 100644
--- a/patches/server/0440-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/server/0441-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0441-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0442-Fix-missing-chunks-due-to-integer-overflow.patch
index d2f7884b38..d2f7884b38 100644
--- a/patches/server/0441-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0442-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0442-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0443-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 1cafad18f3..1cafad18f3 100644
--- a/patches/server/0442-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/server/0443-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0443-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0444-Fix-piston-physics-inconsistency-MC-188840.patch
index 84ffd5bdd4..84ffd5bdd4 100644
--- a/patches/server/0443-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0444-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0444-Fix-sand-duping.patch b/patches/server/0445-Fix-sand-duping.patch
index db38b47879..db38b47879 100644
--- a/patches/server/0444-Fix-sand-duping.patch
+++ b/patches/server/0445-Fix-sand-duping.patch
diff --git a/patches/server/0445-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0446-Prevent-position-desync-in-playerconnection-causing-.patch
index 3cd6a724c6..3cd6a724c6 100644
--- a/patches/server/0445-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0446-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0446-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0447-Inventory-getHolder-method-without-block-snapshot.patch
index dca3e657db..dca3e657db 100644
--- a/patches/server/0446-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0447-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0447-Expose-Arrow-getItemStack.patch b/patches/server/0448-Expose-Arrow-getItemStack.patch
index 38c157797a..38c157797a 100644
--- a/patches/server/0447-Expose-Arrow-getItemStack.patch
+++ b/patches/server/0448-Expose-Arrow-getItemStack.patch
diff --git a/patches/server/0448-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0449-Add-and-implement-PlayerRecipeBookClickEvent.patch
index bc05c6333c..bc05c6333c 100644
--- a/patches/server/0448-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0449-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0449-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0450-Hide-sync-chunk-writes-behind-flag.patch
index 9f93092cb4..9f93092cb4 100644
--- a/patches/server/0449-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0450-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0450-Add-permission-for-command-blocks.patch b/patches/server/0451-Add-permission-for-command-blocks.patch
index 07a74e38d2..07a74e38d2 100644
--- a/patches/server/0450-Add-permission-for-command-blocks.patch
+++ b/patches/server/0451-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0451-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0452-Ensure-Entity-AABB-s-are-never-invalid.patch
index f10b441c9a..f10b441c9a 100644
--- a/patches/server/0451-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0452-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0452-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0453-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index ae51cdc948..ae51cdc948 100644
--- a/patches/server/0452-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0453-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0453-Paper-dumpitem-command.patch b/patches/server/0454-Paper-dumpitem-command.patch
index be0e942b1b..be0e942b1b 100644
--- a/patches/server/0453-Paper-dumpitem-command.patch
+++ b/patches/server/0454-Paper-dumpitem-command.patch
diff --git a/patches/server/0454-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0455-Don-t-allow-null-UUID-s-for-chat.patch
index 79ac87a844..79ac87a844 100644
--- a/patches/server/0454-Don-t-allow-null-UUID-s-for-chat.patch
+++ b/patches/server/0455-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0455-Improve-Legacy-Component-serialization-size.patch b/patches/server/0456-Improve-Legacy-Component-serialization-size.patch
index 8d30b49c6b..8d30b49c6b 100644
--- a/patches/server/0455-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0456-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0456-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0457-Optimize-Bit-Operations-by-inlining.patch
index e0dc27b511..e0dc27b511 100644
--- a/patches/server/0456-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0457-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0457-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0458-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 05d7b13d1c..05d7b13d1c 100644
--- a/patches/server/0457-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0458-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0458-incremental-chunk-and-player-saving.patch b/patches/server/0459-incremental-chunk-and-player-saving.patch
index 212a6d1ffd..7253f7cb58 100644
--- a/patches/server/0458-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0459-incremental-chunk-and-player-saving.patch
@@ -24,7 +24,7 @@ index ebbbffd209c6796bc608992e293035141a122d1f..4fb6b2153117f54a2b0ca940de4c0ee2
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1b31b68ed00df972eb32b9749993478fbd9fab6b..c8bc6c34859542bbb761f1adf8030087d2ae9adc 100644
+index d7e2d0625fe113387f9475688d38be515673d986..7029f424e9a0280421a880c5e64e4dfa4f8f0e92 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -64,6 +64,21 @@ public class PaperWorldConfig {
diff --git a/patches/server/0459-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0460-Stop-copy-on-write-operations-for-updating-light-dat.patch
index 3fe4a3693e..3fe4a3693e 100644
--- a/patches/server/0459-Stop-copy-on-write-operations-for-updating-light-dat.patch
+++ b/patches/server/0460-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0460-Support-old-UUID-format-for-NBT.patch b/patches/server/0461-Support-old-UUID-format-for-NBT.patch
index 607a1ac12a..607a1ac12a 100644
--- a/patches/server/0460-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0461-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0461-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0462-Clean-up-duplicated-GameProfile-Properties.patch
index d9c0d0a1c7..d9c0d0a1c7 100644
--- a/patches/server/0461-Clean-up-duplicated-GameProfile-Properties.patch
+++ b/patches/server/0462-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0462-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0463-Convert-legacy-attributes-in-Item-Meta.patch
index 1225ad8355..1225ad8355 100644
--- a/patches/server/0462-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0463-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0463-Remove-some-streams-from-structures.patch b/patches/server/0464-Remove-some-streams-from-structures.patch
index 0f1c833772..0f1c833772 100644
--- a/patches/server/0463-Remove-some-streams-from-structures.patch
+++ b/patches/server/0464-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0464-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0465-Remove-streams-from-classes-related-villager-gossip.patch
index 23c4519a7b..23c4519a7b 100644
--- a/patches/server/0464-Remove-streams-from-classes-related-villager-gossip.patch
+++ b/patches/server/0465-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0465-Support-components-in-ItemMeta.patch b/patches/server/0466-Support-components-in-ItemMeta.patch
index 64e131bec1..64e131bec1 100644
--- a/patches/server/0465-Support-components-in-ItemMeta.patch
+++ b/patches/server/0466-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0466-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0467-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
index 9a07cce833..9a07cce833 100644
--- a/patches/server/0466-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
+++ b/patches/server/0467-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0467-Add-entity-liquid-API.patch b/patches/server/0468-Add-entity-liquid-API.patch
index bf3caa4be9..bf3caa4be9 100644
--- a/patches/server/0467-Add-entity-liquid-API.patch
+++ b/patches/server/0468-Add-entity-liquid-API.patch
diff --git a/patches/server/0468-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0469-Update-itemstack-legacy-name-and-lore.patch
index b98004d198..b98004d198 100644
--- a/patches/server/0468-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/server/0469-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0469-Spawn-player-in-correct-world-on-login.patch b/patches/server/0470-Spawn-player-in-correct-world-on-login.patch
index bac42e47f9..bac42e47f9 100644
--- a/patches/server/0469-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/server/0470-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0470-Add-PrepareResultEvent.patch b/patches/server/0471-Add-PrepareResultEvent.patch
index 14a6bd3437..14a6bd3437 100644
--- a/patches/server/0470-Add-PrepareResultEvent.patch
+++ b/patches/server/0471-Add-PrepareResultEvent.patch
diff --git a/patches/server/0471-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0472-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 22a49a5fd4..22a49a5fd4 100644
--- a/patches/server/0471-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0472-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0472-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0473-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index 3fcd3c8b1b..3fcd3c8b1b 100644
--- a/patches/server/0472-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/patches/server/0473-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/server/0473-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0474-Optimize-NetworkManager-Exception-Handling.patch
index 79d4327e4f..79d4327e4f 100644
--- a/patches/server/0473-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0474-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0474-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0475-Optimize-the-advancement-data-player-iteration-to-be.patch
index f60ffe8b92..f60ffe8b92 100644
--- a/patches/server/0474-Optimize-the-advancement-data-player-iteration-to-be.patch
+++ b/patches/server/0475-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0475-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0476-Fix-arrows-never-despawning-MC-125757.patch
index 85c6131304..85c6131304 100644
--- a/patches/server/0475-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0476-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0476-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0477-Thread-Safe-Vanilla-Command-permission-checking.patch
index 834506f5be..834506f5be 100644
--- a/patches/server/0476-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0477-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0477-Move-range-check-for-block-placing-up.patch b/patches/server/0478-Move-range-check-for-block-placing-up.patch
index f7c7d2dd76..f7c7d2dd76 100644
--- a/patches/server/0477-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0478-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0478-Fix-SPIGOT-5989.patch b/patches/server/0479-Fix-SPIGOT-5989.patch
index bd7b4e439a..bd7b4e439a 100644
--- a/patches/server/0478-Fix-SPIGOT-5989.patch
+++ b/patches/server/0479-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0479-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0480-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index 86102faf60..86102faf60 100644
--- a/patches/server/0479-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0480-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0480-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0481-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index 5f3e63546b..5f3e63546b 100644
--- a/patches/server/0480-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0481-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0481-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0482-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 0cccf4b597..0cccf4b597 100644
--- a/patches/server/0481-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0482-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0482-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0483-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
index 49f5faddcf..49f5faddcf 100644
--- a/patches/server/0482-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
+++ b/patches/server/0483-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0483-Fix-some-rails-connecting-improperly.patch b/patches/server/0484-Fix-some-rails-connecting-improperly.patch
index 8de7ddf603..8de7ddf603 100644
--- a/patches/server/0483-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0484-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0484-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0485-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index be48fd5ae2..be48fd5ae2 100644
--- a/patches/server/0484-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0485-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0485-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0486-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 0ab51e6a0f..0ab51e6a0f 100644
--- a/patches/server/0485-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0486-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0486-Brand-support.patch b/patches/server/0487-Brand-support.patch
index aa269cdab8..aa269cdab8 100644
--- a/patches/server/0486-Brand-support.patch
+++ b/patches/server/0487-Brand-support.patch
diff --git a/patches/server/0487-Add-setMaxPlayers-API.patch b/patches/server/0488-Add-setMaxPlayers-API.patch
index 8d7468426d..8d7468426d 100644
--- a/patches/server/0487-Add-setMaxPlayers-API.patch
+++ b/patches/server/0488-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0488-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0489-Add-playPickupItemAnimation-to-LivingEntity.patch
index 9efead6d4e..9efead6d4e 100644
--- a/patches/server/0488-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0489-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0489-Don-t-require-FACING-data.patch b/patches/server/0490-Don-t-require-FACING-data.patch
index e1c274797e..e1c274797e 100644
--- a/patches/server/0489-Don-t-require-FACING-data.patch
+++ b/patches/server/0490-Don-t-require-FACING-data.patch
diff --git a/patches/server/0490-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0491-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index a6c1cc787b..a6c1cc787b 100644
--- a/patches/server/0490-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0491-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0491-Add-moon-phase-API.patch b/patches/server/0492-Add-moon-phase-API.patch
index 453da7fc7b..453da7fc7b 100644
--- a/patches/server/0491-Add-moon-phase-API.patch
+++ b/patches/server/0492-Add-moon-phase-API.patch
diff --git a/patches/server/0492-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0493-Improve-Chunk-Status-Transition-Speed.patch
index f95cb1a58c..f95cb1a58c 100644
--- a/patches/server/0492-Improve-Chunk-Status-Transition-Speed.patch
+++ b/patches/server/0493-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/patches/server/0493-Prevent-headless-pistons-from-being-created.patch b/patches/server/0494-Prevent-headless-pistons-from-being-created.patch
index 9361ff6c4a..9361ff6c4a 100644
--- a/patches/server/0493-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0494-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0494-Add-BellRingEvent.patch b/patches/server/0495-Add-BellRingEvent.patch
index e101aa373c..e101aa373c 100644
--- a/patches/server/0494-Add-BellRingEvent.patch
+++ b/patches/server/0495-Add-BellRingEvent.patch
diff --git a/patches/server/0495-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0496-Add-zombie-targets-turtle-egg-config.patch
index eac9809b0c..c06cc34209 100644
--- a/patches/server/0495-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0496-Add-zombie-targets-turtle-egg-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c8bc6c34859542bbb761f1adf8030087d2ae9adc..85afb6a6606b78570e53f7e46339eb5db299558f 100644
+index 7029f424e9a0280421a880c5e64e4dfa4f8f0e92..9f179b1f3be36481e38104e7a52fd7d4e3f1ef16 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -58,6 +58,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0496-Buffer-joins-to-world.patch b/patches/server/0497-Buffer-joins-to-world.patch
index 80114c30ef..80114c30ef 100644
--- a/patches/server/0496-Buffer-joins-to-world.patch
+++ b/patches/server/0497-Buffer-joins-to-world.patch
diff --git a/patches/server/0497-Optimize-redstone-algorithm.patch b/patches/server/0498-Optimize-redstone-algorithm.patch
index c87aad5670..073d360ddb 100644
--- a/patches/server/0497-Optimize-redstone-algorithm.patch
+++ b/patches/server/0498-Optimize-redstone-algorithm.patch
@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 85afb6a6606b78570e53f7e46339eb5db299558f..71427964707e164e2db9c33afcb0373e88783257 100644
+index 9f179b1f3be36481e38104e7a52fd7d4e3f1ef16..6ebc8ef074e6e31f39978b69669af80f4ac82bf9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -63,6 +63,16 @@ public class PaperWorldConfig {
diff --git a/patches/server/0498-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0499-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 31e71d4263..31e71d4263 100644
--- a/patches/server/0498-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0499-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0499-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0500-PortalCreateEvent-needs-to-know-its-entity.patch
index d1abf96af1..d1abf96af1 100644
--- a/patches/server/0499-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0500-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0500-Fix-CraftTeam-null-check.patch b/patches/server/0501-Fix-CraftTeam-null-check.patch
index 61de747dfd..61de747dfd 100644
--- a/patches/server/0500-Fix-CraftTeam-null-check.patch
+++ b/patches/server/0501-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0501-Add-more-Evoker-API.patch b/patches/server/0502-Add-more-Evoker-API.patch
index 367e900e25..367e900e25 100644
--- a/patches/server/0501-Add-more-Evoker-API.patch
+++ b/patches/server/0502-Add-more-Evoker-API.patch
diff --git a/patches/server/0502-Add-methods-to-get-translation-keys.patch b/patches/server/0503-Add-methods-to-get-translation-keys.patch
index ed27a602e0..ed27a602e0 100644
--- a/patches/server/0502-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0503-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0503-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0504-Create-HoverEvent-from-ItemStack-Entity.patch
index 3a415bc680..3a415bc680 100644
--- a/patches/server/0503-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0504-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0504-Cache-block-data-strings.patch b/patches/server/0505-Cache-block-data-strings.patch
index dc4c599bdf..dc4c599bdf 100644
--- a/patches/server/0504-Cache-block-data-strings.patch
+++ b/patches/server/0505-Cache-block-data-strings.patch
diff --git a/patches/server/0505-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0506-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 36ac154bc4..36ac154bc4 100644
--- a/patches/server/0505-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0506-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0506-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0507-Add-additional-open-container-api-to-HumanEntity.patch
index ce59f1dbfc..ce59f1dbfc 100644
--- a/patches/server/0506-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0507-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0507-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0508-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index a02addc375..a02addc375 100644
--- a/patches/server/0507-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0508-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0508-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0509-Extend-block-drop-capture-to-capture-all-items-added.patch
index 7ee1833921..7ee1833921 100644
--- a/patches/server/0508-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0509-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0509-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0510-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
index e9cb396935..e9cb396935 100644
--- a/patches/server/0509-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
+++ b/patches/server/0510-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0510-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0511-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 624bc44802..624bc44802 100644
--- a/patches/server/0510-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0511-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0511-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0512-Lazily-track-plugin-scoreboards-by-default.patch
index e2d6b40548..e2d6b40548 100644
--- a/patches/server/0511-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0512-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0512-Entity-isTicking.patch b/patches/server/0513-Entity-isTicking.patch
index f542ca13d9..f542ca13d9 100644
--- a/patches/server/0512-Entity-isTicking.patch
+++ b/patches/server/0513-Entity-isTicking.patch
diff --git a/patches/server/0513-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0514-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 6c243f99ff..6c243f99ff 100644
--- a/patches/server/0513-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0514-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0514-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0515-Fix-Concurrency-issue-in-WeightedList.patch
index 4f6d7689d1..4f6d7689d1 100644
--- a/patches/server/0514-Fix-Concurrency-issue-in-WeightedList.patch
+++ b/patches/server/0515-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/patches/server/0515-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0516-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index 0e429e17b8..0e429e17b8 100644
--- a/patches/server/0515-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0516-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0516-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0517-Fix-for-large-move-vectors-crashing-server.patch
index b66e68dbc7..b66e68dbc7 100644
--- a/patches/server/0516-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0517-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0517-Optimise-getType-calls.patch b/patches/server/0518-Optimise-getType-calls.patch
index 4464845139..4464845139 100644
--- a/patches/server/0517-Optimise-getType-calls.patch
+++ b/patches/server/0518-Optimise-getType-calls.patch
diff --git a/patches/server/0518-Villager-resetOffers.patch b/patches/server/0519-Villager-resetOffers.patch
index da091e898a..da091e898a 100644
--- a/patches/server/0518-Villager-resetOffers.patch
+++ b/patches/server/0519-Villager-resetOffers.patch
diff --git a/patches/server/0519-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0520-Improve-inlinig-for-some-hot-IBlockData-methods.patch
index 00f9811691..00f9811691 100644
--- a/patches/server/0519-Improve-inlinig-for-some-hot-IBlockData-methods.patch
+++ b/patches/server/0520-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0520-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0521-Retain-block-place-order-when-capturing-blockstates.patch
index 63e5017277..63e5017277 100644
--- a/patches/server/0520-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0521-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0521-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0522-Reduce-blockpos-allocation-from-pathfinding.patch
index 9e0f352b59..9e0f352b59 100644
--- a/patches/server/0521-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/server/0522-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0522-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0523-Fix-item-locations-dropped-from-campfires.patch
index 49b095cf5a..49b095cf5a 100644
--- a/patches/server/0522-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0523-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0523-Player-elytra-boost-API.patch b/patches/server/0524-Player-elytra-boost-API.patch
index 65d6aa6f63..65d6aa6f63 100644
--- a/patches/server/0523-Player-elytra-boost-API.patch
+++ b/patches/server/0524-Player-elytra-boost-API.patch
diff --git a/patches/server/0524-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0525-Fixed-TileEntityBell-memory-leak.patch
index 8f350486f1..8f350486f1 100644
--- a/patches/server/0524-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/server/0525-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0525-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0526-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index d61dbeae68..d61dbeae68 100644
--- a/patches/server/0525-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0526-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0526-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0527-Add-getOfflinePlayerIfCached-String.patch
index 41c32cbec3..41c32cbec3 100644
--- a/patches/server/0526-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0527-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0527-Add-ignore-discounts-API.patch b/patches/server/0528-Add-ignore-discounts-API.patch
index cfd1698df4..cfd1698df4 100644
--- a/patches/server/0527-Add-ignore-discounts-API.patch
+++ b/patches/server/0528-Add-ignore-discounts-API.patch
diff --git a/patches/server/0528-Toggle-for-removing-existing-dragon.patch b/patches/server/0529-Toggle-for-removing-existing-dragon.patch
index 1eba735544..d6e1807335 100644
--- a/patches/server/0528-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0529-Toggle-for-removing-existing-dragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for removing existing dragon
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 71427964707e164e2db9c33afcb0373e88783257..d70b0159a80e697d85d701234975423fca06c2a1 100644
+index 6ebc8ef074e6e31f39978b69669af80f4ac82bf9..224bb42722961de0c1365dbfcbf73b81966777f3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -73,6 +73,14 @@ public class PaperWorldConfig {
diff --git a/patches/server/0529-Fix-client-lag-on-advancement-loading.patch b/patches/server/0530-Fix-client-lag-on-advancement-loading.patch
index ba1add3c37..ba1add3c37 100644
--- a/patches/server/0529-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0530-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0530-Item-no-age-no-player-pickup.patch b/patches/server/0531-Item-no-age-no-player-pickup.patch
index a121c378e3..a121c378e3 100644
--- a/patches/server/0530-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0531-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0531-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0532-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index a7916d16e0..a7916d16e0 100644
--- a/patches/server/0531-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/0532-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0532-Beacon-API-custom-effect-ranges.patch b/patches/server/0533-Beacon-API-custom-effect-ranges.patch
index 6da9cb0f32..6da9cb0f32 100644
--- a/patches/server/0532-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0533-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0533-Add-API-for-quit-reason.patch b/patches/server/0534-Add-API-for-quit-reason.patch
index 6ea3012532..6ea3012532 100644
--- a/patches/server/0533-Add-API-for-quit-reason.patch
+++ b/patches/server/0534-Add-API-for-quit-reason.patch
diff --git a/patches/server/0534-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0535-Add-Wandering-Trader-spawn-rate-config-options.patch
index 925d71a558..a26f2021e2 100644
--- a/patches/server/0534-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0535-Add-Wandering-Trader-spawn-rate-config-options.patch
@@ -11,7 +11,7 @@ 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 d70b0159a80e697d85d701234975423fca06c2a1..94a795786d3e9f2563a026ef7b00e17658d30920 100644
+index 224bb42722961de0c1365dbfcbf73b81966777f3..bec9d5fce523d51c1d9c2b4c45bbcb5806aaad07 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -81,6 +81,19 @@ public class PaperWorldConfig {
diff --git a/patches/server/0535-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0536-Significantly-improve-performance-of-the-end-generat.patch
index 49888cfa4c..49888cfa4c 100644
--- a/patches/server/0535-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0536-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0536-Expose-world-spawn-angle.patch b/patches/server/0537-Expose-world-spawn-angle.patch
index fcd5d2979c..fcd5d2979c 100644
--- a/patches/server/0536-Expose-world-spawn-angle.patch
+++ b/patches/server/0537-Expose-world-spawn-angle.patch
diff --git a/patches/server/0537-Add-Destroy-Speed-API.patch b/patches/server/0538-Add-Destroy-Speed-API.patch
index 7dd915adbf..7dd915adbf 100644
--- a/patches/server/0537-Add-Destroy-Speed-API.patch
+++ b/patches/server/0538-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0538-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0539-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 0b0e931326..0b0e931326 100644
--- a/patches/server/0538-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0539-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0539-Add-LivingEntity-clearActiveItem.patch b/patches/server/0540-Add-LivingEntity-clearActiveItem.patch
index 6b43687673..6b43687673 100644
--- a/patches/server/0539-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0540-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0540-Add-PlayerItemCooldownEvent.patch b/patches/server/0541-Add-PlayerItemCooldownEvent.patch
index 01259836dd..01259836dd 100644
--- a/patches/server/0540-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0541-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0541-More-lightning-API.patch b/patches/server/0542-More-lightning-API.patch
index 4d6ed605b2..4d6ed605b2 100644
--- a/patches/server/0541-More-lightning-API.patch
+++ b/patches/server/0542-More-lightning-API.patch
diff --git a/patches/server/0542-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0543-Climbing-should-not-bypass-cramming-gamerule.patch
index f40e617628..1c11e3e323 100644
--- a/patches/server/0542-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0543-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ 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 94a795786d3e9f2563a026ef7b00e17658d30920..562ecd1adc3097d86fa086010a572d1f6902dba8 100644
+index bec9d5fce523d51c1d9c2b4c45bbcb5806aaad07..166631507bf707954b82739b7c2f0558cc3d4956 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -94,6 +94,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0543-Added-missing-default-perms-for-commands.patch b/patches/server/0544-Added-missing-default-perms-for-commands.patch
index e9e468da5e..e9e468da5e 100644
--- a/patches/server/0543-Added-missing-default-perms-for-commands.patch
+++ b/patches/server/0544-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0544-Add-PlayerShearBlockEvent.patch b/patches/server/0545-Add-PlayerShearBlockEvent.patch
index aa9a8b1203..aa9a8b1203 100644
--- a/patches/server/0544-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0545-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0545-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0546-Fix-curing-zombie-villager-discount-exploit.patch
index 7ba26bd756..52d19719a7 100644
--- a/patches/server/0545-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/server/0546-Fix-curing-zombie-villager-discount-exploit.patch
@@ -8,7 +8,7 @@ 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 562ecd1adc3097d86fa086010a572d1f6902dba8..b3c716a5df2b4085903e0890f1a2146fa68742de 100644
+index 166631507bf707954b82739b7c2f0558cc3d4956..40b88453904e3ff4e958e811d101c1740be3f99d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -99,6 +99,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0546-Limit-recipe-packets.patch b/patches/server/0547-Limit-recipe-packets.patch
index b845097946..b845097946 100644
--- a/patches/server/0546-Limit-recipe-packets.patch
+++ b/patches/server/0547-Limit-recipe-packets.patch
diff --git a/patches/server/0547-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0548-Fix-CraftSound-backwards-compatibility.patch
index 60e8ef1e6b..60e8ef1e6b 100644
--- a/patches/server/0547-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0548-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0548-MC-4-Fix-item-position-desync.patch b/patches/server/0549-MC-4-Fix-item-position-desync.patch
index 4f2105a4c4..4f2105a4c4 100644
--- a/patches/server/0548-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0549-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0549-Player-Chunk-Load-Unload-Events.patch b/patches/server/0550-Player-Chunk-Load-Unload-Events.patch
index efd272c070..efd272c070 100644
--- a/patches/server/0549-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0550-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0550-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0551-Optimize-Dynamic-get-Missing-Keys.patch
index 5a4efe035c..5a4efe035c 100644
--- a/patches/server/0550-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0551-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0551-Expose-LivingEntity-hurt-direction.patch b/patches/server/0552-Expose-LivingEntity-hurt-direction.patch
index 2f461711f6..2f461711f6 100644
--- a/patches/server/0551-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0552-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0552-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0553-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 5bd4c80e2e..5bd4c80e2e 100644
--- a/patches/server/0552-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0553-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0553-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0554-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index e870bb8917..e870bb8917 100644
--- a/patches/server/0553-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/server/0554-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0554-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0555-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 33f6700f18..33f6700f18 100644
--- a/patches/server/0554-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0555-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0555-Implement-TargetHitEvent.patch b/patches/server/0556-Implement-TargetHitEvent.patch
index 3386fe16dd..3386fe16dd 100644
--- a/patches/server/0555-Implement-TargetHitEvent.patch
+++ b/patches/server/0556-Implement-TargetHitEvent.patch
diff --git a/patches/server/0556-Additional-Block-Material-API-s.patch b/patches/server/0557-Additional-Block-Material-API-s.patch
index bbb409e9e4..bbb409e9e4 100644
--- a/patches/server/0556-Additional-Block-Material-API-s.patch
+++ b/patches/server/0557-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0557-Fix-harming-potion-dupe.patch b/patches/server/0558-Fix-harming-potion-dupe.patch
index 40de75b0d2..40de75b0d2 100644
--- a/patches/server/0557-Fix-harming-potion-dupe.patch
+++ b/patches/server/0558-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0558-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0559-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index 69d3ef793f..69d3ef793f 100644
--- a/patches/server/0558-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/server/0559-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0559-Cache-burn-durations.patch b/patches/server/0560-Cache-burn-durations.patch
index e833ebe637..e833ebe637 100644
--- a/patches/server/0559-Cache-burn-durations.patch
+++ b/patches/server/0560-Cache-burn-durations.patch
diff --git a/patches/server/0560-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0561-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index 9f0e4045ce..02bb2281eb 100644
--- a/patches/server/0560-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0561-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
@@ -5,7 +5,7 @@ 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 b3c716a5df2b4085903e0890f1a2146fa68742de..eb6fa156690d50802b4ea1d26d930a0528a2d439 100644
+index 40b88453904e3ff4e958e811d101c1740be3f99d..f0f714f52d3aa163c2dc601dd98c157f16ce0719 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -104,6 +104,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0561-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0562-Fix-Not-a-string-Map-Conversion-spam.patch
index 61ebd79af9..61ebd79af9 100644
--- a/patches/server/0561-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0562-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0562-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0563-Implement-PlayerFlowerPotManipulateEvent.patch
index 8f512f54d6..8f512f54d6 100644
--- a/patches/server/0562-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0563-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0563-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0564-Fix-interact-event-not-being-called-in-adventure.patch
index 857bbcaeb2..857bbcaeb2 100644
--- a/patches/server/0563-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/0564-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0564-Zombie-API-breaking-doors.patch b/patches/server/0565-Zombie-API-breaking-doors.patch
index 2b1fa20025..2b1fa20025 100644
--- a/patches/server/0564-Zombie-API-breaking-doors.patch
+++ b/patches/server/0565-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0565-Fix-nerfed-slime-when-splitting.patch b/patches/server/0566-Fix-nerfed-slime-when-splitting.patch
index f858016096..f858016096 100644
--- a/patches/server/0565-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0566-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0566-Add-EntityLoadCrossbowEvent.patch b/patches/server/0567-Add-EntityLoadCrossbowEvent.patch
index d5edf09a56..d5edf09a56 100644
--- a/patches/server/0566-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0567-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0567-Guardian-beam-workaround.patch b/patches/server/0568-Guardian-beam-workaround.patch
index fa66573d2b..fa66573d2b 100644
--- a/patches/server/0567-Guardian-beam-workaround.patch
+++ b/patches/server/0568-Guardian-beam-workaround.patch
diff --git a/patches/server/0568-Added-WorldGameRuleChangeEvent.patch b/patches/server/0569-Added-WorldGameRuleChangeEvent.patch
index aef4b0d49c..aef4b0d49c 100644
--- a/patches/server/0568-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0569-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0569-Added-ServerResourcesReloadedEvent.patch b/patches/server/0570-Added-ServerResourcesReloadedEvent.patch
index d819afe8b3..d819afe8b3 100644
--- a/patches/server/0569-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0570-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0570-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0571-Added-world-settings-for-mobs-picking-up-loot.patch
index 6192e96f35..b8a40411f7 100644
--- a/patches/server/0570-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0571-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 eb6fa156690d50802b4ea1d26d930a0528a2d439..abe8f8c91c7a6f4dbe8b8e08a8ddf6abf3c21255 100644
+index f0f714f52d3aa163c2dc601dd98c157f16ce0719..b289f6eb973d1ddf6cf913a0e995f899b9ecd041 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -716,6 +716,14 @@ public class PaperWorldConfig {
+@@ -720,6 +720,14 @@ public class PaperWorldConfig {
          phantomOnlyAttackInsomniacs = getBoolean("phantoms-only-attack-insomniacs", phantomOnlyAttackInsomniacs);
      }
  
diff --git a/patches/server/0571-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0572-Implemented-BlockFailedDispenseEvent.patch
index f5db84dc71..f5db84dc71 100644
--- a/patches/server/0571-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0572-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0572-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0573-Added-PlayerLecternPageChangeEvent.patch
index cd550d08ad..cd550d08ad 100644
--- a/patches/server/0572-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0573-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0573-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0574-Added-PlayerLoomPatternSelectEvent.patch
index 336ac8dfc8..336ac8dfc8 100644
--- a/patches/server/0573-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0574-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0574-Configurable-door-breaking-difficulty.patch b/patches/server/0575-Configurable-door-breaking-difficulty.patch
index bae980df60..bc480c1abb 100644
--- a/patches/server/0574-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0575-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 abe8f8c91c7a6f4dbe8b8e08a8ddf6abf3c21255..84dc0f57331ed619e0db76d4dfe18cfd2d2c06f8 100644
+index b289f6eb973d1ddf6cf913a0e995f899b9ecd041..e8b3ce26f289b961e2763be3b033c611bdfe583b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -109,6 +109,25 @@ public class PaperWorldConfig {
diff --git a/patches/server/0575-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0576-Empty-commands-shall-not-be-dispatched.patch
index febba5dbe5..febba5dbe5 100644
--- a/patches/server/0575-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0576-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0576-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0577-Implement-API-to-expose-exact-interaction-point.patch
index 06bc7e440c..06bc7e440c 100644
--- a/patches/server/0576-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/server/0577-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0577-Remove-stale-POIs.patch b/patches/server/0578-Remove-stale-POIs.patch
index c7050f8002..c7050f8002 100644
--- a/patches/server/0577-Remove-stale-POIs.patch
+++ b/patches/server/0578-Remove-stale-POIs.patch
diff --git a/patches/server/0578-Fix-villager-boat-exploit.patch b/patches/server/0579-Fix-villager-boat-exploit.patch
index 68099d756a..68099d756a 100644
--- a/patches/server/0578-Fix-villager-boat-exploit.patch
+++ b/patches/server/0579-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0579-Add-sendOpLevel-API.patch b/patches/server/0580-Add-sendOpLevel-API.patch
index 8e722e5603..8e722e5603 100644
--- a/patches/server/0579-Add-sendOpLevel-API.patch
+++ b/patches/server/0580-Add-sendOpLevel-API.patch
diff --git a/patches/server/0580-Add-StructureLocateEvent.patch b/patches/server/0581-Add-StructureLocateEvent.patch
index 61178fc4a9..61178fc4a9 100644
--- a/patches/server/0580-Add-StructureLocateEvent.patch
+++ b/patches/server/0581-Add-StructureLocateEvent.patch
diff --git a/patches/server/0581-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0582-Collision-option-for-requiring-a-player-participant.patch
index fa8742bd69..57eb52e0db 100644
--- a/patches/server/0581-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0582-Collision-option-for-requiring-a-player-participant.patch
@@ -5,7 +5,7 @@ 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 84dc0f57331ed619e0db76d4dfe18cfd2d2c06f8..03bd3c7bb978d908789e9a85695c9e5996191cb8 100644
+index e8b3ce26f289b961e2763be3b033c611bdfe583b..cb9c9e87be27659febe3df24f93adee989904ca3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -81,6 +81,18 @@ public class PaperWorldConfig {
diff --git a/patches/server/0582-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0583-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index f6d7cce33f..f6d7cce33f 100644
--- a/patches/server/0582-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0583-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0583-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0584-Return-chat-component-with-empty-text-instead-of-thr.patch
index 988a54be94..988a54be94 100644
--- a/patches/server/0583-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0584-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0584-Make-schedule-command-per-world.patch b/patches/server/0585-Make-schedule-command-per-world.patch
index 4859bb69f5..4859bb69f5 100644
--- a/patches/server/0584-Make-schedule-command-per-world.patch
+++ b/patches/server/0585-Make-schedule-command-per-world.patch
diff --git a/patches/server/0585-Configurable-max-leash-distance.patch b/patches/server/0586-Configurable-max-leash-distance.patch
index 6d7d6ce3b3..58f56f72ef 100644
--- a/patches/server/0585-Configurable-max-leash-distance.patch
+++ b/patches/server/0586-Configurable-max-leash-distance.patch
@@ -5,7 +5,7 @@ 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 03bd3c7bb978d908789e9a85695c9e5996191cb8..36135f32b1a3fb739317f6e44a0118adc6125012 100644
+index cb9c9e87be27659febe3df24f93adee989904ca3..b90f9046897325293bdb55f69df1b19833bd453d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -301,6 +301,12 @@ public class PaperWorldConfig {
diff --git a/patches/server/0586-Implement-BlockPreDispenseEvent.patch b/patches/server/0587-Implement-BlockPreDispenseEvent.patch
index ba66935539..ba66935539 100644
--- a/patches/server/0586-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0587-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0587-added-Wither-API.patch b/patches/server/0588-added-Wither-API.patch
index 16df60938a..16df60938a 100644
--- a/patches/server/0587-added-Wither-API.patch
+++ b/patches/server/0588-added-Wither-API.patch
diff --git a/patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0589-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index b6c0947f13..b6c0947f13 100644
--- a/patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0589-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0589-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0590-Add-toggle-for-always-placing-the-dragon-egg.patch
index 653c699571..7bb5f13456 100644
--- a/patches/server/0589-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0590-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 36135f32b1a3fb739317f6e44a0118adc6125012..28141062e404cb9ae993c9c0fb92a06bdfe511a7 100644
+index b90f9046897325293bdb55f69df1b19833bd453d..24f33bf34bacd1748aa7394fbe8951a818e85060 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -746,6 +746,11 @@ public class PaperWorldConfig {
+@@ -750,6 +750,11 @@ public class PaperWorldConfig {
          perPlayerMobSpawns = getBoolean("per-player-mob-spawns", true);
      }
  
diff --git a/patches/server/0590-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0591-Added-PlayerStonecutterRecipeSelectEvent.patch
index c8cefc8ca5..c8cefc8ca5 100644
--- a/patches/server/0590-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0591-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0591-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0592-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index a698656fd0..a698656fd0 100644
--- a/patches/server/0591-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0592-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0592-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0593-Skip-distance-map-update-when-spawning-disabled.patch
index 2488267353..2488267353 100644
--- a/patches/server/0592-Skip-distance-map-update-when-spawning-disabled.patch
+++ b/patches/server/0593-Skip-distance-map-update-when-spawning-disabled.patch
diff --git a/patches/server/0593-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0594-Reset-shield-blocking-on-dimension-change.patch
index 2c33b73be8..2c33b73be8 100644
--- a/patches/server/0593-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0594-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0594-add-DragonEggFormEvent.patch b/patches/server/0595-add-DragonEggFormEvent.patch
index 7f32c9846d..7f32c9846d 100644
--- a/patches/server/0594-add-DragonEggFormEvent.patch
+++ b/patches/server/0595-add-DragonEggFormEvent.patch
diff --git a/patches/server/0595-EntityMoveEvent.patch b/patches/server/0596-EntityMoveEvent.patch
index 72725055d3..72725055d3 100644
--- a/patches/server/0595-EntityMoveEvent.patch
+++ b/patches/server/0596-EntityMoveEvent.patch
diff --git a/patches/server/0596-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0597-added-option-to-disable-pathfinding-updates-on-block.patch
index 805a944f79..691f1b3f28 100644
--- a/patches/server/0596-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0597-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 28141062e404cb9ae993c9c0fb92a06bdfe511a7..3ac3f8f8a6cc144c426409898abee3908c098b76 100644
+index 24f33bf34bacd1748aa7394fbe8951a818e85060..a94cb1ffe034a00f9d3cf2dc190862b906abd8dc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -751,6 +751,11 @@ public class PaperWorldConfig {
+@@ -755,6 +755,11 @@ public class PaperWorldConfig {
          enderDragonsDeathAlwaysPlacesDragonEgg = getBoolean("ender-dragons-death-always-places-dragon-egg", enderDragonsDeathAlwaysPlacesDragonEgg);
      }
  
diff --git a/patches/server/0597-Inline-shift-direction-fields.patch b/patches/server/0598-Inline-shift-direction-fields.patch
index aea372f6f4..aea372f6f4 100644
--- a/patches/server/0597-Inline-shift-direction-fields.patch
+++ b/patches/server/0598-Inline-shift-direction-fields.patch
diff --git a/patches/server/0598-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0599-Allow-adding-items-to-BlockDropItemEvent.patch
index 5b2955f3c1..5b2955f3c1 100644
--- a/patches/server/0598-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0599-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0599-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0600-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 8cfe3357dc..8cfe3357dc 100644
--- a/patches/server/0599-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0600-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0600-living-entity-allow-attribute-registration.patch b/patches/server/0601-living-entity-allow-attribute-registration.patch
index 4bc58ce5e3..4bc58ce5e3 100644
--- a/patches/server/0600-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0601-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0601-fix-dead-slime-setSize-invincibility.patch b/patches/server/0602-fix-dead-slime-setSize-invincibility.patch
index 33ce1b72f2..33ce1b72f2 100644
--- a/patches/server/0601-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0602-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0602-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0603-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0602-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0603-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0603-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0604-Add-support-for-hex-color-codes-in-console.patch
index 4d129a981e..4d129a981e 100644
--- a/patches/server/0603-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/server/0604-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0604-Expose-Tracked-Players.patch b/patches/server/0605-Expose-Tracked-Players.patch
index a7b6532874..a7b6532874 100644
--- a/patches/server/0604-Expose-Tracked-Players.patch
+++ b/patches/server/0605-Expose-Tracked-Players.patch
diff --git a/patches/server/0605-Remove-streams-from-SensorNearest.patch b/patches/server/0606-Remove-streams-from-SensorNearest.patch
index 91ae33c411..91ae33c411 100644
--- a/patches/server/0605-Remove-streams-from-SensorNearest.patch
+++ b/patches/server/0606-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0606-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0607-Throw-proper-exception-on-empty-JsonList-file.patch
index 97b26758f7..97b26758f7 100644
--- a/patches/server/0606-Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/server/0607-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0607-Improve-ServerGUI.patch b/patches/server/0608-Improve-ServerGUI.patch
index 1599e3103f..1599e3103f 100644
--- a/patches/server/0607-Improve-ServerGUI.patch
+++ b/patches/server/0608-Improve-ServerGUI.patch
diff --git a/patches/server/0608-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0609-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
index 1099f41d55..1099f41d55 100644
--- a/patches/server/0608-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
+++ b/patches/server/0609-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0609-fix-converting-txt-to-json-file.patch b/patches/server/0610-fix-converting-txt-to-json-file.patch
index de3c433c66..de3c433c66 100644
--- a/patches/server/0609-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0610-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0610-Add-worldborder-events.patch b/patches/server/0611-Add-worldborder-events.patch
index 26898cfba0..26898cfba0 100644
--- a/patches/server/0610-Add-worldborder-events.patch
+++ b/patches/server/0611-Add-worldborder-events.patch
diff --git a/patches/server/0611-added-PlayerNameEntityEvent.patch b/patches/server/0612-added-PlayerNameEntityEvent.patch
index c1df33b717..c1df33b717 100644
--- a/patches/server/0611-added-PlayerNameEntityEvent.patch
+++ b/patches/server/0612-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0612-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0613-Prevent-grindstones-from-overstacking-items.patch
index 3719f82383..3719f82383 100644
--- a/patches/server/0612-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0613-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0613-Add-recipe-to-cook-events.patch b/patches/server/0614-Add-recipe-to-cook-events.patch
index 37fe944542..37fe944542 100644
--- a/patches/server/0613-Add-recipe-to-cook-events.patch
+++ b/patches/server/0614-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0614-Add-Block-isValidTool.patch b/patches/server/0615-Add-Block-isValidTool.patch
index 26174997c9..26174997c9 100644
--- a/patches/server/0614-Add-Block-isValidTool.patch
+++ b/patches/server/0615-Add-Block-isValidTool.patch
diff --git a/patches/server/0615-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0616-Allow-using-signs-inside-spawn-protection.patch
index 83ba67caf7..4b9fc3b054 100644
--- a/patches/server/0615-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0616-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 3ac3f8f8a6cc144c426409898abee3908c098b76..f1e4f8af50ef5ede030b35bda62ebc63d6982bae 100644
+index a94cb1ffe034a00f9d3cf2dc190862b906abd8dc..716747f86cb7b4ee811c5e128c00b5319959cb64 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -785,4 +785,9 @@ public class PaperWorldConfig {
+@@ -789,4 +789,9 @@ public class PaperWorldConfig {
              delayChunkUnloadsBy *= 20;
          }
      }
diff --git a/patches/server/0616-Implement-Keyed-on-World.patch b/patches/server/0617-Implement-Keyed-on-World.patch
index ddaaa97283..ddaaa97283 100644
--- a/patches/server/0616-Implement-Keyed-on-World.patch
+++ b/patches/server/0617-Implement-Keyed-on-World.patch
diff --git a/patches/server/0617-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0618-Add-fast-alternative-constructor-for-Rotations.patch
index d2a627b5b6..d2a627b5b6 100644
--- a/patches/server/0617-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0618-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0618-Item-Rarity-API.patch b/patches/server/0619-Item-Rarity-API.patch
index 4deefe1dde..4deefe1dde 100644
--- a/patches/server/0618-Item-Rarity-API.patch
+++ b/patches/server/0619-Item-Rarity-API.patch
diff --git a/patches/server/0619-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0620-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index eef34ce857..eef34ce857 100644
--- a/patches/server/0619-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0620-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0620-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0621-copy-TESign-isEditable-from-snapshots.patch
index 990f7cec9b..990f7cec9b 100644
--- a/patches/server/0620-copy-TESign-isEditable-from-snapshots.patch
+++ b/patches/server/0621-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0621-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0622-Drop-carried-item-when-player-has-disconnected.patch
index ab409204fc..ab409204fc 100644
--- a/patches/server/0621-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0622-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0622-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0623-forced-whitelist-use-configurable-kick-message.patch
index 3923abbafd..3923abbafd 100644
--- a/patches/server/0622-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0623-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0623-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0624-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index bdb7bd8746..bdb7bd8746 100644
--- a/patches/server/0623-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0624-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0624-Entity-load-save-limit-per-chunk.patch b/patches/server/0625-Entity-load-save-limit-per-chunk.patch
index 0952bfa389..e9f4fbe4c2 100644
--- a/patches/server/0624-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0625-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 f1e4f8af50ef5ede030b35bda62ebc63d6982bae..ed833a289b99d4ae028b5b83752364d328d48c4b 100644
+index 716747f86cb7b4ee811c5e128c00b5319959cb64..3db7a4ad81db0475ce975c02c435a069abf2ad7e 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;
diff --git a/patches/server/0625-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0626-fix-cancelling-block-falling-causing-client-desync.patch
index e68d092a83..e68d092a83 100644
--- a/patches/server/0625-fix-cancelling-block-falling-causing-client-desync.patch
+++ b/patches/server/0626-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0626-Expose-protocol-version.patch b/patches/server/0627-Expose-protocol-version.patch
index 5e797761af..5e797761af 100644
--- a/patches/server/0626-Expose-protocol-version.patch
+++ b/patches/server/0627-Expose-protocol-version.patch
diff --git a/patches/server/0627-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0628-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index 42fbf5a03d..42fbf5a03d 100644
--- a/patches/server/0627-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/server/0628-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0628-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0629-Enhance-console-tab-completions-for-brigadier-comman.patch
index 139325cbeb..139325cbeb 100644
--- a/patches/server/0628-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0629-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0629-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0630-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 9cdaf8c720..9cdaf8c720 100644
--- a/patches/server/0629-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0630-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0630-Add-bypass-host-check.patch b/patches/server/0631-Add-bypass-host-check.patch
index 80d7b918c3..80d7b918c3 100644
--- a/patches/server/0630-Add-bypass-host-check.patch
+++ b/patches/server/0631-Add-bypass-host-check.patch
diff --git a/patches/server/0631-Set-area-affect-cloud-rotation.patch b/patches/server/0632-Set-area-affect-cloud-rotation.patch
index b7cb1837b3..b7cb1837b3 100644
--- a/patches/server/0631-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0632-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0632-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0633-add-isDeeplySleeping-to-HumanEntity.patch
index b83aaecf3f..b83aaecf3f 100644
--- a/patches/server/0632-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0633-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0633-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0634-Fix-duplicating-give-items-on-item-drop-cancel.patch
index ee8bbaabe6..ee8bbaabe6 100644
--- a/patches/server/0633-Fix-duplicating-give-items-on-item-drop-cancel.patch
+++ b/patches/server/0634-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0634-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0635-add-consumeFuel-to-FurnaceBurnEvent.patch
index 546a504059..546a504059 100644
--- a/patches/server/0634-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0635-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0635-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0636-add-get-set-drop-chance-to-EntityEquipment.patch
index 9720fcdaf4..9720fcdaf4 100644
--- a/patches/server/0635-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0636-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0636-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0637-fix-PigZombieAngerEvent-cancellation.patch
index b0a3c9d25d..b0a3c9d25d 100644
--- a/patches/server/0636-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0637-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0637-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0638-Fix-checkReach-check-for-Shulker-boxes.patch
index e63651a68f..e63651a68f 100644
--- a/patches/server/0637-Fix-checkReach-check-for-Shulker-boxes.patch
+++ b/patches/server/0638-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0638-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0639-fix-PlayerItemHeldEvent-firing-twice.patch
index 13b4e6d251..13b4e6d251 100644
--- a/patches/server/0638-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0639-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0639-Added-PlayerDeepSleepEvent.patch b/patches/server/0640-Added-PlayerDeepSleepEvent.patch
index b0434fe757..b0434fe757 100644
--- a/patches/server/0639-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0640-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0640-More-World-API.patch b/patches/server/0641-More-World-API.patch
index d104b92d9d..d104b92d9d 100644
--- a/patches/server/0640-More-World-API.patch
+++ b/patches/server/0641-More-World-API.patch
diff --git a/patches/server/0641-Added-PlayerBedFailEnterEvent.patch b/patches/server/0642-Added-PlayerBedFailEnterEvent.patch
index 95b8821728..95b8821728 100644
--- a/patches/server/0641-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0642-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0642-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0643-Implement-methods-to-convert-between-Component-and-B.patch
index a483142256..a483142256 100644
--- a/patches/server/0642-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0643-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0643-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0644-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index e593462f25..e593462f25 100644
--- a/patches/server/0643-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0644-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0644-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0645-Introduce-beacon-activation-deactivation-events.patch
index 766214f6eb..766214f6eb 100644
--- a/patches/server/0644-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0645-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0645-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0646-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 1363695456..1363695456 100644
--- a/patches/server/0645-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0646-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0646-Add-Channel-initialization-listeners.patch b/patches/server/0647-Add-Channel-initialization-listeners.patch
index 0efca8f11f..0efca8f11f 100644
--- a/patches/server/0646-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0647-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0647-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0648-Send-empty-commands-if-tab-completion-is-disabled.patch
index a2bbfd3906..a2bbfd3906 100644
--- a/patches/server/0647-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0648-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0648-Add-more-WanderingTrader-API.patch b/patches/server/0649-Add-more-WanderingTrader-API.patch
index fd2be763ca..fd2be763ca 100644
--- a/patches/server/0648-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0649-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0649-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0650-Add-EntityBlockStorage-clearEntities.patch
index f432865c13..f432865c13 100644
--- a/patches/server/0649-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0650-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0650-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0651-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index d62b24cd3e..d62b24cd3e 100644
--- a/patches/server/0650-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0651-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0651-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0652-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 699e712c81..699e712c81 100644
--- a/patches/server/0651-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0652-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0652-Inventory-close.patch b/patches/server/0653-Inventory-close.patch
index e21cf25bc1..e21cf25bc1 100644
--- a/patches/server/0652-Inventory-close.patch
+++ b/patches/server/0653-Inventory-close.patch
diff --git a/patches/server/0653-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0654-call-PortalCreateEvent-players-and-end-platform.patch
index 1dd96ed2ec..1dd96ed2ec 100644
--- a/patches/server/0653-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/server/0654-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0654-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0655-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 73dba9db51..73dba9db51 100644
--- a/patches/server/0654-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0655-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0655-Fix-CraftPotionBrewer-cache.patch b/patches/server/0656-Fix-CraftPotionBrewer-cache.patch
index 2d8295382f..2d8295382f 100644
--- a/patches/server/0655-Fix-CraftPotionBrewer-cache.patch
+++ b/patches/server/0656-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0656-Add-basic-Datapack-API.patch b/patches/server/0657-Add-basic-Datapack-API.patch
index 37c756662f..37c756662f 100644
--- a/patches/server/0656-Add-basic-Datapack-API.patch
+++ b/patches/server/0657-Add-basic-Datapack-API.patch
diff --git a/patches/server/0657-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0658-Add-environment-variable-to-disable-server-gui.patch
index a7f97d8c99..a7f97d8c99 100644
--- a/patches/server/0657-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0658-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0658-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0659-additions-to-PlayerGameModeChangeEvent.patch
index df9de00848..df9de00848 100644
--- a/patches/server/0658-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0659-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0659-ItemStack-repair-check-API.patch b/patches/server/0660-ItemStack-repair-check-API.patch
index 518bb79325..518bb79325 100644
--- a/patches/server/0659-ItemStack-repair-check-API.patch
+++ b/patches/server/0660-ItemStack-repair-check-API.patch
diff --git a/patches/server/0660-More-Enchantment-API.patch b/patches/server/0661-More-Enchantment-API.patch
index be8a7f96c7..be8a7f96c7 100644
--- a/patches/server/0660-More-Enchantment-API.patch
+++ b/patches/server/0661-More-Enchantment-API.patch
diff --git a/patches/server/0661-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0662-Fix-and-optimise-world-force-upgrading.patch
index 94b3eb0a66..94b3eb0a66 100644
--- a/patches/server/0661-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0662-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0662-Add-Mob-lookAt-API.patch b/patches/server/0663-Add-Mob-lookAt-API.patch
index 26b90782d2..26b90782d2 100644
--- a/patches/server/0662-Add-Mob-lookAt-API.patch
+++ b/patches/server/0663-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0663-Add-Unix-domain-socket-support.patch b/patches/server/0664-Add-Unix-domain-socket-support.patch
index 687dd8acef..687dd8acef 100644
--- a/patches/server/0663-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0664-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0664-Add-EntityInsideBlockEvent.patch b/patches/server/0665-Add-EntityInsideBlockEvent.patch
index ca973e9b06..ca973e9b06 100644
--- a/patches/server/0664-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0665-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0665-Attributes-API-for-item-defaults.patch b/patches/server/0666-Attributes-API-for-item-defaults.patch
index a50591e591..a50591e591 100644
--- a/patches/server/0665-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0666-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0666-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0667-Add-cause-to-Weather-ThunderChangeEvents.patch
index 7af83473e6..7af83473e6 100644
--- a/patches/server/0666-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0667-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0667-More-Lidded-Block-API.patch b/patches/server/0668-More-Lidded-Block-API.patch
index 5b7c8a3b64..5b7c8a3b64 100644
--- a/patches/server/0667-More-Lidded-Block-API.patch
+++ b/patches/server/0668-More-Lidded-Block-API.patch
diff --git a/patches/server/0668-Limit-item-frame-cursors-on-maps.patch b/patches/server/0669-Limit-item-frame-cursors-on-maps.patch
index e240a6f098..72fffc70b9 100644
--- a/patches/server/0668-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0669-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 ed833a289b99d4ae028b5b83752364d328d48c4b..01283b5f36063b337494cdc4a44f48397b5754e2 100644
+index 3db7a4ad81db0475ce975c02c435a069abf2ad7e..fb6eaddccc5153037680840f6a7ec29dff733dee 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -824,4 +824,9 @@ public class PaperWorldConfig {
+@@ -828,4 +828,9 @@ public class PaperWorldConfig {
      private void allowUsingSignsInsideSpawnProtection() {
          allowUsingSignsInsideSpawnProtection = getBoolean("allow-using-signs-inside-spawn-protection", allowUsingSignsInsideSpawnProtection);
      }
diff --git a/patches/server/0669-Add-PlayerKickEvent-causes.patch b/patches/server/0670-Add-PlayerKickEvent-causes.patch
index f5bd612f9e..f5bd612f9e 100644
--- a/patches/server/0669-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0670-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0670-Add-PufferFishStateChangeEvent.patch b/patches/server/0671-Add-PufferFishStateChangeEvent.patch
index 14a8a30708..14a8a30708 100644
--- a/patches/server/0670-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0671-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0671-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0672-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 2b9de8138c..2b9de8138c 100644
--- a/patches/server/0671-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0672-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0672-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0673-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
index df2a76b8ab..df2a76b8ab 100644
--- a/patches/server/0672-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
+++ b/patches/server/0673-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0673-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0674-Add-option-to-fix-items-merging-through-walls.patch
index e697c69425..9dfcb756ce 100644
--- a/patches/server/0673-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0674-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 01283b5f36063b337494cdc4a44f48397b5754e2..a653e821343410e7faec39c51d32eeba223c829c 100644
+index fb6eaddccc5153037680840f6a7ec29dff733dee..1305c1a7ae6505c1c89d2a4c2a3fbae2111e2e81 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -829,4 +829,9 @@ public class PaperWorldConfig {
+@@ -833,4 +833,9 @@ public class PaperWorldConfig {
      private void mapItemFrameCursorLimit() {
          mapItemFrameCursorLimit = getInt("map-item-frame-cursor-limit", mapItemFrameCursorLimit);
      }
diff --git a/patches/server/0674-Add-BellRevealRaiderEvent.patch b/patches/server/0675-Add-BellRevealRaiderEvent.patch
index 069c85f11e..069c85f11e 100644
--- a/patches/server/0674-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0675-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0675-Fix-invulnerable-end-crystals.patch b/patches/server/0676-Fix-invulnerable-end-crystals.patch
index 8a83dcfe73..8abc3f294c 100644
--- a/patches/server/0675-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0676-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 a653e821343410e7faec39c51d32eeba223c829c..f6486a74ac205ef82e3a1e7023f6e818db8dab71 100644
+index 1305c1a7ae6505c1c89d2a4c2a3fbae2111e2e81..e6935a01c648773c83f0d1ad2ba0fc9e9e169d6c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -834,4 +834,9 @@ public class PaperWorldConfig {
+@@ -838,4 +838,9 @@ public class PaperWorldConfig {
      private void fixItemsMergingThroughWalls() {
          fixItemsMergingThroughWalls = getBoolean("fix-items-merging-through-walls", fixItemsMergingThroughWalls);
      }
diff --git a/patches/server/0676-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0677-Add-ElderGuardianAppearanceEvent.patch
index 540926f9ef..540926f9ef 100644
--- a/patches/server/0676-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0677-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0677-Fix-dangerous-end-portal-logic.patch b/patches/server/0678-Fix-dangerous-end-portal-logic.patch
index 5674a127de..5674a127de 100644
--- a/patches/server/0677-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0678-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0678-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0679-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 143d33b783..143d33b783 100644
--- a/patches/server/0678-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0679-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0679-Make-item-validations-configurable.patch b/patches/server/0680-Make-item-validations-configurable.patch
index 48a1f4174b..48a1f4174b 100644
--- a/patches/server/0679-Make-item-validations-configurable.patch
+++ b/patches/server/0680-Make-item-validations-configurable.patch
diff --git a/patches/server/0680-Line-Of-Sight-Changes.patch b/patches/server/0681-Line-Of-Sight-Changes.patch
index bc3b2bdece..bc3b2bdece 100644
--- a/patches/server/0680-Line-Of-Sight-Changes.patch
+++ b/patches/server/0681-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0681-add-per-world-spawn-limits.patch b/patches/server/0682-add-per-world-spawn-limits.patch
index 5f911b99e1..e363c931da 100644
--- a/patches/server/0681-add-per-world-spawn-limits.patch
+++ b/patches/server/0682-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 f6486a74ac205ef82e3a1e7023f6e818db8dab71..75988ff014e40b248312d13d27f677882211d607 100644
+index e6935a01c648773c83f0d1ad2ba0fc9e9e169d6c..3831ac4a373009ef2c06fd329459cd84b6329003 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 f6486a74ac205ef82e3a1e7023f6e818db8dab71..75988ff014e40b248312d13d27f67788
          }
  
          if (needsSave) {
-@@ -684,6 +689,21 @@ public class PaperWorldConfig {
+@@ -688,6 +693,21 @@ public class PaperWorldConfig {
          zombieVillagerInfectionChance = getDouble("zombie-villager-infection-chance", zombieVillagerInfectionChance);
      }
  
diff --git a/patches/server/0682-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0683-Fix-PotionSplashEvent-for-water-splash-potions.patch
index 3c51815a89..3c51815a89 100644
--- a/patches/server/0682-Fix-PotionSplashEvent-for-water-splash-potions.patch
+++ b/patches/server/0683-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0683-Add-more-LimitedRegion-API.patch b/patches/server/0684-Add-more-LimitedRegion-API.patch
index b8d8e5c146..b8d8e5c146 100644
--- a/patches/server/0683-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0684-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0684-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0685-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 23cedb13cf..23cedb13cf 100644
--- a/patches/server/0684-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0685-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0685-Missing-Entity-Behavior-API.patch b/patches/server/0686-Missing-Entity-Behavior-API.patch
index 130dd2939f..130dd2939f 100644
--- a/patches/server/0685-Missing-Entity-Behavior-API.patch
+++ b/patches/server/0686-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0686-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0687-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 5a91c997eb..5a91c997eb 100644
--- a/patches/server/0686-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0687-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0687-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0688-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index c2c8ad9b37..c2c8ad9b37 100644
--- a/patches/server/0687-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0688-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0688-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0689-Use-getChunkIfLoadedImmediately-in-places.patch
index d0296bb8d3..d0296bb8d3 100644
--- a/patches/server/0688-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0689-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0689-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0690-Fix-commands-from-signs-not-firing-command-events.patch
index 92242a76f0..b22aa11f86 100644
--- a/patches/server/0689-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0690-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 75988ff014e40b248312d13d27f677882211d607..449093429d0c15dedc2a135a49d570c104f2f563 100644
+index 3831ac4a373009ef2c06fd329459cd84b6329003..754e1f91feb8e6a806ea885d95d95eb25be5405f 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 {
+@@ -863,4 +863,9 @@ public class PaperWorldConfig {
      private void fixInvulnerableEndCrystalExploit() {
          fixInvulnerableEndCrystalExploit = getBoolean("unsupported-settings.fix-invulnerable-end-crystal-exploit", fixInvulnerableEndCrystalExploit);
      }
diff --git a/patches/server/0690-Adds-PlayerArmSwingEvent.patch b/patches/server/0691-Adds-PlayerArmSwingEvent.patch
index 10e2f0ccb8..10e2f0ccb8 100644
--- a/patches/server/0690-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0691-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0691-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0692-Fixes-kick-event-leave-message-not-being-sent.patch
index c5876012bc..c5876012bc 100644
--- a/patches/server/0691-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0692-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0692-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0693-Add-config-for-mobs-immune-to-default-effects.patch
index 33f9286747..7e3abd4a7a 100644
--- a/patches/server/0692-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0693-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 449093429d0c15dedc2a135a49d570c104f2f563..41534b2ee3360b79a1a119c69ea1ce3a0ad1a04b 100644
+index 754e1f91feb8e6a806ea885d95d95eb25be5405f..f07174ca6cdf9609fd695f999b09312c7b2b468e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -679,6 +679,21 @@ public class PaperWorldConfig {
+@@ -683,6 +683,21 @@ public class PaperWorldConfig {
          log("Hopper Ignore Occluding Blocks: " + (hoppersIgnoreOccludingBlocks ? "enabled" : "disabled"));
      }
  
diff --git a/patches/server/0693-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0694-Fix-incorrect-message-for-outdated-client.patch
index e5f39a1485..e5f39a1485 100644
--- a/patches/server/0693-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0694-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0694-Fix-MerchantOffer-BuyB-Only-AssertionError.patch b/patches/server/0695-Fix-MerchantOffer-BuyB-Only-AssertionError.patch
index 6cc9fedf40..6cc9fedf40 100644
--- a/patches/server/0694-Fix-MerchantOffer-BuyB-Only-AssertionError.patch
+++ b/patches/server/0695-Fix-MerchantOffer-BuyB-Only-AssertionError.patch
diff --git a/patches/server/0695-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0696-Don-t-apply-cramming-damage-to-players.patch
index 4302a597c2..bb7e966527 100644
--- a/patches/server/0695-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0696-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 41534b2ee3360b79a1a119c69ea1ce3a0ad1a04b..1895fac6a0fd1545b46b7aebab5aeee7351b2a94 100644
+index f07174ca6cdf9609fd695f999b09312c7b2b468e..5f8e4ea63d00f62df22f4379b67058238e6fe971 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -879,4 +879,9 @@ public class PaperWorldConfig {
+@@ -883,4 +883,9 @@ public class PaperWorldConfig {
      private void showSignClickCommandFailureMessagesToPlayer() {
          showSignClickCommandFailureMessagesToPlayer = getBoolean("show-sign-click-command-failure-msgs-to-player", showSignClickCommandFailureMessagesToPlayer);
      }
diff --git a/patches/server/0696-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0697-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 09fc26f026..dbc3d332fc 100644
--- a/patches/server/0696-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0697-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 1895fac6a0fd1545b46b7aebab5aeee7351b2a94..8f358ed2d734ba63143c98bd044beb7e36a53aa5 100644
+index 5f8e4ea63d00f62df22f4379b67058238e6fe971..aaa437f83b5784464ba443cd04bf13a1321f0921 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 1895fac6a0fd1545b46b7aebab5aeee7351b2a94..8f358ed2d734ba63143c98bd044beb7e
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -884,4 +886,57 @@ public class PaperWorldConfig {
+@@ -888,4 +890,57 @@ public class PaperWorldConfig {
      private void playerCrammingDamage() {
          allowPlayerCrammingDamage = getBoolean("allow-player-cramming-damage", allowPlayerCrammingDamage);
      }
diff --git a/patches/server/0697-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0698-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 127fa915c6..127fa915c6 100644
--- a/patches/server/0697-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0698-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0698-Stinger-API.patch b/patches/server/0699-Stinger-API.patch
index 33f8959315..33f8959315 100644
--- a/patches/server/0698-Stinger-API.patch
+++ b/patches/server/0699-Stinger-API.patch
diff --git a/patches/server/0699-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0700-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index 77196f4ae2..77196f4ae2 100644
--- a/patches/server/0699-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0700-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0700-Add-System.out-err-catcher.patch b/patches/server/0701-Add-System.out-err-catcher.patch
index ff3261501c..ff3261501c 100644
--- a/patches/server/0700-Add-System.out-err-catcher.patch
+++ b/patches/server/0701-Add-System.out-err-catcher.patch
diff --git a/patches/server/0701-Fix-test-not-bootstrapping.patch b/patches/server/0702-Fix-test-not-bootstrapping.patch
index 5d0466c3b3..5d0466c3b3 100644
--- a/patches/server/0701-Fix-test-not-bootstrapping.patch
+++ b/patches/server/0702-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0702-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0703-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 10cd90749d..10cd90749d 100644
--- a/patches/server/0702-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0703-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0703-Improve-boat-collision-performance.patch b/patches/server/0704-Improve-boat-collision-performance.patch
index 865679e09e..865679e09e 100644
--- a/patches/server/0703-Improve-boat-collision-performance.patch
+++ b/patches/server/0704-Improve-boat-collision-performance.patch
diff --git a/patches/server/0704-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0705-Prevent-AFK-kick-while-watching-end-credits.patch
index 90a93b893c..90a93b893c 100644
--- a/patches/server/0704-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0705-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0705-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0706-Allow-skipping-writing-of-comments-to-server.propert.patch
index d4d19d0e69..d4d19d0e69 100644
--- a/patches/server/0705-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0706-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0706-Add-PlayerSetSpawnEvent.patch b/patches/server/0707-Add-PlayerSetSpawnEvent.patch
index d14db0d905..d14db0d905 100644
--- a/patches/server/0706-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0707-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0707-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0708-Make-hoppers-respect-inventory-max-stack-size.patch
index fe1da128ae..fe1da128ae 100644
--- a/patches/server/0707-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0708-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0708-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0709-Optimize-entity-tracker-passenger-checks.patch
index ce8a02f22d..ce8a02f22d 100644
--- a/patches/server/0708-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0709-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0709-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0710-Config-option-for-Piglins-guarding-chests.patch
index ccc23188df..bff7c34f22 100644
--- a/patches/server/0709-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0710-Config-option-for-Piglins-guarding-chests.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config option for Piglins guarding chests
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8f358ed2d734ba63143c98bd044beb7e36a53aa5..1ecc60ca4923e27f6015c00b4bd66ebbfb368be4 100644
+index aaa437f83b5784464ba443cd04bf13a1321f0921..27dbdf072fde014b6244428afbc3b279e2080995 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -72,6 +72,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0710-Added-EntityDamageItemEvent.patch b/patches/server/0711-Added-EntityDamageItemEvent.patch
index a0fecd0278..a0fecd0278 100644
--- a/patches/server/0710-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0711-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0711-Optimize-indirect-passenger-iteration.patch b/patches/server/0712-Optimize-indirect-passenger-iteration.patch
index 9f79ca0e7f..9f79ca0e7f 100644
--- a/patches/server/0711-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0712-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0712-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0713-Fix-block-drops-position-losing-precision-millions-o.patch
index 7077043f4f..7077043f4f 100644
--- a/patches/server/0712-Fix-block-drops-position-losing-precision-millions-o.patch
+++ b/patches/server/0713-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0713-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0714-Configurable-item-frame-map-cursor-update-interval.patch
index 0ba11a1e47..c1bdb0ab59 100644
--- a/patches/server/0713-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0714-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 1ecc60ca4923e27f6015c00b4bd66ebbfb368be4..1dab732cf5614be864cf8abfbd6709545b9ff0c8 100644
+index 27dbdf072fde014b6244428afbc3b279e2080995..d549455e893a2e65fb6f4a529cc9685420190da9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -872,6 +872,11 @@ public class PaperWorldConfig {
+@@ -876,6 +876,11 @@ public class PaperWorldConfig {
          mapItemFrameCursorLimit = getInt("map-item-frame-cursor-limit", mapItemFrameCursorLimit);
      }
  
diff --git a/patches/server/0714-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0715-Make-EntityUnleashEvent-cancellable.patch
index af08044a2f..af08044a2f 100644
--- a/patches/server/0714-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0715-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0715-Clear-bucket-NBT-after-dispense.patch b/patches/server/0716-Clear-bucket-NBT-after-dispense.patch
index 046e7d2e5c..046e7d2e5c 100644
--- a/patches/server/0715-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0716-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0716-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch b/patches/server/0717-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch
index 4a7c6f9fc7..4a7c6f9fc7 100644
--- a/patches/server/0716-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch
+++ b/patches/server/0717-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch
diff --git a/patches/server/0717-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0718-Respect-despawn-rate-in-item-merge-check.patch
index d5cd293f4a..d5cd293f4a 100644
--- a/patches/server/0717-Respect-despawn-rate-in-item-merge-check.patch
+++ b/patches/server/0718-Respect-despawn-rate-in-item-merge-check.patch
diff --git a/patches/server/0718-Move-BlockPistonRetractEvent-to-fix-duplication.patch b/patches/server/0719-Move-BlockPistonRetractEvent-to-fix-duplication.patch
index 87cfb92404..87cfb92404 100644
--- a/patches/server/0718-Move-BlockPistonRetractEvent-to-fix-duplication.patch
+++ b/patches/server/0719-Move-BlockPistonRetractEvent-to-fix-duplication.patch
diff --git a/patches/server/0719-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0720-Change-EnderEye-target-without-changing-other-things.patch
index e4af6267df..e4af6267df 100644
--- a/patches/server/0719-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0720-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0720-Add-BlockBreakBlockEvent.patch b/patches/server/0721-Add-BlockBreakBlockEvent.patch
index 73d2960284..73d2960284 100644
--- a/patches/server/0720-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0721-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0721-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0722-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 14e666a79e..14e666a79e 100644
--- a/patches/server/0721-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0722-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0722-More-CommandBlock-API.patch b/patches/server/0723-More-CommandBlock-API.patch
index daf682f8a0..daf682f8a0 100644
--- a/patches/server/0722-More-CommandBlock-API.patch
+++ b/patches/server/0723-More-CommandBlock-API.patch
diff --git a/patches/server/0723-Add-missing-team-sidebar-display-slots.patch b/patches/server/0724-Add-missing-team-sidebar-display-slots.patch
index 5581728a48..5581728a48 100644
--- a/patches/server/0723-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0724-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0724-Add-back-EntityPortalExitEvent.patch b/patches/server/0725-Add-back-EntityPortalExitEvent.patch
index 8a092218a3..8a092218a3 100644
--- a/patches/server/0724-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0725-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0725-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0726-Add-methods-to-find-targets-for-lightning-strikes.patch
index da9b6f9626..da9b6f9626 100644
--- a/patches/server/0725-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0726-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0726-Get-entity-default-attributes.patch b/patches/server/0727-Get-entity-default-attributes.patch
index 242fb46936..242fb46936 100644
--- a/patches/server/0726-Get-entity-default-attributes.patch
+++ b/patches/server/0727-Get-entity-default-attributes.patch
diff --git a/patches/server/0727-Left-handed-API.patch b/patches/server/0728-Left-handed-API.patch
index dd1acc7723..dd1acc7723 100644
--- a/patches/server/0727-Left-handed-API.patch
+++ b/patches/server/0728-Left-handed-API.patch
diff --git a/patches/server/0728-Add-advancement-display-API.patch b/patches/server/0729-Add-advancement-display-API.patch
index c2bd6b94c0..c2bd6b94c0 100644
--- a/patches/server/0728-Add-advancement-display-API.patch
+++ b/patches/server/0729-Add-advancement-display-API.patch
diff --git a/patches/server/0729-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0730-Add-ItemFactory-getMonsterEgg-API.patch
index a7a82e297a..a7a82e297a 100644
--- a/patches/server/0729-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/server/0730-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0730-Add-critical-damage-API.patch b/patches/server/0731-Add-critical-damage-API.patch
index dfd5229da4..dfd5229da4 100644
--- a/patches/server/0730-Add-critical-damage-API.patch
+++ b/patches/server/0731-Add-critical-damage-API.patch
diff --git a/patches/server/0731-Fix-issues-with-mob-conversion.patch b/patches/server/0732-Fix-issues-with-mob-conversion.patch
index 65a03ed56e..65a03ed56e 100644
--- a/patches/server/0731-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0732-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0732-Add-isCollidable-methods-to-various-places.patch b/patches/server/0733-Add-isCollidable-methods-to-various-places.patch
index faf261a998..faf261a998 100644
--- a/patches/server/0732-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0733-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0733-Goat-ram-API.patch b/patches/server/0734-Goat-ram-API.patch
index 641bebca80..641bebca80 100644
--- a/patches/server/0733-Goat-ram-API.patch
+++ b/patches/server/0734-Goat-ram-API.patch
diff --git a/patches/server/0734-Add-API-for-resetting-a-single-score.patch b/patches/server/0735-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9..c2e1fd93b9 100644
--- a/patches/server/0734-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0735-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0735-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0736-Add-Raw-Byte-Entity-Serialization.patch
index d21672b6aa..d21672b6aa 100644
--- a/patches/server/0735-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0736-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0736-Vanilla-command-permission-fixes.patch b/patches/server/0737-Vanilla-command-permission-fixes.patch
index 9080cc3cca..9080cc3cca 100644
--- a/patches/server/0736-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0737-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0737-Make-CallbackExecutor-strict-again.patch b/patches/server/0738-Make-CallbackExecutor-strict-again.patch
index 68b18d6536..68b18d6536 100644
--- a/patches/server/0737-Make-CallbackExecutor-strict-again.patch
+++ b/patches/server/0738-Make-CallbackExecutor-strict-again.patch
diff --git a/patches/server/0738-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0739-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
index eb5a3a65ed..eb5a3a65ed 100644
--- a/patches/server/0738-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
+++ b/patches/server/0739-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0739-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0740-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 7de4b588e9..7de4b588e9 100644
--- a/patches/server/0739-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0740-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0740-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0741-Correctly-handle-recursion-for-chunkholder-updates.patch
index 8b0d0239c2..8b0d0239c2 100644
--- a/patches/server/0740-Correctly-handle-recursion-for-chunkholder-updates.patch
+++ b/patches/server/0741-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0741-Separate-lookup-locking-from-state-access-in-UserCac.patch b/patches/server/0742-Separate-lookup-locking-from-state-access-in-UserCac.patch
index 20298aa1a6..20298aa1a6 100644
--- a/patches/server/0741-Separate-lookup-locking-from-state-access-in-UserCac.patch
+++ b/patches/server/0742-Separate-lookup-locking-from-state-access-in-UserCac.patch
diff --git a/patches/server/0742-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0743-Fix-chunks-refusing-to-unload-at-low-TPS.patch
index 5d95d12b7c..5d95d12b7c 100644
--- a/patches/server/0742-Fix-chunks-refusing-to-unload-at-low-TPS.patch
+++ b/patches/server/0743-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0743-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0744-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
index d1cd2e9a71..d1cd2e9a71 100644
--- a/patches/server/0743-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
+++ b/patches/server/0744-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
diff --git a/patches/server/0744-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0745-Do-not-allow-ticket-level-changes-when-updating-chun.patch
index e4d9eab542..e4d9eab542 100644
--- a/patches/server/0744-Do-not-allow-ticket-level-changes-when-updating-chun.patch
+++ b/patches/server/0745-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0745-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0746-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index 6fd3fefa43..6fd3fefa43 100644
--- a/patches/server/0745-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/server/0746-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0746-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0747-Log-when-the-async-catcher-is-tripped.patch
index 7006040b25..7006040b25 100644
--- a/patches/server/0746-Log-when-the-async-catcher-is-tripped.patch
+++ b/patches/server/0747-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0747-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0748-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 6c68736e63..6c68736e63 100644
--- a/patches/server/0747-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0748-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0748-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0749-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
index 7560130c15..7560130c15 100644
--- a/patches/server/0748-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
+++ b/patches/server/0749-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/0749-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0750-Sanitize-ResourceLocation-error-logging.patch
index 1f990a622a..1f990a622a 100644
--- a/patches/server/0749-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0750-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0750-Optimise-general-POI-access.patch b/patches/server/0751-Optimise-general-POI-access.patch
index c920f51774..c920f51774 100644
--- a/patches/server/0750-Optimise-general-POI-access.patch
+++ b/patches/server/0751-Optimise-general-POI-access.patch
diff --git a/patches/server/0751-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0752-Allow-controlled-flushing-for-network-manager.patch
index c52730c1df..c52730c1df 100644
--- a/patches/server/0751-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/server/0752-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0752-Add-more-async-catchers.patch b/patches/server/0753-Add-more-async-catchers.patch
index 9eca07f148..9eca07f148 100644
--- a/patches/server/0752-Add-more-async-catchers.patch
+++ b/patches/server/0753-Add-more-async-catchers.patch
diff --git a/patches/server/0753-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0754-Rewrite-entity-bounding-box-lookup-calls.patch
index 2f7e4c540e..2f7e4c540e 100644
--- a/patches/server/0753-Rewrite-entity-bounding-box-lookup-calls.patch
+++ b/patches/server/0754-Rewrite-entity-bounding-box-lookup-calls.patch
diff --git a/patches/server/0754-Execute-chunk-tasks-mid-tick.patch b/patches/server/0755-Execute-chunk-tasks-mid-tick.patch
index ef13dfd332..ef13dfd332 100644
--- a/patches/server/0754-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0755-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0755-Do-not-copy-visible-chunks.patch b/patches/server/0756-Do-not-copy-visible-chunks.patch
index e649466db3..e649466db3 100644
--- a/patches/server/0755-Do-not-copy-visible-chunks.patch
+++ b/patches/server/0756-Do-not-copy-visible-chunks.patch
diff --git a/patches/server/0756-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0757-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 48436825c0..48436825c0 100644
--- a/patches/server/0756-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0757-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0757-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0758-Custom-table-implementation-for-blockstate-state-loo.patch
index 9b556d7fe8..9b556d7fe8 100644
--- a/patches/server/0757-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0758-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0758-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0759-Detail-more-information-in-watchdog-dumps.patch
index 0c33109e1b..0c33109e1b 100644
--- a/patches/server/0758-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0759-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0759-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0760-Manually-inline-methods-in-BlockPosition.patch
index 0d800a8100..0d800a8100 100644
--- a/patches/server/0759-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0760-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0760-Distance-manager-tick-timings.patch b/patches/server/0761-Distance-manager-tick-timings.patch
index a79ba7d3e5..a79ba7d3e5 100644
--- a/patches/server/0760-Distance-manager-tick-timings.patch
+++ b/patches/server/0761-Distance-manager-tick-timings.patch
diff --git a/patches/server/0761-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0762-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 7d081ee195..7d081ee195 100644
--- a/patches/server/0761-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0762-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0762-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0763-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index ff97803f3d..ff97803f3d 100644
--- a/patches/server/0762-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0763-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0763-Add-packet-limiter-config.patch b/patches/server/0764-Add-packet-limiter-config.patch
index 4ff4c8272f..4ff4c8272f 100644
--- a/patches/server/0763-Add-packet-limiter-config.patch
+++ b/patches/server/0764-Add-packet-limiter-config.patch
diff --git a/patches/server/0764-Lag-compensate-block-breaking.patch b/patches/server/0765-Lag-compensate-block-breaking.patch
index 9ab1776b29..9ab1776b29 100644
--- a/patches/server/0764-Lag-compensate-block-breaking.patch
+++ b/patches/server/0765-Lag-compensate-block-breaking.patch
diff --git a/patches/server/0765-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0766-Use-correct-LevelStem-registry-when-loading-default-.patch
index c769a8f3bb..c769a8f3bb 100644
--- a/patches/server/0765-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/server/0766-Use-correct-LevelStem-registry-when-loading-default-.patch
diff --git a/patches/server/0766-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0767-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index b201e36d10..b201e36d10 100644
--- a/patches/server/0766-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0767-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0767-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0768-Consolidate-flush-calls-for-entity-tracker-packets.patch
index 5a4d4e942a..5a4d4e942a 100644
--- a/patches/server/0767-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/server/0768-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0768-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0769-Don-t-lookup-fluid-state-when-raytracing.patch
index a1ddcdaa79..a1ddcdaa79 100644
--- a/patches/server/0768-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0769-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0769-Time-scoreboard-search.patch b/patches/server/0770-Time-scoreboard-search.patch
index 48469b83af..48469b83af 100644
--- a/patches/server/0769-Time-scoreboard-search.patch
+++ b/patches/server/0770-Time-scoreboard-search.patch
diff --git a/patches/server/0770-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0771-Send-full-pos-packets-for-hard-colliding-entities.patch
index af1611e279..af1611e279 100644
--- a/patches/server/0770-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0771-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0771-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0772-Do-not-run-raytrace-logic-for-AIR.patch
index 8517a67d89..8517a67d89 100644
--- a/patches/server/0771-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0772-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0772-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0773-Oprimise-map-impl-for-tracked-players.patch
index 9a9b55816c..9a9b55816c 100644
--- a/patches/server/0772-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0773-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0773-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0774-Optimise-BlockSoil-nearby-water-lookup.patch
index 54639ad2a8..54639ad2a8 100644
--- a/patches/server/0773-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0774-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0774-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0775-Allow-removal-addition-of-entities-to-entity-ticklis.patch
index d68c8524e7..d68c8524e7 100644
--- a/patches/server/0774-Allow-removal-addition-of-entities-to-entity-ticklis.patch
+++ b/patches/server/0775-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0775-Optimise-random-block-ticking.patch b/patches/server/0776-Optimise-random-block-ticking.patch
index 906f0a2193..906f0a2193 100644
--- a/patches/server/0775-Optimise-random-block-ticking.patch
+++ b/patches/server/0776-Optimise-random-block-ticking.patch
diff --git a/patches/server/0776-Optimise-non-flush-packet-sending.patch b/patches/server/0777-Optimise-non-flush-packet-sending.patch
index f8dc75ba8c..f8dc75ba8c 100644
--- a/patches/server/0776-Optimise-non-flush-packet-sending.patch
+++ b/patches/server/0777-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0777-Optimise-nearby-player-lookups.patch b/patches/server/0778-Optimise-nearby-player-lookups.patch
index 155aa7711e..155aa7711e 100644
--- a/patches/server/0777-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0778-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0778-Optimise-WorldServer-notify.patch b/patches/server/0779-Optimise-WorldServer-notify.patch
index c553f2a0cb..c553f2a0cb 100644
--- a/patches/server/0778-Optimise-WorldServer-notify.patch
+++ b/patches/server/0779-Optimise-WorldServer-notify.patch
diff --git a/patches/server/0779-Remove-streams-for-villager-AI.patch b/patches/server/0780-Remove-streams-for-villager-AI.patch
index 8257c2de40..8257c2de40 100644
--- a/patches/server/0779-Remove-streams-for-villager-AI.patch
+++ b/patches/server/0780-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0780-Rewrite-dataconverter-system.patch b/patches/server/0781-Rewrite-dataconverter-system.patch
index 999b3737c5..999b3737c5 100644
--- a/patches/server/0780-Rewrite-dataconverter-system.patch
+++ b/patches/server/0781-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0781-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0782-Use-Velocity-compression-and-cipher-natives.patch
index f3d0058479..f3d0058479 100644
--- a/patches/server/0781-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0782-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0782-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0783-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index d95c023f1e..d95c023f1e 100644
--- a/patches/server/0782-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0783-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0783-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0784-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
index ddc57c0d3a..ddc57c0d3a 100644
--- a/patches/server/0783-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
+++ b/patches/server/0784-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
diff --git a/patches/server/0784-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0785-Async-catch-modifications-to-critical-entity-state.patch
index 7b91e7da2c..7b91e7da2c 100644
--- a/patches/server/0784-Async-catch-modifications-to-critical-entity-state.patch
+++ b/patches/server/0785-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0785-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0786-Fix-Bukkit-NamespacedKey-shenanigans.patch
index 8f152dd0e7..8f152dd0e7 100644
--- a/patches/server/0785-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0786-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0786-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0787-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index d50214bb27..d50214bb27 100644
--- a/patches/server/0786-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0787-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0787-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0788-Check-requirement-before-suggesting-root-nodes.patch
index da19d3f1ca..da19d3f1ca 100644
--- a/patches/server/0787-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0788-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0788-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0789-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index c34f26e3fb..c34f26e3fb 100644
--- a/patches/server/0788-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0789-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0789-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0790-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 31e987614a..31e987614a 100644
--- a/patches/server/0789-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0790-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0790-Ensure-valid-vehicle-status.patch b/patches/server/0791-Ensure-valid-vehicle-status.patch
index b179fe45e2..b179fe45e2 100644
--- a/patches/server/0790-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0791-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0791-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0792-Prevent-softlocked-end-exit-portal-generation.patch
index d7ec8ee0ea..d7ec8ee0ea 100644
--- a/patches/server/0791-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0792-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0792-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0793-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 2ce994e362..2ce994e362 100644
--- a/patches/server/0792-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0793-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0793-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0794-Don-t-log-debug-logging-being-disabled.patch
index 52bf120706..52bf120706 100644
--- a/patches/server/0793-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0794-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0794-Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/server/0795-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
index 5a420fb241..5a420fb241 100644
--- a/patches/server/0794-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
+++ b/patches/server/0795-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
diff --git a/patches/server/0795-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0796-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0795-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0796-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0796-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0797-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
index e68034a318..e68034a318 100644
--- a/patches/server/0796-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
+++ b/patches/server/0797-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
diff --git a/patches/server/0797-Preserve-overstacked-loot.patch b/patches/server/0798-Preserve-overstacked-loot.patch
index f25f684b12..adf5975922 100644
--- a/patches/server/0797-Preserve-overstacked-loot.patch
+++ b/patches/server/0798-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 1dab732cf5614be864cf8abfbd6709545b9ff0c8..b20422f847d8f06d658950af8dcc95998bd5ac6c 100644
+index d549455e893a2e65fb6f4a529cc9685420190da9..6dc4c20464783c021104f5f20e76eca48323e81f 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 {
+@@ -901,6 +901,11 @@ public class PaperWorldConfig {
          allowPlayerCrammingDamage = getBoolean("allow-player-cramming-damage", allowPlayerCrammingDamage);
      }
  
diff --git a/patches/server/0798-Update-head-rotation-in-missing-places.patch b/patches/server/0799-Update-head-rotation-in-missing-places.patch
index 45c4e3710a..45c4e3710a 100644
--- a/patches/server/0798-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0799-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0799-prevent-unintended-light-block-manipulation.patch b/patches/server/0800-prevent-unintended-light-block-manipulation.patch
index 08bd6164f5..08bd6164f5 100644
--- a/patches/server/0799-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0800-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0800-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch b/patches/server/0801-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
index 6619ce60f3..6619ce60f3 100644
--- a/patches/server/0800-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
+++ b/patches/server/0801-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
diff --git a/patches/server/0801-Fix-CraftCriteria-defaults-map.patch b/patches/server/0802-Fix-CraftCriteria-defaults-map.patch
index 11fce3ca24..11fce3ca24 100644
--- a/patches/server/0801-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0802-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0802-Fix-upstreams-block-state-factories.patch b/patches/server/0803-Fix-upstreams-block-state-factories.patch
index 0d31f433f5..0d31f433f5 100644
--- a/patches/server/0802-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0803-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0803-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0804-Add-config-option-for-logging-player-ip-addresses.patch
index fdf4ff8ea0..fdf4ff8ea0 100644
--- a/patches/server/0803-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0804-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0804-Configurable-feature-seeds.patch b/patches/server/0805-Configurable-feature-seeds.patch
index d23c9aca54..5b2812d7fc 100644
--- a/patches/server/0804-Configurable-feature-seeds.patch
+++ b/patches/server/0805-Configurable-feature-seeds.patch
@@ -19,10 +19,10 @@ index ee53453440177537fc653ea156785d7591498614..5e3b7fb2e0b7608610555cd23e7ad25a
              }
              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 b20422f847d8f06d658950af8dcc95998bd5ac6c..b64fbce003c00a6371a849d4835632c18ad730bb 100644
+index 6dc4c20464783c021104f5f20e76eca48323e81f..21e502716f312849b5232d1a3c5c87dc76394fee 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -942,6 +942,55 @@ public class PaperWorldConfig {
+@@ -946,6 +946,55 @@ public class PaperWorldConfig {
          return table;
      }
  
diff --git a/patches/server/0805-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0806-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
index 6e33709dbe..6e33709dbe 100644
--- a/patches/server/0805-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ b/patches/server/0806-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0806-Add-root-admin-user-detection.patch b/patches/server/0807-Add-root-admin-user-detection.patch
index 63ae0993b1..63ae0993b1 100644
--- a/patches/server/0806-Add-root-admin-user-detection.patch
+++ b/patches/server/0807-Add-root-admin-user-detection.patch
diff --git a/patches/server/0807-Always-allow-item-changing-in-Fireball.patch b/patches/server/0808-Always-allow-item-changing-in-Fireball.patch
index fe4cbf2ef1..fe4cbf2ef1 100644
--- a/patches/server/0807-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0808-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0808-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0809-don-t-attempt-to-teleport-dead-entities.patch
index a828511ee7..a828511ee7 100644
--- a/patches/server/0808-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0809-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0809-Call-onRemove-logic-for-breakNaturally.patch b/patches/server/0810-Call-onRemove-logic-for-breakNaturally.patch
index e7fd337046..e7fd337046 100644
--- a/patches/server/0809-Call-onRemove-logic-for-breakNaturally.patch
+++ b/patches/server/0810-Call-onRemove-logic-for-breakNaturally.patch
diff --git a/patches/server/0810-Fix-anvil-prepare-event-not-working-with-zero-xp.patch b/patches/server/0811-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
index 408215402f..408215402f 100644
--- a/patches/server/0810-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
+++ b/patches/server/0811-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
diff --git a/patches/server/0811-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0812-Prevent-excessive-velocity-through-repeated-crits.patch
index 862abaa913..862abaa913 100644
--- a/patches/server/0811-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0812-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0812-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0813-Remove-client-side-code-using-deprecated-for-removal.patch
index 368687d252..368687d252 100644
--- a/patches/server/0812-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0813-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0813-Rewrite-the-light-engine.patch b/patches/server/0814-Rewrite-the-light-engine.patch
index 531dd88a89..531dd88a89 100644
--- a/patches/server/0813-Rewrite-the-light-engine.patch
+++ b/patches/server/0814-Rewrite-the-light-engine.patch
diff --git a/patches/server/0814-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0815-Always-parse-protochunk-light-sources-unless-it-is-m.patch
index cd0dd1b77a..cd0dd1b77a 100644
--- a/patches/server/0814-Always-parse-protochunk-light-sources-unless-it-is-m.patch
+++ b/patches/server/0815-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0815-Fix-removing-recipes.patch b/patches/server/0816-Fix-removing-recipes.patch
index e2a279a4be..e2a279a4be 100644
--- a/patches/server/0815-Fix-removing-recipes.patch
+++ b/patches/server/0816-Fix-removing-recipes.patch
diff --git a/patches/server/0816-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0817-Hide-unnecessary-itemmeta-from-clients.patch
index 9b32aecc9f..cb6113352f 100644
--- a/patches/server/0816-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0817-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 b64fbce003c00a6371a849d4835632c18ad730bb..7e2d31737bd4977c9589541e1ebdcfe4ac40a335 100644
+index 21e502716f312849b5232d1a3c5c87dc76394fee..43fe9b31b0e64304711c7cead4100e988bafcb87 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -912,6 +912,13 @@ public class PaperWorldConfig {
+@@ -916,6 +916,13 @@ public class PaperWorldConfig {
          behaviorTickRates = loadTickRates("behavior");
      }