proper migration to gamerules for keep spawn loaded distance

1017 files changed, 227 insertions, 410 deletions

diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
index be80eac01f..8442ee0f87 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -121,12 +121,13 @@ index 0000000000000000000000000000000000000000..042478cf7ce150f1f1bc5cddd7fa40f8
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e4762e72eff
+index 0000000000000000000000000000000000000000..522156e1b7578663c426fcaf7e47acb93d030486
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/Configurations.java
-@@ -0,0 +1,355 @@
+@@ -0,0 +1,360 @@
 +package io.papermc.paper.configuration;
 +
++import com.google.common.base.Preconditions;
 +import com.mojang.logging.LogUtils;
 +import io.leangen.geantyref.TypeToken;
 +import io.papermc.paper.configuration.constraint.Constraint;
@@ -134,6 +135,7 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +import net.minecraft.core.RegistryAccess;
 +import net.minecraft.resources.ResourceLocation;
 +import net.minecraft.server.level.ServerLevel;
++import net.minecraft.world.level.GameRules;
 +import org.checkerframework.checker.nullness.qual.Nullable;
 +import org.jetbrains.annotations.MustBeInvokedByOverriders;
 +import org.slf4j.Logger;
@@ -141,6 +143,7 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +import org.spongepowered.configurate.ConfigurateException;
 +import org.spongepowered.configurate.ConfigurationNode;
 +import org.spongepowered.configurate.ConfigurationOptions;
++import org.spongepowered.configurate.NodePath;
 +import org.spongepowered.configurate.objectmapping.ObjectMapper;
 +import org.spongepowered.configurate.serialize.SerializationException;
 +import org.spongepowered.configurate.util.CheckedFunction;
@@ -210,9 +213,9 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +        return this.createLoaderBuilder();
 +    }
 +
-+    static <T> CheckedFunction<ConfigurationNode, T, SerializationException> creator(Class<T> type, boolean refreshNode) {
++    static <T> CheckedFunction<ConfigurationNode, T, SerializationException> creator(final Class<? extends T> type, final boolean refreshNode) {
 +        return node -> {
-+            T instance = node.require(type);
++            final T instance = node.require(type);
 +            if (refreshNode) {
 +                node.set(type, instance);
 +            }
@@ -300,7 +303,7 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +        this.applyWorldConfigTransformations(contextMap, node);
 +        final W instance = node.require(this.worldConfigClass);
 +        node.set(this.worldConfigClass, instance);
-+        trySaveFileNode(loader, node, configFile.toString());
++        this.trySaveFileNode(loader, node, configFile.toString());
 +    }
 +
 +    private DefaultWorldLoader createDefaultWorldLoader(final boolean requireFile, final ContextMap contextMap, final Path configFile) {
@@ -335,6 +338,7 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +    }
 +
 +    protected W createWorldConfig(final ContextMap contextMap, final CheckedFunction<ConfigurationNode, W, SerializationException> creator) throws IOException {
++        Preconditions.checkArgument(!contextMap.isDefaultWorldContext(), "cannot create world map with default world context");
 +        final Path defaultsConfigFile = this.globalFolder.resolve(this.defaultWorldConfigFileName);
 +        final YamlConfigurationLoader defaultsLoader = this.createDefaultWorldLoader(true, this.createDefaultContextMap(contextMap.require(REGISTRY_ACCESS)).build(), defaultsConfigFile).loader();
 +        final ConfigurationNode defaultsNode = defaultsLoader.load();
@@ -360,7 +364,7 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +        }
 +        this.applyWorldConfigTransformations(contextMap, worldNode);
 +        this.applyDefaultsAwareWorldConfigTransformations(contextMap, worldNode, defaultsNode);
-+        trySaveFileNode(worldLoader, worldNode, worldConfigFile.toString()); // save before loading node NOTE: don't save the backing node after loading it, or you'll fill up the world-specific config
++        this.trySaveFileNode(worldLoader, worldNode, worldConfigFile.toString()); // save before loading node NOTE: don't save the backing node after loading it, or you'll fill up the world-specific config
 +        worldNode.mergeFrom(defaultsNode);
 +        return creator.apply(worldNode);
 +    }
@@ -467,6 +471,7 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +    public static final ContextKey<ResourceLocation> WORLD_KEY = new ContextKey<>(ResourceLocation.class, "world key");
 +    public static final ContextKey<Void> FIRST_DEFAULT = new ContextKey<>(Void.class, "first default");
 +    public static final ContextKey<RegistryAccess> REGISTRY_ACCESS = new ContextKey<>(RegistryAccess.class, "registry access");
++    public static final ContextKey<GameRules> GAME_RULES = new ContextKey<>(GameRules.class, "game rules");
 +
 +    public record ContextKey<T>(TypeToken<T> type, String name) {
 +
@@ -837,10 +842,10 @@ index 0000000000000000000000000000000000000000..69add4a7f1147015806bc9b63a8340d1
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..fa1c0aee8c3a4d0868482cf5c703bbfd08e09874
+index 0000000000000000000000000000000000000000..d99489e0216b24d27a19c92a1ce0c10ae10d071f
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-@@ -0,0 +1,465 @@
+@@ -0,0 +1,464 @@
 +package io.papermc.paper.configuration;
 +
 +import com.google.common.base.Suppliers;
@@ -864,6 +869,7 @@ index 0000000000000000000000000000000000000000..fa1c0aee8c3a4d0868482cf5c703bbfd
 +import io.papermc.paper.configuration.transformation.global.versioned.V29_LogIPs;
 +import io.papermc.paper.configuration.transformation.world.FeatureSeedsGeneration;
 +import io.papermc.paper.configuration.transformation.world.LegacyPaperWorldConfig;
++import io.papermc.paper.configuration.transformation.world.SpawnLoadedRangeToGameRule;
 +import io.papermc.paper.configuration.transformation.world.versioned.V29_ZeroWorldHeight;
 +import io.papermc.paper.configuration.transformation.world.versioned.V30_RenameFilterNbtFromSpawnEgg;
 +import io.papermc.paper.configuration.type.BooleanOrDefault;
@@ -893,6 +899,7 @@ index 0000000000000000000000000000000000000000..fa1c0aee8c3a4d0868482cf5c703bbfd
 +import net.minecraft.server.level.ServerLevel;
 +import net.minecraft.world.entity.EntityType;
 +import net.minecraft.world.item.Item;
++import net.minecraft.world.level.GameRules;
 +import net.minecraft.world.level.block.Block;
 +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 +import org.apache.commons.lang3.RandomStringUtils;
@@ -1121,21 +1128,17 @@ index 0000000000000000000000000000000000000000..fa1c0aee8c3a4d0868482cf5c703bbfd
 +        versionedBuilder.build().apply(node);
 +    }
 +
-+    private static final List<Transformations.DefaultsAware> DEFAULT_AWARE_TRANSFORMATIONS = List.of(FeatureSeedsGeneration::apply);
++    private static final List<Transformations.DefaultsAware> DEFAULT_AWARE_TRANSFORMATIONS = List.of(
++        FeatureSeedsGeneration::apply,
++        SpawnLoadedRangeToGameRule::apply
++    );
 +
 +    @Override
 +    protected void applyDefaultsAwareWorldConfigTransformations(final ContextMap contextMap, final ConfigurationNode worldNode, final ConfigurationNode defaultsNode) throws ConfigurateException {
 +        final ConfigurationTransformation.Builder builder = ConfigurationTransformation.builder();
 +        // ADD FUTURE TRANSFORMS HERE (these transforms run after the defaults have been merged into the node)
 +        DEFAULT_AWARE_TRANSFORMATIONS.forEach(transform -> transform.apply(builder, contextMap, defaultsNode));
-+
-+        ConfigurationTransformation transformation;
-+        try {
-+            transformation = builder.build(); // build throws IAE if no actions were provided (bad zml)
-+        } catch (IllegalArgumentException ignored) {
-+            return;
-+        }
-+        transformation.apply(worldNode);
++        builder.build().apply(worldNode);
 +    }
 +
 +    @Override
@@ -1166,16 +1169,17 @@ index 0000000000000000000000000000000000000000..fa1c0aee8c3a4d0868482cf5c703bbfd
 +    }
 +
 +    private static ContextMap createWorldContextMap(ServerLevel level) {
-+        return createWorldContextMap(level.convertable.levelDirectory.path(), level.serverLevelData.getLevelName(), level.dimension().location(), level.spigotConfig, level.registryAccess());
++        return createWorldContextMap(level.convertable.levelDirectory.path(), level.serverLevelData.getLevelName(), level.dimension().location(), level.spigotConfig, level.registryAccess(), level.getGameRules());
 +    }
 +
-+    public static ContextMap createWorldContextMap(Path dir, String levelName, ResourceLocation worldKey, SpigotWorldConfig spigotConfig, RegistryAccess registryAccess) {
++    public static ContextMap createWorldContextMap(final Path dir, final String levelName, final ResourceLocation worldKey, final SpigotWorldConfig spigotConfig, final RegistryAccess registryAccess, final GameRules gameRules) {
 +        return ContextMap.builder()
 +            .put(WORLD_DIRECTORY, dir)
 +            .put(WORLD_NAME, levelName)
 +            .put(WORLD_KEY, worldKey)
 +            .put(SPIGOT_WORLD_CONFIG_CONTEXT_KEY, Suppliers.ofInstance(spigotConfig))
 +            .put(REGISTRY_ACCESS, registryAccess)
++            .put(GAME_RULES, gameRules)
 +            .build();
 +    }
 +
@@ -1308,10 +1312,10 @@ index 0000000000000000000000000000000000000000..fa1c0aee8c3a4d0868482cf5c703bbfd
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..ede22142ef70bbdc6ede22ff4a13ed69fbce4915
+index 0000000000000000000000000000000000000000..990d1bb46e0f9719f4e9af928d80ac6f8dff23b5
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
-@@ -0,0 +1,80 @@
+@@ -0,0 +1,82 @@
 +package io.papermc.paper.configuration;
 +
 +import org.spongepowered.configurate.NodePath;
@@ -1368,6 +1372,8 @@ index 0000000000000000000000000000000000000000..ede22142ef70bbdc6ede22ff4a13ed69
 +        path("fixes", "fix-curing-zombie-villager-discount-exploit"),
 +        path("entities", "mob-effects", "undead-immune-to-certain-effects")
 +    };
++    // spawn.keep-spawn-loaded and spawn.keep-spawn-loaded-range are no longer used, but kept
++    // in the world default config for compatibility with old worlds being migrated to use the gamerule
 +
 +    NodePath[] REMOVED_GLOBAL_PATHS = {
 +        path("data-value-allowed-items"),
@@ -1394,10 +1400,10 @@ index 0000000000000000000000000000000000000000..ede22142ef70bbdc6ede22ff4a13ed69
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..bfc10ae8e09ac07b969a38eecddfab1e3c308f5a
+index 0000000000000000000000000000000000000000..b3a39a0b1f54d38207fa55485318e6ca257a57ab
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-@@ -0,0 +1,553 @@
+@@ -0,0 +1,550 @@
 +package io.papermc.paper.configuration;
 +
 +import com.google.common.collect.HashBasedTable;
@@ -1405,7 +1411,6 @@ index 0000000000000000000000000000000000000000..bfc10ae8e09ac07b969a38eecddfab1e
 +import com.mojang.logging.LogUtils;
 +import io.papermc.paper.configuration.legacy.MaxEntityCollisionsInitializer;
 +import io.papermc.paper.configuration.legacy.RequiresSpigotInitialization;
-+import io.papermc.paper.configuration.legacy.SpawnLoadedRangeInitializer;
 +import io.papermc.paper.configuration.mapping.MergeMap;
 +import io.papermc.paper.configuration.serializer.NbtPathSerializer;
 +import io.papermc.paper.configuration.transformation.world.FeatureSeedsGeneration;
@@ -1463,9 +1468,10 @@ index 0000000000000000000000000000000000000000..bfc10ae8e09ac07b969a38eecddfab1e
 +    private static final Logger LOGGER = LogUtils.getClassLogger();
 +    static final int CURRENT_VERSION = 30; // (when you change the version, change the comment, so it conflicts on rebases): rename filter bad nbt from spawn eggs
 +
-+    private transient final SpigotWorldConfig spigotConfig;
-+    private transient final ResourceLocation worldKey;
-+    WorldConfiguration(SpigotWorldConfig spigotConfig, ResourceLocation worldKey) {
++    private final transient SpigotWorldConfig spigotConfig;
++    private final transient ResourceLocation worldKey;
++
++    WorldConfiguration(final SpigotWorldConfig spigotConfig, final ResourceLocation worldKey) {
 +        this.spigotConfig = spigotConfig;
 +        this.worldKey = worldKey;
 +    }
@@ -1821,9 +1827,6 @@ index 0000000000000000000000000000000000000000..bfc10ae8e09ac07b969a38eecddfab1e
 +    public Spawn spawn;
 +
 +    public class Spawn extends ConfigurationPart {
-+        @RequiresSpigotInitialization(SpawnLoadedRangeInitializer.class)
-+        public short keepSpawnLoadedRange = 10;
-+        public boolean keepSpawnLoaded = true;
 +        public boolean allowUsingSignsInsideSpawnProtection = false;
 +    }
 +
@@ -3561,7 +3564,7 @@ index 0000000000000000000000000000000000000000..90071acf589fb2fa1c3480883165b429
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/transformation/world/FeatureSeedsGeneration.java b/src/main/java/io/papermc/paper/configuration/transformation/world/FeatureSeedsGeneration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..1326aae8f95ab11f840abdee0c8c7a557705fd73
+index 0000000000000000000000000000000000000000..6cdc40cb4a5f94654c874f9dbdb106fa0e4d41f3
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/transformation/world/FeatureSeedsGeneration.java
 @@ -0,0 +1,71 @@
@@ -3631,7 +3634,7 @@ index 0000000000000000000000000000000000000000..1326aae8f95ab11f840abdee0c8c7a55
 +
 +
 +    public static void apply(final ConfigurationTransformation.Builder builder, final Configurations.ContextMap contextMap, final ConfigurationNode defaultsNode) {
-+        if (!contextMap.isDefaultWorldContext() && defaultsNode.node(FEATURE_SEEDS_KEY, GENERATE_KEY).getBoolean(false)) {
++        if (defaultsNode.node(FEATURE_SEEDS_KEY, GENERATE_KEY).getBoolean(false)) {
 +            builder.addAction(path(), new FeatureSeedsGeneration(contextMap.require(Configurations.WORLD_KEY)));
 +        }
 +    }
@@ -3964,6 +3967,63 @@ index 0000000000000000000000000000000000000000..edaa6ef28c1f9a223943969870889700
 +        moveFromRootAndRename(builder, path("game-mechanics", oldKey), newKey, parents);
 +    }
 +}
+diff --git a/src/main/java/io/papermc/paper/configuration/transformation/world/SpawnLoadedRangeToGameRule.java b/src/main/java/io/papermc/paper/configuration/transformation/world/SpawnLoadedRangeToGameRule.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..3f31c0626b6f01da6bb13942126565f844ca5faa
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/configuration/transformation/world/SpawnLoadedRangeToGameRule.java
+@@ -0,0 +1,51 @@
++package io.papermc.paper.configuration.transformation.world;
++
++import io.papermc.paper.configuration.Configurations;
++import net.minecraft.world.level.GameRules;
++import org.checkerframework.checker.nullness.qual.Nullable;
++import org.spongepowered.configurate.ConfigurateException;
++import org.spongepowered.configurate.ConfigurationNode;
++import org.spongepowered.configurate.NodePath;
++import org.spongepowered.configurate.transformation.ConfigurationTransformation;
++import org.spongepowered.configurate.transformation.TransformAction;
++
++import static org.spongepowered.configurate.NodePath.path;
++
++public final class SpawnLoadedRangeToGameRule implements TransformAction {
++
++    private static final String SPAWN = "spawn";
++    private static final String KEEP_SPAWN_LOADED_RANGE = "keep-spawn-loaded-range";
++    private static final String KEEP_SPAWN_LOADED = "keep-spawn-loaded";
++
++    private final GameRules gameRules;
++    private final ConfigurationNode defaultsNode;
++
++    private SpawnLoadedRangeToGameRule(final GameRules gameRules, final ConfigurationNode defaultsNode) {
++        this.gameRules = gameRules;
++        this.defaultsNode = defaultsNode;
++    }
++
++    @Override
++    public Object @Nullable [] visitPath(final NodePath path, final ConfigurationNode value) {
++        final ConfigurationNode worldSpawnNode = value.node(SPAWN);
++        final ConfigurationNode worldLoadedNode = worldSpawnNode.node(KEEP_SPAWN_LOADED);
++        final boolean keepLoaded = worldLoadedNode.getBoolean(this.defaultsNode.node(SPAWN, KEEP_SPAWN_LOADED).getBoolean());
++        worldLoadedNode.raw(null);
++        final ConfigurationNode worldRangeNode = worldSpawnNode.node(KEEP_SPAWN_LOADED_RANGE);
++        final int range = worldRangeNode.getInt(this.defaultsNode.node(SPAWN, KEEP_SPAWN_LOADED_RANGE).getInt());
++        worldRangeNode.raw(null);
++        if (worldSpawnNode.empty()) {
++            worldSpawnNode.raw(null);
++        }
++        if (!keepLoaded) {
++            this.gameRules.getRule(GameRules.RULE_SPAWN_CHUNK_RADIUS).set(0, null);
++        } else {
++            this.gameRules.getRule(GameRules.RULE_SPAWN_CHUNK_RADIUS).set(range, null);
++        }
++        return null;
++    }
++
++    public static void apply(final ConfigurationTransformation.Builder builder, final Configurations.ContextMap contextMap, final ConfigurationNode defaultsNode) {
++        builder.addAction(path(), new SpawnLoadedRangeToGameRule(contextMap.require(Configurations.GAME_RULES), defaultsNode));
++    }
++}
 diff --git a/src/main/java/io/papermc/paper/configuration/transformation/world/versioned/V29_ZeroWorldHeight.java b/src/main/java/io/papermc/paper/configuration/transformation/world/versioned/V29_ZeroWorldHeight.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..6e481d509d091e65a4909d79014ac94ea63c8455
@@ -4934,7 +4994,7 @@ index 6d89a5414f46a0c30badb4fcd25bc6cb6d18db3a..0ec3b546db0cf3858dd9cd9ea067d1d6
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d7c5e872136d0452311b316c5703050c45960230..cc5e1076bdf7b4794ee79934fb70234ba61efe15 100644
+index d7c5e872136d0452311b316c5703050c45960230..b84078f8105bccc40da0c14932ad3160c96d371c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -241,7 +241,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -4942,7 +5002,7 @@ index d7c5e872136d0452311b316c5703050c45960230..cc5e1076bdf7b4794ee79934fb70234b
  
          // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
 -        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env);
-+        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess()))); // Paper - create paper world configs
++        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules()))); // Paper - create paper world configs
          this.pvpMode = minecraftserver.isPvpAllowed();
          this.convertable = convertable_conversionsession;
          this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
diff --git a/patches/server/0008-CB-fixes.patch b/patches/server/0008-CB-fixes.patch
index dcaff2cc56..e93ee80f17 100644
--- a/patches/server/0008-CB-fixes.patch
+++ b/patches/server/0008-CB-fixes.patch
@@ -17,7 +17,7 @@ Subject: [PATCH] CB fixes
 Co-authored-by: Spottedleaf <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cc5e1076bdf7b4794ee79934fb70234ba61efe15..b3caf69f9627ba2114dc9d06551ccf182debfb04 100644
+index b84078f8105bccc40da0c14932ad3160c96d371c..c4bd9be9d1884be1f5040ff1417f44f8ac4b655f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -302,7 +302,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch
index 383fbe5d4f..ee3ac63479 100644
--- a/patches/server/0009-MC-Utils.patch
+++ b/patches/server/0009-MC-Utils.patch
@@ -6847,7 +6847,7 @@ index 8661ed9962d07fb40390faf7f186b9cd8ce6bc62..23c39b78486b018e222af489c8edbf4e
          ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos);
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b3caf69f9627ba2114dc9d06551ccf182debfb04..9332573e6948092ea1cda4efa7f3944729da91be 100644
+index c4bd9be9d1884be1f5040ff1417f44f8ac4b655f..319cb644c0a42e9cc0d3ce9d1cbaa93b9c3dcd5b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -235,6 +235,98 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0023-Timings-v2.patch b/patches/server/0023-Timings-v2.patch
index f377e89d95..e4fc7060f8 100644
--- a/patches/server/0023-Timings-v2.patch
+++ b/patches/server/0023-Timings-v2.patch
@@ -1111,7 +1111,7 @@ index 23c39b78486b018e222af489c8edbf4e749abff6..3f60a3289ec58d5eb3c0c5634ca62ef2
              gameprofilerfiller.pop();
              gameprofilerfiller.pop();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9332573e6948092ea1cda4efa7f3944729da91be..476b513e05a8ef099a17db44732ebc8eed8a595c 100644
+index 319cb644c0a42e9cc0d3ce9d1cbaa93b9c3dcd5b..a6e78b8a6ced8ec84273e2c5d18ffccacb005cb6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1,6 +1,8 @@
diff --git a/patches/server/0033-Allow-for-toggling-of-spawn-chunks.patch b/patches/server/0033-Allow-for-toggling-of-spawn-chunks.patch
deleted file mode 100644
index 2aa0d85e0b..0000000000
--- a/patches/server/0033-Allow-for-toggling-of-spawn-chunks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <[email protected]>
-Date: Thu, 3 Mar 2016 03:53:43 -0600
-Subject: [PATCH] Allow for toggling of spawn chunks
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 476b513e05a8ef099a17db44732ebc8eed8a595c..a72b84cdf2b5f4aea5eb7fe4dfc0faad27c46876 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -403,6 +403,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             this.dragonFight = null;
-         }
- 
-+        // Paper start - keep spawn loaded
-+        if (this.paperConfig().spawn.keepSpawnLoaded && this.getGameRules().getInt(GameRules.RULE_SPAWN_CHUNK_RADIUS) == 0) {
-+            this.getGameRules().getRule(GameRules.RULE_SPAWN_CHUNK_RADIUS).set(this.paperConfig().spawn.keepSpawnLoadedRange, this);
-+        }
-+        // Paper end - keep spawn loaded
-+
-         this.sleepStatus = new SleepStatus();
-         this.gameEventDispatcher = new GameEventDispatcher(this);
-         this.randomSequences = (RandomSequences) Objects.requireNonNullElseGet(randomsequences, () -> {
diff --git a/patches/server/0034-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/server/0033-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 70612c5eb7..70612c5eb7 100644
--- a/patches/server/0034-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/patches/server/0033-Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff --git a/patches/server/0035-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0034-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index e9ab7846ac..e9ab7846ac 100644
--- a/patches/server/0035-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/server/0034-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
diff --git a/patches/server/0036-Implement-Paper-VersionChecker.patch b/patches/server/0035-Implement-Paper-VersionChecker.patch
index 484e0425d5..484e0425d5 100644
--- a/patches/server/0036-Implement-Paper-VersionChecker.patch
+++ b/patches/server/0035-Implement-Paper-VersionChecker.patch
diff --git a/patches/server/0037-Add-version-history-to-version-command.patch b/patches/server/0036-Add-version-history-to-version-command.patch
index 4d5ccce75a..4d5ccce75a 100644
--- a/patches/server/0037-Add-version-history-to-version-command.patch
+++ b/patches/server/0036-Add-version-history-to-version-command.patch
diff --git a/patches/server/0038-Player-affects-spawning-API.patch b/patches/server/0037-Player-affects-spawning-API.patch
index da0e19a5dc..da0e19a5dc 100644
--- a/patches/server/0038-Player-affects-spawning-API.patch
+++ b/patches/server/0037-Player-affects-spawning-API.patch
diff --git a/patches/server/0039-Only-refresh-abilities-if-needed.patch b/patches/server/0038-Only-refresh-abilities-if-needed.patch
index b49e75f193..b49e75f193 100644
--- a/patches/server/0039-Only-refresh-abilities-if-needed.patch
+++ b/patches/server/0038-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0040-Entity-Origin-API.patch b/patches/server/0039-Entity-Origin-API.patch
index f971fccaba..ac1b821538 100644
--- a/patches/server/0040-Entity-Origin-API.patch
+++ b/patches/server/0039-Entity-Origin-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a72b84cdf2b5f4aea5eb7fe4dfc0faad27c46876..c8dadfd6441452817db858ae934b7baed5194403 100644
+index a6e78b8a6ced8ec84273e2c5d18ffccacb005cb6..c476a49f69261868f74ad528a2ad746aed3094a3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2179,6 +2179,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2173,6 +2173,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
              entity.inWorld = true; // CraftBukkit - Mark entity as in world
              entity.valid = true; // CraftBukkit
diff --git a/patches/server/0041-Prevent-block-entity-and-entity-crashes.patch b/patches/server/0040-Prevent-block-entity-and-entity-crashes.patch
index ada6a4d53e..ada6a4d53e 100644
--- a/patches/server/0041-Prevent-block-entity-and-entity-crashes.patch
+++ b/patches/server/0040-Prevent-block-entity-and-entity-crashes.patch
diff --git a/patches/server/0042-Configurable-top-of-nether-void-damage.patch b/patches/server/0041-Configurable-top-of-nether-void-damage.patch
index 715e63f758..715e63f758 100644
--- a/patches/server/0042-Configurable-top-of-nether-void-damage.patch
+++ b/patches/server/0041-Configurable-top-of-nether-void-damage.patch
diff --git a/patches/server/0043-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/server/0042-Check-online-mode-before-converting-and-renaming-pla.patch
index f89cf885a5..f89cf885a5 100644
--- a/patches/server/0043-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/patches/server/0042-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0044-Add-more-entities-to-activation-range-ignore-list.patch b/patches/server/0043-Add-more-entities-to-activation-range-ignore-list.patch
index c402bdafa2..c402bdafa2 100644
--- a/patches/server/0044-Add-more-entities-to-activation-range-ignore-list.patch
+++ b/patches/server/0043-Add-more-entities-to-activation-range-ignore-list.patch
diff --git a/patches/server/0045-Configurable-end-credits.patch b/patches/server/0044-Configurable-end-credits.patch
index 3229c1d2a5..3229c1d2a5 100644
--- a/patches/server/0045-Configurable-end-credits.patch
+++ b/patches/server/0044-Configurable-end-credits.patch
diff --git a/patches/server/0046-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/server/0045-Fix-lag-from-explosions-processing-dead-entities.patch
index d1713bcbc2..d1713bcbc2 100644
--- a/patches/server/0046-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/patches/server/0045-Fix-lag-from-explosions-processing-dead-entities.patch
diff --git a/patches/server/0047-Optimize-explosions.patch b/patches/server/0046-Optimize-explosions.patch
index 3a77d7f327..3a77d7f327 100644
--- a/patches/server/0047-Optimize-explosions.patch
+++ b/patches/server/0046-Optimize-explosions.patch
diff --git a/patches/server/0048-Disable-explosion-knockback.patch b/patches/server/0047-Disable-explosion-knockback.patch
index b9a0b33b6c..b9a0b33b6c 100644
--- a/patches/server/0048-Disable-explosion-knockback.patch
+++ b/patches/server/0047-Disable-explosion-knockback.patch
diff --git a/patches/server/0049-Disable-thunder.patch b/patches/server/0048-Disable-thunder.patch
index bece00e2e2..55d3e6add9 100644
--- a/patches/server/0049-Disable-thunder.patch
+++ b/patches/server/0048-Disable-thunder.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable thunder
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c8dadfd6441452817db858ae934b7baed5194403..b41a4d6dc7fb98b6f6fc172a2b83ea43213643b4 100644
+index c476a49f69261868f74ad528a2ad746aed3094a3..b66b2cc4111073f080620a52883e1b8d6946e768 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -621,7 +621,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -615,7 +615,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("thunder");
diff --git a/patches/server/0050-Disable-ice-and-snow.patch b/patches/server/0049-Disable-ice-and-snow.patch
index 36c4e1948f..d17551d9f5 100644
--- a/patches/server/0050-Disable-ice-and-snow.patch
+++ b/patches/server/0049-Disable-ice-and-snow.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable ice and snow
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b41a4d6dc7fb98b6f6fc172a2b83ea43213643b4..6440c0459248a9a0de21c8871e4f4ce399b525ec 100644
+index b66b2cc4111073f080620a52883e1b8d6946e768..53e69115a2186c0124d3d8c83f6ca0aecc68c324 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -651,11 +651,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -645,11 +645,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          gameprofilerfiller.popPush("iceandsnow");
  
diff --git a/patches/server/0051-Configurable-mob-spawner-tick-rate.patch b/patches/server/0050-Configurable-mob-spawner-tick-rate.patch
index deb1ddde3f..deb1ddde3f 100644
--- a/patches/server/0051-Configurable-mob-spawner-tick-rate.patch
+++ b/patches/server/0050-Configurable-mob-spawner-tick-rate.patch
diff --git a/patches/server/0052-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0051-Implement-PlayerLocaleChangeEvent.patch
index 039776ed1c..039776ed1c 100644
--- a/patches/server/0052-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0051-Implement-PlayerLocaleChangeEvent.patch
diff --git a/patches/server/0053-Add-BeaconEffectEvent.patch b/patches/server/0052-Add-BeaconEffectEvent.patch
index 4273bf29eb..4273bf29eb 100644
--- a/patches/server/0053-Add-BeaconEffectEvent.patch
+++ b/patches/server/0052-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0054-Configurable-container-update-tick-rate.patch b/patches/server/0053-Configurable-container-update-tick-rate.patch
index 715ffa53d4..715ffa53d4 100644
--- a/patches/server/0054-Configurable-container-update-tick-rate.patch
+++ b/patches/server/0053-Configurable-container-update-tick-rate.patch
diff --git a/patches/server/0055-Use-UserCache-for-player-heads.patch b/patches/server/0054-Use-UserCache-for-player-heads.patch
index 8a33892e11..8a33892e11 100644
--- a/patches/server/0055-Use-UserCache-for-player-heads.patch
+++ b/patches/server/0054-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0056-Disable-spigot-tick-limiters.patch b/patches/server/0055-Disable-spigot-tick-limiters.patch
index 0884563fa8..0884563fa8 100644
--- a/patches/server/0056-Disable-spigot-tick-limiters.patch
+++ b/patches/server/0055-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0057-Add-PlayerInitialSpawnEvent.patch b/patches/server/0056-Add-PlayerInitialSpawnEvent.patch
index 6afbd430d3..6afbd430d3 100644
--- a/patches/server/0057-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/server/0056-Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/server/0058-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/server/0057-Configurable-Disabling-Cat-Chest-Detection.patch
index 684534ebbe..684534ebbe 100644
--- a/patches/server/0058-Configurable-Disabling-Cat-Chest-Detection.patch
+++ b/patches/server/0057-Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/0059-Improve-Player-chat-API-handling.patch b/patches/server/0058-Improve-Player-chat-API-handling.patch
index 9f73bcc555..9f73bcc555 100644
--- a/patches/server/0059-Improve-Player-chat-API-handling.patch
+++ b/patches/server/0058-Improve-Player-chat-API-handling.patch
diff --git a/patches/server/0060-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/server/0059-All-chunks-are-slime-spawn-chunks-toggle.patch
index 7735158345..7735158345 100644
--- a/patches/server/0060-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/patches/server/0059-All-chunks-are-slime-spawn-chunks-toggle.patch
diff --git a/patches/server/0061-Expose-server-CommandMap.patch b/patches/server/0060-Expose-server-CommandMap.patch
index c930d0feae..c930d0feae 100644
--- a/patches/server/0061-Expose-server-CommandMap.patch
+++ b/patches/server/0060-Expose-server-CommandMap.patch
diff --git a/patches/server/0062-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0061-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 5c996dd4f7..5c996dd4f7 100644
--- a/patches/server/0062-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/patches/server/0061-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0063-Player-Tab-List-and-Title-APIs.patch b/patches/server/0062-Player-Tab-List-and-Title-APIs.patch
index 396ca10a8d..396ca10a8d 100644
--- a/patches/server/0063-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/server/0062-Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/server/0064-Add-configurable-portal-search-radius.patch b/patches/server/0063-Add-configurable-portal-search-radius.patch
index 41391fe2ae..41391fe2ae 100644
--- a/patches/server/0064-Add-configurable-portal-search-radius.patch
+++ b/patches/server/0063-Add-configurable-portal-search-radius.patch
diff --git a/patches/server/0065-Add-velocity-warnings.patch b/patches/server/0064-Add-velocity-warnings.patch
index b52433be2f..b52433be2f 100644
--- a/patches/server/0065-Add-velocity-warnings.patch
+++ b/patches/server/0064-Add-velocity-warnings.patch
diff --git a/patches/server/0066-Configurable-inter-world-teleportation-safety.patch b/patches/server/0065-Configurable-inter-world-teleportation-safety.patch
index 2154200454..2154200454 100644
--- a/patches/server/0066-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/server/0065-Configurable-inter-world-teleportation-safety.patch
diff --git a/patches/server/0067-Add-exception-reporting-event.patch b/patches/server/0066-Add-exception-reporting-event.patch
index b0a4afc624..b0a4afc624 100644
--- a/patches/server/0067-Add-exception-reporting-event.patch
+++ b/patches/server/0066-Add-exception-reporting-event.patch
diff --git a/patches/server/0068-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0067-Disable-Scoreboards-for-non-players-by-default.patch
index 65cd7d8a7a..65cd7d8a7a 100644
--- a/patches/server/0068-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/patches/server/0067-Disable-Scoreboards-for-non-players-by-default.patch
diff --git a/patches/server/0069-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0068-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index aa48fe9119..aa48fe9119 100644
--- a/patches/server/0069-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/server/0068-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0070-Chunk-Save-Reattempt.patch b/patches/server/0069-Chunk-Save-Reattempt.patch
index 7a39e17bad..7a39e17bad 100644
--- a/patches/server/0070-Chunk-Save-Reattempt.patch
+++ b/patches/server/0069-Chunk-Save-Reattempt.patch
diff --git a/patches/server/0071-Complete-resource-pack-API.patch b/patches/server/0070-Complete-resource-pack-API.patch
index cc03581dff..cc03581dff 100644
--- a/patches/server/0071-Complete-resource-pack-API.patch
+++ b/patches/server/0070-Complete-resource-pack-API.patch
diff --git a/patches/server/0072-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0071-Default-loading-permissions.yml-before-plugins.patch
index 339b9641c0..339b9641c0 100644
--- a/patches/server/0072-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/server/0071-Default-loading-permissions.yml-before-plugins.patch
diff --git a/patches/server/0073-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0072-Allow-Reloading-of-Custom-Permissions.patch
index a9c2652319..a9c2652319 100644
--- a/patches/server/0073-Allow-Reloading-of-Custom-Permissions.patch
+++ b/patches/server/0072-Allow-Reloading-of-Custom-Permissions.patch
diff --git a/patches/server/0074-Remove-Metadata-on-reload.patch b/patches/server/0073-Remove-Metadata-on-reload.patch
index cd2cb8fb9c..cd2cb8fb9c 100644
--- a/patches/server/0074-Remove-Metadata-on-reload.patch
+++ b/patches/server/0073-Remove-Metadata-on-reload.patch
diff --git a/patches/server/0075-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0074-Handle-Item-Meta-Inconsistencies.patch
index ef76b801d9..ef76b801d9 100644
--- a/patches/server/0075-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/server/0074-Handle-Item-Meta-Inconsistencies.patch
diff --git a/patches/server/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index e9a2a02b12..e9a2a02b12 100644
--- a/patches/server/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/patches/server/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch
diff --git a/patches/server/0077-Add-World-Util-Methods.patch b/patches/server/0076-Add-World-Util-Methods.patch
index ddac3fe2dc..ddac3fe2dc 100644
--- a/patches/server/0077-Add-World-Util-Methods.patch
+++ b/patches/server/0076-Add-World-Util-Methods.patch
diff --git a/patches/server/0078-Custom-replacement-for-eaten-items.patch b/patches/server/0077-Custom-replacement-for-eaten-items.patch
index 46944191ba..46944191ba 100644
--- a/patches/server/0078-Custom-replacement-for-eaten-items.patch
+++ b/patches/server/0077-Custom-replacement-for-eaten-items.patch
diff --git a/patches/server/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 56e384c127..56e384c127 100644
--- a/patches/server/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch
diff --git a/patches/server/0080-Use-a-Shared-Random-for-Entities.patch b/patches/server/0079-Use-a-Shared-Random-for-Entities.patch
index 8be701d5d4..8be701d5d4 100644
--- a/patches/server/0080-Use-a-Shared-Random-for-Entities.patch
+++ b/patches/server/0079-Use-a-Shared-Random-for-Entities.patch
diff --git a/patches/server/0081-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0080-Configurable-spawn-chances-for-skeleton-horses.patch
index 8f20b0f7c9..ea9b957f2c 100644
--- a/patches/server/0081-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/server/0080-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable spawn chances for skeleton horses
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6440c0459248a9a0de21c8871e4f4ce399b525ec..2b0f4839b128d8a0cdedd0bb8f4a4c6cf02990af 100644
+index 53e69115a2186c0124d3d8c83f6ca0aecc68c324..001cbed05de94cadd4862c38c414b5e039bff818 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -626,7 +626,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -620,7 +620,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
              if (this.isRainingAt(blockposition)) {
                  DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
diff --git a/patches/server/0082-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0081-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index 23d296a257..7a21368c62 100644
--- a/patches/server/0082-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/server/0081-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -18,7 +18,7 @@ index 231fba80a25601cdfba4f6f44ac7c2888e505ed2..4dc8fcd8e118a1c2f5fac0fc291b5555
              this.profiler.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2b0f4839b128d8a0cdedd0bb8f4a4c6cf02990af..c37e613361a2cc8bae2442c5b4ec425df821f30e 100644
+index 001cbed05de94cadd4862c38c414b5e039bff818..5b44a9e0b6d87e7caba54cb4e972099c1602393b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -226,6 +226,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0083-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0082-Entity-AddTo-RemoveFrom-World-Events.patch
index 92094cc1fb..701980a603 100644
--- a/patches/server/0083-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/server/0082-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c37e613361a2cc8bae2442c5b4ec425df821f30e..b6bc5edad1cf6b54e1b18dddd5acf4002f3c97fd 100644
+index 5b44a9e0b6d87e7caba54cb4e972099c1602393b..2e4567e34369e6a9138aa064adf64b9895e21277 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2191,6 +2191,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2185,6 +2185,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  entity.setOrigin(entity.getOriginVector().toLocation(getWorld()));
              }
              // Paper end - Entity origin API
@@ -16,7 +16,7 @@ index c37e613361a2cc8bae2442c5b4ec425df821f30e..b6bc5edad1cf6b54e1b18dddd5acf400
          }
  
          public void onTrackingEnd(Entity entity) {
-@@ -2261,6 +2262,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2255,6 +2256,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  }
              }
              // CraftBukkit end
diff --git a/patches/server/0084-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0083-Configurable-Chunk-Inhabited-Time.patch
index 5c8f105ea5..5c8f105ea5 100644
--- a/patches/server/0084-Configurable-Chunk-Inhabited-Time.patch
+++ b/patches/server/0083-Configurable-Chunk-Inhabited-Time.patch
diff --git a/patches/server/0085-EntityPathfindEvent.patch b/patches/server/0084-EntityPathfindEvent.patch
index e29cff85e6..e29cff85e6 100644
--- a/patches/server/0085-EntityPathfindEvent.patch
+++ b/patches/server/0084-EntityPathfindEvent.patch
diff --git a/patches/server/0086-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0085-Sanitise-RegionFileCache-and-make-configurable.patch
index eeb14ca415..eeb14ca415 100644
--- a/patches/server/0086-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/patches/server/0085-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/0087-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0086-Do-not-load-chunks-for-Pathfinding.patch
index 76cfe02b0f..76cfe02b0f 100644
--- a/patches/server/0087-Do-not-load-chunks-for-Pathfinding.patch
+++ b/patches/server/0086-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0088-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0087-Add-PlayerUseUnknownEntityEvent.patch
index e4e640e70c..e4e640e70c 100644
--- a/patches/server/0088-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/server/0087-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/server/0089-Configurable-random-tick-rates-for-blocks.patch b/patches/server/0088-Configurable-random-tick-rates-for-blocks.patch
index c936bd291e..c936bd291e 100644
--- a/patches/server/0089-Configurable-random-tick-rates-for-blocks.patch
+++ b/patches/server/0088-Configurable-random-tick-rates-for-blocks.patch
diff --git a/patches/server/0090-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0089-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 204de0aa56..0e30285466 100644
--- a/patches/server/0090-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/server/0089-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b6bc5edad1cf6b54e1b18dddd5acf4002f3c97fd..ab91dc3c9a738097b79bdecbcbe41557aa3ed0de 100644
+index 2e4567e34369e6a9138aa064adf64b9895e21277..57c13407fd20bcdd17642b0e6078f10082aea87b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1397,6 +1397,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1391,6 +1391,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void updateNeighborsAt(BlockPos pos, Block sourceBlock) {
diff --git a/patches/server/0091-Optimize-DataBits.patch b/patches/server/0090-Optimize-DataBits.patch
index fa5c0b02f0..fa5c0b02f0 100644
--- a/patches/server/0091-Optimize-DataBits.patch
+++ b/patches/server/0090-Optimize-DataBits.patch
diff --git a/patches/server/0092-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0091-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 1108c99038..1108c99038 100644
--- a/patches/server/0092-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/patches/server/0091-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0093-Configurable-Player-Collision.patch b/patches/server/0092-Configurable-Player-Collision.patch
index 17ddfb3ccf..17ddfb3ccf 100644
--- a/patches/server/0093-Configurable-Player-Collision.patch
+++ b/patches/server/0092-Configurable-Player-Collision.patch
diff --git a/patches/server/0094-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0093-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 87920d8d8c..87920d8d8c 100644
--- a/patches/server/0094-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/server/0093-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0095-Configurable-RCON-IP-address.patch b/patches/server/0094-Configurable-RCON-IP-address.patch
index 5f1a673a18..5f1a673a18 100644
--- a/patches/server/0095-Configurable-RCON-IP-address.patch
+++ b/patches/server/0094-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0096-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0095-EntityRegainHealthEvent-isFastRegen-API.patch
index 7876757aed..7876757aed 100644
--- a/patches/server/0096-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/server/0095-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/server/0097-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0096-Add-ability-to-configure-frosted_ice-properties.patch
index edd8aee842..edd8aee842 100644
--- a/patches/server/0097-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/patches/server/0096-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0098-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0097-remove-null-possibility-for-getServer-singleton.patch
index 33e773e0fe..33e773e0fe 100644
--- a/patches/server/0098-remove-null-possibility-for-getServer-singleton.patch
+++ b/patches/server/0097-remove-null-possibility-for-getServer-singleton.patch
diff --git a/patches/server/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0098-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index bb493d5a5f..bb493d5a5f 100644
--- a/patches/server/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/patches/server/0098-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/0100-LootTable-API-and-replenishable-lootables.patch b/patches/server/0099-LootTable-API-and-replenishable-lootables.patch
index b09c92c498..b09c92c498 100644
--- a/patches/server/0100-LootTable-API-and-replenishable-lootables.patch
+++ b/patches/server/0099-LootTable-API-and-replenishable-lootables.patch
diff --git a/patches/server/0101-System-property-for-disabling-watchdoge.patch b/patches/server/0100-System-property-for-disabling-watchdoge.patch
index 4a35e21392..4a35e21392 100644
--- a/patches/server/0101-System-property-for-disabling-watchdoge.patch
+++ b/patches/server/0100-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0102-Async-GameProfileCache-saving.patch b/patches/server/0101-Async-GameProfileCache-saving.patch
index 6ca5cfdff1..6ca5cfdff1 100644
--- a/patches/server/0102-Async-GameProfileCache-saving.patch
+++ b/patches/server/0101-Async-GameProfileCache-saving.patch
diff --git a/patches/server/0103-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0102-Optional-TNT-doesn-t-move-in-water.patch
index e78b02bbd5..e78b02bbd5 100644
--- a/patches/server/0103-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/server/0102-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/0104-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0103-Faster-redstone-torch-rapid-clock-removal.patch
index 4ec00fb17a..4ec00fb17a 100644
--- a/patches/server/0104-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/server/0103-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/0105-Add-server-name-parameter.patch b/patches/server/0104-Add-server-name-parameter.patch
index 465d38a30d..465d38a30d 100644
--- a/patches/server/0105-Add-server-name-parameter.patch
+++ b/patches/server/0104-Add-server-name-parameter.patch
diff --git a/patches/server/0106-Fix-global-sound-handling.patch b/patches/server/0105-Fix-global-sound-handling.patch
index 78440e9377..81efd49063 100644
--- a/patches/server/0106-Fix-global-sound-handling.patch
+++ b/patches/server/0105-Fix-global-sound-handling.patch
@@ -11,10 +11,10 @@ Co-authored-by: lexikiq <[email protected]>
 Co-authored-by: Aikar <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ab91dc3c9a738097b79bdecbcbe41557aa3ed0de..f2016ed77a2239bdc597175c24ce4427a808d1a6 100644
+index 57c13407fd20bcdd17642b0e6078f10082aea87b..0a7dec5ff89c94503908ad011fe7da8dd8256685 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1330,7 +1330,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1324,7 +1324,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void levelEvent(@Nullable Player player, int eventId, BlockPos pos, int data) {
diff --git a/patches/server/0107-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0106-Avoid-blocking-on-Network-Manager-creation.patch
index 1c6ee84de8..1c6ee84de8 100644
--- a/patches/server/0107-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/patches/server/0106-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0108-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0107-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 82dc93463f..82dc93463f 100644
--- a/patches/server/0108-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/patches/server/0107-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0109-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0108-Add-setting-for-proxy-online-mode-status.patch
index f660a5693e..f660a5693e 100644
--- a/patches/server/0109-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/server/0108-Add-setting-for-proxy-online-mode-status.patch
diff --git a/patches/server/0110-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0109-Optimise-BlockState-s-hashCode-equals.patch
index 348097f8ce..348097f8ce 100644
--- a/patches/server/0110-Optimise-BlockState-s-hashCode-equals.patch
+++ b/patches/server/0109-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0111-Configurable-packet-in-spam-threshold.patch b/patches/server/0110-Configurable-packet-in-spam-threshold.patch
index ca7788bafa..ca7788bafa 100644
--- a/patches/server/0111-Configurable-packet-in-spam-threshold.patch
+++ b/patches/server/0110-Configurable-packet-in-spam-threshold.patch
diff --git a/patches/server/0112-Configurable-flying-kick-messages.patch b/patches/server/0111-Configurable-flying-kick-messages.patch
index c398b0d327..c398b0d327 100644
--- a/patches/server/0112-Configurable-flying-kick-messages.patch
+++ b/patches/server/0111-Configurable-flying-kick-messages.patch
diff --git a/patches/server/0113-Add-EntityZapEvent.patch b/patches/server/0112-Add-EntityZapEvent.patch
index a54599fb44..a54599fb44 100644
--- a/patches/server/0113-Add-EntityZapEvent.patch
+++ b/patches/server/0112-Add-EntityZapEvent.patch
diff --git a/patches/server/0114-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch b/patches/server/0113-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
index c961e57817..c961e57817 100644
--- a/patches/server/0114-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
+++ b/patches/server/0113-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
diff --git a/patches/server/0115-Cache-user-authenticator-threads.patch b/patches/server/0114-Cache-user-authenticator-threads.patch
index af62d4792e..af62d4792e 100644
--- a/patches/server/0115-Cache-user-authenticator-threads.patch
+++ b/patches/server/0114-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0116-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0115-Allow-Reloading-of-Command-Aliases.patch
index 84b11ff12b..84b11ff12b 100644
--- a/patches/server/0116-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/server/0115-Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/server/0117-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0116-Add-source-to-PlayerExpChangeEvent.patch
index 1a4c72d2eb..1a4c72d2eb 100644
--- a/patches/server/0117-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/server/0116-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0118-Add-ProjectileCollideEvent.patch b/patches/server/0117-Add-ProjectileCollideEvent.patch
index 72842141bf..72842141bf 100644
--- a/patches/server/0118-Add-ProjectileCollideEvent.patch
+++ b/patches/server/0117-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0119-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0118-Prevent-Pathfinding-out-of-World-Border.patch
index ce3053228d..ce3053228d 100644
--- a/patches/server/0119-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/patches/server/0118-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0120-Optimize-Level.hasChunkAt-BlockPosition-Z.patch b/patches/server/0119-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
index e4bdedfa83..e4bdedfa83 100644
--- a/patches/server/0120-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
+++ b/patches/server/0119-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
diff --git a/patches/server/0121-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0120-Bound-Treasure-Maps-to-World-Border.patch
index 507479d986..507479d986 100644
--- a/patches/server/0121-Bound-Treasure-Maps-to-World-Border.patch
+++ b/patches/server/0120-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0122-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0121-Configurable-Cartographer-Treasure-Maps.patch
index 52b259bda3..52b259bda3 100644
--- a/patches/server/0122-Configurable-Cartographer-Treasure-Maps.patch
+++ b/patches/server/0121-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0123-Add-API-methods-to-control-if-armor-stands-can-move.patch b/patches/server/0122-Add-API-methods-to-control-if-armor-stands-can-move.patch
index 0921060796..0921060796 100644
--- a/patches/server/0123-Add-API-methods-to-control-if-armor-stands-can-move.patch
+++ b/patches/server/0122-Add-API-methods-to-control-if-armor-stands-can-move.patch
diff --git a/patches/server/0124-String-based-Action-Bar-API.patch b/patches/server/0123-String-based-Action-Bar-API.patch
index c6afb32b4d..c6afb32b4d 100644
--- a/patches/server/0124-String-based-Action-Bar-API.patch
+++ b/patches/server/0123-String-based-Action-Bar-API.patch
diff --git a/patches/server/0125-Properly-fix-item-duplication-bug.patch b/patches/server/0124-Properly-fix-item-duplication-bug.patch
index 7879e5309a..7879e5309a 100644
--- a/patches/server/0125-Properly-fix-item-duplication-bug.patch
+++ b/patches/server/0124-Properly-fix-item-duplication-bug.patch
diff --git a/patches/server/0126-Firework-API-s.patch b/patches/server/0125-Firework-API-s.patch
index 97437e72f2..97437e72f2 100644
--- a/patches/server/0126-Firework-API-s.patch
+++ b/patches/server/0125-Firework-API-s.patch
diff --git a/patches/server/0127-PlayerTeleportEndGatewayEvent.patch b/patches/server/0126-PlayerTeleportEndGatewayEvent.patch
index b63f7764ee..b63f7764ee 100644
--- a/patches/server/0127-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/server/0126-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0128-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0127-Provide-E-TE-Chunk-count-stat-methods.patch
index 1c42b6754f..1c42b6754f 100644
--- a/patches/server/0128-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/server/0127-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/0129-Enforce-Sync-Player-Saves.patch b/patches/server/0128-Enforce-Sync-Player-Saves.patch
index 0a5c3c945c..0a5c3c945c 100644
--- a/patches/server/0129-Enforce-Sync-Player-Saves.patch
+++ b/patches/server/0128-Enforce-Sync-Player-Saves.patch
diff --git a/patches/server/0130-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 5a6cb6d9be..5a6cb6d9be 100644
--- a/patches/server/0130-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/server/0131-Cap-Entity-Collisions.patch b/patches/server/0130-Cap-Entity-Collisions.patch
index 3178a0a8f1..3178a0a8f1 100644
--- a/patches/server/0131-Cap-Entity-Collisions.patch
+++ b/patches/server/0130-Cap-Entity-Collisions.patch
diff --git a/patches/server/0132-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
index 721f748db6..721f748db6 100644
--- a/patches/server/0132-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch
index eb9dccee49..eb9dccee49 100644
--- a/patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index afefe47c9c..afefe47c9c 100644
--- a/patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
diff --git a/patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch
index 9d390326d1..9d390326d1 100644
--- a/patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
index 5d6a56dbae..5d6a56dbae 100644
--- a/patches/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0137-Item-canEntityPickup.patch b/patches/server/0136-Item-canEntityPickup.patch
index 4b622591cc..4b622591cc 100644
--- a/patches/server/0137-Item-canEntityPickup.patch
+++ b/patches/server/0136-Item-canEntityPickup.patch
diff --git a/patches/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 6a32c3b05f..6a32c3b05f 100644
--- a/patches/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0139-PlayerAttemptPickupItemEvent.patch b/patches/server/0138-PlayerAttemptPickupItemEvent.patch
index af6c33cefe..af6c33cefe 100644
--- a/patches/server/0139-PlayerAttemptPickupItemEvent.patch
+++ b/patches/server/0138-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index e660ce370c..e660ce370c 100644
--- a/patches/server/0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0141-Basic-PlayerProfile-API.patch b/patches/server/0140-Basic-PlayerProfile-API.patch
index 81c8e55127..81c8e55127 100644
--- a/patches/server/0141-Basic-PlayerProfile-API.patch
+++ b/patches/server/0140-Basic-PlayerProfile-API.patch
diff --git a/patches/server/0142-Add-UnknownCommandEvent.patch b/patches/server/0141-Add-UnknownCommandEvent.patch
index 16acb37865..16acb37865 100644
--- a/patches/server/0142-Add-UnknownCommandEvent.patch
+++ b/patches/server/0141-Add-UnknownCommandEvent.patch
diff --git a/patches/server/0143-Shoulder-Entities-Release-API.patch b/patches/server/0142-Shoulder-Entities-Release-API.patch
index 5cffe32839..5cffe32839 100644
--- a/patches/server/0143-Shoulder-Entities-Release-API.patch
+++ b/patches/server/0142-Shoulder-Entities-Release-API.patch
diff --git a/patches/server/0144-Profile-Lookup-Events.patch b/patches/server/0143-Profile-Lookup-Events.patch
index 8a3c9a944e..8a3c9a944e 100644
--- a/patches/server/0144-Profile-Lookup-Events.patch
+++ b/patches/server/0143-Profile-Lookup-Events.patch
diff --git a/patches/server/0145-Block-player-logins-during-server-shutdown.patch b/patches/server/0144-Block-player-logins-during-server-shutdown.patch
index 0a09c804d3..0a09c804d3 100644
--- a/patches/server/0145-Block-player-logins-during-server-shutdown.patch
+++ b/patches/server/0144-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0146-Entity-fromMobSpawner.patch b/patches/server/0145-Entity-fromMobSpawner.patch
index dc08de6d4b..dc08de6d4b 100644
--- a/patches/server/0146-Entity-fromMobSpawner.patch
+++ b/patches/server/0145-Entity-fromMobSpawner.patch
diff --git a/patches/server/0147-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0146-Improve-the-Saddle-API-for-Horses.patch
index 0621160522..0621160522 100644
--- a/patches/server/0147-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/server/0146-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0148-ensureServerConversions-API.patch b/patches/server/0147-ensureServerConversions-API.patch
index 85e770b115..85e770b115 100644
--- a/patches/server/0148-ensureServerConversions-API.patch
+++ b/patches/server/0147-ensureServerConversions-API.patch
diff --git a/patches/server/0149-Implement-getI18NDisplayName.patch b/patches/server/0148-Implement-getI18NDisplayName.patch
index 9493175f29..9493175f29 100644
--- a/patches/server/0149-Implement-getI18NDisplayName.patch
+++ b/patches/server/0148-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0150-ProfileWhitelistVerifyEvent.patch b/patches/server/0149-ProfileWhitelistVerifyEvent.patch
index b11dd2a0d1..b11dd2a0d1 100644
--- a/patches/server/0150-ProfileWhitelistVerifyEvent.patch
+++ b/patches/server/0149-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/server/0151-Fix-this-stupid-bullshit.patch b/patches/server/0150-Fix-this-stupid-bullshit.patch
index 0ac6601973..0ac6601973 100644
--- a/patches/server/0151-Fix-this-stupid-bullshit.patch
+++ b/patches/server/0150-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0152-LivingEntity-setKiller.patch b/patches/server/0151-LivingEntity-setKiller.patch
index 9fd26436ef..9fd26436ef 100644
--- a/patches/server/0152-LivingEntity-setKiller.patch
+++ b/patches/server/0151-LivingEntity-setKiller.patch
diff --git a/patches/server/0153-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch
index 9dc664ab89..9dc664ab89 100644
--- a/patches/server/0153-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 129e8461dc..129e8461dc 100644
--- a/patches/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
index 8abd11f071..8abd11f071 100644
--- a/patches/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/patches/server/0156-Add-PlayerJumpEvent.patch b/patches/server/0155-Add-PlayerJumpEvent.patch
index e9c26db028..e9c26db028 100644
--- a/patches/server/0156-Add-PlayerJumpEvent.patch
+++ b/patches/server/0155-Add-PlayerJumpEvent.patch
diff --git a/patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch
index b7fa733d4a..b7fa733d4a 100644
--- a/patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch
+++ b/patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch
diff --git a/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
index 6f1694b0be..6f1694b0be 100644
--- a/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
diff --git a/patches/server/0159-revert-serverside-behavior-of-keepalives.patch b/patches/server/0158-revert-serverside-behavior-of-keepalives.patch
index fa7ee14322..fa7ee14322 100644
--- a/patches/server/0159-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/0158-revert-serverside-behavior-of-keepalives.patch
diff --git a/patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 7d1fe2ef5f..7d1fe2ef5f 100644
--- a/patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0161-Add-PlayerArmorChangeEvent.patch b/patches/server/0160-Add-PlayerArmorChangeEvent.patch
index b06adec4a2..b06adec4a2 100644
--- a/patches/server/0161-Add-PlayerArmorChangeEvent.patch
+++ b/patches/server/0160-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch
index f6552aac5d..f6552aac5d 100644
--- a/patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0163-Fix-MC-117075-Block-entity-unload-lag-spike.patch b/patches/server/0162-Fix-MC-117075-Block-entity-unload-lag-spike.patch
index 4dda00330b..4dda00330b 100644
--- a/patches/server/0163-Fix-MC-117075-Block-entity-unload-lag-spike.patch
+++ b/patches/server/0162-Fix-MC-117075-Block-entity-unload-lag-spike.patch
diff --git a/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch
index 50782d18cc..50782d18cc 100644
--- a/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch
index 2ca3917af8..2ca3917af8 100644
--- a/patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0166-AsyncTabCompleteEvent.patch b/patches/server/0165-AsyncTabCompleteEvent.patch
index f90e0edaae..f90e0edaae 100644
--- a/patches/server/0166-AsyncTabCompleteEvent.patch
+++ b/patches/server/0165-AsyncTabCompleteEvent.patch
diff --git a/patches/server/0167-PlayerPickupExperienceEvent.patch b/patches/server/0166-PlayerPickupExperienceEvent.patch
index e604445c7b..e604445c7b 100644
--- a/patches/server/0167-PlayerPickupExperienceEvent.patch
+++ b/patches/server/0166-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
index 4dbdc50fe5..4dbdc50fe5 100644
--- a/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
index a022415f3d..a022415f3d 100644
--- a/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch
index 99435ec31e..99435ec31e 100644
--- a/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0171-PreCreatureSpawnEvent.patch b/patches/server/0170-PreCreatureSpawnEvent.patch
index 3ebb425a2c..3ebb425a2c 100644
--- a/patches/server/0171-PreCreatureSpawnEvent.patch
+++ b/patches/server/0170-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0172-Fill-Profile-Property-Events.patch b/patches/server/0171-Fill-Profile-Property-Events.patch
index ef1f330999..ef1f330999 100644
--- a/patches/server/0172-Fill-Profile-Property-Events.patch
+++ b/patches/server/0171-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0173-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0172-Add-PlayerAdvancementCriterionGrantEvent.patch
index d407c53d24..d407c53d24 100644
--- a/patches/server/0173-Add-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/server/0172-Add-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0174-Add-ArmorStand-Item-Meta.patch b/patches/server/0173-Add-ArmorStand-Item-Meta.patch
index 609dc1f9e1..609dc1f9e1 100644
--- a/patches/server/0174-Add-ArmorStand-Item-Meta.patch
+++ b/patches/server/0173-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0175-Extend-Player-Interact-cancellation.patch b/patches/server/0174-Extend-Player-Interact-cancellation.patch
index fee4959d90..fee4959d90 100644
--- a/patches/server/0175-Extend-Player-Interact-cancellation.patch
+++ b/patches/server/0174-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0176-Tameable-getOwnerUniqueId-API.patch b/patches/server/0175-Tameable-getOwnerUniqueId-API.patch
index 8ef9a7ad54..8ef9a7ad54 100644
--- a/patches/server/0176-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/server/0175-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0177-Toggleable-player-crits.patch b/patches/server/0176-Toggleable-player-crits.patch
index 5f23bbc174..5f23bbc174 100644
--- a/patches/server/0177-Toggleable-player-crits.patch
+++ b/patches/server/0176-Toggleable-player-crits.patch
diff --git a/patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch
index 7795462dbe..7795462dbe 100644
--- a/patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch
index 3ecad64906..3ecad64906 100644
--- a/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch
diff --git a/patches/server/0180-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch
index 05bf2e60ad..05bf2e60ad 100644
--- a/patches/server/0180-Add-more-fields-to-AsyncPreLoginEvent.patch
+++ b/patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch
diff --git a/patches/server/0181-Player.setPlayerProfile-API.patch b/patches/server/0180-Player.setPlayerProfile-API.patch
index 9c4d661771..9c4d661771 100644
--- a/patches/server/0181-Player.setPlayerProfile-API.patch
+++ b/patches/server/0180-Player.setPlayerProfile-API.patch
diff --git a/patches/server/0182-getPlayerUniqueId-API.patch b/patches/server/0181-getPlayerUniqueId-API.patch
index 740edfaf0a..740edfaf0a 100644
--- a/patches/server/0182-getPlayerUniqueId-API.patch
+++ b/patches/server/0181-getPlayerUniqueId-API.patch
diff --git a/patches/server/0183-Improved-Async-Task-Scheduler.patch b/patches/server/0182-Improved-Async-Task-Scheduler.patch
index 3ce3a754e3..3ce3a754e3 100644
--- a/patches/server/0183-Improved-Async-Task-Scheduler.patch
+++ b/patches/server/0182-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0183-Make-legacy-ping-handler-more-reliable.patch
index e9431bd1eb..e9431bd1eb 100644
--- a/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch
+++ b/patches/server/0183-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 5265180dd5..5265180dd5 100644
--- a/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0186-Flag-to-disable-the-channel-limit.patch b/patches/server/0185-Flag-to-disable-the-channel-limit.patch
index 1ec64fa716..1ec64fa716 100644
--- a/patches/server/0186-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0185-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0187-Add-openSign-method-to-HumanEntity.patch b/patches/server/0186-Add-openSign-method-to-HumanEntity.patch
index 969c29ccc9..969c29ccc9 100644
--- a/patches/server/0187-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/server/0186-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/server/0188-Configurable-sprint-interruption-on-attack.patch b/patches/server/0187-Configurable-sprint-interruption-on-attack.patch
index 19fef02dc1..19fef02dc1 100644
--- a/patches/server/0188-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/server/0187-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0189-EndermanEscapeEvent.patch b/patches/server/0188-EndermanEscapeEvent.patch
index 8508ed70d2..8508ed70d2 100644
--- a/patches/server/0189-EndermanEscapeEvent.patch
+++ b/patches/server/0188-EndermanEscapeEvent.patch
diff --git a/patches/server/0190-Enderman.teleportRandomly.patch b/patches/server/0189-Enderman.teleportRandomly.patch
index aeb2e69493..aeb2e69493 100644
--- a/patches/server/0190-Enderman.teleportRandomly.patch
+++ b/patches/server/0189-Enderman.teleportRandomly.patch
diff --git a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0190-Block-Enderpearl-Travel-Exploit.patch
index e1163117f2..37ffcb8ff8 100644
--- a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/server/0190-Block-Enderpearl-Travel-Exploit.patch
@@ -16,10 +16,10 @@ public net.minecraft.world.entity.projectile.Projectile cachedOwner
 public net.minecraft.world.entity.projectile.Projectile ownerUUID
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f2016ed77a2239bdc597175c24ce4427a808d1a6..7be0547f6225a6be6ca1037f63f4aff8759b5dc4 100644
+index 0a7dec5ff89c94503908ad011fe7da8dd8256685..f31d403420294f479e116013b200ea7e87ac901e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2149,6 +2149,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2143,6 +2143,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          public void onTickingEnd(Entity entity) {
              ServerLevel.this.entityTickList.remove(entity);
diff --git a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch
index a3e3807ea2..763d9a65b6 100644
--- a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -10,10 +10,10 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7be0547f6225a6be6ca1037f63f4aff8759b5dc4..e79329ee9b02a11b55253cf2ce4e08b2fc39a43f 100644
+index f31d403420294f479e116013b200ea7e87ac901e..82947c9743433df9c03732e0a3229563de0ab53c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1516,12 +1516,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1510,12 +1510,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      public <T extends ParticleOptions> int sendParticles(ServerPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
diff --git a/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 5f4980ec04..5f4980ec04 100644
--- a/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/0194-EndermanAttackPlayerEvent.patch b/patches/server/0193-EndermanAttackPlayerEvent.patch
index ccd3efb275..ccd3efb275 100644
--- a/patches/server/0194-EndermanAttackPlayerEvent.patch
+++ b/patches/server/0193-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0195-WitchConsumePotionEvent.patch b/patches/server/0194-WitchConsumePotionEvent.patch
index 8c307613d4..8c307613d4 100644
--- a/patches/server/0195-WitchConsumePotionEvent.patch
+++ b/patches/server/0194-WitchConsumePotionEvent.patch
diff --git a/patches/server/0196-WitchThrowPotionEvent.patch b/patches/server/0195-WitchThrowPotionEvent.patch
index 309ef84532..309ef84532 100644
--- a/patches/server/0196-WitchThrowPotionEvent.patch
+++ b/patches/server/0195-WitchThrowPotionEvent.patch
diff --git a/patches/server/0197-WitchReadyPotionEvent.patch b/patches/server/0196-WitchReadyPotionEvent.patch
index f99a5b42df..f99a5b42df 100644
--- a/patches/server/0197-WitchReadyPotionEvent.patch
+++ b/patches/server/0196-WitchReadyPotionEvent.patch
diff --git a/patches/server/0198-ItemStack-getMaxItemUseDuration.patch b/patches/server/0197-ItemStack-getMaxItemUseDuration.patch
index d7b18de72a..d7b18de72a 100644
--- a/patches/server/0198-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/server/0197-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0199-Add-EntityTeleportEndGatewayEvent.patch b/patches/server/0198-Add-EntityTeleportEndGatewayEvent.patch
index c43c6a3b23..c43c6a3b23 100644
--- a/patches/server/0199-Add-EntityTeleportEndGatewayEvent.patch
+++ b/patches/server/0198-Add-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0200-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0199-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 61d4865bc1..61d4865bc1 100644
--- a/patches/server/0200-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/server/0199-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0201-Fix-CraftEntity-hashCode.patch b/patches/server/0200-Fix-CraftEntity-hashCode.patch
index cc51f19266..cc51f19266 100644
--- a/patches/server/0201-Fix-CraftEntity-hashCode.patch
+++ b/patches/server/0200-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0202-Configurable-LootPool-luck-formula.patch b/patches/server/0201-Configurable-LootPool-luck-formula.patch
index 33c95e3339..33c95e3339 100644
--- a/patches/server/0202-Configurable-LootPool-luck-formula.patch
+++ b/patches/server/0201-Configurable-LootPool-luck-formula.patch
diff --git a/patches/server/0203-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0202-Print-Error-details-when-failing-to-save-player-data.patch
index 19f2e71553..19f2e71553 100644
--- a/patches/server/0203-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/server/0202-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0204-Make-shield-blocking-delay-configurable.patch b/patches/server/0203-Make-shield-blocking-delay-configurable.patch
index df30f32224..df30f32224 100644
--- a/patches/server/0204-Make-shield-blocking-delay-configurable.patch
+++ b/patches/server/0203-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/server/0205-Improve-EntityShootBowEvent.patch b/patches/server/0204-Improve-EntityShootBowEvent.patch
index b0811d8d24..b0811d8d24 100644
--- a/patches/server/0205-Improve-EntityShootBowEvent.patch
+++ b/patches/server/0204-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0206-PlayerReadyArrowEvent.patch b/patches/server/0205-PlayerReadyArrowEvent.patch
index 5675770a19..5675770a19 100644
--- a/patches/server/0206-PlayerReadyArrowEvent.patch
+++ b/patches/server/0205-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0207-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch b/patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
index fb37d7ab55..fb37d7ab55 100644
--- a/patches/server/0207-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
+++ b/patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
diff --git a/patches/server/0208-Expand-Explosions-API.patch b/patches/server/0207-Expand-Explosions-API.patch
index c8b7653db6..c8b7653db6 100644
--- a/patches/server/0208-Expand-Explosions-API.patch
+++ b/patches/server/0207-Expand-Explosions-API.patch
diff --git a/patches/server/0209-LivingEntity-Active-Item-API.patch b/patches/server/0208-LivingEntity-Active-Item-API.patch
index 8bed563bc0..8bed563bc0 100644
--- a/patches/server/0209-LivingEntity-Active-Item-API.patch
+++ b/patches/server/0208-LivingEntity-Active-Item-API.patch
diff --git a/patches/server/0210-RangedEntity-API.patch b/patches/server/0209-RangedEntity-API.patch
index 5383dfd935..5383dfd935 100644
--- a/patches/server/0210-RangedEntity-API.patch
+++ b/patches/server/0209-RangedEntity-API.patch
diff --git a/patches/server/0211-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0210-Add-config-to-disable-ender-dragon-legacy-check.patch
index c9acef0191..c9acef0191 100644
--- a/patches/server/0211-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/server/0210-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0212-Implement-World.getEntity-UUID-API.patch b/patches/server/0211-Implement-World.getEntity-UUID-API.patch
index 3e9389db22..3e9389db22 100644
--- a/patches/server/0212-Implement-World.getEntity-UUID-API.patch
+++ b/patches/server/0211-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0213-InventoryCloseEvent-Reason-API.patch b/patches/server/0212-InventoryCloseEvent-Reason-API.patch
index e02b376de2..64b3489350 100644
--- a/patches/server/0213-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0212-InventoryCloseEvent-Reason-API.patch
@@ -7,10 +7,10 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e79329ee9b02a11b55253cf2ce4e08b2fc39a43f..c5b89c3149b869a3358434490a001f0f45f716fb 100644
+index 82947c9743433df9c03732e0a3229563de0ab53c..6f2e316480c4cd1ffb32e8d01009a18c2234c731 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1247,7 +1247,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1241,7 +1241,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          for (net.minecraft.world.level.block.entity.BlockEntity tileentity : chunk.getBlockEntities().values()) {
              if (tileentity instanceof net.minecraft.world.Container) {
                  for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((net.minecraft.world.Container) tileentity).getViewers())) {
@@ -19,7 +19,7 @@ index e79329ee9b02a11b55253cf2ce4e08b2fc39a43f..c5b89c3149b869a3358434490a001f0f
                  }
              }
          }
-@@ -2234,7 +2234,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2228,7 +2228,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
                  for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((org.bukkit.inventory.InventoryHolder) entity.getBukkitEntity()).getInventory().getViewers())) {
diff --git a/patches/server/0214-Vex-get-setSummoner-API.patch b/patches/server/0213-Vex-get-setSummoner-API.patch
index 9c014ff1fc..9c014ff1fc 100644
--- a/patches/server/0214-Vex-get-setSummoner-API.patch
+++ b/patches/server/0213-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0215-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 2cb488e718..2cb488e718 100644
--- a/patches/server/0215-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/patches/server/0216-add-more-information-to-Entity.toString.patch b/patches/server/0215-add-more-information-to-Entity.toString.patch
index 075a1453d8..075a1453d8 100644
--- a/patches/server/0216-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0215-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0217-EnderDragon-Events.patch b/patches/server/0216-EnderDragon-Events.patch
index 17519e6abe..17519e6abe 100644
--- a/patches/server/0217-EnderDragon-Events.patch
+++ b/patches/server/0216-EnderDragon-Events.patch
diff --git a/patches/server/0218-PlayerElytraBoostEvent.patch b/patches/server/0217-PlayerElytraBoostEvent.patch
index 0581d2cd0a..0581d2cd0a 100644
--- a/patches/server/0218-PlayerElytraBoostEvent.patch
+++ b/patches/server/0217-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0219-PlayerLaunchProjectileEvent.patch b/patches/server/0218-PlayerLaunchProjectileEvent.patch
index c696862b1d..c696862b1d 100644
--- a/patches/server/0219-PlayerLaunchProjectileEvent.patch
+++ b/patches/server/0218-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0220-Improve-BlockPosition-inlining.patch b/patches/server/0219-Improve-BlockPosition-inlining.patch
index 469c5f7390..469c5f7390 100644
--- a/patches/server/0220-Improve-BlockPosition-inlining.patch
+++ b/patches/server/0219-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0221-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0220-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 4c4526b87a..4c4526b87a 100644
--- a/patches/server/0221-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0220-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0222-Vanished-players-don-t-have-rights.patch b/patches/server/0221-Vanished-players-don-t-have-rights.patch
index 5eead4a61f..5eead4a61f 100644
--- a/patches/server/0222-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0221-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0223-Allow-disabling-armor-stand-ticking.patch b/patches/server/0222-Allow-disabling-armor-stand-ticking.patch
index b0daae19fd..b0daae19fd 100644
--- a/patches/server/0223-Allow-disabling-armor-stand-ticking.patch
+++ b/patches/server/0222-Allow-disabling-armor-stand-ticking.patch
diff --git a/patches/server/0224-SkeletonHorse-Additions.patch b/patches/server/0223-SkeletonHorse-Additions.patch
index fa351dc912..fa351dc912 100644
--- a/patches/server/0224-SkeletonHorse-Additions.patch
+++ b/patches/server/0223-SkeletonHorse-Additions.patch
diff --git a/patches/server/0225-Expand-ArmorStand-API.patch b/patches/server/0224-Expand-ArmorStand-API.patch
index 1112902d66..1112902d66 100644
--- a/patches/server/0225-Expand-ArmorStand-API.patch
+++ b/patches/server/0224-Expand-ArmorStand-API.patch
diff --git a/patches/server/0226-AnvilDamageEvent.patch b/patches/server/0225-AnvilDamageEvent.patch
index e7fa11cbd6..e7fa11cbd6 100644
--- a/patches/server/0226-AnvilDamageEvent.patch
+++ b/patches/server/0225-AnvilDamageEvent.patch
diff --git a/patches/server/0227-Add-TNTPrimeEvent.patch b/patches/server/0226-Add-TNTPrimeEvent.patch
index 20aea2bef7..20aea2bef7 100644
--- a/patches/server/0227-Add-TNTPrimeEvent.patch
+++ b/patches/server/0226-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0228-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0227-Break-up-and-make-tab-spam-limits-configurable.patch
index 444c042a87..444c042a87 100644
--- a/patches/server/0228-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0227-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/0229-Fix-NBT-type-issues.patch b/patches/server/0228-Fix-NBT-type-issues.patch
index 041a4039c7..041a4039c7 100644
--- a/patches/server/0229-Fix-NBT-type-issues.patch
+++ b/patches/server/0228-Fix-NBT-type-issues.patch
diff --git a/patches/server/0230-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0229-Remove-unnecessary-itemmeta-handling.patch
index ad3868499a..ad3868499a 100644
--- a/patches/server/0230-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/server/0229-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0231-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0230-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 9d19ef52a1..27da8072f4 100644
--- a/patches/server/0231-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0230-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -26,10 +26,10 @@ index 46da628073e2bfb77b3deab623dba46228d92618..1c508d1f122d287cd8dc0a905de96436
  
      protected void tick() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c5b89c3149b869a3358434490a001f0f45f716fb..2879de5d5c6638d9b683e74da8dc3863738f2b65 100644
+index 6f2e316480c4cd1ffb32e8d01009a18c2234c731..42dd9ab70c07e92258da70ad29b51c7780401a5d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1209,6 +1209,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1203,6 +1203,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
      // CraftBukkit start
      private boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
          org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
diff --git a/patches/server/0232-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0231-Add-Early-Warning-Feature-to-WatchDog.patch
index bcc6d21efc..bcc6d21efc 100644
--- a/patches/server/0232-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0231-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/patches/server/0233-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0232-Use-ConcurrentHashMap-in-JsonList.patch
index f2227d0d63..f2227d0d63 100644
--- a/patches/server/0233-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/server/0232-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0234-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0233-Use-a-Queue-for-Queueing-Commands.patch
index 34b61b9cfc..34b61b9cfc 100644
--- a/patches/server/0234-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/server/0233-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0235-Ability-to-get-block-entities-from-a-chunk-without-s.patch b/patches/server/0234-Ability-to-get-block-entities-from-a-chunk-without-s.patch
index 7c3bd3c439..7c3bd3c439 100644
--- a/patches/server/0235-Ability-to-get-block-entities-from-a-chunk-without-s.patch
+++ b/patches/server/0234-Ability-to-get-block-entities-from-a-chunk-without-s.patch
diff --git a/patches/server/0236-Optimize-BlockPosition-helper-methods.patch b/patches/server/0235-Optimize-BlockPosition-helper-methods.patch
index 3e78fec75c..3e78fec75c 100644
--- a/patches/server/0236-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/server/0235-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0237-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0236-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index aa9cfcc962..aa9cfcc962 100644
--- a/patches/server/0237-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/server/0236-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0238-Slime-Pathfinder-Events.patch b/patches/server/0237-Slime-Pathfinder-Events.patch
index dcc57291f0..dcc57291f0 100644
--- a/patches/server/0238-Slime-Pathfinder-Events.patch
+++ b/patches/server/0237-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0239-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0238-Configurable-speed-for-water-flowing-over-lava.patch
index fafdd583ab..fafdd583ab 100644
--- a/patches/server/0239-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/server/0238-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0240-Optimize-CraftBlockData-Creation.patch b/patches/server/0239-Optimize-CraftBlockData-Creation.patch
index 127bebc309..127bebc309 100644
--- a/patches/server/0240-Optimize-CraftBlockData-Creation.patch
+++ b/patches/server/0239-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0241-Optimize-MappedRegistry.patch b/patches/server/0240-Optimize-MappedRegistry.patch
index de87a88672..de87a88672 100644
--- a/patches/server/0241-Optimize-MappedRegistry.patch
+++ b/patches/server/0240-Optimize-MappedRegistry.patch
diff --git a/patches/server/0242-Add-PhantomPreSpawnEvent.patch b/patches/server/0241-Add-PhantomPreSpawnEvent.patch
index 20c2fee95a..20c2fee95a 100644
--- a/patches/server/0242-Add-PhantomPreSpawnEvent.patch
+++ b/patches/server/0241-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0243-Add-More-Creeper-API.patch b/patches/server/0242-Add-More-Creeper-API.patch
index c5b211840f..c5b211840f 100644
--- a/patches/server/0243-Add-More-Creeper-API.patch
+++ b/patches/server/0242-Add-More-Creeper-API.patch
diff --git a/patches/server/0244-Inventory-removeItemAnySlot.patch b/patches/server/0243-Inventory-removeItemAnySlot.patch
index 1316343a0a..1316343a0a 100644
--- a/patches/server/0244-Inventory-removeItemAnySlot.patch
+++ b/patches/server/0243-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0245-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0244-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 07df345386..07df345386 100644
--- a/patches/server/0245-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/server/0244-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0246-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0245-Add-ray-tracing-methods-to-LivingEntity.patch
index 6059533369..6059533369 100644
--- a/patches/server/0246-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/server/0245-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0247-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0246-Expose-attack-cooldown-methods-for-Player.patch
index e382df3eff..e382df3eff 100644
--- a/patches/server/0247-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0246-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0248-Improve-death-events.patch b/patches/server/0247-Improve-death-events.patch
index 5bb85c8f53..5bb85c8f53 100644
--- a/patches/server/0248-Improve-death-events.patch
+++ b/patches/server/0247-Improve-death-events.patch
diff --git a/patches/server/0249-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0248-Allow-chests-to-be-placed-with-NBT-data.patch
index 68138d557c..68138d557c 100644
--- a/patches/server/0249-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/server/0248-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0250-Mob-Pathfinding-API.patch b/patches/server/0249-Mob-Pathfinding-API.patch
index 2adce44ac3..2adce44ac3 100644
--- a/patches/server/0250-Mob-Pathfinding-API.patch
+++ b/patches/server/0249-Mob-Pathfinding-API.patch
diff --git a/patches/server/0251-Prevent-various-interactions-from-causing-chunk-load.patch b/patches/server/0250-Prevent-various-interactions-from-causing-chunk-load.patch
index 16fa7f5101..16fa7f5101 100644
--- a/patches/server/0251-Prevent-various-interactions-from-causing-chunk-load.patch
+++ b/patches/server/0250-Prevent-various-interactions-from-causing-chunk-load.patch
diff --git a/patches/server/0252-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0251-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 1ca48ef5a8..1ca48ef5a8 100644
--- a/patches/server/0252-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/server/0251-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0253-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0252-Implement-furnace-cook-speed-multiplier-API.patch
index 1b102b8639..1b102b8639 100644
--- a/patches/server/0253-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/server/0252-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0254-Honor-EntityAgeable.ageLock.patch b/patches/server/0253-Honor-EntityAgeable.ageLock.patch
index e1922af42f..e1922af42f 100644
--- a/patches/server/0254-Honor-EntityAgeable.ageLock.patch
+++ b/patches/server/0253-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0255-Configurable-connection-throttle-kick-message.patch b/patches/server/0254-Configurable-connection-throttle-kick-message.patch
index 45bfe1972e..45bfe1972e 100644
--- a/patches/server/0255-Configurable-connection-throttle-kick-message.patch
+++ b/patches/server/0254-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0256-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0255-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 50c82e5d54..50c82e5d54 100644
--- a/patches/server/0256-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/patches/server/0255-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0257-PreSpawnerSpawnEvent.patch b/patches/server/0256-PreSpawnerSpawnEvent.patch
index 3512bab510..3512bab510 100644
--- a/patches/server/0257-PreSpawnerSpawnEvent.patch
+++ b/patches/server/0256-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0258-Add-LivingEntity-getTargetEntity.patch b/patches/server/0257-Add-LivingEntity-getTargetEntity.patch
index 44504af9dc..44504af9dc 100644
--- a/patches/server/0258-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0257-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0259-Add-sun-related-API.patch b/patches/server/0258-Add-sun-related-API.patch
index 6ae32c9602..6ae32c9602 100644
--- a/patches/server/0259-Add-sun-related-API.patch
+++ b/patches/server/0258-Add-sun-related-API.patch
diff --git a/patches/server/0260-Catch-JsonParseException-in-entity-and-block-entity-.patch b/patches/server/0259-Catch-JsonParseException-in-entity-and-block-entity-.patch
index f96f0429bc..f96f0429bc 100644
--- a/patches/server/0260-Catch-JsonParseException-in-entity-and-block-entity-.patch
+++ b/patches/server/0259-Catch-JsonParseException-in-entity-and-block-entity-.patch
diff --git a/patches/server/0261-Turtle-API.patch b/patches/server/0260-Turtle-API.patch
index 4069d4db59..4069d4db59 100644
--- a/patches/server/0261-Turtle-API.patch
+++ b/patches/server/0260-Turtle-API.patch
diff --git a/patches/server/0262-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0261-Call-player-spectator-target-events-and-improve-impl.patch
index 6c50ec8023..6c50ec8023 100644
--- a/patches/server/0262-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0261-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0263-Add-more-Witch-API.patch b/patches/server/0262-Add-more-Witch-API.patch
index a4d09e1bb4..a4d09e1bb4 100644
--- a/patches/server/0263-Add-more-Witch-API.patch
+++ b/patches/server/0262-Add-more-Witch-API.patch
diff --git a/patches/server/0264-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0263-Check-Drowned-for-Villager-Aggression-Config.patch
index efafeb919c..efafeb919c 100644
--- a/patches/server/0264-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/server/0263-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0265-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 0c5151b43a..0c5151b43a 100644
--- a/patches/server/0265-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0266-Reset-players-airTicks-on-respawn.patch b/patches/server/0265-Reset-players-airTicks-on-respawn.patch
index 792f05094a..792f05094a 100644
--- a/patches/server/0266-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0265-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0267-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0266-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index d871ee76b6..d871ee76b6 100644
--- a/patches/server/0267-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/server/0266-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0268-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 5930ac11e6..5930ac11e6 100644
--- a/patches/server/0268-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0269-Optimize-World-Time-Updates.patch b/patches/server/0268-Optimize-World-Time-Updates.patch
index 4b1b035dfe..4b1b035dfe 100644
--- a/patches/server/0269-Optimize-World-Time-Updates.patch
+++ b/patches/server/0268-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0270-Restore-custom-InventoryHolder-support.patch b/patches/server/0269-Restore-custom-InventoryHolder-support.patch
index 99ca50730b..99ca50730b 100644
--- a/patches/server/0270-Restore-custom-InventoryHolder-support.patch
+++ b/patches/server/0269-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0271-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0270-Fix-SpongeAbsortEvent-handling.patch
index be21ac2045..be21ac2045 100644
--- a/patches/server/0271-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/server/0270-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0272-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0271-Don-t-allow-digging-into-unloaded-chunks.patch
index e7f3a33daa..e7f3a33daa 100644
--- a/patches/server/0272-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0271-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0273-Make-the-default-permission-message-configurable.patch b/patches/server/0272-Make-the-default-permission-message-configurable.patch
index 98a4c6ccc2..98a4c6ccc2 100644
--- a/patches/server/0273-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0272-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0274-force-entity-dismount-during-teleportation.patch b/patches/server/0273-force-entity-dismount-during-teleportation.patch
index 273b4e4634..273b4e4634 100644
--- a/patches/server/0274-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0273-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0275-Add-more-Zombie-API.patch b/patches/server/0274-Add-more-Zombie-API.patch
index 68302fc88c..68302fc88c 100644
--- a/patches/server/0275-Add-more-Zombie-API.patch
+++ b/patches/server/0274-Add-more-Zombie-API.patch
diff --git a/patches/server/0276-Book-Size-Limits.patch b/patches/server/0275-Book-Size-Limits.patch
index 2a4e92854c..2a4e92854c 100644
--- a/patches/server/0276-Book-Size-Limits.patch
+++ b/patches/server/0275-Book-Size-Limits.patch
diff --git a/patches/server/0277-Add-PlayerConnectionCloseEvent.patch b/patches/server/0276-Add-PlayerConnectionCloseEvent.patch
index f9b0532074..f9b0532074 100644
--- a/patches/server/0277-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0276-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0278-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0277-Replace-OfflinePlayer-getLastPlayed.patch
index aa6050d048..aa6050d048 100644
--- a/patches/server/0278-Replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0277-Replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0279-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0278-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 0b04379c7c..0b04379c7c 100644
--- a/patches/server/0279-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0278-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0280-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0279-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
index 7ff0d9c37b..7ff0d9c37b 100644
--- a/patches/server/0280-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
+++ b/patches/server/0279-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
diff --git a/patches/server/0281-BlockDestroyEvent.patch b/patches/server/0280-BlockDestroyEvent.patch
index 726ae64149..726ae64149 100644
--- a/patches/server/0281-BlockDestroyEvent.patch
+++ b/patches/server/0280-BlockDestroyEvent.patch
diff --git a/patches/server/0282-Async-command-map-building.patch b/patches/server/0281-Async-command-map-building.patch
index 7f58d78b88..7f58d78b88 100644
--- a/patches/server/0282-Async-command-map-building.patch
+++ b/patches/server/0281-Async-command-map-building.patch
diff --git a/patches/server/0283-Brigadier-Mojang-API.patch b/patches/server/0282-Brigadier-Mojang-API.patch
index b7aa6edfb3..b7aa6edfb3 100644
--- a/patches/server/0283-Brigadier-Mojang-API.patch
+++ b/patches/server/0282-Brigadier-Mojang-API.patch
diff --git a/patches/server/0284-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0283-Improve-exact-choice-recipe-ingredients.patch
index 99b2e8b822..99b2e8b822 100644
--- a/patches/server/0284-Improve-exact-choice-recipe-ingredients.patch
+++ b/patches/server/0283-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/0285-Limit-Client-Sign-length-more.patch b/patches/server/0284-Limit-Client-Sign-length-more.patch
index 3d821a4879..3d821a4879 100644
--- a/patches/server/0285-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0284-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0286-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0285-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 17ab7a0e08..17ab7a0e08 100644
--- a/patches/server/0286-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0285-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0287-Entity-getEntitySpawnReason.patch b/patches/server/0286-Entity-getEntitySpawnReason.patch
index 023b0316cd..1a57fcb5d4 100644
--- a/patches/server/0287-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0286-Entity-getEntitySpawnReason.patch
@@ -22,10 +22,10 @@ index bf72cf288ade52ee8cc41ca978f368b3ad575951..798999be50d26be357ef3c6d5b9383ce
              });
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2879de5d5c6638d9b683e74da8dc3863738f2b65..893846b2b216ef67652285a59ba3c67bb2b4c78d 100644
+index 42dd9ab70c07e92258da70ad29b51c7780401a5d..2b524c41daa4fe1605a40c151a90de101d96e8af 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1215,6 +1215,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1209,6 +1209,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return true;
          }
          // Paper end - extra debug info
diff --git a/patches/server/0288-Fire-event-on-GS4-query.patch b/patches/server/0287-Fire-event-on-GS4-query.patch
index 6468ff12c1..6468ff12c1 100644
--- a/patches/server/0288-Fire-event-on-GS4-query.patch
+++ b/patches/server/0287-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0289-Add-PlayerPostRespawnEvent.patch b/patches/server/0288-Add-PlayerPostRespawnEvent.patch
index 0b64cfe5fe..0b64cfe5fe 100644
--- a/patches/server/0289-Add-PlayerPostRespawnEvent.patch
+++ b/patches/server/0288-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0290-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0289-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index f94771a112..f94771a112 100644
--- a/patches/server/0290-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0289-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0291-Server-Tick-Events.patch b/patches/server/0290-Server-Tick-Events.patch
index 384e60e5de..384e60e5de 100644
--- a/patches/server/0291-Server-Tick-Events.patch
+++ b/patches/server/0290-Server-Tick-Events.patch
diff --git a/patches/server/0292-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0291-PlayerDeathEvent-getItemsToKeep.patch
index b9fa9fdd39..b9fa9fdd39 100644
--- a/patches/server/0292-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0291-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0293-Optimize-Captured-BlockEntity-Lookup.patch b/patches/server/0292-Optimize-Captured-BlockEntity-Lookup.patch
index ca3803242c..ca3803242c 100644
--- a/patches/server/0293-Optimize-Captured-BlockEntity-Lookup.patch
+++ b/patches/server/0292-Optimize-Captured-BlockEntity-Lookup.patch
diff --git a/patches/server/0294-Add-Heightmap-API.patch b/patches/server/0293-Add-Heightmap-API.patch
index 6a2bacf567..6a2bacf567 100644
--- a/patches/server/0294-Add-Heightmap-API.patch
+++ b/patches/server/0293-Add-Heightmap-API.patch
diff --git a/patches/server/0295-Mob-Spawner-API-Enhancements.patch b/patches/server/0294-Mob-Spawner-API-Enhancements.patch
index cd16a9d0ca..cd16a9d0ca 100644
--- a/patches/server/0295-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0294-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0296-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0295-Fix-CB-call-to-changed-postToMainThread-method.patch
index b3bb4ebaec..b3bb4ebaec 100644
--- a/patches/server/0296-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0295-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0297-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0296-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 8e45f027aa..8e45f027aa 100644
--- a/patches/server/0297-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/server/0296-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0298-Implement-CraftBlockSoundGroup.patch b/patches/server/0297-Implement-CraftBlockSoundGroup.patch
index 9bf16806b3..9bf16806b3 100644
--- a/patches/server/0298-Implement-CraftBlockSoundGroup.patch
+++ b/patches/server/0297-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0299-Expose-the-internal-current-tick.patch b/patches/server/0298-Expose-the-internal-current-tick.patch
index b1d3de338b..b1d3de338b 100644
--- a/patches/server/0299-Expose-the-internal-current-tick.patch
+++ b/patches/server/0298-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0300-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0299-Show-blockstate-location-if-we-failed-to-read-it.patch
index 05aee9d84e..05aee9d84e 100644
--- a/patches/server/0300-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/server/0299-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0301-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0300-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index cb2e502f71..cb2e502f71 100644
--- a/patches/server/0301-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0300-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0302-Configurable-projectile-relative-velocity.patch b/patches/server/0301-Configurable-projectile-relative-velocity.patch
index c96f031ef6..c96f031ef6 100644
--- a/patches/server/0302-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0301-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0303-offset-item-frame-ticking.patch b/patches/server/0302-offset-item-frame-ticking.patch
index e5be0eb235..e5be0eb235 100644
--- a/patches/server/0303-offset-item-frame-ticking.patch
+++ b/patches/server/0302-offset-item-frame-ticking.patch
diff --git a/patches/server/0304-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0303-Prevent-consuming-the-wrong-itemstack.patch
index b3336ee24c..b3336ee24c 100644
--- a/patches/server/0304-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0303-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0305-Dont-send-unnecessary-sign-update.patch b/patches/server/0304-Dont-send-unnecessary-sign-update.patch
index afca8562db..afca8562db 100644
--- a/patches/server/0305-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0304-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0306-Add-option-to-disable-pillager-patrols.patch b/patches/server/0305-Add-option-to-disable-pillager-patrols.patch
index 3021a1f6c8..3021a1f6c8 100644
--- a/patches/server/0306-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/server/0305-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0307-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0306-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index 82277a287f..82277a287f 100644
--- a/patches/server/0307-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/server/0306-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0308-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0307-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 528cf153ea..528cf153ea 100644
--- a/patches/server/0308-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/server/0307-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0309-Duplicate-UUID-Resolve-Option.patch b/patches/server/0308-Duplicate-UUID-Resolve-Option.patch
index a8fd0cc85e..a8fd0cc85e 100644
--- a/patches/server/0309-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0308-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0310-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0309-PlayerDeathEvent-shouldDropExperience.patch
index 4a5a9b4d6c..4a5a9b4d6c 100644
--- a/patches/server/0310-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0309-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0311-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0310-Prevent-bees-loading-chunks-checking-hive-position.patch
index 9e8924d226..9e8924d226 100644
--- a/patches/server/0311-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0310-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0312-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0311-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 3b189be4e4..3b189be4e4 100644
--- a/patches/server/0312-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/server/0311-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0313-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0312-Optimise-EntityGetter-getPlayerByUUID.patch
index 631463b4c8..0428d89897 100644
--- a/patches/server/0313-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0312-Optimise-EntityGetter-getPlayerByUUID.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise EntityGetter#getPlayerByUUID
 Use the PlayerList map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 893846b2b216ef67652285a59ba3c67bb2b4c78d..9ce6c66213deaac1e57986de980176e58b222368 100644
+index 2b524c41daa4fe1605a40c151a90de101d96e8af..51644c24900600d95c3f6df073769b68be702b2d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -329,6 +329,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0314-Fix-items-not-falling-correctly.patch b/patches/server/0313-Fix-items-not-falling-correctly.patch
index a9746d7d4e..a9746d7d4e 100644
--- a/patches/server/0314-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0313-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0315-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0314-Optimize-call-to-getFluid-for-explosions.patch
index 311cde37d6..311cde37d6 100644
--- a/patches/server/0315-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0314-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0316-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0315-Guard-against-serializing-mismatching-chunk-coordina.patch
index 98e6fa59a3..98e6fa59a3 100644
--- a/patches/server/0316-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/0315-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0317-Alternative-item-despawn-rate.patch b/patches/server/0316-Alternative-item-despawn-rate.patch
index a3a719c954..a3a719c954 100644
--- a/patches/server/0317-Alternative-item-despawn-rate.patch
+++ b/patches/server/0316-Alternative-item-despawn-rate.patch
diff --git a/patches/server/0318-Tracking-Range-Improvements.patch b/patches/server/0317-Tracking-Range-Improvements.patch
index 0c63932883..0c63932883 100644
--- a/patches/server/0318-Tracking-Range-Improvements.patch
+++ b/patches/server/0317-Tracking-Range-Improvements.patch
diff --git a/patches/server/0319-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0318-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 19d4ba5fa9..19d4ba5fa9 100644
--- a/patches/server/0319-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0318-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0320-Improve-Block-breakNaturally-API.patch b/patches/server/0319-Improve-Block-breakNaturally-API.patch
index 59270e660a..59270e660a 100644
--- a/patches/server/0320-Improve-Block-breakNaturally-API.patch
+++ b/patches/server/0319-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0321-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0320-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index a96e5d4769..a96e5d4769 100644
--- a/patches/server/0321-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0320-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0322-Add-debug-for-sync-chunk-loads.patch b/patches/server/0321-Add-debug-for-sync-chunk-loads.patch
index a4a3835b0e..f96cf2c189 100644
--- a/patches/server/0322-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0321-Add-debug-for-sync-chunk-loads.patch
@@ -312,10 +312,10 @@ index d41c0e4474d057c7b13427bfd896c50f24232615..2d9d4d06b75873f888ef4d8f5779a527
              chunkproviderserver_b.managedBlock(completablefuture::isDone);
                  this.level.timings.syncChunkLoad.stopTiming(); // Paper
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9ce6c66213deaac1e57986de980176e58b222368..8bc20746d729d5be06be30b23bb196bdc6fcd628 100644
+index 51644c24900600d95c3f6df073769b68be702b2d..1170a0031368ede2e45d24720506f6519cbd55da 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -427,6 +427,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -421,6 +421,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
      }
  
diff --git a/patches/server/0323-Improve-java-version-check.patch b/patches/server/0322-Improve-java-version-check.patch
index b923a87862..b923a87862 100644
--- a/patches/server/0323-Improve-java-version-check.patch
+++ b/patches/server/0322-Improve-java-version-check.patch
diff --git a/patches/server/0324-Add-ThrownEggHatchEvent.patch b/patches/server/0323-Add-ThrownEggHatchEvent.patch
index acec0a7669..acec0a7669 100644
--- a/patches/server/0324-Add-ThrownEggHatchEvent.patch
+++ b/patches/server/0323-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0325-Entity-Jump-API.patch b/patches/server/0324-Entity-Jump-API.patch
index 6debbbab6a..6debbbab6a 100644
--- a/patches/server/0325-Entity-Jump-API.patch
+++ b/patches/server/0324-Entity-Jump-API.patch
diff --git a/patches/server/0326-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0325-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 21df90e99e..21df90e99e 100644
--- a/patches/server/0326-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0325-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0327-Make-the-GUI-graph-fancier.patch b/patches/server/0326-Make-the-GUI-graph-fancier.patch
index 9e79ca7b91..9e79ca7b91 100644
--- a/patches/server/0327-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0326-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0328-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0327-add-hand-to-BlockMultiPlaceEvent.patch
index 17fa73f9af..17fa73f9af 100644
--- a/patches/server/0328-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0327-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0329-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0328-Validate-tripwire-hook-placement-before-update.patch
index bc1125b169..bc1125b169 100644
--- a/patches/server/0329-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/server/0328-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0330-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0329-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index e09ab64290..e09ab64290 100644
--- a/patches/server/0330-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/server/0329-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0331-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0330-Configurable-chance-of-villager-zombie-infection.patch
index ecb3c72bd4..ecb3c72bd4 100644
--- a/patches/server/0331-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0330-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0332-Optimise-Chunk-getFluid.patch b/patches/server/0331-Optimise-Chunk-getFluid.patch
index 211f2b345f..211f2b345f 100644
--- a/patches/server/0332-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0331-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0333-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0332-Set-spigots-verbose-world-setting-to-false-by-def.patch
index f00c33db91..f00c33db91 100644
--- a/patches/server/0333-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0332-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0334-Add-tick-times-API-and-mspt-command.patch b/patches/server/0333-Add-tick-times-API-and-mspt-command.patch
index b596499602..b596499602 100644
--- a/patches/server/0334-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0333-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0335-Expose-MinecraftServer-isRunning.patch b/patches/server/0334-Expose-MinecraftServer-isRunning.patch
index 5f6a2398f3..5f6a2398f3 100644
--- a/patches/server/0335-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0334-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0336-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0335-Add-Raw-Byte-ItemStack-Serialization.patch
index 711b66b07b..711b66b07b 100644
--- a/patches/server/0336-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0335-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0337-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0336-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 1e050126e8..1e050126e8 100644
--- a/patches/server/0337-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0336-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0338-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0337-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index d5833fa44c..d5833fa44c 100644
--- a/patches/server/0338-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0337-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0339-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0338-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index 80606e638c..80606e638c 100644
--- a/patches/server/0339-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0338-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0340-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0339-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index e2cba50e34..8403fc132e 100644
--- a/patches/server/0340-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0339-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -25,10 +25,10 @@ index f13f8119cf43711b96b4dc5834fceaa0282d632d..66936834a80ef6b645ab44f3439defcb
              EntityType<?> entitytypes = entity.getType();
              int i = entitytypes.clientTrackingRange() * 16;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8bc20746d729d5be06be30b23bb196bdc6fcd628..a17f6ee94a686390b8dd3bb676f11986ec0dc8ac 100644
+index 1170a0031368ede2e45d24720506f6519cbd55da..df623f10def1ecf071971119f449a773063b3ce1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2187,7 +2187,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2181,7 +2181,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          public void onTrackingStart(Entity entity) {
              org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot
@@ -37,7 +37,7 @@ index 8bc20746d729d5be06be30b23bb196bdc6fcd628..a17f6ee94a686390b8dd3bb676f11986
              if (entity instanceof ServerPlayer entityplayer) {
                  ServerLevel.this.players.add(entityplayer);
                  ServerLevel.this.updateSleepingPlayerList();
-@@ -2217,6 +2217,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2211,6 +2211,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
              entity.inWorld = true; // CraftBukkit - Mark entity as in world
              entity.valid = true; // CraftBukkit
diff --git a/patches/server/0341-Don-t-tick-dead-players.patch b/patches/server/0340-Don-t-tick-dead-players.patch
index 742fc27e78..742fc27e78 100644
--- a/patches/server/0341-Don-t-tick-dead-players.patch
+++ b/patches/server/0340-Don-t-tick-dead-players.patch
diff --git a/patches/server/0342-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0341-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 91235fa7aa..91235fa7aa 100644
--- a/patches/server/0342-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0341-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0343-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0342-Don-t-move-existing-players-to-world-spawn.patch
index d81ed62207..d81ed62207 100644
--- a/patches/server/0343-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0342-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0344-Optimize-Pathfinding.patch b/patches/server/0343-Optimize-Pathfinding.patch
index 281988ce37..281988ce37 100644
--- a/patches/server/0344-Optimize-Pathfinding.patch
+++ b/patches/server/0343-Optimize-Pathfinding.patch
diff --git a/patches/server/0345-Reduce-Either-Optional-allocation.patch b/patches/server/0344-Reduce-Either-Optional-allocation.patch
index d42e0ac184..d42e0ac184 100644
--- a/patches/server/0345-Reduce-Either-Optional-allocation.patch
+++ b/patches/server/0344-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0346-Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0345-Reduce-memory-footprint-of-CompoundTag.patch
index 55111ab6e8..55111ab6e8 100644
--- a/patches/server/0346-Reduce-memory-footprint-of-CompoundTag.patch
+++ b/patches/server/0345-Reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/server/0347-Prevent-opening-inventories-when-frozen.patch b/patches/server/0346-Prevent-opening-inventories-when-frozen.patch
index 3cd9a7bd13..3cd9a7bd13 100644
--- a/patches/server/0347-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0346-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0348-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0347-Don-t-run-entity-collision-code-if-not-needed.patch
index 9b172946c6..9b172946c6 100644
--- a/patches/server/0348-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0347-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0349-Implement-Player-Client-Options-API.patch b/patches/server/0348-Implement-Player-Client-Options-API.patch
index cee4051d9c..cee4051d9c 100644
--- a/patches/server/0349-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0348-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0350-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0349-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 0859eed952..0859eed952 100644
--- a/patches/server/0350-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/server/0349-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0351-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0350-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
index 8125140964..8125140964 100644
--- a/patches/server/0351-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
+++ b/patches/server/0350-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
diff --git a/patches/server/0352-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0351-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 3cf5caf32a..3cf5caf32a 100644
--- a/patches/server/0352-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0351-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0353-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0352-Add-PlayerAttackEntityCooldownResetEvent.patch
index 617252a191..617252a191 100644
--- a/patches/server/0353-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0352-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0354-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0353-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 8a262c1f35..8a262c1f35 100644
--- a/patches/server/0354-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0353-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0355-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0354-Add-phantom-creative-and-insomniac-controls.patch
index 8101fc3b6a..8101fc3b6a 100644
--- a/patches/server/0355-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0354-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0356-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0355-Fix-item-duplication-and-teleport-issues.patch
index e8784b4e33..e8784b4e33 100644
--- a/patches/server/0356-Fix-item-duplication-and-teleport-issues.patch
+++ b/patches/server/0355-Fix-item-duplication-and-teleport-issues.patch
diff --git a/patches/server/0357-Villager-Restocks-API.patch b/patches/server/0356-Villager-Restocks-API.patch
index 75b7928672..75b7928672 100644
--- a/patches/server/0357-Villager-Restocks-API.patch
+++ b/patches/server/0356-Villager-Restocks-API.patch
diff --git a/patches/server/0358-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0357-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 64608fdfdd..64608fdfdd 100644
--- a/patches/server/0358-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0357-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0359-Expose-game-version.patch b/patches/server/0358-Expose-game-version.patch
index bd1a504019..bd1a504019 100644
--- a/patches/server/0359-Expose-game-version.patch
+++ b/patches/server/0358-Expose-game-version.patch
diff --git a/patches/server/0360-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0359-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index a5ad213696..a5ad213696 100644
--- a/patches/server/0360-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0359-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0361-misc-debugging-dumps.patch b/patches/server/0360-misc-debugging-dumps.patch
index 9e356eecb4..9e356eecb4 100644
--- a/patches/server/0361-misc-debugging-dumps.patch
+++ b/patches/server/0360-misc-debugging-dumps.patch
diff --git a/patches/server/0362-Prevent-teleporting-dead-entities.patch b/patches/server/0361-Prevent-teleporting-dead-entities.patch
index fc30bb64c6..fc30bb64c6 100644
--- a/patches/server/0362-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0361-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0363-Implement-Mob-Goal-API.patch b/patches/server/0362-Implement-Mob-Goal-API.patch
index 1dee6e1616..1dee6e1616 100644
--- a/patches/server/0363-Implement-Mob-Goal-API.patch
+++ b/patches/server/0362-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0364-Add-villager-reputation-API.patch b/patches/server/0363-Add-villager-reputation-API.patch
index 5043e90bdc..5043e90bdc 100644
--- a/patches/server/0364-Add-villager-reputation-API.patch
+++ b/patches/server/0363-Add-villager-reputation-API.patch
diff --git a/patches/server/0365-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0364-Option-for-maximum-exp-value-when-merging-orbs.patch
index 6b0e5e5279..6b0e5e5279 100644
--- a/patches/server/0365-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0364-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0366-ExperienceOrbMergeEvent.patch b/patches/server/0365-ExperienceOrbMergeEvent.patch
index 2d56cb06bf..2d56cb06bf 100644
--- a/patches/server/0366-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0365-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0367-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0366-Fix-PotionEffect-ignores-icon-flag.patch
index a401f6eca3..a401f6eca3 100644
--- a/patches/server/0367-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0366-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0368-Potential-bed-API.patch b/patches/server/0367-Potential-bed-API.patch
index 34470bcfc1..34470bcfc1 100644
--- a/patches/server/0368-Potential-bed-API.patch
+++ b/patches/server/0367-Potential-bed-API.patch
diff --git a/patches/server/0369-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0368-Wait-for-Async-Tasks-during-shutdown.patch
index 6115960afb..6115960afb 100644
--- a/patches/server/0369-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0368-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0370-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0369-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index a65b9bbbbc..a65b9bbbbc 100644
--- a/patches/server/0370-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0369-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0371-Ensure-safe-gateway-teleport.patch b/patches/server/0370-Ensure-safe-gateway-teleport.patch
index c1867dbc2c..c1867dbc2c 100644
--- a/patches/server/0371-Ensure-safe-gateway-teleport.patch
+++ b/patches/server/0370-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0372-Add-option-for-console-having-all-permissions.patch b/patches/server/0371-Add-option-for-console-having-all-permissions.patch
index ace91d22dd..ace91d22dd 100644
--- a/patches/server/0372-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0371-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0373-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0372-Fix-villager-trading-demand-MC-163962.patch
index bd7b6c4273..bd7b6c4273 100644
--- a/patches/server/0373-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/server/0372-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0374-Maps-shouldn-t-load-chunks.patch b/patches/server/0373-Maps-shouldn-t-load-chunks.patch
index 3bc3299f81..3bc3299f81 100644
--- a/patches/server/0374-Maps-shouldn-t-load-chunks.patch
+++ b/patches/server/0373-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0375-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0374-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 27672e59d7..27672e59d7 100644
--- a/patches/server/0375-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/server/0374-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0376-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0375-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 4175cae3b0..4175cae3b0 100644
--- a/patches/server/0376-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/server/0375-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0377-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0376-Fix-piston-physics-inconsistency-MC-188840.patch
index 44f85960c4..44f85960c4 100644
--- a/patches/server/0377-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0376-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0378-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0377-Fix-missing-chunks-due-to-integer-overflow.patch
index e7af97469b..e7af97469b 100644
--- a/patches/server/0378-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0377-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0379-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0378-Prevent-position-desync-causing-tp-exploit.patch
index cc71ab24de..cc71ab24de 100644
--- a/patches/server/0379-Prevent-position-desync-causing-tp-exploit.patch
+++ b/patches/server/0378-Prevent-position-desync-causing-tp-exploit.patch
diff --git a/patches/server/0380-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0379-Inventory-getHolder-method-without-block-snapshot.patch
index b30d42bf56..b30d42bf56 100644
--- a/patches/server/0380-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0379-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0381-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0380-Add-PlayerRecipeBookClickEvent.patch
index 7f2ad0e0dc..7f2ad0e0dc 100644
--- a/patches/server/0381-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0380-Add-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0382-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0381-Hide-sync-chunk-writes-behind-flag.patch
index 030a5a1365..030a5a1365 100644
--- a/patches/server/0382-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0381-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0383-Add-permission-for-command-blocks.patch b/patches/server/0382-Add-permission-for-command-blocks.patch
index 56b93f4de8..56b93f4de8 100644
--- a/patches/server/0383-Add-permission-for-command-blocks.patch
+++ b/patches/server/0382-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0384-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0383-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index db4f96e468..db4f96e468 100644
--- a/patches/server/0384-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/server/0383-Ensure-Entity-position-and-AABB-are-never-invalid.patch
diff --git a/patches/server/0385-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0384-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index f9de6ceab3..f9de6ceab3 100644
--- a/patches/server/0385-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0384-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0386-Paper-dumpitem-command.patch b/patches/server/0385-Paper-dumpitem-command.patch
index fc0d3fd7a8..fc0d3fd7a8 100644
--- a/patches/server/0386-Paper-dumpitem-command.patch
+++ b/patches/server/0385-Paper-dumpitem-command.patch
diff --git a/patches/server/0387-Improve-Legacy-Component-serialization-size.patch b/patches/server/0386-Improve-Legacy-Component-serialization-size.patch
index 2fc5b1860f..2fc5b1860f 100644
--- a/patches/server/0387-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0386-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0388-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0387-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index deaa1e2a0d..deaa1e2a0d 100644
--- a/patches/server/0388-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0387-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0389-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0388-Add-BlockStateMeta-clearBlockState.patch
index 01340d9d9b..01340d9d9b 100644
--- a/patches/server/0389-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/server/0388-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/server/0390-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0389-Convert-legacy-attributes-in-Item-Meta.patch
index b412fb6983..b412fb6983 100644
--- a/patches/server/0390-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0389-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0391-Do-not-accept-invalid-client-settings.patch b/patches/server/0390-Do-not-accept-invalid-client-settings.patch
index ad0a7a55ea..ad0a7a55ea 100644
--- a/patches/server/0391-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0390-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0392-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0391-Improve-fix-EntityTargetLivingEntityEvent.patch
index 513faeb27d..513faeb27d 100644
--- a/patches/server/0392-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/server/0391-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0393-Add-entity-liquid-API.patch b/patches/server/0392-Add-entity-liquid-API.patch
index ab34d7ab7a..ab34d7ab7a 100644
--- a/patches/server/0393-Add-entity-liquid-API.patch
+++ b/patches/server/0392-Add-entity-liquid-API.patch
diff --git a/patches/server/0394-Add-PrepareResultEvent.patch b/patches/server/0393-Add-PrepareResultEvent.patch
index 647dfc2399..647dfc2399 100644
--- a/patches/server/0394-Add-PrepareResultEvent.patch
+++ b/patches/server/0393-Add-PrepareResultEvent.patch
diff --git a/patches/server/0395-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0394-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index f671f9aab8..f671f9aab8 100644
--- a/patches/server/0395-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0394-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0396-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0395-Fix-arrows-never-despawning-MC-125757.patch
index a08ff237f0..a08ff237f0 100644
--- a/patches/server/0396-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0395-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0397-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0396-Thread-Safe-Vanilla-Command-permission-checking.patch
index a210e43dce..a210e43dce 100644
--- a/patches/server/0397-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0396-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0398-Fix-SPIGOT-5989.patch b/patches/server/0397-Fix-SPIGOT-5989.patch
index 5b41e0742c..5b41e0742c 100644
--- a/patches/server/0398-Fix-SPIGOT-5989.patch
+++ b/patches/server/0397-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0399-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0398-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index fe347fabc4..fe347fabc4 100644
--- a/patches/server/0399-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0398-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0400-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0399-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index df26348fac..df26348fac 100644
--- a/patches/server/0400-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0399-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0401-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0400-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 817e925f2f..817e925f2f 100644
--- a/patches/server/0401-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0400-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0402-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0401-Optimize-NetworkManager-Exception-Handling.patch
index 8626e3b900..8626e3b900 100644
--- a/patches/server/0402-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0401-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0403-Fix-some-rails-connecting-improperly.patch b/patches/server/0402-Fix-some-rails-connecting-improperly.patch
index 4f5cd86538..4f5cd86538 100644
--- a/patches/server/0403-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0402-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0404-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0403-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 75cd32bb83..75cd32bb83 100644
--- a/patches/server/0404-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0403-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0405-Brand-support.patch b/patches/server/0404-Brand-support.patch
index 2622e64ecf..2622e64ecf 100644
--- a/patches/server/0405-Brand-support.patch
+++ b/patches/server/0404-Brand-support.patch
diff --git a/patches/server/0406-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0405-Add-playPickupItemAnimation-to-LivingEntity.patch
index 00d87adf6c..00d87adf6c 100644
--- a/patches/server/0406-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0405-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0407-Don-t-require-FACING-data.patch b/patches/server/0406-Don-t-require-FACING-data.patch
index 98d0ef923f..98d0ef923f 100644
--- a/patches/server/0407-Don-t-require-FACING-data.patch
+++ b/patches/server/0406-Don-t-require-FACING-data.patch
diff --git a/patches/server/0408-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0407-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 02fed28440..47d790e9ed 100644
--- a/patches/server/0408-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0407-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a17f6ee94a686390b8dd3bb676f11986ec0dc8ac..4efb57b2b252a2bed50685162cc96575f63a9d1d 100644
+index df623f10def1ecf071971119f449a773063b3ce1..f079192644e3b366dc58c4a77c10cbbe65c25eca 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1674,7 +1674,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1668,7 +1668,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
          float f1 = this.levelData.getSpawnAngle();
  
          if (!blockposition1.equals(pos) || f1 != angle) {
diff --git a/patches/server/0409-Add-moon-phase-API.patch b/patches/server/0408-Add-moon-phase-API.patch
index bcc15c76d0..bcc15c76d0 100644
--- a/patches/server/0409-Add-moon-phase-API.patch
+++ b/patches/server/0408-Add-moon-phase-API.patch
diff --git a/patches/server/0410-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0409-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 4c1742107a..4c1742107a 100644
--- a/patches/server/0410-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0409-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0411-Prevent-headless-pistons-from-being-created.patch b/patches/server/0410-Prevent-headless-pistons-from-being-created.patch
index 4235450c0f..4235450c0f 100644
--- a/patches/server/0411-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0410-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0412-Add-BellRingEvent.patch b/patches/server/0411-Add-BellRingEvent.patch
index 114bbe332a..114bbe332a 100644
--- a/patches/server/0412-Add-BellRingEvent.patch
+++ b/patches/server/0411-Add-BellRingEvent.patch
diff --git a/patches/server/0413-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0412-Add-zombie-targets-turtle-egg-config.patch
index 553e712827..553e712827 100644
--- a/patches/server/0413-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0412-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0414-Buffer-joins-to-world.patch b/patches/server/0413-Buffer-joins-to-world.patch
index 26675cacaf..26675cacaf 100644
--- a/patches/server/0414-Buffer-joins-to-world.patch
+++ b/patches/server/0413-Buffer-joins-to-world.patch
diff --git a/patches/server/0415-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0414-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 0f9bba490b..0f9bba490b 100644
--- a/patches/server/0415-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0414-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0416-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0415-PortalCreateEvent-needs-to-know-its-entity.patch
index 4f717a77b9..4f717a77b9 100644
--- a/patches/server/0416-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0415-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0417-Add-more-Evoker-API.patch b/patches/server/0416-Add-more-Evoker-API.patch
index f44eceff55..f44eceff55 100644
--- a/patches/server/0417-Add-more-Evoker-API.patch
+++ b/patches/server/0416-Add-more-Evoker-API.patch
diff --git a/patches/server/0418-Add-methods-to-get-translation-keys.patch b/patches/server/0417-Add-methods-to-get-translation-keys.patch
index e61dce6cd3..e61dce6cd3 100644
--- a/patches/server/0418-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0417-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0419-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0418-Create-HoverEvent-from-ItemStack-Entity.patch
index 4117c384be..4117c384be 100644
--- a/patches/server/0419-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0418-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0420-Cache-block-data-strings.patch b/patches/server/0419-Cache-block-data-strings.patch
index ead288ff03..ead288ff03 100644
--- a/patches/server/0420-Cache-block-data-strings.patch
+++ b/patches/server/0419-Cache-block-data-strings.patch
diff --git a/patches/server/0421-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0420-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index e275eb17f8..e275eb17f8 100644
--- a/patches/server/0421-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0420-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0422-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0421-Add-additional-open-container-api-to-HumanEntity.patch
index 47aa453acf..47aa453acf 100644
--- a/patches/server/0422-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0421-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0423-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0422-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 572dc995c0..572dc995c0 100644
--- a/patches/server/0423-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0422-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0424-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0423-Extend-block-drop-capture-to-capture-all-items-added.patch
index 7d7f14f1ae..bf2c2519f2 100644
--- a/patches/server/0424-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0423-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4efb57b2b252a2bed50685162cc96575f63a9d1d..2506673e2e778b55f1cd9e2cd987d116aed450fb 100644
+index f079192644e3b366dc58c4a77c10cbbe65c25eca..17985c75deaa8d317ea4019f73eafe118d347f41 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1236,6 +1236,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1230,6 +1230,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
          } else {
diff --git a/patches/server/0425-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0424-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index a704a14645..a704a14645 100644
--- a/patches/server/0425-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0424-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0426-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0425-Lazily-track-plugin-scoreboards-by-default.patch
index 28ae9df043..28ae9df043 100644
--- a/patches/server/0426-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0425-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0427-Entity-isTicking.patch b/patches/server/0426-Entity-isTicking.patch
index 5add9ab4cb..5add9ab4cb 100644
--- a/patches/server/0427-Entity-isTicking.patch
+++ b/patches/server/0426-Entity-isTicking.patch
diff --git a/patches/server/0428-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0427-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index eab9b96e28..eab9b96e28 100644
--- a/patches/server/0428-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0427-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0429-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0428-Fix-Concurrency-issue-in-ShufflingList.patch
index f04a40e1ac..f04a40e1ac 100644
--- a/patches/server/0429-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0428-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0430-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0429-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index f727c2200f..f727c2200f 100644
--- a/patches/server/0430-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0429-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0431-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0430-Fix-for-large-move-vectors-crashing-server.patch
index a80c955bab..a80c955bab 100644
--- a/patches/server/0431-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0430-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0432-Optimise-getType-calls.patch b/patches/server/0431-Optimise-getType-calls.patch
index 988e1865ce..988e1865ce 100644
--- a/patches/server/0432-Optimise-getType-calls.patch
+++ b/patches/server/0431-Optimise-getType-calls.patch
diff --git a/patches/server/0433-Villager-resetOffers.patch b/patches/server/0432-Villager-resetOffers.patch
index e8e71e6b5c..e8e71e6b5c 100644
--- a/patches/server/0433-Villager-resetOffers.patch
+++ b/patches/server/0432-Villager-resetOffers.patch
diff --git a/patches/server/0434-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0433-Retain-block-place-order-when-capturing-blockstates.patch
index 9de684873f..9de684873f 100644
--- a/patches/server/0434-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0433-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0435-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0434-Fix-item-locations-dropped-from-campfires.patch
index 65034de65e..65034de65e 100644
--- a/patches/server/0435-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0434-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0436-Fix-bell-block-entity-memory-leak.patch b/patches/server/0435-Fix-bell-block-entity-memory-leak.patch
index 5343b073cd..5343b073cd 100644
--- a/patches/server/0436-Fix-bell-block-entity-memory-leak.patch
+++ b/patches/server/0435-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0437-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0436-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 87d59f556c..87d59f556c 100644
--- a/patches/server/0437-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0436-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0438-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0437-Add-getOfflinePlayerIfCached-String.patch
index 8965f3368d..8965f3368d 100644
--- a/patches/server/0438-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0437-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0439-Add-ignore-discounts-API.patch b/patches/server/0438-Add-ignore-discounts-API.patch
index 2f9c40bb4c..2f9c40bb4c 100644
--- a/patches/server/0439-Add-ignore-discounts-API.patch
+++ b/patches/server/0438-Add-ignore-discounts-API.patch
diff --git a/patches/server/0440-Toggle-for-removing-existing-dragon.patch b/patches/server/0439-Toggle-for-removing-existing-dragon.patch
index 1bfa511969..1bfa511969 100644
--- a/patches/server/0440-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0439-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0441-Fix-client-lag-on-advancement-loading.patch b/patches/server/0440-Fix-client-lag-on-advancement-loading.patch
index aca8035481..aca8035481 100644
--- a/patches/server/0441-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0440-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0442-Item-no-age-no-player-pickup.patch b/patches/server/0441-Item-no-age-no-player-pickup.patch
index 1fffbaf558..1fffbaf558 100644
--- a/patches/server/0442-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0441-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0443-Beacon-API-custom-effect-ranges.patch b/patches/server/0442-Beacon-API-custom-effect-ranges.patch
index 5ab714aeef..5ab714aeef 100644
--- a/patches/server/0443-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0442-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0444-Add-API-for-quit-reason.patch b/patches/server/0443-Add-API-for-quit-reason.patch
index 7b73031464..7b73031464 100644
--- a/patches/server/0444-Add-API-for-quit-reason.patch
+++ b/patches/server/0443-Add-API-for-quit-reason.patch
diff --git a/patches/server/0445-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0444-Add-Wandering-Trader-spawn-rate-config-options.patch
index 98525387d7..98525387d7 100644
--- a/patches/server/0445-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0444-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0446-Expose-world-spawn-angle.patch b/patches/server/0445-Expose-world-spawn-angle.patch
index 8a6e41905d..8a6e41905d 100644
--- a/patches/server/0446-Expose-world-spawn-angle.patch
+++ b/patches/server/0445-Expose-world-spawn-angle.patch
diff --git a/patches/server/0447-Add-Destroy-Speed-API.patch b/patches/server/0446-Add-Destroy-Speed-API.patch
index 3d0806c67f..3d0806c67f 100644
--- a/patches/server/0447-Add-Destroy-Speed-API.patch
+++ b/patches/server/0446-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0448-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0447-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index b837b1cf1f..b837b1cf1f 100644
--- a/patches/server/0448-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0447-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0449-Add-LivingEntity-clearActiveItem.patch b/patches/server/0448-Add-LivingEntity-clearActiveItem.patch
index 50382e523c..50382e523c 100644
--- a/patches/server/0449-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0448-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0450-Add-PlayerItemCooldownEvent.patch b/patches/server/0449-Add-PlayerItemCooldownEvent.patch
index 4b90903dd2..4b90903dd2 100644
--- a/patches/server/0450-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0449-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0451-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0450-Significantly-improve-performance-of-the-end-generat.patch
index ed3ee50bc9..ed3ee50bc9 100644
--- a/patches/server/0451-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0450-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0452-More-lightning-API.patch b/patches/server/0451-More-lightning-API.patch
index 967871902a..967871902a 100644
--- a/patches/server/0452-More-lightning-API.patch
+++ b/patches/server/0451-More-lightning-API.patch
diff --git a/patches/server/0453-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch
index 0640edf4f3..0640edf4f3 100644
--- a/patches/server/0453-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0454-Add-missing-default-perms-for-commands.patch b/patches/server/0453-Add-missing-default-perms-for-commands.patch
index d49628ee32..d49628ee32 100644
--- a/patches/server/0454-Add-missing-default-perms-for-commands.patch
+++ b/patches/server/0453-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0455-Add-PlayerShearBlockEvent.patch b/patches/server/0454-Add-PlayerShearBlockEvent.patch
index e212c2217b..e212c2217b 100644
--- a/patches/server/0455-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0454-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0456-Limit-recipe-packets.patch b/patches/server/0455-Limit-recipe-packets.patch
index 31d5f14eec..31d5f14eec 100644
--- a/patches/server/0456-Limit-recipe-packets.patch
+++ b/patches/server/0455-Limit-recipe-packets.patch
diff --git a/patches/server/0457-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0456-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0457-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0456-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0458-Player-Chunk-Load-Unload-Events.patch b/patches/server/0457-Player-Chunk-Load-Unload-Events.patch
index bd58a9a7ec..bd58a9a7ec 100644
--- a/patches/server/0458-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0457-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0459-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0458-Optimize-Dynamic-get-Missing-Keys.patch
index e8bbac8b76..e8bbac8b76 100644
--- a/patches/server/0459-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0458-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0460-Expose-LivingEntity-hurt-direction.patch b/patches/server/0459-Expose-LivingEntity-hurt-direction.patch
index a2ec7481d3..a2ec7481d3 100644
--- a/patches/server/0460-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0459-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0461-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0460-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index ca3ce280b4..ca3ce280b4 100644
--- a/patches/server/0461-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0460-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0462-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0461-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
index 762023bb09..762023bb09 100644
--- a/patches/server/0462-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
+++ b/patches/server/0461-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0463-Add-TargetHitEvent.patch b/patches/server/0462-Add-TargetHitEvent.patch
index 816c525fd2..816c525fd2 100644
--- a/patches/server/0463-Add-TargetHitEvent.patch
+++ b/patches/server/0462-Add-TargetHitEvent.patch
diff --git a/patches/server/0464-MC-4-Fix-item-position-desync.patch b/patches/server/0463-MC-4-Fix-item-position-desync.patch
index 56d177e95e..56d177e95e 100644
--- a/patches/server/0464-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0463-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0465-Additional-Block-Material-API.patch b/patches/server/0464-Additional-Block-Material-API.patch
index 81728edf48..81728edf48 100644
--- a/patches/server/0465-Additional-Block-Material-API.patch
+++ b/patches/server/0464-Additional-Block-Material-API.patch
diff --git a/patches/server/0466-Fix-harming-potion-dupe.patch b/patches/server/0465-Fix-harming-potion-dupe.patch
index 8fdd027d4f..8fdd027d4f 100644
--- a/patches/server/0466-Fix-harming-potion-dupe.patch
+++ b/patches/server/0465-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0467-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0466-API-to-get-Material-from-Boats-and-Minecarts.patch
index 9bcb17ad14..9bcb17ad14 100644
--- a/patches/server/0467-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/server/0466-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0468-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0467-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index da8441444c..da8441444c 100644
--- a/patches/server/0468-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0467-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0469-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0468-Fix-Not-a-string-Map-Conversion-spam.patch
index 00f5d0e877..00f5d0e877 100644
--- a/patches/server/0469-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0468-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0470-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0469-Add-PlayerFlowerPotManipulateEvent.patch
index 8b61833059..8b61833059 100644
--- a/patches/server/0470-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0469-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0471-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0470-Fix-interact-event-not-being-called-sometimes.patch
index 61518602f2..61518602f2 100644
--- a/patches/server/0471-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0470-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0472-Zombie-API-breaking-doors.patch b/patches/server/0471-Zombie-API-breaking-doors.patch
index 50bb6965cf..50bb6965cf 100644
--- a/patches/server/0472-Zombie-API-breaking-doors.patch
+++ b/patches/server/0471-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0473-Fix-nerfed-slime-when-splitting.patch b/patches/server/0472-Fix-nerfed-slime-when-splitting.patch
index 2ebdf09288..2ebdf09288 100644
--- a/patches/server/0473-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0472-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0474-Add-EntityLoadCrossbowEvent.patch b/patches/server/0473-Add-EntityLoadCrossbowEvent.patch
index 074e763090..074e763090 100644
--- a/patches/server/0474-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0473-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0475-Add-WorldGameRuleChangeEvent.patch b/patches/server/0474-Add-WorldGameRuleChangeEvent.patch
index 547e9cb24d..547e9cb24d 100644
--- a/patches/server/0475-Add-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0474-Add-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0476-Add-ServerResourcesReloadedEvent.patch b/patches/server/0475-Add-ServerResourcesReloadedEvent.patch
index 05289f3429..05289f3429 100644
--- a/patches/server/0476-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0475-Add-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0477-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0476-Add-world-settings-for-mobs-picking-up-loot.patch
index d75813f3ee..d75813f3ee 100644
--- a/patches/server/0477-Add-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0476-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0478-Add-BlockFailedDispenseEvent.patch b/patches/server/0477-Add-BlockFailedDispenseEvent.patch
index df51c962ab..df51c962ab 100644
--- a/patches/server/0478-Add-BlockFailedDispenseEvent.patch
+++ b/patches/server/0477-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0479-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0478-Add-PlayerLecternPageChangeEvent.patch
index 2e62d2becf..2e62d2becf 100644
--- a/patches/server/0479-Add-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0478-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0480-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0479-Add-PlayerLoomPatternSelectEvent.patch
index 4d74c20681..4d74c20681 100644
--- a/patches/server/0480-Add-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0479-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0481-Configurable-door-breaking-difficulty.patch b/patches/server/0480-Configurable-door-breaking-difficulty.patch
index 9fdaf01170..9fdaf01170 100644
--- a/patches/server/0481-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0480-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0482-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0481-Empty-commands-shall-not-be-dispatched.patch
index 947eb79c2e..947eb79c2e 100644
--- a/patches/server/0482-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0481-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0483-Remove-stale-POIs.patch b/patches/server/0482-Remove-stale-POIs.patch
index 4223edeb9d..fece7e3371 100644
--- a/patches/server/0483-Remove-stale-POIs.patch
+++ b/patches/server/0482-Remove-stale-POIs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove stale POIs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2506673e2e778b55f1cd9e2cd987d116aed450fb..39f9a18ba04f265eb10e154042a90fd56adb4f0d 100644
+index 17985c75deaa8d317ea4019f73eafe118d347f41..a9a39c99874001f1024f71bfc97130e8c9a507e7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1749,6 +1749,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1743,6 +1743,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
              });
              optional1.ifPresent((holder) -> {
                  this.getServer().execute(() -> {
diff --git a/patches/server/0484-Fix-villager-boat-exploit.patch b/patches/server/0483-Fix-villager-boat-exploit.patch
index 91f979915f..91f979915f 100644
--- a/patches/server/0484-Fix-villager-boat-exploit.patch
+++ b/patches/server/0483-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0485-Add-sendOpLevel-API.patch b/patches/server/0484-Add-sendOpLevel-API.patch
index fd90e10a99..fd90e10a99 100644
--- a/patches/server/0485-Add-sendOpLevel-API.patch
+++ b/patches/server/0484-Add-sendOpLevel-API.patch
diff --git a/patches/server/0486-TODO-Registry-Modification-API.patch b/patches/server/0485-TODO-Registry-Modification-API.patch
index d624aad69b..d624aad69b 100644
--- a/patches/server/0486-TODO-Registry-Modification-API.patch
+++ b/patches/server/0485-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0487-Add-StructuresLocateEvent.patch b/patches/server/0486-Add-StructuresLocateEvent.patch
index 4e44861dd1..4e44861dd1 100644
--- a/patches/server/0487-Add-StructuresLocateEvent.patch
+++ b/patches/server/0486-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0488-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0487-Collision-option-for-requiring-a-player-participant.patch
index 8d8ebfc1f4..8d8ebfc1f4 100644
--- a/patches/server/0488-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0487-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0489-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0488-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index bb6de57d99..bb6de57d99 100644
--- a/patches/server/0489-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0488-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0490-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0489-Return-chat-component-with-empty-text-instead-of-thr.patch
index 4dea2ddeed..4dea2ddeed 100644
--- a/patches/server/0490-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0489-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0491-Make-schedule-command-per-world.patch b/patches/server/0490-Make-schedule-command-per-world.patch
index 2d8f63ad1e..2d8f63ad1e 100644
--- a/patches/server/0491-Make-schedule-command-per-world.patch
+++ b/patches/server/0490-Make-schedule-command-per-world.patch
diff --git a/patches/server/0492-Configurable-max-leash-distance.patch b/patches/server/0491-Configurable-max-leash-distance.patch
index e228b633f0..e228b633f0 100644
--- a/patches/server/0492-Configurable-max-leash-distance.patch
+++ b/patches/server/0491-Configurable-max-leash-distance.patch
diff --git a/patches/server/0493-Add-BlockPreDispenseEvent.patch b/patches/server/0492-Add-BlockPreDispenseEvent.patch
index 2f1b97fbfa..2f1b97fbfa 100644
--- a/patches/server/0493-Add-BlockPreDispenseEvent.patch
+++ b/patches/server/0492-Add-BlockPreDispenseEvent.patch
diff --git a/patches/server/0494-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0493-Add-PlayerChangeBeaconEffectEvent.patch
index b3444419ee..b3444419ee 100644
--- a/patches/server/0494-Add-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0493-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0495-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0494-Add-toggle-for-always-placing-the-dragon-egg.patch
index 2576990e24..2576990e24 100644
--- a/patches/server/0495-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0494-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0496-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0495-Add-PlayerStonecutterRecipeSelectEvent.patch
index 6aad83c0bc..6aad83c0bc 100644
--- a/patches/server/0496-Add-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0495-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0497-Expand-EntityUnleashEvent.patch b/patches/server/0496-Expand-EntityUnleashEvent.patch
index d179143636..d179143636 100644
--- a/patches/server/0497-Expand-EntityUnleashEvent.patch
+++ b/patches/server/0496-Expand-EntityUnleashEvent.patch
diff --git a/patches/server/0498-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0497-Reset-shield-blocking-on-dimension-change.patch
index 8d9b5e6d19..8d9b5e6d19 100644
--- a/patches/server/0498-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0497-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0499-Add-DragonEggFormEvent.patch b/patches/server/0498-Add-DragonEggFormEvent.patch
index c9ec752038..c9ec752038 100644
--- a/patches/server/0499-Add-DragonEggFormEvent.patch
+++ b/patches/server/0498-Add-DragonEggFormEvent.patch
diff --git a/patches/server/0500-Add-EntityMoveEvent.patch b/patches/server/0499-Add-EntityMoveEvent.patch
index a96a512102..fdac2ac203 100644
--- a/patches/server/0500-Add-EntityMoveEvent.patch
+++ b/patches/server/0499-Add-EntityMoveEvent.patch
@@ -17,7 +17,7 @@ index 7a12028ab83cb6162a7f5d7e22c52af0853b79ee..784bcb1a504482bafcccfe57f72186e5
              this.profiler.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 39f9a18ba04f265eb10e154042a90fd56adb4f0d..89e02274d3c8587a3e3eb58e2bbca0341507d173 100644
+index a9a39c99874001f1024f71bfc97130e8c9a507e7..19333b61bcb50f2171ac2c75d7f4ca4fdf4d4743 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -227,6 +227,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0501-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0500-added-option-to-disable-pathfinding-updates-on-block.patch
index ab98297dc6..f740499e21 100644
--- a/patches/server/0501-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0500-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/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 89e02274d3c8587a3e3eb58e2bbca0341507d173..d188c34aecf06293f3a3cb50256b51fcdf9ff97f 100644
+index 19333b61bcb50f2171ac2c75d7f4ca4fdf4d4743..714968021716fa7cee9ba0b47204d126fb8272fb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1381,6 +1381,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1375,6 +1375,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          this.getChunkSource().blockChanged(pos);
@@ -16,7 +16,7 @@ index 89e02274d3c8587a3e3eb58e2bbca0341507d173..d188c34aecf06293f3a3cb50256b51fc
          this.pathTypesByPosCache.invalidate(pos);
          VoxelShape voxelshape = oldState.getCollisionShape(this, pos);
          VoxelShape voxelshape1 = newState.getCollisionShape(this, pos);
-@@ -1423,6 +1424,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1417,6 +1418,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
          }
diff --git a/patches/server/0502-Inline-shift-direction-fields.patch b/patches/server/0501-Inline-shift-direction-fields.patch
index 910b881e3a..910b881e3a 100644
--- a/patches/server/0502-Inline-shift-direction-fields.patch
+++ b/patches/server/0501-Inline-shift-direction-fields.patch
diff --git a/patches/server/0503-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0502-Allow-adding-items-to-BlockDropItemEvent.patch
index ea45c33555..ea45c33555 100644
--- a/patches/server/0503-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0502-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0504-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0503-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 57d54a0434..57d54a0434 100644
--- a/patches/server/0504-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0503-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0505-living-entity-allow-attribute-registration.patch b/patches/server/0504-living-entity-allow-attribute-registration.patch
index fc60a15040..fc60a15040 100644
--- a/patches/server/0505-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0504-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0506-fix-dead-slime-setSize-invincibility.patch b/patches/server/0505-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0506-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0505-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0507-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0506-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0507-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0506-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0508-Expose-Tracked-Players.patch b/patches/server/0507-Expose-Tracked-Players.patch
index b15fc67f75..b15fc67f75 100644
--- a/patches/server/0508-Expose-Tracked-Players.patch
+++ b/patches/server/0507-Expose-Tracked-Players.patch
diff --git a/patches/server/0509-Improve-ServerGUI.patch b/patches/server/0508-Improve-ServerGUI.patch
index 872206f5fe..872206f5fe 100644
--- a/patches/server/0509-Improve-ServerGUI.patch
+++ b/patches/server/0508-Improve-ServerGUI.patch
diff --git a/patches/server/0510-fix-converting-txt-to-json-file.patch b/patches/server/0509-fix-converting-txt-to-json-file.patch
index ad83e310fc..ad83e310fc 100644
--- a/patches/server/0510-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0509-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0511-Add-worldborder-events.patch b/patches/server/0510-Add-worldborder-events.patch
index 2ab55e30ef..2ab55e30ef 100644
--- a/patches/server/0511-Add-worldborder-events.patch
+++ b/patches/server/0510-Add-worldborder-events.patch
diff --git a/patches/server/0512-Add-PlayerNameEntityEvent.patch b/patches/server/0511-Add-PlayerNameEntityEvent.patch
index 9287edc1b7..9287edc1b7 100644
--- a/patches/server/0512-Add-PlayerNameEntityEvent.patch
+++ b/patches/server/0511-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0513-Add-recipe-to-cook-events.patch b/patches/server/0512-Add-recipe-to-cook-events.patch
index 05bf67ef6c..05bf67ef6c 100644
--- a/patches/server/0513-Add-recipe-to-cook-events.patch
+++ b/patches/server/0512-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0514-Add-Block-isValidTool.patch b/patches/server/0513-Add-Block-isValidTool.patch
index 5f36fb047c..5f36fb047c 100644
--- a/patches/server/0514-Add-Block-isValidTool.patch
+++ b/patches/server/0513-Add-Block-isValidTool.patch
diff --git a/patches/server/0515-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0514-Allow-using-signs-inside-spawn-protection.patch
index f71bd69625..f71bd69625 100644
--- a/patches/server/0515-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0514-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0516-Expand-world-key-API.patch b/patches/server/0515-Expand-world-key-API.patch
index 74d0fe3827..74d0fe3827 100644
--- a/patches/server/0516-Expand-world-key-API.patch
+++ b/patches/server/0515-Expand-world-key-API.patch
diff --git a/patches/server/0517-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0516-Add-fast-alternative-constructor-for-Rotations.patch
index e28775fc9a..e28775fc9a 100644
--- a/patches/server/0517-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0516-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0518-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0517-Drop-carried-item-when-player-has-disconnected.patch
index 4683817946..4683817946 100644
--- a/patches/server/0518-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0517-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0519-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0518-forced-whitelist-use-configurable-kick-message.patch
index 484e77b357..484e77b357 100644
--- a/patches/server/0519-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0518-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0520-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0519-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index df4031ea97..df4031ea97 100644
--- a/patches/server/0520-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0519-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0521-Expose-protocol-version.patch b/patches/server/0520-Expose-protocol-version.patch
index 86eecc86b6..86eecc86b6 100644
--- a/patches/server/0521-Expose-protocol-version.patch
+++ b/patches/server/0520-Expose-protocol-version.patch
diff --git a/patches/server/0522-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0521-Enhance-console-tab-completions-for-brigadier-comman.patch
index 8e6ac6e4c9..8e6ac6e4c9 100644
--- a/patches/server/0522-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0521-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0523-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0522-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 36f12103c7..36f12103c7 100644
--- a/patches/server/0523-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0522-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0524-Add-bypass-host-check.patch b/patches/server/0523-Add-bypass-host-check.patch
index 8c40f13437..8c40f13437 100644
--- a/patches/server/0524-Add-bypass-host-check.patch
+++ b/patches/server/0523-Add-bypass-host-check.patch
diff --git a/patches/server/0525-Set-area-affect-cloud-rotation.patch b/patches/server/0524-Set-area-affect-cloud-rotation.patch
index e78e14e0a0..e78e14e0a0 100644
--- a/patches/server/0525-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0524-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0526-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0525-add-isDeeplySleeping-to-HumanEntity.patch
index 26e38b4777..26e38b4777 100644
--- a/patches/server/0526-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0525-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0527-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0526-add-consumeFuel-to-FurnaceBurnEvent.patch
index 2f79b2a47f..2f79b2a47f 100644
--- a/patches/server/0527-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0526-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0528-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0527-add-get-set-drop-chance-to-EntityEquipment.patch
index fd7cafa884..fd7cafa884 100644
--- a/patches/server/0528-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0527-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0529-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0528-fix-PigZombieAngerEvent-cancellation.patch
index ad3619023e..ad3619023e 100644
--- a/patches/server/0529-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0528-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0530-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0529-fix-PlayerItemHeldEvent-firing-twice.patch
index 3f974caf76..3f974caf76 100644
--- a/patches/server/0530-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0529-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0531-Add-PlayerDeepSleepEvent.patch b/patches/server/0530-Add-PlayerDeepSleepEvent.patch
index 638530f645..638530f645 100644
--- a/patches/server/0531-Add-PlayerDeepSleepEvent.patch
+++ b/patches/server/0530-Add-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0532-More-World-API.patch b/patches/server/0531-More-World-API.patch
index 0e444d651b..0e444d651b 100644
--- a/patches/server/0532-More-World-API.patch
+++ b/patches/server/0531-More-World-API.patch
diff --git a/patches/server/0533-Add-PlayerBedFailEnterEvent.patch b/patches/server/0532-Add-PlayerBedFailEnterEvent.patch
index aff72983ac..aff72983ac 100644
--- a/patches/server/0533-Add-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0532-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0534-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0533-Implement-methods-to-convert-between-Component-and-B.patch
index fc7d02c151..fc7d02c151 100644
--- a/patches/server/0534-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0533-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0535-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0534-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index 048061b651..048061b651 100644
--- a/patches/server/0535-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
+++ b/patches/server/0534-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
diff --git a/patches/server/0536-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0535-Introduce-beacon-activation-deactivation-events.patch
index de6741ca2b..de6741ca2b 100644
--- a/patches/server/0536-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0535-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0537-Add-Channel-initialization-listeners.patch b/patches/server/0536-Add-Channel-initialization-listeners.patch
index 8b6d7c3c06..8b6d7c3c06 100644
--- a/patches/server/0537-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0536-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0538-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0537-Send-empty-commands-if-tab-completion-is-disabled.patch
index 3c45c05c10..3c45c05c10 100644
--- a/patches/server/0538-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0537-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0539-Add-more-WanderingTrader-API.patch b/patches/server/0538-Add-more-WanderingTrader-API.patch
index 07cdb98c54..07cdb98c54 100644
--- a/patches/server/0539-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0538-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0540-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0539-Add-EntityBlockStorage-clearEntities.patch
index e52d1c5e1c..e52d1c5e1c 100644
--- a/patches/server/0540-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0539-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0541-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0540-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 839c465c9c..839c465c9c 100644
--- a/patches/server/0541-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0540-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0542-Add-HiddenPotionEffect-API.patch b/patches/server/0541-Add-HiddenPotionEffect-API.patch
index 724bbc9ff5..724bbc9ff5 100644
--- a/patches/server/0542-Add-HiddenPotionEffect-API.patch
+++ b/patches/server/0541-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0543-Inventory-close.patch b/patches/server/0542-Inventory-close.patch
index 9ca8b717ab..9ca8b717ab 100644
--- a/patches/server/0543-Inventory-close.patch
+++ b/patches/server/0542-Inventory-close.patch
diff --git a/patches/server/0544-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0543-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 950600a9e0..950600a9e0 100644
--- a/patches/server/0544-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0543-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0545-Add-basic-Datapack-API.patch b/patches/server/0544-Add-basic-Datapack-API.patch
index 08c4d71896..08c4d71896 100644
--- a/patches/server/0545-Add-basic-Datapack-API.patch
+++ b/patches/server/0544-Add-basic-Datapack-API.patch
diff --git a/patches/server/0546-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0545-Add-environment-variable-to-disable-server-gui.patch
index e4de8ec477..e4de8ec477 100644
--- a/patches/server/0546-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0545-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0547-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0546-Expand-PlayerGameModeChangeEvent.patch
index e8a43cf71d..e8a43cf71d 100644
--- a/patches/server/0547-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0546-Expand-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0548-ItemStack-repair-check-API.patch b/patches/server/0547-ItemStack-repair-check-API.patch
index d72feae891..d72feae891 100644
--- a/patches/server/0548-ItemStack-repair-check-API.patch
+++ b/patches/server/0547-ItemStack-repair-check-API.patch
diff --git a/patches/server/0549-More-Enchantment-API.patch b/patches/server/0548-More-Enchantment-API.patch
index d561409c37..d561409c37 100644
--- a/patches/server/0549-More-Enchantment-API.patch
+++ b/patches/server/0548-More-Enchantment-API.patch
diff --git a/patches/server/0550-Move-range-check-for-block-placing-up.patch b/patches/server/0549-Move-range-check-for-block-placing-up.patch
index 3c66f1bf6a..3c66f1bf6a 100644
--- a/patches/server/0550-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0549-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0551-Add-Mob-lookAt-API.patch b/patches/server/0550-Add-Mob-lookAt-API.patch
index 3139490a61..3139490a61 100644
--- a/patches/server/0551-Add-Mob-lookAt-API.patch
+++ b/patches/server/0550-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0552-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0551-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
index faa6d5c514..faa6d5c514 100644
--- a/patches/server/0552-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/server/0551-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0553-Add-Unix-domain-socket-support.patch b/patches/server/0552-Add-Unix-domain-socket-support.patch
index c289ae85a2..c289ae85a2 100644
--- a/patches/server/0553-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0552-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0554-Add-EntityInsideBlockEvent.patch b/patches/server/0553-Add-EntityInsideBlockEvent.patch
index 26d32bc8bf..26d32bc8bf 100644
--- a/patches/server/0554-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0553-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0555-Fix-item-default-attributes-API.patch b/patches/server/0554-Fix-item-default-attributes-API.patch
index f23189a1ba..f23189a1ba 100644
--- a/patches/server/0555-Fix-item-default-attributes-API.patch
+++ b/patches/server/0554-Fix-item-default-attributes-API.patch
diff --git a/patches/server/0556-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0555-Add-cause-to-Weather-ThunderChangeEvents.patch
index 92b87ba18e..d1e76737e3 100644
--- a/patches/server/0556-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0555-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d188c34aecf06293f3a3cb50256b51fcdf9ff97f..2236fae8147eea1c315c21d90fc864405bfa602d 100644
+index 714968021716fa7cee9ba0b47204d126fb8272fb..d4e73445f680a283cda9a1e4b823efcd389a84ed 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -446,8 +446,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -440,8 +440,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
          this.serverLevelData.setClearWeatherTime(clearDuration);
          this.serverLevelData.setRainTime(rainDuration);
          this.serverLevelData.setThunderTime(rainDuration);
@@ -19,7 +19,7 @@ index d188c34aecf06293f3a3cb50256b51fcdf9ff97f..2236fae8147eea1c315c21d90fc86440
      }
  
      @Override
-@@ -880,8 +880,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -874,8 +874,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  this.serverLevelData.setThunderTime(j);
                  this.serverLevelData.setRainTime(k);
                  this.serverLevelData.setClearWeatherTime(i);
@@ -30,7 +30,7 @@ index d188c34aecf06293f3a3cb50256b51fcdf9ff97f..2236fae8147eea1c315c21d90fc86440
              }
  
              this.oThunderLevel = this.thunderLevel;
-@@ -948,14 +948,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -942,14 +942,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @VisibleForTesting
      public void resetWeatherCycle() {
          // CraftBukkit start
diff --git a/patches/server/0557-More-Lidded-Block-API.patch b/patches/server/0556-More-Lidded-Block-API.patch
index 7e52e36425..7e52e36425 100644
--- a/patches/server/0557-More-Lidded-Block-API.patch
+++ b/patches/server/0556-More-Lidded-Block-API.patch
diff --git a/patches/server/0558-Limit-item-frame-cursors-on-maps.patch b/patches/server/0557-Limit-item-frame-cursors-on-maps.patch
index 6072cb5269..6072cb5269 100644
--- a/patches/server/0558-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0557-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0559-Add-PlayerKickEvent-causes.patch b/patches/server/0558-Add-PlayerKickEvent-causes.patch
index cbba020ab8..cbba020ab8 100644
--- a/patches/server/0559-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0558-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0560-Add-PufferFishStateChangeEvent.patch b/patches/server/0559-Add-PufferFishStateChangeEvent.patch
index 87e61bb2a3..87e61bb2a3 100644
--- a/patches/server/0560-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0559-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0561-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0560-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 6e70197163..6e70197163 100644
--- a/patches/server/0561-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0560-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0562-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0561-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 04a6d787b6..04a6d787b6 100644
--- a/patches/server/0562-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0561-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0563-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0562-Add-option-to-fix-items-merging-through-walls.patch
index 05969fb324..05969fb324 100644
--- a/patches/server/0563-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0562-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0564-Add-BellRevealRaiderEvent.patch b/patches/server/0563-Add-BellRevealRaiderEvent.patch
index 871aa2a198..871aa2a198 100644
--- a/patches/server/0564-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0563-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0565-Fix-invulnerable-end-crystals.patch b/patches/server/0564-Fix-invulnerable-end-crystals.patch
index bddc6ec149..bddc6ec149 100644
--- a/patches/server/0565-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0564-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0566-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0565-Add-ElderGuardianAppearanceEvent.patch
index d9bc14356d..d9bc14356d 100644
--- a/patches/server/0566-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0565-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0567-Fix-dangerous-end-portal-logic.patch b/patches/server/0566-Fix-dangerous-end-portal-logic.patch
index 94e78d0600..94e78d0600 100644
--- a/patches/server/0567-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0566-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0568-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0567-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 3d03f4c4d2..3d03f4c4d2 100644
--- a/patches/server/0568-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0567-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0569-Line-Of-Sight-Changes.patch b/patches/server/0568-Line-Of-Sight-Changes.patch
index 6811307521..6811307521 100644
--- a/patches/server/0569-Line-Of-Sight-Changes.patch
+++ b/patches/server/0568-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0570-add-per-world-spawn-limits.patch b/patches/server/0569-add-per-world-spawn-limits.patch
index 8ff7b50013..8ff7b50013 100644
--- a/patches/server/0570-add-per-world-spawn-limits.patch
+++ b/patches/server/0569-add-per-world-spawn-limits.patch
diff --git a/patches/server/0571-Fix-potions-splash-events.patch b/patches/server/0570-Fix-potions-splash-events.patch
index 66e5ec5995..66e5ec5995 100644
--- a/patches/server/0571-Fix-potions-splash-events.patch
+++ b/patches/server/0570-Fix-potions-splash-events.patch
diff --git a/patches/server/0572-Add-more-LimitedRegion-API.patch b/patches/server/0571-Add-more-LimitedRegion-API.patch
index 6e183e954e..6e183e954e 100644
--- a/patches/server/0572-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0571-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0573-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0572-Fix-PlayerDropItemEvent-using-wrong-item.patch
index ab0fe17dd5..ab0fe17dd5 100644
--- a/patches/server/0573-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0572-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0574-Missing-Entity-API.patch b/patches/server/0573-Missing-Entity-API.patch
index 0f3d205a48..0f3d205a48 100644
--- a/patches/server/0574-Missing-Entity-API.patch
+++ b/patches/server/0573-Missing-Entity-API.patch
diff --git a/patches/server/0575-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0574-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 9af04f9803..9af04f9803 100644
--- a/patches/server/0575-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0574-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0576-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0575-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index a5c4eefb9a..a5c4eefb9a 100644
--- a/patches/server/0576-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0575-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0577-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0576-Use-getChunkIfLoadedImmediately-in-places.patch
index 452b5c4a64..0a393f84af 100644
--- a/patches/server/0577-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0576-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2236fae8147eea1c315c21d90fc864405bfa602d..da3821010598f9c67d6a21fbfc6b559280203100 100644
+index d4e73445f680a283cda9a1e4b823efcd389a84ed..6d7b006525068f32549c8f9cccafd821e5a587ce 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -230,7 +230,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0578-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0577-Fix-commands-from-signs-not-firing-command-events.patch
index b86e341359..b86e341359 100644
--- a/patches/server/0578-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0577-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0579-Add-PlayerArmSwingEvent.patch b/patches/server/0578-Add-PlayerArmSwingEvent.patch
index 14174822a6..14174822a6 100644
--- a/patches/server/0579-Add-PlayerArmSwingEvent.patch
+++ b/patches/server/0578-Add-PlayerArmSwingEvent.patch
diff --git a/patches/server/0580-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0579-Fix-kick-event-leave-message-not-being-sent.patch
index 8d66d84399..8d66d84399 100644
--- a/patches/server/0580-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0579-Fix-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0581-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0580-Don-t-apply-cramming-damage-to-players.patch
index 04ae75c0ea..04ae75c0ea 100644
--- a/patches/server/0581-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0580-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0582-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0581-Rate-options-and-timings-for-sensors-and-behaviors.patch
index d74af14524..d74af14524 100644
--- a/patches/server/0582-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0581-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0583-Add-missing-forceDrop-toggles.patch b/patches/server/0582-Add-missing-forceDrop-toggles.patch
index 951b6714fa..951b6714fa 100644
--- a/patches/server/0583-Add-missing-forceDrop-toggles.patch
+++ b/patches/server/0582-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0584-Stinger-API.patch b/patches/server/0583-Stinger-API.patch
index 3abe3d922a..3abe3d922a 100644
--- a/patches/server/0584-Stinger-API.patch
+++ b/patches/server/0583-Stinger-API.patch
diff --git a/patches/server/0585-Add-System.out-err-catcher.patch b/patches/server/0584-Add-System.out-err-catcher.patch
index 5b85a7f2b8..5b85a7f2b8 100644
--- a/patches/server/0585-Add-System.out-err-catcher.patch
+++ b/patches/server/0584-Add-System.out-err-catcher.patch
diff --git a/patches/server/0586-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0585-Prevent-AFK-kick-while-watching-end-credits.patch
index af6da87145..af6da87145 100644
--- a/patches/server/0586-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0585-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0587-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0586-Allow-skipping-writing-of-comments-to-server.propert.patch
index 1fce522892..1fce522892 100644
--- a/patches/server/0587-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0586-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0588-Add-PlayerSetSpawnEvent.patch b/patches/server/0587-Add-PlayerSetSpawnEvent.patch
index 5c81577101..5c81577101 100644
--- a/patches/server/0588-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0587-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0589-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0588-Make-hoppers-respect-inventory-max-stack-size.patch
index c5f669b979..c5f669b979 100644
--- a/patches/server/0589-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0588-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0590-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0589-Optimize-entity-tracker-passenger-checks.patch
index a764dcd8ab..a764dcd8ab 100644
--- a/patches/server/0590-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0589-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0591-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0590-Config-option-for-Piglins-guarding-chests.patch
index e1b0af28d0..e1b0af28d0 100644
--- a/patches/server/0591-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0590-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0592-Add-EntityDamageItemEvent.patch b/patches/server/0591-Add-EntityDamageItemEvent.patch
index 34c8cf7e74..34c8cf7e74 100644
--- a/patches/server/0592-Add-EntityDamageItemEvent.patch
+++ b/patches/server/0591-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0593-Optimize-indirect-passenger-iteration.patch b/patches/server/0592-Optimize-indirect-passenger-iteration.patch
index f63dee44e9..f63dee44e9 100644
--- a/patches/server/0593-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0592-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0594-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0593-Configurable-item-frame-map-cursor-update-interval.patch
index f06f3a327b..f06f3a327b 100644
--- a/patches/server/0594-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0593-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0595-Clear-bucket-NBT-after-dispense.patch b/patches/server/0594-Clear-bucket-NBT-after-dispense.patch
index ece5517a45..ece5517a45 100644
--- a/patches/server/0595-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0594-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0596-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0595-Change-EnderEye-target-without-changing-other-things.patch
index 53d06a36ec..53d06a36ec 100644
--- a/patches/server/0596-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0595-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0597-Add-BlockBreakBlockEvent.patch b/patches/server/0596-Add-BlockBreakBlockEvent.patch
index fbf1b1ea38..fbf1b1ea38 100644
--- a/patches/server/0597-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0596-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0598-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0597-Option-to-prevent-data-components-copy-in-smithing-r.patch
index c4e4b8be1b..c4e4b8be1b 100644
--- a/patches/server/0598-Option-to-prevent-data-components-copy-in-smithing-r.patch
+++ b/patches/server/0597-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/server/0599-More-CommandBlock-API.patch b/patches/server/0598-More-CommandBlock-API.patch
index 16cf3ee3d7..16cf3ee3d7 100644
--- a/patches/server/0599-More-CommandBlock-API.patch
+++ b/patches/server/0598-More-CommandBlock-API.patch
diff --git a/patches/server/0600-Add-missing-team-sidebar-display-slots.patch b/patches/server/0599-Add-missing-team-sidebar-display-slots.patch
index 8e253e2960..8e253e2960 100644
--- a/patches/server/0600-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0599-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0601-Add-back-EntityPortalExitEvent.patch b/patches/server/0600-Add-back-EntityPortalExitEvent.patch
index 02c52718f6..02c52718f6 100644
--- a/patches/server/0601-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0600-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0602-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0601-Add-methods-to-find-targets-for-lightning-strikes.patch
index 7a7068cabb..a6b0c9df56 100644
--- a/patches/server/0602-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0601-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index da3821010598f9c67d6a21fbfc6b559280203100..666968eff55e97443fd02e00a7ad11e059de44b8 100644
+index 6d7b006525068f32549c8f9cccafd821e5a587ce..1f556e53c4fa70c2ecab2181a655020ba7669624 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -769,6 +769,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -763,6 +763,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      protected BlockPos findLightningTargetAround(BlockPos pos) {
@@ -22,7 +22,7 @@ index da3821010598f9c67d6a21fbfc6b559280203100..666968eff55e97443fd02e00a7ad11e0
          BlockPos blockposition1 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos);
          Optional<BlockPos> optional = this.findLightningRod(blockposition1);
  
-@@ -783,6 +788,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -777,6 +782,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              if (!list.isEmpty()) {
                  return ((LivingEntity) list.get(this.random.nextInt(list.size()))).blockPosition();
              } else {
diff --git a/patches/server/0603-Get-entity-default-attributes.patch b/patches/server/0602-Get-entity-default-attributes.patch
index b0c1f2f95c..b0c1f2f95c 100644
--- a/patches/server/0603-Get-entity-default-attributes.patch
+++ b/patches/server/0602-Get-entity-default-attributes.patch
diff --git a/patches/server/0604-Left-handed-API.patch b/patches/server/0603-Left-handed-API.patch
index 643df451a4..643df451a4 100644
--- a/patches/server/0604-Left-handed-API.patch
+++ b/patches/server/0603-Left-handed-API.patch
diff --git a/patches/server/0605-Add-more-advancement-API.patch b/patches/server/0604-Add-more-advancement-API.patch
index 0fa7fedd64..0fa7fedd64 100644
--- a/patches/server/0605-Add-more-advancement-API.patch
+++ b/patches/server/0604-Add-more-advancement-API.patch
diff --git a/patches/server/0606-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0605-Add-ItemFactory-getSpawnEgg-API.patch
index 207215c511..207215c511 100644
--- a/patches/server/0606-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0605-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0607-Add-critical-damage-API.patch b/patches/server/0606-Add-critical-damage-API.patch
index 862878dd06..862878dd06 100644
--- a/patches/server/0607-Add-critical-damage-API.patch
+++ b/patches/server/0606-Add-critical-damage-API.patch
diff --git a/patches/server/0608-Fix-issues-with-mob-conversion.patch b/patches/server/0607-Fix-issues-with-mob-conversion.patch
index c714b6dda9..c714b6dda9 100644
--- a/patches/server/0608-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0607-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0609-Add-isCollidable-methods-to-various-places.patch b/patches/server/0608-Add-isCollidable-methods-to-various-places.patch
index 226170159d..226170159d 100644
--- a/patches/server/0609-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0608-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0610-Goat-ram-API.patch b/patches/server/0609-Goat-ram-API.patch
index 2f5ccdfed4..2f5ccdfed4 100644
--- a/patches/server/0610-Goat-ram-API.patch
+++ b/patches/server/0609-Goat-ram-API.patch
diff --git a/patches/server/0611-Add-API-for-resetting-a-single-score.patch b/patches/server/0610-Add-API-for-resetting-a-single-score.patch
index b9dd1c2be3..b9dd1c2be3 100644
--- a/patches/server/0611-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0610-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0612-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0611-Add-Raw-Byte-Entity-Serialization.patch
index 5eeed3ba32..5eeed3ba32 100644
--- a/patches/server/0612-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0611-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0613-Vanilla-command-permission-fixes.patch b/patches/server/0612-Vanilla-command-permission-fixes.patch
index e7be2c02c2..e7be2c02c2 100644
--- a/patches/server/0613-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0612-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0614-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0613-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 9675d4a991..96b92ceb04 100644
--- a/patches/server/0614-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0613-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,10 +9,10 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 666968eff55e97443fd02e00a7ad11e059de44b8..fbc8fac6ad623be5bf434d3249889de966d1f741 100644
+index 1f556e53c4fa70c2ecab2181a655020ba7669624..efc246d405d58550104bb767a40d296e40b79d70 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1282,9 +1282,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1276,9 +1276,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Spigot Start
          for (net.minecraft.world.level.block.entity.BlockEntity tileentity : chunk.getBlockEntities().values()) {
              if (tileentity instanceof net.minecraft.world.Container) {
diff --git a/patches/server/0615-Fix-GameProfileCache-concurrency.patch b/patches/server/0614-Fix-GameProfileCache-concurrency.patch
index 6cb7e5235f..6cb7e5235f 100644
--- a/patches/server/0615-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0614-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0616-Improve-and-expand-AsyncCatcher.patch b/patches/server/0615-Improve-and-expand-AsyncCatcher.patch
index 1e59e9e075..1e59e9e075 100644
--- a/patches/server/0616-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0615-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0617-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0616-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 5d60195ebe..5d60195ebe 100644
--- a/patches/server/0617-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0616-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0618-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0617-Sanitize-ResourceLocation-error-logging.patch
index 28ba1000d7..28ba1000d7 100644
--- a/patches/server/0618-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0617-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0619-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0618-Manually-inline-methods-in-BlockPosition.patch
index 630cd08862..630cd08862 100644
--- a/patches/server/0619-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0618-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0620-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0619-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 30f250f235..30f250f235 100644
--- a/patches/server/0620-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0619-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0621-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0620-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index ffee136c87..ffee136c87 100644
--- a/patches/server/0621-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0620-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0622-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0621-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 0c62fa92a6..0c62fa92a6 100644
--- a/patches/server/0622-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0621-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0623-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0622-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index 0ab3e48f48..0ab3e48f48 100644
--- a/patches/server/0623-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
+++ b/patches/server/0622-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0624-Time-scoreboard-search.patch b/patches/server/0623-Time-scoreboard-search.patch
index 8d15084758..8d15084758 100644
--- a/patches/server/0624-Time-scoreboard-search.patch
+++ b/patches/server/0623-Time-scoreboard-search.patch
diff --git a/patches/server/0625-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0624-Oprimise-map-impl-for-tracked-players.patch
index 05a08024ed..05a08024ed 100644
--- a/patches/server/0625-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0624-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0626-Add-missing-InventoryType.patch b/patches/server/0625-Add-missing-InventoryType.patch
index a49bdf073d..a49bdf073d 100644
--- a/patches/server/0626-Add-missing-InventoryType.patch
+++ b/patches/server/0625-Add-missing-InventoryType.patch
diff --git a/patches/server/0627-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0626-Optimise-BlockSoil-nearby-water-lookup.patch
index 81b199a243..81b199a243 100644
--- a/patches/server/0627-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0626-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0628-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0627-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index f342ae9146..e17f65772c 100644
--- a/patches/server/0628-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0627-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index fbc8fac6ad623be5bf434d3249889de966d1f741..d4cc0a6c0ec10614737615143e05c2e250e8149d 100644
+index efc246d405d58550104bb767a40d296e40b79d70..dd1f03109a7f8cd65f9e77de94a2a170652ce4ed 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2283,6 +2283,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2277,6 +2277,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot end
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
diff --git a/patches/server/0629-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0628-Check-requirement-before-suggesting-root-nodes.patch
index fce5e326f9..fce5e326f9 100644
--- a/patches/server/0629-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0628-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0630-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0629-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index f426fa8333..f426fa8333 100644
--- a/patches/server/0630-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0629-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0631-Add-packet-limiter-config.patch b/patches/server/0630-Add-packet-limiter-config.patch
index 8315eb0598..8315eb0598 100644
--- a/patches/server/0631-Add-packet-limiter-config.patch
+++ b/patches/server/0630-Add-packet-limiter-config.patch
diff --git a/patches/server/0632-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0631-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index b11f4117a8..b11f4117a8 100644
--- a/patches/server/0632-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0631-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0633-Ensure-valid-vehicle-status.patch b/patches/server/0632-Ensure-valid-vehicle-status.patch
index 657d2eb9a7..657d2eb9a7 100644
--- a/patches/server/0633-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0632-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0634-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0633-Prevent-softlocked-end-exit-portal-generation.patch
index e2698e961b..e2698e961b 100644
--- a/patches/server/0634-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0633-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0635-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0634-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 4fac0c1ab3..4fac0c1ab3 100644
--- a/patches/server/0635-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0634-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0636-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0635-Don-t-log-debug-logging-being-disabled.patch
index eda86b69fc..eda86b69fc 100644
--- a/patches/server/0636-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0635-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0637-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0636-fix-various-menus-with-empty-level-accesses.patch
index efe5d1ddce..efe5d1ddce 100644
--- a/patches/server/0637-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0636-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0638-Preserve-overstacked-loot.patch b/patches/server/0637-Preserve-overstacked-loot.patch
index bd846768be..bd846768be 100644
--- a/patches/server/0638-Preserve-overstacked-loot.patch
+++ b/patches/server/0637-Preserve-overstacked-loot.patch
diff --git a/patches/server/0639-Update-head-rotation-in-missing-places.patch b/patches/server/0638-Update-head-rotation-in-missing-places.patch
index 88e0dccdcb..88e0dccdcb 100644
--- a/patches/server/0639-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0638-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0640-prevent-unintended-light-block-manipulation.patch b/patches/server/0639-prevent-unintended-light-block-manipulation.patch
index bff44792dc..bff44792dc 100644
--- a/patches/server/0640-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0639-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0641-Fix-CraftCriteria-defaults-map.patch b/patches/server/0640-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0641-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0640-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0642-Fix-upstreams-block-state-factories.patch b/patches/server/0641-Fix-upstreams-block-state-factories.patch
index d5cf218ad2..d5cf218ad2 100644
--- a/patches/server/0642-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0641-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0643-Configurable-feature-seeds.patch b/patches/server/0642-Configurable-feature-seeds.patch
index 44d7b04076..44d7b04076 100644
--- a/patches/server/0643-Configurable-feature-seeds.patch
+++ b/patches/server/0642-Configurable-feature-seeds.patch
diff --git a/patches/server/0644-Add-root-admin-user-detection.patch b/patches/server/0643-Add-root-admin-user-detection.patch
index 5b81dcd09a..5b81dcd09a 100644
--- a/patches/server/0644-Add-root-admin-user-detection.patch
+++ b/patches/server/0643-Add-root-admin-user-detection.patch
diff --git a/patches/server/0645-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0644-don-t-attempt-to-teleport-dead-entities.patch
index 0a5f77989b..0a5f77989b 100644
--- a/patches/server/0645-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0644-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0646-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0645-Prevent-excessive-velocity-through-repeated-crits.patch
index 50956e86f7..50956e86f7 100644
--- a/patches/server/0646-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0645-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0647-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0646-Remove-client-side-code-using-deprecated-for-removal.patch
index 77ffcc7ddc..77ffcc7ddc 100644
--- a/patches/server/0647-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0646-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0648-Fix-Spigot-growth-modifiers.patch b/patches/server/0647-Fix-Spigot-growth-modifiers.patch
index 245729c1f4..245729c1f4 100644
--- a/patches/server/0648-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0647-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0649-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0648-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index b017de75d1..b017de75d1 100644
--- a/patches/server/0649-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0648-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0650-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0649-Add-PlayerItemFrameChangeEvent.patch
index 37c616b0a1..37c616b0a1 100644
--- a/patches/server/0650-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0649-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0651-Optimize-HashMapPalette.patch b/patches/server/0650-Optimize-HashMapPalette.patch
index d50159b901..d50159b901 100644
--- a/patches/server/0651-Optimize-HashMapPalette.patch
+++ b/patches/server/0650-Optimize-HashMapPalette.patch
diff --git a/patches/server/0652-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0651-Allow-delegation-to-vanilla-chunk-gen.patch
index 8c6c32dac2..8c6c32dac2 100644
--- a/patches/server/0652-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0651-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0653-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0652-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 239a0c56cc..239a0c56cc 100644
--- a/patches/server/0653-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0652-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0654-Add-more-Campfire-API.patch b/patches/server/0653-Add-more-Campfire-API.patch
index c47758fa53..c47758fa53 100644
--- a/patches/server/0654-Add-more-Campfire-API.patch
+++ b/patches/server/0653-Add-more-Campfire-API.patch
diff --git a/patches/server/0655-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0654-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 82e383fc34..82e383fc34 100644
--- a/patches/server/0655-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0654-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0656-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0655-Forward-CraftEntity-in-teleport-command.patch
index fed3943910..fed3943910 100644
--- a/patches/server/0656-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0655-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0657-Improve-scoreboard-entries.patch b/patches/server/0656-Improve-scoreboard-entries.patch
index 8acac86ce3..8acac86ce3 100644
--- a/patches/server/0657-Improve-scoreboard-entries.patch
+++ b/patches/server/0656-Improve-scoreboard-entries.patch
diff --git a/patches/server/0658-Entity-powdered-snow-API.patch b/patches/server/0657-Entity-powdered-snow-API.patch
index 84af920e2a..84af920e2a 100644
--- a/patches/server/0658-Entity-powdered-snow-API.patch
+++ b/patches/server/0657-Entity-powdered-snow-API.patch
diff --git a/patches/server/0659-Add-API-for-item-entity-health.patch b/patches/server/0658-Add-API-for-item-entity-health.patch
index cd2757b544..cd2757b544 100644
--- a/patches/server/0659-Add-API-for-item-entity-health.patch
+++ b/patches/server/0658-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0660-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0659-Configurable-max-block-light-for-monster-spawning.patch
index 421d176050..421d176050 100644
--- a/patches/server/0660-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0659-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0661-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0660-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 2ee001a77a..2ee001a77a 100644
--- a/patches/server/0661-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0660-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0662-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0661-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..d7ccde8439 100644
--- a/patches/server/0662-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0661-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0663-Bucketable-API.patch b/patches/server/0662-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0663-Bucketable-API.patch
+++ b/patches/server/0662-Bucketable-API.patch
diff --git a/patches/server/0664-Validate-usernames.patch b/patches/server/0663-Validate-usernames.patch
index 51eedf4f14..51eedf4f14 100644
--- a/patches/server/0664-Validate-usernames.patch
+++ b/patches/server/0663-Validate-usernames.patch
diff --git a/patches/server/0665-Make-water-animal-spawn-height-configurable.patch b/patches/server/0664-Make-water-animal-spawn-height-configurable.patch
index 36a83d9116..36a83d9116 100644
--- a/patches/server/0665-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0664-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0666-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0665-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 96fc6e3b61..96fc6e3b61 100644
--- a/patches/server/0666-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0665-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0667-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0666-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0667-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0666-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0668-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0667-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
index be0eedab93..be0eedab93 100644
--- a/patches/server/0668-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/server/0667-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0669-Multiple-Entries-with-Scoreboards.patch b/patches/server/0668-Multiple-Entries-with-Scoreboards.patch
index c286ca9e4b..c286ca9e4b 100644
--- a/patches/server/0669-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0668-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0670-Reset-placed-block-on-exception.patch b/patches/server/0669-Reset-placed-block-on-exception.patch
index c5b6f9f135..c5b6f9f135 100644
--- a/patches/server/0670-Reset-placed-block-on-exception.patch
+++ b/patches/server/0669-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0671-Add-configurable-height-for-slime-spawn.patch b/patches/server/0670-Add-configurable-height-for-slime-spawn.patch
index 04458eb176..04458eb176 100644
--- a/patches/server/0671-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0670-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0672-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0671-Fix-xp-reward-for-baby-zombies.patch
index 67fe48ec26..67fe48ec26 100644
--- a/patches/server/0672-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0671-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0673-Multi-Block-Change-API-Implementation.patch b/patches/server/0672-Multi-Block-Change-API-Implementation.patch
index 3eee7a872a..3eee7a872a 100644
--- a/patches/server/0673-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0672-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0674-Fix-NotePlayEvent.patch b/patches/server/0673-Fix-NotePlayEvent.patch
index 4a601d8f1b..4a601d8f1b 100644
--- a/patches/server/0674-Fix-NotePlayEvent.patch
+++ b/patches/server/0673-Fix-NotePlayEvent.patch
diff --git a/patches/server/0675-Freeze-Tick-Lock-API.patch b/patches/server/0674-Freeze-Tick-Lock-API.patch
index 4c0f4ccb90..4c0f4ccb90 100644
--- a/patches/server/0675-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0674-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0676-More-PotionEffectType-API.patch b/patches/server/0675-More-PotionEffectType-API.patch
index 07a0ef6777..07a0ef6777 100644
--- a/patches/server/0676-More-PotionEffectType-API.patch
+++ b/patches/server/0675-More-PotionEffectType-API.patch
diff --git a/patches/server/0677-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0676-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index b19bb65d35..b19bb65d35 100644
--- a/patches/server/0677-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0676-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0678-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0677-API-for-creating-command-sender-which-forwards-feedb.patch
index 4e11ae0467..4e11ae0467 100644
--- a/patches/server/0678-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0677-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0679-Add-missing-structure-set-seed-configs.patch b/patches/server/0678-Add-missing-structure-set-seed-configs.patch
index 0c160b7c1c..0c160b7c1c 100644
--- a/patches/server/0679-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0678-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0680-Implement-regenerateChunk.patch b/patches/server/0679-Implement-regenerateChunk.patch
index c6a6c8eb34..c6a6c8eb34 100644
--- a/patches/server/0680-Implement-regenerateChunk.patch
+++ b/patches/server/0679-Implement-regenerateChunk.patch
diff --git a/patches/server/0681-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0680-Fix-cancelled-powdered-snow-bucket-placement.patch
index 57020bc01b..57020bc01b 100644
--- a/patches/server/0681-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0680-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0682-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0681-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 43e7e71051..43e7e71051 100644
--- a/patches/server/0682-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0681-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0683-Add-GameEvent-tags.patch b/patches/server/0682-Add-GameEvent-tags.patch
index 1de3d4a3c4..1de3d4a3c4 100644
--- a/patches/server/0683-Add-GameEvent-tags.patch
+++ b/patches/server/0682-Add-GameEvent-tags.patch
diff --git a/patches/server/0684-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0683-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 3d074b30b4..3d074b30b4 100644
--- a/patches/server/0684-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0683-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0685-Furnace-RecipesUsed-API.patch b/patches/server/0684-Furnace-RecipesUsed-API.patch
index d8224fe839..d8224fe839 100644
--- a/patches/server/0685-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0684-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0686-Configurable-sculk-sensor-listener-range.patch b/patches/server/0685-Configurable-sculk-sensor-listener-range.patch
index f2d79796cb..f2d79796cb 100644
--- a/patches/server/0686-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0685-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0687-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0686-Add-missing-block-data-mins-and-maxes.patch
index fe8170196d..fe8170196d 100644
--- a/patches/server/0687-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0686-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0688-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0687-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 22d038e185..22d038e185 100644
--- a/patches/server/0688-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0687-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0689-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0688-Put-world-into-worldlist-before-initing-the-world.patch
index de105288ed..de105288ed 100644
--- a/patches/server/0689-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0688-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0690-Fix-Entity-Position-Desync.patch b/patches/server/0689-Fix-Entity-Position-Desync.patch
index fb9d587df1..fb9d587df1 100644
--- a/patches/server/0690-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0689-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0691-Custom-Potion-Mixes.patch b/patches/server/0690-Custom-Potion-Mixes.patch
index 04763694af..04763694af 100644
--- a/patches/server/0691-Custom-Potion-Mixes.patch
+++ b/patches/server/0690-Custom-Potion-Mixes.patch
diff --git a/patches/server/0692-Force-close-world-loading-screen.patch b/patches/server/0691-Force-close-world-loading-screen.patch
index a90bc669b4..a90bc669b4 100644
--- a/patches/server/0692-Force-close-world-loading-screen.patch
+++ b/patches/server/0691-Force-close-world-loading-screen.patch
diff --git a/patches/server/0693-Fix-falling-block-spawn-methods.patch b/patches/server/0692-Fix-falling-block-spawn-methods.patch
index 1f5d0c19cc..1f5d0c19cc 100644
--- a/patches/server/0693-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0692-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0694-Expose-furnace-minecart-push-values.patch b/patches/server/0693-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0694-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0693-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0695-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0694-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 2d524b390b..2d524b390b 100644
--- a/patches/server/0695-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0694-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0696-More-Projectile-API.patch b/patches/server/0695-More-Projectile-API.patch
index bccb9ad23b..bccb9ad23b 100644
--- a/patches/server/0696-More-Projectile-API.patch
+++ b/patches/server/0695-More-Projectile-API.patch
diff --git a/patches/server/0697-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0696-Fix-swamp-hut-cat-generation-deadlock.patch
index 1b0f7d0ed5..1b0f7d0ed5 100644
--- a/patches/server/0697-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0696-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0698-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0697-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 70d82d0dce..70d82d0dce 100644
--- a/patches/server/0698-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0697-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0699-Implement-getComputedBiome-API.patch b/patches/server/0698-Implement-getComputedBiome-API.patch
index 57a6b3a7c5..57a6b3a7c5 100644
--- a/patches/server/0699-Implement-getComputedBiome-API.patch
+++ b/patches/server/0698-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0700-Make-some-itemstacks-nonnull.patch b/patches/server/0699-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0700-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0699-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0701-Implement-enchantWithLevels-API.patch b/patches/server/0700-Implement-enchantWithLevels-API.patch
index 7031b197b7..7031b197b7 100644
--- a/patches/server/0701-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0700-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0702-Fix-saving-in-unloadWorld.patch b/patches/server/0701-Fix-saving-in-unloadWorld.patch
index aa9f726bd7..aa9f726bd7 100644
--- a/patches/server/0702-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0701-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0703-Buffer-OOB-setBlock-calls.patch b/patches/server/0702-Buffer-OOB-setBlock-calls.patch
index d0e56ca766..d0e56ca766 100644
--- a/patches/server/0703-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0702-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0704-Add-TameableDeathMessageEvent.patch b/patches/server/0703-Add-TameableDeathMessageEvent.patch
index 355d8192ca..355d8192ca 100644
--- a/patches/server/0704-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0703-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0705-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0704-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index d811493fc4..d811493fc4 100644
--- a/patches/server/0705-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0704-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0706-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0705-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 0f56e9ee1f..0f56e9ee1f 100644
--- a/patches/server/0706-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0705-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0707-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0706-Ensure-entity-passenger-world-matches-ridden-entity.patch
index b656e4e0e3..b656e4e0e3 100644
--- a/patches/server/0707-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0706-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0708-cache-resource-keys.patch b/patches/server/0707-cache-resource-keys.patch
index d444813b7a..d444813b7a 100644
--- a/patches/server/0708-cache-resource-keys.patch
+++ b/patches/server/0707-cache-resource-keys.patch
diff --git a/patches/server/0709-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0708-Allow-changing-the-EnderDragon-podium.patch
index 623c4b9689..623c4b9689 100644
--- a/patches/server/0709-Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/server/0708-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0710-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0709-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 05d5b9189b..05d5b9189b 100644
--- a/patches/server/0710-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0709-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0711-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0710-Prevent-tile-entity-copies-loading-chunks.patch
index cc180d9fc6..cc180d9fc6 100644
--- a/patches/server/0711-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0710-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0712-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0711-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 9eed66c5cf..9eed66c5cf 100644
--- a/patches/server/0712-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0711-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0713-Expand-PlayerItemDamageEvent.patch b/patches/server/0712-Expand-PlayerItemDamageEvent.patch
index 9163d3de01..9163d3de01 100644
--- a/patches/server/0713-Expand-PlayerItemDamageEvent.patch
+++ b/patches/server/0712-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0714-WorldCreator-keepSpawnLoaded.patch b/patches/server/0713-WorldCreator-keepSpawnLoaded.patch
index 92ffaf7290..92ffaf7290 100644
--- a/patches/server/0714-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0713-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0715-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0714-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index ed8adb4503..ed8adb4503 100644
--- a/patches/server/0715-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0714-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0716-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0715-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index d6e979b4fa..d6e979b4fa 100644
--- a/patches/server/0716-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0715-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0717-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0716-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 7c31e2a5df..7c31e2a5df 100644
--- a/patches/server/0717-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0716-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0718-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0717-Fire-CauldronLevelChange-on-initial-fill.patch
index 4f5e70f836..4f5e70f836 100644
--- a/patches/server/0718-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0717-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0719-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0718-fix-powder-snow-cauldrons-not-turning-to-water.patch
index f277b93aa1..f277b93aa1 100644
--- a/patches/server/0719-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0718-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0720-Add-PlayerStopUsingItemEvent.patch b/patches/server/0719-Add-PlayerStopUsingItemEvent.patch
index f8544cd79c..f8544cd79c 100644
--- a/patches/server/0720-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0719-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0721-Don-t-tick-markers.patch b/patches/server/0720-Don-t-tick-markers.patch
index 33c11195ac..429927b2bf 100644
--- a/patches/server/0721-Don-t-tick-markers.patch
+++ b/patches/server/0720-Don-t-tick-markers.patch
@@ -23,10 +23,10 @@ index ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8..5e5a018433414af76eaa1e781f61612d
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d4cc0a6c0ec10614737615143e05c2e250e8149d..842a47a61ac58337f1c1dc9c905a196524a28c97 100644
+index dd1f03109a7f8cd65f9e77de94a2a170652ce4ed..376a03b48db954479dd3d8bdbe7f1b7c956e322b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2198,6 +2198,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2192,6 +2192,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          public void onTickingStart(Entity entity) {
diff --git a/patches/server/0722-Expand-FallingBlock-API.patch b/patches/server/0721-Expand-FallingBlock-API.patch
index 861e7e87f2..861e7e87f2 100644
--- a/patches/server/0722-Expand-FallingBlock-API.patch
+++ b/patches/server/0721-Expand-FallingBlock-API.patch
diff --git a/patches/server/0723-Add-support-for-Proxy-Protocol.patch b/patches/server/0722-Add-support-for-Proxy-Protocol.patch
index b6d5d54b9a..b6d5d54b9a 100644
--- a/patches/server/0723-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0722-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0724-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0723-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 61c9b7dd07..61c9b7dd07 100644
--- a/patches/server/0724-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0723-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0725-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0724-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 7158b83635..7158b83635 100644
--- a/patches/server/0725-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0724-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0726-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0725-Sanitize-sent-BlockEntity-NBT.patch
index 79bacba95c..79bacba95c 100644
--- a/patches/server/0726-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/server/0725-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0727-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0726-Disable-component-selector-resolving-in-books-by-def.patch
index 796fcc7f2a..796fcc7f2a 100644
--- a/patches/server/0727-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0726-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0728-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0727-Prevent-entity-loading-causing-async-lookups.patch
index d3f30f5169..d3f30f5169 100644
--- a/patches/server/0728-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0727-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0729-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0728-Throw-exception-on-world-create-while-being-ticked.patch
index e3913abcf5..e3913abcf5 100644
--- a/patches/server/0729-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0728-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0730-Dont-resent-entity-on-art-update.patch b/patches/server/0729-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0730-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0729-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0731-Add-WardenAngerChangeEvent.patch b/patches/server/0730-Add-WardenAngerChangeEvent.patch
index 38df99e752..38df99e752 100644
--- a/patches/server/0731-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0730-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0732-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0731-Add-option-for-strict-advancement-dimension-checks.patch
index 6fa3d4f18f..6fa3d4f18f 100644
--- a/patches/server/0732-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0731-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0733-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0732-Add-missing-important-BlockStateListPopulator-method.patch
index ecf565ebf6..ecf565ebf6 100644
--- a/patches/server/0733-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0732-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0734-Nameable-Banner-API.patch b/patches/server/0733-Nameable-Banner-API.patch
index 823dd8a8c8..823dd8a8c8 100644
--- a/patches/server/0734-Nameable-Banner-API.patch
+++ b/patches/server/0733-Nameable-Banner-API.patch
diff --git a/patches/server/0735-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0734-Don-t-broadcast-messages-to-command-blocks.patch
index 44292abef1..44292abef1 100644
--- a/patches/server/0735-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0734-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0736-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0735-Prevent-empty-items-from-being-added-to-world.patch
index a619a30fd0..f3d82c1fbd 100644
--- a/patches/server/0736-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0735-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,10 +7,10 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca
 Just simply prevent them from being added to the world instead.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 842a47a61ac58337f1c1dc9c905a196524a28c97..1e60b0d2873381d9e91ed2cc2a912a94b94fd21d 100644
+index 376a03b48db954479dd3d8bdbe7f1b7c956e322b..23c9aca7c05a4457e357699c67c7780894ebe3de 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1243,6 +1243,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1237,6 +1237,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
          } else {
diff --git a/patches/server/0737-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0736-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 2c104c79c4..2c104c79c4 100644
--- a/patches/server/0737-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0736-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0738-Add-Player-getFishHook.patch b/patches/server/0737-Add-Player-getFishHook.patch
index d87fa21619..d87fa21619 100644
--- a/patches/server/0738-Add-Player-getFishHook.patch
+++ b/patches/server/0737-Add-Player-getFishHook.patch
diff --git a/patches/server/0739-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0738-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 32aaf6dc6e..32aaf6dc6e 100644
--- a/patches/server/0739-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0738-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0740-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0739-Add-various-missing-EntityDropItemEvent-calls.patch
index bafd157cd1..bafd157cd1 100644
--- a/patches/server/0740-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0739-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0741-Fix-Bee-flower-NPE.patch b/patches/server/0740-Fix-Bee-flower-NPE.patch
index 13dcee533d..13dcee533d 100644
--- a/patches/server/0741-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0740-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0742-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0741-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 67d2417c55..67d2417c55 100644
--- a/patches/server/0742-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0741-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0743-More-Teleport-API.patch b/patches/server/0742-More-Teleport-API.patch
index 9a4763b6fe..9a4763b6fe 100644
--- a/patches/server/0743-More-Teleport-API.patch
+++ b/patches/server/0742-More-Teleport-API.patch
diff --git a/patches/server/0744-Add-EntityPortalReadyEvent.patch b/patches/server/0743-Add-EntityPortalReadyEvent.patch
index 50d3716266..50d3716266 100644
--- a/patches/server/0744-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0743-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0745-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0744-Don-t-use-level-random-in-entity-constructors.patch
index 4d7c249601..4d7c249601 100644
--- a/patches/server/0745-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0744-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0746-Send-block-entities-after-destroy-prediction.patch b/patches/server/0745-Send-block-entities-after-destroy-prediction.patch
index 0a6e27c3c6..0a6e27c3c6 100644
--- a/patches/server/0746-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0745-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0747-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0746-Warn-on-plugins-accessing-faraway-chunks.patch
index 2f60387b5d..2f60387b5d 100644
--- a/patches/server/0747-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0746-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0748-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0747-Custom-Chat-Completion-Suggestions-API.patch
index 52d9d632bf..52d9d632bf 100644
--- a/patches/server/0748-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0747-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0749-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0748-Add-and-fix-missing-BlockFadeEvents.patch
index 18f8fbe87f..18f8fbe87f 100644
--- a/patches/server/0749-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0748-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0750-Collision-API.patch b/patches/server/0749-Collision-API.patch
index b4840d04ac..b4840d04ac 100644
--- a/patches/server/0750-Collision-API.patch
+++ b/patches/server/0749-Collision-API.patch
diff --git a/patches/server/0751-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0750-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index c145128551..c145128551 100644
--- a/patches/server/0751-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0750-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0752-Block-Ticking-API.patch b/patches/server/0751-Block-Ticking-API.patch
index f1b51ee5b1..f1b51ee5b1 100644
--- a/patches/server/0752-Block-Ticking-API.patch
+++ b/patches/server/0751-Block-Ticking-API.patch
diff --git a/patches/server/0753-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0752-Add-Velocity-IP-Forwarding-Support.patch
index 0987d6a956..0987d6a956 100644
--- a/patches/server/0753-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0752-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0754-Add-NamespacedKey-biome-methods.patch b/patches/server/0753-Add-NamespacedKey-biome-methods.patch
index b870c787cc..b870c787cc 100644
--- a/patches/server/0754-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0753-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0755-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0754-Fix-plugin-loggers-on-server-shutdown.patch
index c0da2d76a6..c0da2d76a6 100644
--- a/patches/server/0755-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0754-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0756-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0755-Stop-large-look-changes-from-crashing-the-server.patch
index 4604a3c7d6..4604a3c7d6 100644
--- a/patches/server/0756-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0755-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0757-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0756-Fire-EntityChangeBlockEvent-in-more-places.patch
index d21cfe9e22..d21cfe9e22 100644
--- a/patches/server/0757-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0756-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0758-Missing-eating-regain-reason.patch b/patches/server/0757-Missing-eating-regain-reason.patch
index 7c26c6d752..7c26c6d752 100644
--- a/patches/server/0758-Missing-eating-regain-reason.patch
+++ b/patches/server/0757-Missing-eating-regain-reason.patch
diff --git a/patches/server/0759-Missing-effect-cause.patch b/patches/server/0758-Missing-effect-cause.patch
index 17172c3b36..17172c3b36 100644
--- a/patches/server/0759-Missing-effect-cause.patch
+++ b/patches/server/0758-Missing-effect-cause.patch
diff --git a/patches/server/0760-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0759-Added-byte-array-serialization-deserialization-for-P.patch
index f2a4d437f0..f2a4d437f0 100644
--- a/patches/server/0760-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0759-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0761-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0760-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index c6ff862ed6..c6ff862ed6 100644
--- a/patches/server/0761-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0760-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0762-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0761-Call-BlockPhysicsEvent-more-often.patch
index 1839fbe711..1839fbe711 100644
--- a/patches/server/0762-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0761-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0763-Configurable-chat-thread-limit.patch b/patches/server/0762-Configurable-chat-thread-limit.patch
index 255381bd14..255381bd14 100644
--- a/patches/server/0763-Configurable-chat-thread-limit.patch
+++ b/patches/server/0762-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0764-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0763-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 6b16e23fbc..6b16e23fbc 100644
--- a/patches/server/0764-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0763-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0765-fix-Jigsaw-block-kicking-user.patch b/patches/server/0764-fix-Jigsaw-block-kicking-user.patch
index 0c52c47ce9..0c52c47ce9 100644
--- a/patches/server/0765-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0764-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0766-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0765-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 8653ffd786..8653ffd786 100644
--- a/patches/server/0766-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0765-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0767-Add-getDrops-to-BlockState.patch b/patches/server/0766-Add-getDrops-to-BlockState.patch
index ea12f69bde..ea12f69bde 100644
--- a/patches/server/0767-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0766-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0768-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch
index f847c09279..81cd4525ce 100644
--- a/patches/server/0768-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch
@@ -117,10 +117,10 @@ index 3532febc8e34c8436a69a4c4b472b1776f21ee48..de19a5ea96fa38621513e970e04d1535
          return this.anyPlayerCloseEnoughForSpawning(pos, false);
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1e60b0d2873381d9e91ed2cc2a912a94b94fd21d..48177251377644d79c91eae67a970659c225e0d5 100644
+index 23c9aca7c05a4457e357699c67c7780894ebe3de..ab31102de7c43a4fc923b26d9072242453a3f199 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -782,7 +782,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -776,7 +776,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          } else {
              AABB axisalignedbb = AABB.encapsulatingFullBlocks(blockposition1, new BlockPos(blockposition1.atY(this.getMaxBuildHeight()))).inflate(3.0D);
              List<LivingEntity> list = this.getEntitiesOfClass(LivingEntity.class, axisalignedbb, (entityliving) -> {
diff --git a/patches/server/0769-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0768-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 8e43d21dd8..73e5958d98 100644
--- a/patches/server/0769-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0768-Remove-unnecessary-onTrackingStart-during-navigation.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 48177251377644d79c91eae67a970659c225e0d5..9377b2d46100f1e0f28e5e908fbb7eaea2be2fdb 100644
+index ab31102de7c43a4fc923b26d9072242453a3f199..93f6864c69761b70735795186cf118d1f091d092 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2222,7 +2222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2216,7 +2216,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
              if (entity instanceof Mob entityinsentient) {
@@ -17,7 +17,7 @@ index 48177251377644d79c91eae67a970659c225e0d5..9377b2d46100f1e0f28e5e908fbb7eae
                      String s = "onTrackingStart called during navigation iteration";
  
                      Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration"));
-@@ -2302,7 +2302,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2296,7 +2296,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
              if (entity instanceof Mob entityinsentient) {
diff --git a/patches/server/0770-Fix-custom-piglin-loved-items.patch b/patches/server/0769-Fix-custom-piglin-loved-items.patch
index 043217eed5..043217eed5 100644
--- a/patches/server/0770-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0769-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0771-EntityPickupItemEvent-fixes.patch b/patches/server/0770-EntityPickupItemEvent-fixes.patch
index 5780237591..5780237591 100644
--- a/patches/server/0771-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0770-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0772-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0771-Correctly-handle-interactions-with-items-on-cooldown.patch
index abeca5857c..abeca5857c 100644
--- a/patches/server/0772-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0771-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0773-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0772-Add-PlayerInventorySlotChangeEvent.patch
index c9503fa774..c9503fa774 100644
--- a/patches/server/0773-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0772-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0774-Elder-Guardian-appearance-API.patch b/patches/server/0773-Elder-Guardian-appearance-API.patch
index 403482552b..403482552b 100644
--- a/patches/server/0774-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0773-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0775-Allow-changing-bed-s-occupied-property.patch b/patches/server/0774-Allow-changing-bed-s-occupied-property.patch
index d8b51d7f0b..d8b51d7f0b 100644
--- a/patches/server/0775-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0774-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0776-Add-entity-knockback-API.patch b/patches/server/0775-Add-entity-knockback-API.patch
index c5c8da6eb6..c5c8da6eb6 100644
--- a/patches/server/0776-Add-entity-knockback-API.patch
+++ b/patches/server/0775-Add-entity-knockback-API.patch
diff --git a/patches/server/0777-Detect-headless-JREs.patch b/patches/server/0776-Detect-headless-JREs.patch
index 5ba28913a8..5ba28913a8 100644
--- a/patches/server/0777-Detect-headless-JREs.patch
+++ b/patches/server/0776-Detect-headless-JREs.patch
diff --git a/patches/server/0778-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0777-fix-entity-vehicle-collision-event-not-called.patch
index fdb817e0f7..fdb817e0f7 100644
--- a/patches/server/0778-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0777-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0779-Add-EntityToggleSitEvent.patch b/patches/server/0778-Add-EntityToggleSitEvent.patch
index 6430c3e7f9..6430c3e7f9 100644
--- a/patches/server/0779-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0778-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0780-Add-fire-tick-delay-option.patch b/patches/server/0779-Add-fire-tick-delay-option.patch
index 848f831f0e..848f831f0e 100644
--- a/patches/server/0780-Add-fire-tick-delay-option.patch
+++ b/patches/server/0779-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0781-Add-Moving-Piston-API.patch b/patches/server/0780-Add-Moving-Piston-API.patch
index e3d3955822..e3d3955822 100644
--- a/patches/server/0781-Add-Moving-Piston-API.patch
+++ b/patches/server/0780-Add-Moving-Piston-API.patch
diff --git a/patches/server/0782-Ignore-impossible-spawn-tick.patch b/patches/server/0781-Ignore-impossible-spawn-tick.patch
index f046102ceb..f046102ceb 100644
--- a/patches/server/0782-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0781-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0783-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0782-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index c42422ceca..c42422ceca 100644
--- a/patches/server/0783-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0782-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0784-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0783-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 5def430ee3..5def430ee3 100644
--- a/patches/server/0784-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0783-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0785-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0784-Add-PrePlayerAttackEntityEvent.patch
index 6ea383ac09..6ea383ac09 100644
--- a/patches/server/0785-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0784-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0786-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0785-ensure-reset-EnderDragon-boss-event-name.patch
index 854c391fc5..854c391fc5 100644
--- a/patches/server/0786-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0785-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0787-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0786-fix-MC-252817-green-map-markers-do-not-disappear.patch
index a5e8df272b..a5e8df272b 100644
--- a/patches/server/0787-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0786-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0788-Add-Player-Warden-Warning-API.patch b/patches/server/0787-Add-Player-Warden-Warning-API.patch
index cbda3eac9c..cbda3eac9c 100644
--- a/patches/server/0788-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0787-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0789-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0788-More-vanilla-friendly-methods-to-update-trades.patch
index 5280c03219..5280c03219 100644
--- a/patches/server/0789-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0788-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0790-Add-paper-dumplisteners-command.patch b/patches/server/0789-Add-paper-dumplisteners-command.patch
index 4170206f59..4170206f59 100644
--- a/patches/server/0790-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0789-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0791-check-global-player-list-where-appropriate.patch b/patches/server/0790-check-global-player-list-where-appropriate.patch
index 38c66589bb..a0e80701f5 100644
--- a/patches/server/0791-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0790-check-global-player-list-where-appropriate.patch
@@ -7,10 +7,10 @@ Makes certain entities check all players when searching for a player
 instead of just checking players in their world.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9377b2d46100f1e0f28e5e908fbb7eaea2be2fdb..d4ac2a2d3f59cfdd80baf59c45d532cad22b46bb 100644
+index 93f6864c69761b70735795186cf118d1f091d092..3ce6604a74d7ab0b045901261d58736ca4c543a7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2338,4 +2338,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2332,4 +2332,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entity.updateDynamicGameEventListener(DynamicGameEventListener::move);
          }
      }
diff --git a/patches/server/0792-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0791-Fix-async-entity-add-due-to-fungus-trees.patch
index a5f4531c29..a5f4531c29 100644
--- a/patches/server/0792-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0791-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0793-ItemStack-damage-API.patch b/patches/server/0792-ItemStack-damage-API.patch
index 807a916f44..807a916f44 100644
--- a/patches/server/0793-ItemStack-damage-API.patch
+++ b/patches/server/0792-ItemStack-damage-API.patch
diff --git a/patches/server/0794-Friction-API.patch b/patches/server/0793-Friction-API.patch
index d4359b9c85..d4359b9c85 100644
--- a/patches/server/0794-Friction-API.patch
+++ b/patches/server/0793-Friction-API.patch
diff --git a/patches/server/0795-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0794-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 5bc45a7af4..5bc45a7af4 100644
--- a/patches/server/0795-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0794-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0796-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0795-Fix-premature-player-kicks-on-shutdown.patch
index d824af1bd8..d824af1bd8 100644
--- a/patches/server/0796-Fix-premature-player-kicks-on-shutdown.patch
+++ b/patches/server/0795-Fix-premature-player-kicks-on-shutdown.patch
diff --git a/patches/server/0797-Sync-offhand-slot-in-menus.patch b/patches/server/0796-Sync-offhand-slot-in-menus.patch
index ca3c70a65a..ca3c70a65a 100644
--- a/patches/server/0797-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0796-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0798-Player-Entity-Tracking-Events.patch b/patches/server/0797-Player-Entity-Tracking-Events.patch
index 4a5f62d874..4a5f62d874 100644
--- a/patches/server/0798-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0797-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0799-Limit-pet-look-distance.patch b/patches/server/0798-Limit-pet-look-distance.patch
index 7a9fe7cf5c..7a9fe7cf5c 100644
--- a/patches/server/0799-Limit-pet-look-distance.patch
+++ b/patches/server/0798-Limit-pet-look-distance.patch
diff --git a/patches/server/0800-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0799-Fixes-and-additions-to-the-SpawnReason-API.patch
index d758b37206..d758b37206 100644
--- a/patches/server/0800-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0799-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0801-fix-Instruments.patch b/patches/server/0800-fix-Instruments.patch
index 610a880852..610a880852 100644
--- a/patches/server/0801-fix-Instruments.patch
+++ b/patches/server/0800-fix-Instruments.patch
diff --git a/patches/server/0802-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0801-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 2f86713e06..2f86713e06 100644
--- a/patches/server/0802-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0801-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0803-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0802-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 5b38409d1f..5b38409d1f 100644
--- a/patches/server/0803-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0802-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0804-Add-BlockLockCheckEvent.patch b/patches/server/0803-Add-BlockLockCheckEvent.patch
index 91be1b9825..91be1b9825 100644
--- a/patches/server/0804-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0803-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0805-Add-Sneaking-API-for-Entities.patch b/patches/server/0804-Add-Sneaking-API-for-Entities.patch
index 47d08328f7..47d08328f7 100644
--- a/patches/server/0805-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0804-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0806-Improve-logging-and-errors.patch b/patches/server/0805-Improve-logging-and-errors.patch
index 5fd0fba842..5fd0fba842 100644
--- a/patches/server/0806-Improve-logging-and-errors.patch
+++ b/patches/server/0805-Improve-logging-and-errors.patch
diff --git a/patches/server/0807-Improve-PortalEvents.patch b/patches/server/0806-Improve-PortalEvents.patch
index 680471754c..680471754c 100644
--- a/patches/server/0807-Improve-PortalEvents.patch
+++ b/patches/server/0806-Improve-PortalEvents.patch
diff --git a/patches/server/0808-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0807-Add-config-option-for-spider-worldborder-climbing.patch
index b10bcacd3c..b10bcacd3c 100644
--- a/patches/server/0808-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0807-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0809-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0808-Add-missing-SpigotConfig-logCommands-check.patch
index fca5a305ca..fca5a305ca 100644
--- a/patches/server/0809-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0808-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0810-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0809-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0810-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0809-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0811-Flying-Fall-Damage.patch b/patches/server/0810-Flying-Fall-Damage.patch
index 46bd6e117e..46bd6e117e 100644
--- a/patches/server/0811-Flying-Fall-Damage.patch
+++ b/patches/server/0810-Flying-Fall-Damage.patch
diff --git a/patches/server/0812-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0811-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index c966db60a9..c966db60a9 100644
--- a/patches/server/0812-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/server/0811-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0813-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0812-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 214bb65165..214bb65165 100644
--- a/patches/server/0813-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0812-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0814-config-for-disabling-entity-tag-tags.patch b/patches/server/0813-config-for-disabling-entity-tag-tags.patch
index 79f922d624..79f922d624 100644
--- a/patches/server/0814-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0813-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0815-Use-single-player-info-update-packet-on-join.patch b/patches/server/0814-Use-single-player-info-update-packet-on-join.patch
index be7116d308..be7116d308 100644
--- a/patches/server/0815-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0814-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0816-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0815-Correctly-shrink-items-during-EntityResurrectEvent.patch
index d4dc43a7c7..d4dc43a7c7 100644
--- a/patches/server/0816-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0815-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0817-Win-Screen-API.patch b/patches/server/0816-Win-Screen-API.patch
index 55b4336093..55b4336093 100644
--- a/patches/server/0817-Win-Screen-API.patch
+++ b/patches/server/0816-Win-Screen-API.patch
diff --git a/patches/server/0818-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0817-Remove-CraftItemStack-setAmount-null-assignment.patch
index 83f46bb0c6..83f46bb0c6 100644
--- a/patches/server/0818-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0817-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0819-Fix-force-opening-enchantment-tables.patch b/patches/server/0818-Fix-force-opening-enchantment-tables.patch
index eac3ab63ee..eac3ab63ee 100644
--- a/patches/server/0819-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0818-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0820-Add-Entity-Body-Yaw-API.patch b/patches/server/0819-Add-Entity-Body-Yaw-API.patch
index 47d59d5783..47d59d5783 100644
--- a/patches/server/0820-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0819-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0821-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0820-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 962917dab8..962917dab8 100644
--- a/patches/server/0821-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0820-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0822-Add-EntityFertilizeEggEvent.patch b/patches/server/0821-Add-EntityFertilizeEggEvent.patch
index 4936a75506..4936a75506 100644
--- a/patches/server/0822-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0821-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0823-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0822-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index a3e0925b49..a3e0925b49 100644
--- a/patches/server/0823-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0822-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0824-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0823-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 85321a4a5b..85321a4a5b 100644
--- a/patches/server/0824-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0823-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0825-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0824-Correctly-handle-ArmorStand-invisibility.patch
index ea22d29006..ea22d29006 100644
--- a/patches/server/0825-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0824-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0826-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0825-Fix-advancement-triggers-for-entity-damage.patch
index 2d24162670..2d24162670 100644
--- a/patches/server/0826-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0825-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0827-Fix-text-display-error-on-spawn.patch b/patches/server/0826-Fix-text-display-error-on-spawn.patch
index 7f64cfe6d9..7f64cfe6d9 100644
--- a/patches/server/0827-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0826-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0828-Fix-inventories-returning-null-Locations.patch b/patches/server/0827-Fix-inventories-returning-null-Locations.patch
index 2a3e133d8d..2a3e133d8d 100644
--- a/patches/server/0828-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0827-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0829-Add-Shearable-API.patch b/patches/server/0828-Add-Shearable-API.patch
index 34eb025e6b..34eb025e6b 100644
--- a/patches/server/0829-Add-Shearable-API.patch
+++ b/patches/server/0828-Add-Shearable-API.patch
diff --git a/patches/server/0830-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0829-Fix-SpawnEggMeta-get-setSpawnedType.patch
index bf28528953..bf28528953 100644
--- a/patches/server/0830-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0829-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0831-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0830-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index c51be7e3ac..c51be7e3ac 100644
--- a/patches/server/0831-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0830-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0832-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0831-Treat-sequence-violations-like-they-should-be.patch
index 6a727c191f..6a727c191f 100644
--- a/patches/server/0832-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0831-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0833-remove-duplicate-animate-packet-for-records.patch b/patches/server/0832-remove-duplicate-animate-packet-for-records.patch
index 47fc3e8c30..47fc3e8c30 100644
--- a/patches/server/0833-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0832-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0834-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0833-Prevent-causing-expired-keys-from-impacting-new-join.patch
index bf4d66e914..bf4d66e914 100644
--- a/patches/server/0834-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0833-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0835-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0834-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 45b84428cb..98ae07fa8b 100644
--- a/patches/server/0835-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0834-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d4ac2a2d3f59cfdd80baf59c45d532cad22b46bb..b8aac1c72bac15bf421d0f7ae406feefe1cad587 100644
+index 3ce6604a74d7ab0b045901261d58736ca4c543a7..751efd2400a1c6fa6e1db72080c4f17fa9a9c548 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1380,6 +1380,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1374,6 +1374,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void gameEvent(Holder<GameEvent> event, Vec3 emitterPos, GameEvent.Context emitter) {
diff --git a/patches/server/0836-Use-array-for-gamerule-storage.patch b/patches/server/0835-Use-array-for-gamerule-storage.patch
index 194ff8f15b..194ff8f15b 100644
--- a/patches/server/0836-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0835-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0837-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0836-Fix-a-couple-of-upstream-bed-issues.patch
index b2cad9c8d3..b2cad9c8d3 100644
--- a/patches/server/0837-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0836-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0838-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0837-Fix-demo-flag-not-enabling-demo-mode.patch
index d64dd23e37..d64dd23e37 100644
--- a/patches/server/0838-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0837-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0839-Add-Mob-Experience-reward-API.patch b/patches/server/0838-Add-Mob-Experience-reward-API.patch
index 487fe9e567..487fe9e567 100644
--- a/patches/server/0839-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0838-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0840-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0839-Break-redstone-on-top-of-trap-doors-early.patch
index 2f89b7d780..2f89b7d780 100644
--- a/patches/server/0840-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0839-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0841-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0840-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index becde16ce8..becde16ce8 100644
--- a/patches/server/0841-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0840-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0842-More-accurate-isInOpenWater-impl.patch b/patches/server/0841-More-accurate-isInOpenWater-impl.patch
index ca26fd9045..ca26fd9045 100644
--- a/patches/server/0842-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0841-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0843-Expand-PlayerItemMendEvent.patch b/patches/server/0842-Expand-PlayerItemMendEvent.patch
index 617b45a407..617b45a407 100644
--- a/patches/server/0843-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0842-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0844-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0843-Refresh-ProjectileSource-for-projectiles.patch
index f6d4037762..f6d4037762 100644
--- a/patches/server/0844-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0843-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0845-Add-transient-modifier-API.patch b/patches/server/0844-Add-transient-modifier-API.patch
index 5614f73626..5614f73626 100644
--- a/patches/server/0845-Add-transient-modifier-API.patch
+++ b/patches/server/0844-Add-transient-modifier-API.patch
diff --git a/patches/server/0846-Fix-block-place-logic.patch b/patches/server/0845-Fix-block-place-logic.patch
index 2e91a7ea75..2e91a7ea75 100644
--- a/patches/server/0846-Fix-block-place-logic.patch
+++ b/patches/server/0845-Fix-block-place-logic.patch
diff --git a/patches/server/0847-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0846-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index a337cf6e29..a337cf6e29 100644
--- a/patches/server/0847-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0846-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0848-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0847-Call-BlockGrowEvent-for-missing-blocks.patch
index 895a528de8..895a528de8 100644
--- a/patches/server/0848-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0847-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0849-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0848-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index d3064fd3ee..d3064fd3ee 100644
--- a/patches/server/0849-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0848-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0850-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0849-fix-MapLike-spam-for-missing-key-selector.patch
index 2bd3b889f1..2bd3b889f1 100644
--- a/patches/server/0850-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0849-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0851-Fix-sniffer-removeExploredLocation.patch b/patches/server/0850-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0851-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0850-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0852-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0851-Add-method-to-remove-all-active-potion-effects.patch
index a3bf117ed3..a3bf117ed3 100644
--- a/patches/server/0852-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0851-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0853-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0852-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index 702619dd05..702619dd05 100644
--- a/patches/server/0853-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0852-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0854-Add-event-for-player-editing-sign.patch b/patches/server/0853-Add-event-for-player-editing-sign.patch
index 30316e5cd7..30316e5cd7 100644
--- a/patches/server/0854-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0853-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0855-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0854-Only-tick-item-frames-if-players-can-see-it.patch
index dbf1486052..dbf1486052 100644
--- a/patches/server/0855-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0854-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0856-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0855-Fix-cmd-permission-levels-for-command-blocks.patch
index 1f86b6a789..1f86b6a789 100644
--- a/patches/server/0856-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0855-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0857-Add-option-to-disable-block-updates.patch b/patches/server/0856-Add-option-to-disable-block-updates.patch
index 8fe599472e..8fe599472e 100644
--- a/patches/server/0857-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0856-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0858-Call-missing-BlockDispenseEvent.patch b/patches/server/0857-Call-missing-BlockDispenseEvent.patch
index f018b2ae74..f018b2ae74 100644
--- a/patches/server/0858-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0857-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0859-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0858-Don-t-load-chunks-for-supporting-block-checks.patch
index 4dd0bce763..4dd0bce763 100644
--- a/patches/server/0859-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0858-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0860-Optimize-player-lookups-for-beacons.patch b/patches/server/0859-Optimize-player-lookups-for-beacons.patch
index e5daf82675..e5daf82675 100644
--- a/patches/server/0860-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0859-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0861-Add-Sign-getInteractableSideFor.patch b/patches/server/0860-Add-Sign-getInteractableSideFor.patch
index 2833829ce4..2833829ce4 100644
--- a/patches/server/0861-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0860-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0862-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0861-fix-item-meta-for-tadpole-buckets.patch
index 11453b4a7d..11453b4a7d 100644
--- a/patches/server/0862-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0861-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0863-Fix-BanList-API.patch b/patches/server/0862-Fix-BanList-API.patch
index ad75aaf764..ad75aaf764 100644
--- a/patches/server/0863-Fix-BanList-API.patch
+++ b/patches/server/0862-Fix-BanList-API.patch
diff --git a/patches/server/0864-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0863-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 5f51eb317c..5f51eb317c 100644
--- a/patches/server/0864-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0863-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0865-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0864-Fix-possible-NPE-on-painting-creation.patch
index cf51e817de..cf51e817de 100644
--- a/patches/server/0865-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0864-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0866-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0865-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 32b71969c8..32b71969c8 100644
--- a/patches/server/0866-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0865-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0867-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0866-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 96941a19e5..96941a19e5 100644
--- a/patches/server/0867-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0866-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0868-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0867-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 301b345fb9..301b345fb9 100644
--- a/patches/server/0868-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0867-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0869-Add-whitelist-events.patch b/patches/server/0868-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0869-Add-whitelist-events.patch
+++ b/patches/server/0868-Add-whitelist-events.patch
diff --git a/patches/server/0870-Implement-PlayerFailMoveEvent.patch b/patches/server/0869-Implement-PlayerFailMoveEvent.patch
index a0afcbdacd..a0afcbdacd 100644
--- a/patches/server/0870-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0869-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0871-Folia-scheduler-and-owned-region-API.patch b/patches/server/0870-Folia-scheduler-and-owned-region-API.patch
index 43a9734890..43a9734890 100644
--- a/patches/server/0871-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0870-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0872-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0871-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0872-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0871-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0873-API-for-updating-recipes-on-clients.patch b/patches/server/0872-API-for-updating-recipes-on-clients.patch
index 6460683bdd..6460683bdd 100644
--- a/patches/server/0873-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0872-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0874-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0873-Fix-rotation-when-spawning-display-entities.patch
index a027b8b8bb..a027b8b8bb 100644
--- a/patches/server/0874-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0873-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0875-Only-capture-actual-tree-growth.patch b/patches/server/0874-Only-capture-actual-tree-growth.patch
index de9ee567ad..de9ee567ad 100644
--- a/patches/server/0875-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0874-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0876-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0875-Use-correct-source-for-mushroom-block-spread-event.patch
index a295e29bcb..a295e29bcb 100644
--- a/patches/server/0876-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0875-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0877-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0876-Respect-randomizeData-on-more-entities-when-spawning.patch
index 777f9a2e5a..777f9a2e5a 100644
--- a/patches/server/0877-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0876-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0878-Use-correct-seed-on-api-world-load.patch b/patches/server/0877-Use-correct-seed-on-api-world-load.patch
index b5e00916b9..b5e00916b9 100644
--- a/patches/server/0878-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0877-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0879-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0878-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 2f19c9d94a..2f19c9d94a 100644
--- a/patches/server/0879-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0878-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0880-Cache-map-ids-on-item-frames.patch b/patches/server/0879-Cache-map-ids-on-item-frames.patch
index 4294f88d3c..4294f88d3c 100644
--- a/patches/server/0880-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0879-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0881-Fix-custom-statistic-criteria-creation.patch b/patches/server/0880-Fix-custom-statistic-criteria-creation.patch
index c15d703018..c15d703018 100644
--- a/patches/server/0881-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0880-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0882-Bandaid-fix-for-Effect.patch b/patches/server/0881-Bandaid-fix-for-Effect.patch
index 524e09bb4f..524e09bb4f 100644
--- a/patches/server/0882-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0881-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0883-SculkCatalyst-bloom-API.patch b/patches/server/0882-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0883-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0882-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0884-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0883-API-for-an-entity-s-scoreboard-name.patch
index c44b023d7d..c44b023d7d 100644
--- a/patches/server/0884-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0883-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0885-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0884-Deprecate-and-replace-methods-with-old-StructureType.patch
index 31119a3193..31119a3193 100644
--- a/patches/server/0885-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0884-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0886-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0885-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index f6d9c42ed2..f6d9c42ed2 100644
--- a/patches/server/0886-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0885-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0887-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0886-Properly-handle-BlockBreakEvent-isDropItems.patch
index aa3f1c73c8..aa3f1c73c8 100644
--- a/patches/server/0887-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0886-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0888-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0887-Fire-entity-death-event-for-ender-dragon.patch
index 08b7409275..08b7409275 100644
--- a/patches/server/0888-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0887-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0889-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0888-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 1cf3f3d9a6..1cf3f3d9a6 100644
--- a/patches/server/0889-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0888-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0890-Add-Listing-API-for-Player.patch b/patches/server/0889-Add-Listing-API-for-Player.patch
index 280e547dd5..280e547dd5 100644
--- a/patches/server/0890-Add-Listing-API-for-Player.patch
+++ b/patches/server/0889-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0891-Configurable-Region-Compression-Format.patch b/patches/server/0890-Configurable-Region-Compression-Format.patch
index 64a52a4ea2..64a52a4ea2 100644
--- a/patches/server/0891-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0890-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0892-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0891-Add-BlockFace-to-BlockDamageEvent.patch
index 3af304961a..3af304961a 100644
--- a/patches/server/0892-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0891-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0893-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0892-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0893-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0892-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0894-Expand-Pose-API.patch b/patches/server/0893-Expand-Pose-API.patch
index 1a247ee6fd..1a247ee6fd 100644
--- a/patches/server/0894-Expand-Pose-API.patch
+++ b/patches/server/0893-Expand-Pose-API.patch
diff --git a/patches/server/0895-More-DragonBattle-API.patch b/patches/server/0894-More-DragonBattle-API.patch
index a6e0c111c0..a6e0c111c0 100644
--- a/patches/server/0895-More-DragonBattle-API.patch
+++ b/patches/server/0894-More-DragonBattle-API.patch
diff --git a/patches/server/0896-Add-PlayerPickItemEvent.patch b/patches/server/0895-Add-PlayerPickItemEvent.patch
index a611fad439..a611fad439 100644
--- a/patches/server/0896-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0895-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0897-Allow-trident-custom-damage.patch b/patches/server/0896-Allow-trident-custom-damage.patch
index eaa126da9c..eaa126da9c 100644
--- a/patches/server/0897-Allow-trident-custom-damage.patch
+++ b/patches/server/0896-Allow-trident-custom-damage.patch
diff --git a/patches/server/0898-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0897-Expose-hand-in-BlockCanBuildEvent.patch
index 4abc7e9fc5..4abc7e9fc5 100644
--- a/patches/server/0898-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0897-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0899-Optimize-nearest-structure-border-iteration.patch b/patches/server/0898-Optimize-nearest-structure-border-iteration.patch
index 805af0f26c..805af0f26c 100644
--- a/patches/server/0899-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0898-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0900-Implement-OfflinePlayer-isConnected.patch b/patches/server/0899-Implement-OfflinePlayer-isConnected.patch
index 45edfbf777..45edfbf777 100644
--- a/patches/server/0900-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0899-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0901-Fix-inventory-desync.patch b/patches/server/0900-Fix-inventory-desync.patch
index 3381bed750..3381bed750 100644
--- a/patches/server/0901-Fix-inventory-desync.patch
+++ b/patches/server/0900-Fix-inventory-desync.patch
diff --git a/patches/server/0902-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0901-Add-titleOverride-to-InventoryOpenEvent.patch
index c4903a4da6..c4903a4da6 100644
--- a/patches/server/0902-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0901-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0903-Configure-sniffer-egg-hatch-time.patch b/patches/server/0902-Configure-sniffer-egg-hatch-time.patch
index 7def55b1f7..7def55b1f7 100644
--- a/patches/server/0903-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0902-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0904-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0903-Do-crystal-portal-proximity-check-before-entity-look.patch
index c83b2614f9..c83b2614f9 100644
--- a/patches/server/0904-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0903-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0905-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0904-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0905-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0904-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0906-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0905-Add-slot-sanity-checks-in-container-clicks.patch
index 3ee111d847..3ee111d847 100644
--- a/patches/server/0906-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0905-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0907-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0906-Call-BlockRedstoneEvents-for-lecterns.patch
index bafd87afad..bafd87afad 100644
--- a/patches/server/0907-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0906-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0908-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0907-Allow-proper-checking-of-empty-item-stacks.patch
index 906d0184e4..906d0184e4 100644
--- a/patches/server/0908-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0907-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0909-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0908-Fix-silent-equipment-change-for-mobs.patch
index c75be4adb1..c75be4adb1 100644
--- a/patches/server/0909-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0908-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0910-Fix-spigot-s-Forced-Stats.patch b/patches/server/0909-Fix-spigot-s-Forced-Stats.patch
index a138a58b79..a138a58b79 100644
--- a/patches/server/0910-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0909-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0911-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0910-Add-missing-InventoryHolders-to-inventories.patch
index a2c5867c17..a2c5867c17 100644
--- a/patches/server/0911-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0910-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0912-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0911-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index 21515b5dba..21515b5dba 100644
--- a/patches/server/0912-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0911-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0913-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0912-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0913-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0912-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0914-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0913-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e1f2934daa..e1f2934daa 100644
--- a/patches/server/0914-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0913-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0915-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0914-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0915-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0914-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0916-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0915-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0916-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0915-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0917-Fix-missing-map-initialize-event-call.patch b/patches/server/0916-Fix-missing-map-initialize-event-call.patch
index be9f07bfc2..df02af5590 100644
--- a/patches/server/0917-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0916-Fix-missing-map-initialize-event-call.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Fix missing map initialize event call
 public net.minecraft.world.level.storage.DimensionDataStorage readSavedData(Ljava/util/function/Function;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;)Lnet/minecraft/world/level/saveddata/SavedData;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b8aac1c72bac15bf421d0f7ae406feefe1cad587..601ddb8a2ed1559a3c439c1aca49f772ffdd092a 100644
+index 751efd2400a1c6fa6e1db72080c4f17fa9a9c548..b37cad7d65e72ead9f3967baaae45f1b734ad726 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1670,13 +1670,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1664,13 +1664,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Nullable
      @Override
      public MapItemSavedData getMapData(MapId id) {
diff --git a/patches/server/0918-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0917-Update-entity-data-when-attaching-firework-to-entity.patch
index 8cbc0f974a..8cbc0f974a 100644
--- a/patches/server/0918-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0917-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0919-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0918-Fix-UnsafeValues-loadAdvancement.patch
index 07ee09f53a..07ee09f53a 100644
--- a/patches/server/0919-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0918-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0920-Add-player-idle-duration-API.patch b/patches/server/0919-Add-player-idle-duration-API.patch
index 3aaeed1d13..3aaeed1d13 100644
--- a/patches/server/0920-Add-player-idle-duration-API.patch
+++ b/patches/server/0919-Add-player-idle-duration-API.patch
diff --git a/patches/server/0921-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0920-Don-t-check-if-we-can-see-non-visible-entities.patch
index a63a8d3cb7..a63a8d3cb7 100644
--- a/patches/server/0921-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0920-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0922-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0921-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 3f575aef28..3f575aef28 100644
--- a/patches/server/0922-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0921-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0923-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0922-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 2778d6eb28..2778d6eb28 100644
--- a/patches/server/0923-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0922-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0924-Optimize-VarInts.patch b/patches/server/0923-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0924-Optimize-VarInts.patch
+++ b/patches/server/0923-Optimize-VarInts.patch
diff --git a/patches/server/0925-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0924-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index ac06d6fe4b..ac06d6fe4b 100644
--- a/patches/server/0925-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0924-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0926-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0925-Add-predicate-for-blocks-when-raytracing.patch
index 712ca7a8c8..712ca7a8c8 100644
--- a/patches/server/0926-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0925-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0927-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0926-Broadcast-take-item-packets-with-collector-as-source.patch
index a1301dea28..a1301dea28 100644
--- a/patches/server/0927-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0926-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0928-Expand-LingeringPotion-API.patch b/patches/server/0927-Expand-LingeringPotion-API.patch
index b203b03355..b203b03355 100644
--- a/patches/server/0928-Expand-LingeringPotion-API.patch
+++ b/patches/server/0927-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0929-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0928-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index 3d51508d96..3d51508d96 100644
--- a/patches/server/0929-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0928-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0930-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0929-Add-hand-to-fish-event-for-all-player-interactions.patch
index 3bc8cd9b24..3bc8cd9b24 100644
--- a/patches/server/0930-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0929-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0931-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0930-Fix-several-issues-with-EntityBreedEvent.patch
index dfc2aa7485..dfc2aa7485 100644
--- a/patches/server/0931-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0930-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0932-Add-UUID-attribute-modifier-API.patch b/patches/server/0931-Add-UUID-attribute-modifier-API.patch
index c9666b4f31..c9666b4f31 100644
--- a/patches/server/0932-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0931-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0933-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0932-Fix-missing-event-call-for-entity-teleport-API.patch
index ac77e45fa2..ac77e45fa2 100644
--- a/patches/server/0933-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0932-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0934-Lazily-create-LootContext-for-criterions.patch b/patches/server/0933-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0934-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0933-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0935-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0934-Don-t-fire-sync-events-during-worldgen.patch
index 492d95271a..24e5999fbb 100644
--- a/patches/server/0935-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0934-Don-t-fire-sync-events-during-worldgen.patch
@@ -19,10 +19,10 @@ where generation happened directly to a ServerLevel and the
 entity still has the flag set.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 601ddb8a2ed1559a3c439c1aca49f772ffdd092a..6e7f98fd7b43b46171c3cd58ed91b53960bd0d8a 100644
+index b37cad7d65e72ead9f3967baaae45f1b734ad726..4e5b08093413fb6571a3c49b1563f50b05d8fce1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1232,6 +1232,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1226,6 +1226,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      // CraftBukkit start
      private boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
          org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
diff --git a/patches/server/0936-Add-Structure-check-API.patch b/patches/server/0935-Add-Structure-check-API.patch
index b1501eb55b..b1501eb55b 100644
--- a/patches/server/0936-Add-Structure-check-API.patch
+++ b/patches/server/0935-Add-Structure-check-API.patch
diff --git a/patches/server/0937-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0936-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index 8568cfc5bf..8568cfc5bf 100644
--- a/patches/server/0937-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0936-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0938-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0937-Restore-vanilla-entity-drops-behavior.patch
index edb6769a27..edb6769a27 100644
--- a/patches/server/0938-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0937-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0939-Dont-resend-blocks-on-interactions.patch b/patches/server/0938-Dont-resend-blocks-on-interactions.patch
index a08da77332..a08da77332 100644
--- a/patches/server/0939-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0938-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0940-add-more-scoreboard-API.patch b/patches/server/0939-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0940-add-more-scoreboard-API.patch
+++ b/patches/server/0939-add-more-scoreboard-API.patch
diff --git a/patches/server/0941-Improve-Registry.patch b/patches/server/0940-Improve-Registry.patch
index 0d7c6b94e6..0d7c6b94e6 100644
--- a/patches/server/0941-Improve-Registry.patch
+++ b/patches/server/0940-Improve-Registry.patch
diff --git a/patches/server/0942-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0941-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index b6f285b9cc..b6f285b9cc 100644
--- a/patches/server/0942-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0941-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0943-Add-experience-points-API.patch b/patches/server/0942-Add-experience-points-API.patch
index cdd4f08f67..cdd4f08f67 100644
--- a/patches/server/0943-Add-experience-points-API.patch
+++ b/patches/server/0942-Add-experience-points-API.patch
diff --git a/patches/server/0944-Add-drops-to-shear-events.patch b/patches/server/0943-Add-drops-to-shear-events.patch
index 2c756b4953..2c756b4953 100644
--- a/patches/server/0944-Add-drops-to-shear-events.patch
+++ b/patches/server/0943-Add-drops-to-shear-events.patch
diff --git a/patches/server/0945-Add-PlayerShieldDisableEvent.patch b/patches/server/0944-Add-PlayerShieldDisableEvent.patch
index a4316fd237..a4316fd237 100644
--- a/patches/server/0945-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0944-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0946-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0945-Validate-ResourceLocation-in-NBT-reading.patch
index 0e1c0b7e08..0e1c0b7e08 100644
--- a/patches/server/0946-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0945-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0947-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0946-Properly-handle-experience-dropping-on-block-break.patch
index 3ee724786e..3ee724786e 100644
--- a/patches/server/0947-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0946-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0948-Fixup-NamespacedKey-handling.patch b/patches/server/0947-Fixup-NamespacedKey-handling.patch
index 20c52c2fba..20c52c2fba 100644
--- a/patches/server/0948-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0947-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0949-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0948-Expose-LootTable-of-DecoratedPot.patch
index 6b5fd029f3..6b5fd029f3 100644
--- a/patches/server/0949-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0948-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0950-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0949-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index dc2cbd7a08..dc2cbd7a08 100644
--- a/patches/server/0950-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0949-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0951-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0950-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 7d75e1147a..7d75e1147a 100644
--- a/patches/server/0951-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0950-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0952-Add-ShulkerDuplicateEvent.patch b/patches/server/0951-Add-ShulkerDuplicateEvent.patch
index 22315c9908..22315c9908 100644
--- a/patches/server/0952-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/0951-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0953-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0952-Add-api-for-spawn-egg-texture-colors.patch
index d937011392..d937011392 100644
--- a/patches/server/0953-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0952-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/0954-Add-Lifecycle-Event-system.patch b/patches/server/0953-Add-Lifecycle-Event-system.patch
index 4d36afb58d..4d36afb58d 100644
--- a/patches/server/0954-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0953-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/0955-ItemStack-Tooltip-API.patch b/patches/server/0954-ItemStack-Tooltip-API.patch
index d55aff4e5d..d55aff4e5d 100644
--- a/patches/server/0955-ItemStack-Tooltip-API.patch
+++ b/patches/server/0954-ItemStack-Tooltip-API.patch
diff --git a/patches/server/0956-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0955-Add-getChunkSnapshot-includeLightData-parameter.patch
index 70efa7282a..70efa7282a 100644
--- a/patches/server/0956-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/0955-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0957-Add-FluidState-API.patch b/patches/server/0956-Add-FluidState-API.patch
index de7b959ccc..de7b959ccc 100644
--- a/patches/server/0957-Add-FluidState-API.patch
+++ b/patches/server/0956-Add-FluidState-API.patch
diff --git a/patches/server/0958-add-number-format-api.patch b/patches/server/0957-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0958-add-number-format-api.patch
+++ b/patches/server/0957-add-number-format-api.patch
diff --git a/patches/server/0959-improve-BanList-types.patch b/patches/server/0958-improve-BanList-types.patch
index b5d73be289..b5d73be289 100644
--- a/patches/server/0959-improve-BanList-types.patch
+++ b/patches/server/0958-improve-BanList-types.patch
diff --git a/patches/server/0960-Expanded-Hopper-API.patch b/patches/server/0959-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0960-Expanded-Hopper-API.patch
+++ b/patches/server/0959-Expanded-Hopper-API.patch
diff --git a/patches/server/0961-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0960-Add-BlockBreakProgressUpdateEvent.patch
index 67abc67fb7..8ecbca8a5a 100644
--- a/patches/server/0961-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0960-Add-BlockBreakProgressUpdateEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add BlockBreakProgressUpdateEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6e7f98fd7b43b46171c3cd58ed91b53960bd0d8a..55c7c078e0219e4a6a9e22db23f671ba728ff036 100644
+index 4e5b08093413fb6571a3c49b1563f50b05d8fce1..57d96e809bc230bce5db589c9f150f614fcea699 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1328,6 +1328,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1322,6 +1322,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (entity instanceof Player) entityhuman = (Player) entity;
          // CraftBukkit end
  
diff --git a/patches/server/0962-Deprecate-ItemStack-setType.patch b/patches/server/0961-Deprecate-ItemStack-setType.patch
index a252511a0b..a252511a0b 100644
--- a/patches/server/0962-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0961-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0963-Add-CartographyItemEvent.patch b/patches/server/0962-Add-CartographyItemEvent.patch
index 4502c9aa8a..4502c9aa8a 100644
--- a/patches/server/0963-Add-CartographyItemEvent.patch
+++ b/patches/server/0962-Add-CartographyItemEvent.patch
diff --git a/patches/server/0964-More-Raid-API.patch b/patches/server/0963-More-Raid-API.patch
index 14fcb7449a..14fcb7449a 100644
--- a/patches/server/0964-More-Raid-API.patch
+++ b/patches/server/0963-More-Raid-API.patch
diff --git a/patches/server/0965-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0964-Add-onboarding-message-for-initial-server-start.patch
index ee7cedb905..29e25a735d 100644
--- a/patches/server/0965-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0964-Add-onboarding-message-for-initial-server-start.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add onboarding message for initial server start
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java
-index c01b4393439838976965823298f12e4762e72eff..218bf89fd7583d6db9f64754c4db8fcce5415bdb 100644
+index 522156e1b7578663c426fcaf7e47acb93d030486..4495e1e8930619a0d58745cc55c69a5b574eb698 100644
 --- a/src/main/java/io/papermc/paper/configuration/Configurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/Configurations.java
-@@ -126,6 +126,7 @@ public abstract class Configurations<G, W> {
+@@ -129,6 +129,7 @@ public abstract class Configurations<G, W> {
          if (Files.notExists(configFile)) {
              node = CommentedConfigurationNode.root(loader.defaultOptions());
              node.node(Configuration.VERSION_FIELD).raw(this.globalConfigVersion());
diff --git a/patches/server/0966-Configurable-max-block-fluid-ticks.patch b/patches/server/0965-Configurable-max-block-fluid-ticks.patch
index ed1c561d6e..daf283c431 100644
--- a/patches/server/0966-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0965-Configurable-max-block-fluid-ticks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable max block/fluid ticks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 55c7c078e0219e4a6a9e22db23f671ba728ff036..5eab8532bfe3b7082123a12b8a3e62d25a4463d3 100644
+index 57d96e809bc230bce5db589c9f150f614fcea699..39819cfb316ee24db5c6648e32f929e15fd71157 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -506,9 +506,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -500,9 +500,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (!this.isDebug() && flag) {
              j = this.getGameTime();
              gameprofilerfiller.push("blockTicks");
diff --git a/patches/server/0967-Fix-bees-aging-inside-hives.patch b/patches/server/0966-Fix-bees-aging-inside-hives.patch
index ae6a0ff63d..ae6a0ff63d 100644
--- a/patches/server/0967-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0966-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0968-Disable-memory-reserve-allocating.patch b/patches/server/0967-Disable-memory-reserve-allocating.patch
index 30eabae9e8..30eabae9e8 100644
--- a/patches/server/0968-Disable-memory-reserve-allocating.patch
+++ b/patches/server/0967-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0969-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0968-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index 5c5bb40964..5c5bb40964 100644
--- a/patches/server/0969-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/0968-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0970-Fix-DamageSource-API.patch b/patches/server/0969-Fix-DamageSource-API.patch
index 0e5c644bc1..0e5c644bc1 100644
--- a/patches/server/0970-Fix-DamageSource-API.patch
+++ b/patches/server/0969-Fix-DamageSource-API.patch
diff --git a/patches/server/0971-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0970-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index a745081446..a745081446 100644
--- a/patches/server/0971-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/server/0970-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0972-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0971-Fix-possible-StackOverflowError-for-some-dispenses.patch
index 21910b922f..21910b922f 100644
--- a/patches/server/0972-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/0971-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0973-Improve-tag-parser-handling.patch b/patches/server/0972-Improve-tag-parser-handling.patch
index 6f346ac4f2..6f346ac4f2 100644
--- a/patches/server/0973-Improve-tag-parser-handling.patch
+++ b/patches/server/0972-Improve-tag-parser-handling.patch
diff --git a/patches/server/0974-Item-Mutation-Fixes.patch b/patches/server/0973-Item-Mutation-Fixes.patch
index 736d493c99..736d493c99 100644
--- a/patches/server/0974-Item-Mutation-Fixes.patch
+++ b/patches/server/0973-Item-Mutation-Fixes.patch
diff --git a/patches/server/0975-Per-world-ticks-per-spawn-settings.patch b/patches/server/0974-Per-world-ticks-per-spawn-settings.patch
index ebdf89762d..ebdf89762d 100644
--- a/patches/server/0975-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0974-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0976-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0975-Properly-track-the-changed-item-from-dispense-events.patch
index 9957c97ca3..9957c97ca3 100644
--- a/patches/server/0976-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/0975-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0977-Rewrite-dataconverter-system.patch b/patches/server/0976-Rewrite-dataconverter-system.patch
index 290aeebd76..290aeebd76 100644
--- a/patches/server/0977-Rewrite-dataconverter-system.patch
+++ b/patches/server/0976-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0978-Suspicious-Effect-Entry-API.patch b/patches/server/0977-Suspicious-Effect-Entry-API.patch
index 2ff782764f..2ff782764f 100644
--- a/patches/server/0978-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/0977-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0979-check-if-itemstack-is-stackable-first.patch b/patches/server/0978-check-if-itemstack-is-stackable-first.patch
index 6143642997..6143642997 100644
--- a/patches/server/0979-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/0978-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0980-disable-forced-empty-world-ticks.patch b/patches/server/0979-disable-forced-empty-world-ticks.patch
index 6ef5295591..35b666570c 100644
--- a/patches/server/0980-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0979-disable-forced-empty-world-ticks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] disable forced empty world ticks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5eab8532bfe3b7082123a12b8a3e62d25a4463d3..7dfbb3dd6100180abd2ebab4d1e9e34928666f9e 100644
+index 39819cfb316ee24db5c6648e32f929e15fd71157..4f15b9d7c706a9b11ce2df0fa3b67d49f2b73d09 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -533,7 +533,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -527,7 +527,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          this.handlingTick = false;
          gameprofilerfiller.pop();
diff --git a/patches/server/0981-Starlight.patch b/patches/server/0980-Starlight.patch
index 72b56b3d53..72b56b3d53 100644
--- a/patches/server/0981-Starlight.patch
+++ b/patches/server/0980-Starlight.patch
diff --git a/patches/server/0982-Rewrite-chunk-system.patch b/patches/server/0981-Rewrite-chunk-system.patch
index 882d275984..bda9e3aa31 100644
--- a/patches/server/0982-Rewrite-chunk-system.patch
+++ b/patches/server/0981-Rewrite-chunk-system.patch
@@ -18398,7 +18398,7 @@ index 2d9d4d06b75873f888ef4d8f5779a52706f821a8..f74efe41cd0da2f9749fc96fb9e0f7cf
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0ae6f7321 100644
+index 4f15b9d7c706a9b11ce2df0fa3b67d49f2b73d09..60fd84819ea7aa96f351db743e8667334af9e96b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -199,7 +199,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -18756,7 +18756,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
              return minecraftserver.overworld().getDataStorage();
          });
          this.chunkSource.getGeneratorState().ensureStructuresGenerated();
-@@ -426,6 +657,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -420,6 +651,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return (RandomSequences) this.getDataStorage().computeIfAbsent(RandomSequences.factory(l), "random_sequences");
          });
          this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
@@ -18766,7 +18766,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
      }
  
      // Paper start
-@@ -558,7 +792,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -552,7 +786,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                          gameprofilerfiller.push("checkDespawn");
                          entity.checkDespawn();
                          gameprofilerfiller.pop();
@@ -18775,7 +18775,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
                              Entity entity1 = entity.getVehicle();
  
                              if (entity1 != null) {
-@@ -583,13 +817,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -577,13 +811,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          gameprofilerfiller.push("entityManagement");
@@ -18794,7 +18794,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
      }
  
      protected void tickTime() {
-@@ -1066,6 +1303,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1060,6 +1297,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      public void save(@Nullable ProgressListener progressListener, boolean flush, boolean savingDisabled) {
@@ -18806,7 +18806,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
          ServerChunkCache chunkproviderserver = this.getChunkSource();
  
          if (!savingDisabled) {
-@@ -1081,16 +1323,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1075,16 +1317,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
                  timings.worldSaveChunks.startTiming(); // Paper
@@ -18827,7 +18827,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
  
          // CraftBukkit start - moved from MinecraftServer.saveChunks
          ServerLevel worldserver1 = this;
-@@ -1226,7 +1465,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1220,7 +1459,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              this.removePlayerImmediately((ServerPlayer) entity, Entity.RemovalReason.DISCARDED);
          }
  
@@ -18836,7 +18836,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
      }
  
      // CraftBukkit start
-@@ -1257,7 +1496,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1251,7 +1490,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
              // CraftBukkit end
  
@@ -18845,7 +18845,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
          }
      }
  
-@@ -1269,10 +1508,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1263,10 +1502,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public boolean tryAddFreshEntityWithPassengers(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
          // CraftBukkit end
          Stream<UUID> stream = entity.getSelfAndPassengers().map(Entity::getUUID); // CraftBukkit - decompile error
@@ -18859,7 +18859,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
              return false;
          } else {
              this.addFreshEntityWithPassengers(entity, reason); // CraftBukkit
-@@ -1858,7 +2097,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1852,7 +2091,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  }
              }
  
@@ -18868,7 +18868,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
              bufferedwriter.write(String.format(Locale.ROOT, "block_entity_tickers: %d\n", this.blockEntityTickers.size()));
              bufferedwriter.write(String.format(Locale.ROOT, "block_ticks: %d\n", this.getBlockTicks().count()));
              bufferedwriter.write(String.format(Locale.ROOT, "fluid_ticks: %d\n", this.getFluidTicks().count()));
-@@ -1907,7 +2146,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1901,7 +2140,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          BufferedWriter bufferedwriter2 = Files.newBufferedWriter(path1);
  
          try {
@@ -18877,7 +18877,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
          } catch (Throwable throwable4) {
              if (bufferedwriter2 != null) {
                  try {
-@@ -1928,7 +2167,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1922,7 +2161,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          BufferedWriter bufferedwriter3 = Files.newBufferedWriter(path2);
  
          try {
@@ -18886,7 +18886,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
          } catch (Throwable throwable6) {
              if (bufferedwriter3 != null) {
                  try {
-@@ -2070,7 +2309,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2064,7 +2303,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @VisibleForTesting
      public String getWatchdogStats() {
@@ -18895,7 +18895,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
              return BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).toString();
          }), this.blockEntityTickers.size(), ServerLevel.getTypeCount(this.blockEntityTickers, TickingBlockEntity::getType), this.getBlockTicks().count(), this.getFluidTicks().count(), this.gatherChunkSourceStats());
      }
-@@ -2130,15 +2369,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2124,15 +2363,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Override
      public LevelEntityGetter<Entity> getEntities() {
          org.spigotmc.AsyncCatcher.catchOp("Chunk getEntities call"); // Spigot
@@ -18916,7 +18916,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
      }
  
      public void startTickingChunk(LevelChunk chunk) {
-@@ -2158,34 +2397,49 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2152,34 +2391,49 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Override
      public void close() throws IOException {
          super.close();
@@ -18973,7 +18973,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
      }
  
      @Override
-@@ -2211,7 +2465,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2205,7 +2459,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          CrashReportCategory crashreportsystemdetails = super.fillReportDetails(report);
  
          crashreportsystemdetails.setDetail("Loaded entity count", () -> {
diff --git a/patches/server/0983-incremental-chunk-and-player-saving.patch b/patches/server/0982-incremental-chunk-and-player-saving.patch
index 36bfcb0797..22cf818d37 100644
--- a/patches/server/0983-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0982-incremental-chunk-and-player-saving.patch
@@ -76,10 +76,10 @@ index f74efe41cd0da2f9749fc96fb9e0f7cf237ad1c6..d1728e13a7b649f308bde90ab633c79d
      public void close() throws IOException {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7f8793fa8260cb8a1f55d0ba405e6df0ae6f7321..db6a54c752ac39012537ec85ad31d5c8b886be1a 100644
+index 60fd84819ea7aa96f351db743e8667334af9e96b..afc1639c96c01197c6c11873fcd5d779e4ed93a9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1302,6 +1302,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1296,6 +1296,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return !this.server.isUnderSpawnProtection(this, pos, player) && this.getWorldBorder().isWithinBounds(pos);
      }
  
diff --git a/patches/server/0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0983-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 474f3d6165..474f3d6165 100644
--- a/patches/server/0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0983-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0984-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index c004efe2f5..73b3fa9e9c 100644
--- a/patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0984-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -13,10 +13,10 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index db6a54c752ac39012537ec85ad31d5c8b886be1a..5285cc76b001a8b5fd5e11764a3aa11e45c9d999 100644
+index afc1639c96c01197c6c11873fcd5d779e4ed93a9..7106f388aed2ef2ce14a2228eb85b51092cb983d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2588,6 +2588,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2582,6 +2582,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                              {
                                  if ( iter.next().player == entity )
                                  {
diff --git a/patches/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0985-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 1a86ce02de..1a86ce02de 100644
--- a/patches/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0985-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0986-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 84396ba635..84396ba635 100644
--- a/patches/server/0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0986-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0988-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0987-Allow-Saving-of-Oversized-Chunks.patch
index c190834bbb..c190834bbb 100644
--- a/patches/server/0988-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0987-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0989-Fix-World-isChunkGenerated-calls.patch b/patches/server/0988-Fix-World-isChunkGenerated-calls.patch
index 85cc5c81aa..85cc5c81aa 100644
--- a/patches/server/0989-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0988-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0990-Flat-bedrock-generator-settings.patch b/patches/server/0989-Flat-bedrock-generator-settings.patch
index 7103386726..7103386726 100644
--- a/patches/server/0990-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0989-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0991-Entity-Activation-Range-2.0.patch b/patches/server/0990-Entity-Activation-Range-2.0.patch
index fee8d41d7e..6db2a7e550 100644
--- a/patches/server/0991-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0990-Entity-Activation-Range-2.0.patch
@@ -17,7 +17,7 @@ Adds villagers as separate config
 public net.minecraft.world.entity.Entity isInsidePortal
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5285cc76b001a8b5fd5e11764a3aa11e45c9d999..b7ca39623348090c5b85e2d80f67a1747553d7d7 100644
+index 7106f388aed2ef2ce14a2228eb85b51092cb983d..c5e7743f1712bd15a93046e494ef5f7df1273b3c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2,7 +2,6 @@ package net.minecraft.server.level;
@@ -28,7 +28,7 @@ index 5285cc76b001a8b5fd5e11764a3aa11e45c9d999..b7ca39623348090c5b85e2d80f67a174
  import com.google.common.collect.Lists;
  import com.mojang.datafixers.DataFixer;
  import com.mojang.datafixers.util.Pair;
-@@ -1234,17 +1233,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1228,17 +1227,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
          ++TimingHistory.entityTicks; // Paper - timings
          // Spigot start
          co.aikar.timings.Timing timer; // Paper
@@ -50,7 +50,7 @@ index 5285cc76b001a8b5fd5e11764a3aa11e45c9d999..b7ca39623348090c5b85e2d80f67a174
          try {
          // Paper end - timings
          entity.setOldPosAndRot();
-@@ -1255,9 +1254,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1249,9 +1248,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).toString();
          });
          gameprofilerfiller.incrementCounter("tickNonPassenger");
@@ -64,7 +64,7 @@ index 5285cc76b001a8b5fd5e11764a3aa11e45c9d999..b7ca39623348090c5b85e2d80f67a174
          Iterator iterator = entity.getPassengers().iterator();
  
          while (iterator.hasNext()) {
-@@ -1265,13 +1268,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1259,13 +1262,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
              this.tickPassenger(entity, entity1);
          }
@@ -84,7 +84,7 @@ index 5285cc76b001a8b5fd5e11764a3aa11e45c9d999..b7ca39623348090c5b85e2d80f67a174
                  passenger.setOldPosAndRot();
                  ++passenger.tickCount;
                  ProfilerFiller gameprofilerfiller = this.getProfiler();
-@@ -1280,8 +1288,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1274,8 +1282,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      return BuiltInRegistries.ENTITY_TYPE.getKey(passenger.getType()).toString();
                  });
                  gameprofilerfiller.incrementCounter("tickPassenger");
@@ -102,7 +102,7 @@ index 5285cc76b001a8b5fd5e11764a3aa11e45c9d999..b7ca39623348090c5b85e2d80f67a174
                  gameprofilerfiller.pop();
                  Iterator iterator = passenger.getPassengers().iterator();
  
-@@ -1291,6 +1308,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1285,6 +1302,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      this.tickPassenger(passenger, entity2);
                  }
  
diff --git a/patches/server/0992-Optional-per-player-mob-spawns.patch b/patches/server/0991-Optional-per-player-mob-spawns.patch
index b9fe80f3e4..b9fe80f3e4 100644
--- a/patches/server/0992-Optional-per-player-mob-spawns.patch
+++ b/patches/server/0991-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/0993-Anti-Xray.patch b/patches/server/0992-Anti-Xray.patch
index 2175c15308..11b005d518 100644
--- a/patches/server/0993-Anti-Xray.patch
+++ b/patches/server/0992-Anti-Xray.patch
@@ -1104,15 +1104,15 @@ index 183b2191fa1c1b27adedf39593e1b5a223fb1279..8ead66c134688b11dca15f6509147e72
  
      private ClientboundLevelChunkWithLightPacket(RegistryFriendlyByteBuf buf) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b7ca39623348090c5b85e2d80f67a1747553d7d7..bc609da7105293dfa4ed339f553be66b0a632698 100644
+index c5e7743f1712bd15a93046e494ef5f7df1273b3c..87f0ded1b878e00fde433afb341e5a79d77f6f57 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -575,7 +575,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
  
          // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
--        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess()))); // Paper - create paper world configs
-+        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess())), executor); // Paper - create paper world configs; Async-Anti-Xray: Pass executor
+-        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules()))); // Paper - create paper world configs
++        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules())), executor); // Paper - create paper world configs; Async-Anti-Xray: Pass executor
          this.pvpMode = minecraftserver.isPvpAllowed();
          this.convertable = convertable_conversionsession;
          this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
diff --git a/patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0993-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 12af227d2a..12af227d2a 100644
--- a/patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0993-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0995-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0994-Optimize-Collision-to-not-load-chunks.patch
index 17286aaa99..17286aaa99 100644
--- a/patches/server/0995-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0994-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0996-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0995-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 1f46712639..1f46712639 100644
--- a/patches/server/0996-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0995-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0997-Entity-load-save-limit-per-chunk.patch b/patches/server/0996-Entity-load-save-limit-per-chunk.patch
index 1dbf729bda..1dbf729bda 100644
--- a/patches/server/0997-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0996-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0998-Improved-Watchdog-Support.patch b/patches/server/0997-Improved-Watchdog-Support.patch
index 2f40b2b0ec..2f40b2b0ec 100644
--- a/patches/server/0998-Improved-Watchdog-Support.patch
+++ b/patches/server/0997-Improved-Watchdog-Support.patch
diff --git a/patches/server/0999-Optimize-Voxel-Shape-Merging.patch b/patches/server/0998-Optimize-Voxel-Shape-Merging.patch
index 4ec779560c..4ec779560c 100644
--- a/patches/server/0999-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/0998-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1000-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0999-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 9d41c60b80..9d41c60b80 100644
--- a/patches/server/1000-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0999-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/1001-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/1000-Use-distance-map-to-optimise-entity-tracker.patch
index 22535d896b..22535d896b 100644
--- a/patches/server/1001-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/1000-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/1002-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1001-Optimize-Bit-Operations-by-inlining.patch
index a1f24dd8dc..a1f24dd8dc 100644
--- a/patches/server/1002-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/1001-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1003-Remove-streams-from-hot-code.patch b/patches/server/1002-Remove-streams-from-hot-code.patch
index 4c6d94f7bf..4c6d94f7bf 100644
--- a/patches/server/1003-Remove-streams-from-hot-code.patch
+++ b/patches/server/1002-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1004-Eigencraft-redstone-implementation.patch b/patches/server/1003-Eigencraft-redstone-implementation.patch
index b3e3db6504..b3e3db6504 100644
--- a/patches/server/1004-Eigencraft-redstone-implementation.patch
+++ b/patches/server/1003-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1004-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 6fc4445bbf..6fc4445bbf 100644
--- a/patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/1004-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1006-Improve-boat-collision-performance.patch b/patches/server/1005-Improve-boat-collision-performance.patch
index 3cd32de1e5..3cd32de1e5 100644
--- a/patches/server/1006-Improve-boat-collision-performance.patch
+++ b/patches/server/1005-Improve-boat-collision-performance.patch
diff --git a/patches/server/1007-Optimise-general-POI-access.patch b/patches/server/1006-Optimise-general-POI-access.patch
index 118734c246..118734c246 100644
--- a/patches/server/1007-Optimise-general-POI-access.patch
+++ b/patches/server/1006-Optimise-general-POI-access.patch
diff --git a/patches/server/1008-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1007-Custom-table-implementation-for-blockstate-state-loo.patch
index 96d90abea3..96d90abea3 100644
--- a/patches/server/1008-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1007-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1009-Execute-chunk-tasks-mid-tick.patch b/patches/server/1008-Execute-chunk-tasks-mid-tick.patch
index 191ea66bd4..f31ae8f976 100644
--- a/patches/server/1009-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/1008-Execute-chunk-tasks-mid-tick.patch
@@ -123,7 +123,7 @@ index c7b7f153895a4b95b2071a31db00c9c4b69fa094..7fbeebe63f755624b967374072aa2e05
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index bc609da7105293dfa4ed339f553be66b0a632698..f9de1196c01c6e32ff1bfad33761bc64c1c6dc5d 100644
+index 87f0ded1b878e00fde433afb341e5a79d77f6f57..dbc7092d4951a1e0090e7c139840b3bad741e8bd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -221,6 +221,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -134,7 +134,7 @@ index bc609da7105293dfa4ed339f553be66b0a632698..f9de1196c01c6e32ff1bfad33761bc64
  
      // CraftBukkit start
      public final LevelStorageSource.LevelStorageAccess convertable;
-@@ -1217,6 +1218,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1211,6 +1212,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (fluid1.is(fluid)) {
              fluid1.tick(this, pos);
          }
@@ -142,7 +142,7 @@ index bc609da7105293dfa4ed339f553be66b0a632698..f9de1196c01c6e32ff1bfad33761bc64
  
      }
  
-@@ -1226,6 +1228,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1220,6 +1222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (iblockdata.is(block)) {
              iblockdata.tick(this, pos, this.random);
          }
diff --git a/patches/server/1010-Optimise-random-block-ticking.patch b/patches/server/1009-Optimise-random-block-ticking.patch
index b3874d8f37..a414d7b769 100644
--- a/patches/server/1010-Optimise-random-block-ticking.patch
+++ b/patches/server/1009-Optimise-random-block-ticking.patch
@@ -90,10 +90,10 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f9de1196c01c6e32ff1bfad33761bc64c1c6dc5d..b776f1083b8693d13ea523985bf6ec6a3f7ba8dc 100644
+index dbc7092d4951a1e0090e7c139840b3bad741e8bd..11d5729f91b45bbd5b634c8c63469396bc2a3f9c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -867,6 +867,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -861,6 +861,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entityplayer.stopSleepInBed(false, false);
          });
      }
@@ -104,7 +104,7 @@ index f9de1196c01c6e32ff1bfad33761bc64c1c6dc5d..b776f1083b8693d13ea523985bf6ec6a
  
      public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
          ChunkPos chunkcoordintpair = chunk.getPos();
-@@ -876,8 +880,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -870,8 +874,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("thunder");
@@ -116,7 +116,7 @@ index f9de1196c01c6e32ff1bfad33761bc64c1c6dc5d..b776f1083b8693d13ea523985bf6ec6a
  
              if (this.isRainingAt(blockposition)) {
                  DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
-@@ -909,7 +915,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -903,7 +909,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (!this.paperConfig().environment.disableIceAndSnow) { // Paper - Option to disable ice and snow
          for (int l = 0; l < randomTickSpeed; ++l) {
              if (this.random.nextInt(48) == 0) {
@@ -128,7 +128,7 @@ index f9de1196c01c6e32ff1bfad33761bc64c1c6dc5d..b776f1083b8693d13ea523985bf6ec6a
              }
          }
          } // Paper - Option to disable ice and snow
-@@ -917,36 +926,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -911,36 +920,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
          gameprofilerfiller.popPush("tickBlocks");
          timings.chunkTicksBlocks.startTiming(); // Paper
          if (randomTickSpeed > 0) {
@@ -190,7 +190,7 @@ index f9de1196c01c6e32ff1bfad33761bc64c1c6dc5d..b776f1083b8693d13ea523985bf6ec6a
  
          timings.chunkTicksBlocks.stopTiming(); // Paper
          gameprofilerfiller.pop();
-@@ -954,17 +964,25 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -948,17 +958,25 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @VisibleForTesting
      public void tickPrecipitation(BlockPos pos) {
@@ -220,7 +220,7 @@ index f9de1196c01c6e32ff1bfad33761bc64c1c6dc5d..b776f1083b8693d13ea523985bf6ec6a
              if (i > 0 && biomebase.shouldSnow(this, blockposition1)) {
                  BlockState iblockdata = this.getBlockState(blockposition1);
  
-@@ -982,12 +1000,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -976,12 +994,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  }
              }
  
diff --git a/patches/server/1011-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1010-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 0bbbb36e0b..0bbbb36e0b 100644
--- a/patches/server/1011-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1010-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1012-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1011-Use-Velocity-compression-and-cipher-natives.patch
index 5677c523de..5677c523de 100644
--- a/patches/server/1012-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/1011-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1013-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1012-Detail-more-information-in-watchdog-dumps.patch
index 6aa867b8a8..e7c3992145 100644
--- a/patches/server/1013-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1012-Detail-more-information-in-watchdog-dumps.patch
@@ -76,10 +76,10 @@ index e161ad0f53a21a68e8c78575ba5d3cdbdb11fca0..57e76b53e5e314c3e6b8856010f7a841
              });
              throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b776f1083b8693d13ea523985bf6ec6a3f7ba8dc..b27dbee5bef643ed6e79845587f5c02ef238124c 100644
+index 11d5729f91b45bbd5b634c8c63469396bc2a3f9c..e8e18748d12c567eec990d3247086fca8c13620f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1251,7 +1251,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1245,7 +1245,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      }
  
@@ -106,7 +106,7 @@ index b776f1083b8693d13ea523985bf6ec6a3f7ba8dc..b27dbee5bef643ed6e79845587f5c02e
          ++TimingHistory.entityTicks; // Paper - timings
          // Spigot start
          co.aikar.timings.Timing timer; // Paper
-@@ -1291,7 +1310,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1285,7 +1304,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              this.tickPassenger(entity, entity1);
          }
          // } finally { timer.stopTiming(); } // Paper - timings - move up
diff --git a/patches/server/1014-Collision-optimisations.patch b/patches/server/1013-Collision-optimisations.patch
index a6179487ff..a6179487ff 100644
--- a/patches/server/1014-Collision-optimisations.patch
+++ b/patches/server/1013-Collision-optimisations.patch
diff --git a/patches/server/1015-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1014-Optimise-collision-checking-in-player-move-packet-ha.patch
index 378e882366..378e882366 100644
--- a/patches/server/1015-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1014-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1016-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1015-Fix-tripwire-disarming-not-working-as-intended.patch
index fa7f6bde06..fa7f6bde06 100644
--- a/patches/server/1016-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/server/1015-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/1017-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1016-Fix-entity-type-tags-suggestions-in-selectors.patch
index d24e7d583c..d24e7d583c 100644
--- a/patches/server/1017-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1016-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1018-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1017-Add-Alternate-Current-redstone-implementation.patch
index 5b234ecc82..6fcb4ef6f5 100644
--- a/patches/server/1018-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1017-Add-Alternate-Current-redstone-implementation.patch
@@ -2009,7 +2009,7 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b27dbee5bef643ed6e79845587f5c02ef238124c..232ee4e3f32b93f5ae725b025abd538fe8927d90 100644
+index e8e18748d12c567eec990d3247086fca8c13620f..35751ff961383280ffce1be18fc3c1aa311f0c08 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -228,6 +228,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2020,7 +2020,7 @@ index b27dbee5bef643ed6e79845587f5c02ef238124c..232ee4e3f32b93f5ae725b025abd538f
  
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately
-@@ -2566,6 +2567,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2560,6 +2561,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return crashreportsystemdetails;
      }
  
diff --git a/patches/server/1019-optimize-dirt-and-snow-spreading.patch b/patches/server/1018-optimize-dirt-and-snow-spreading.patch
index 49de7fcab9..49de7fcab9 100644
--- a/patches/server/1019-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/1018-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1020-Properly-resend-entities.patch b/patches/server/1019-Properly-resend-entities.patch
index 4ac71e7b7c..4ac71e7b7c 100644
--- a/patches/server/1020-Properly-resend-entities.patch
+++ b/patches/server/1019-Properly-resend-entities.patch
diff --git a/patches/server/1021-Optimize-Hoppers.patch b/patches/server/1020-Optimize-Hoppers.patch
index 89784a86e5..89784a86e5 100644
--- a/patches/server/1021-Optimize-Hoppers.patch
+++ b/patches/server/1020-Optimize-Hoppers.patch
diff --git a/patches/server/1022-Improve-performance-of-mass-crafts.patch b/patches/server/1021-Improve-performance-of-mass-crafts.patch
index f9839d9135..f9839d9135 100644
--- a/patches/server/1022-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1021-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1023-Actually-optimise-explosions.patch b/patches/server/1022-Actually-optimise-explosions.patch
index a7db826672..a7db826672 100644
--- a/patches/server/1023-Actually-optimise-explosions.patch
+++ b/patches/server/1022-Actually-optimise-explosions.patch
diff --git a/patches/server/1024-Optimise-chunk-tick-iteration.patch b/patches/server/1023-Optimise-chunk-tick-iteration.patch
index 21131380ce..21131380ce 100644
--- a/patches/server/1024-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1023-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1025-Lag-compensation-ticks.patch b/patches/server/1024-Lag-compensation-ticks.patch
index fb9ab1a352..dbf7a195bd 100644
--- a/patches/server/1025-Lag-compensation-ticks.patch
+++ b/patches/server/1024-Lag-compensation-ticks.patch
@@ -28,7 +28,7 @@ index b21daeeb043df885fba5e6a7572d311fd0830815..8515cec5e21ad291ca427baaafb4c2f3
              this.profiler.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 232ee4e3f32b93f5ae725b025abd538fe8927d90..05e7a908c18b5eef49afb088b7519185bc806056 100644
+index 35751ff961383280ffce1be18fc3c1aa311f0c08..a378866740b4f283d542028ad4dd75064083d5b7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -570,6 +570,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1026-Optimise-nearby-player-retrieval.patch b/patches/server/1025-Optimise-nearby-player-retrieval.patch
index 92bfc2ab50..22e16a6576 100644
--- a/patches/server/1026-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1025-Optimise-nearby-player-retrieval.patch
@@ -8,7 +8,7 @@ we can instead use the nearby player tracking system to reduce
 the number of tests per search.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 05e7a908c18b5eef49afb088b7519185bc806056..de3da37c40053789ba2c5d3754452ab49fa9962b 100644
+index a378866740b4f283d542028ad4dd75064083d5b7..0b0fd9e32d2772098d1aade83083b38cac01b76e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -581,6 +581,115 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1027-Distance-manager-tick-timings.patch b/patches/server/1026-Distance-manager-tick-timings.patch
index f946d92596..f946d92596 100644
--- a/patches/server/1027-Distance-manager-tick-timings.patch
+++ b/patches/server/1026-Distance-manager-tick-timings.patch
diff --git a/patches/server/1028-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1027-Handle-Oversized-block-entities-in-chunks.patch
index b9ea4832bd..b9ea4832bd 100644
--- a/patches/server/1028-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1027-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1029-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1028-Send-full-pos-packets-for-hard-colliding-entities.patch
index 6a98c63b52..6a98c63b52 100644
--- a/patches/server/1029-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/1028-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/1030-Fix-and-optimise-world-force-upgrading.patch b/patches/server/1029-Fix-and-optimise-world-force-upgrading.patch
index 3e94098edd..3e94098edd 100644
--- a/patches/server/1030-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/1029-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/1031-API-for-checking-sent-chunks.patch b/patches/server/1030-API-for-checking-sent-chunks.patch
index 6187f99887..6187f99887 100644
--- a/patches/server/1031-API-for-checking-sent-chunks.patch
+++ b/patches/server/1030-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1032-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch b/patches/server/1031-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
index 80403b7725..80403b7725 100644
--- a/patches/server/1032-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
+++ b/patches/server/1031-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
diff --git a/patches/server/1033-handle-converting-old-serialized-names-to-new-names.patch b/patches/server/1032-handle-converting-old-serialized-names-to-new-names.patch
index ff357c9f58..ff357c9f58 100644
--- a/patches/server/1033-handle-converting-old-serialized-names-to-new-names.patch
+++ b/patches/server/1032-handle-converting-old-serialized-names-to-new-names.patch
diff --git a/patches/server/1034-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/1033-Add-config-for-mobs-immune-to-default-effects.patch
index 7bf145751f..7bf145751f 100644
--- a/patches/server/1034-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/1033-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/1035-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/1034-Deep-clone-nbt-tags-in-PDC.patch
index 4bcc5895e7..4bcc5895e7 100644
--- a/patches/server/1035-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/server/1034-Deep-clone-nbt-tags-in-PDC.patch
diff --git a/patches/server/1036-Support-old-UUID-format-for-NBT.patch b/patches/server/1035-Support-old-UUID-format-for-NBT.patch
index a38c2a7f7b..a38c2a7f7b 100644
--- a/patches/server/1036-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/1035-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/1037-Fix-shield-disable-inconsistency.patch b/patches/server/1036-Fix-shield-disable-inconsistency.patch
index 777f27d8bb..777f27d8bb 100644
--- a/patches/server/1037-Fix-shield-disable-inconsistency.patch
+++ b/patches/server/1036-Fix-shield-disable-inconsistency.patch
diff --git a/patches/server/1038-Write-SavedData-IO-async.patch b/patches/server/1037-Write-SavedData-IO-async.patch
index 601abd1ff6..932cd936fb 100644
--- a/patches/server/1038-Write-SavedData-IO-async.patch
+++ b/patches/server/1037-Write-SavedData-IO-async.patch
@@ -44,10 +44,10 @@ index 36caf354634d6675a3f1ec6829f4778e1d0623bc..b99f50604bafecbc68835974c9ed0caa
  
      // CraftBukkit start - modelled on below
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index de3da37c40053789ba2c5d3754452ab49fa9962b..12a9342634ffa7d6aaa9a7fdd65a45bccec8dd13 100644
+index 0b0fd9e32d2772098d1aade83083b38cac01b76e..0981d440d0dbfe4df668d1f3f1b5706a93bc4434 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1498,7 +1498,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1492,7 +1492,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          try (co.aikar.timings.Timing ignored = this.timings.worldSave.startTiming()) {
              if (doFull) {
@@ -56,7 +56,7 @@ index de3da37c40053789ba2c5d3754452ab49fa9962b..12a9342634ffa7d6aaa9a7fdd65a45bc
              }
  
              this.timings.worldSaveChunks.startTiming(); // Paper
-@@ -1534,7 +1534,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1528,7 +1528,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  progressListener.progressStartNoAbort(Component.translatable("menu.savingLevel"));
              }
  
@@ -65,7 +65,7 @@ index de3da37c40053789ba2c5d3754452ab49fa9962b..12a9342634ffa7d6aaa9a7fdd65a45bc
              if (progressListener != null) {
                  progressListener.progressStage(Component.translatable("menu.savingChunks"));
              }
-@@ -1557,12 +1557,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1551,12 +1551,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // CraftBukkit end
      }
  
diff --git a/patches/server/1039-Don-t-lose-removed-data-components-in-ItemMeta.patch b/patches/server/1038-Don-t-lose-removed-data-components-in-ItemMeta.patch
index 2aa999fdeb..2aa999fdeb 100644
--- a/patches/server/1039-Don-t-lose-removed-data-components-in-ItemMeta.patch
+++ b/patches/server/1038-Don-t-lose-removed-data-components-in-ItemMeta.patch
diff --git a/patches/server/1040-Add-experimental-improved-give-command.patch b/patches/server/1039-Add-experimental-improved-give-command.patch
index aaadb56694..aaadb56694 100644
--- a/patches/server/1040-Add-experimental-improved-give-command.patch
+++ b/patches/server/1039-Add-experimental-improved-give-command.patch
diff --git a/patches/server/1041-Handle-Large-Packets-disconnecting-client.patch b/patches/server/1040-Handle-Large-Packets-disconnecting-client.patch
index 49f2553189..49f2553189 100644
--- a/patches/server/1041-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/1040-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/1042-Fix-ItemFlags.patch b/patches/server/1041-Fix-ItemFlags.patch
index 9c1df3f6e8..9c1df3f6e8 100644
--- a/patches/server/1042-Fix-ItemFlags.patch
+++ b/patches/server/1041-Fix-ItemFlags.patch
diff --git a/patches/server/1043-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/1042-Fix-helmet-damage-reduction-inconsistencies.patch
index 38d5a20724..38d5a20724 100644
--- a/patches/server/1043-Fix-helmet-damage-reduction-inconsistencies.patch
+++ b/patches/server/1042-Fix-helmet-damage-reduction-inconsistencies.patch
diff --git a/patches/server/1044-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/1043-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index 9f386e1311..9f386e1311 100644
--- a/patches/server/1044-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/1043-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/removed-patches-1-20-5/0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/removed-patches-1-20-5/0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch
deleted file mode 100644
index 4d9cba2dd0..0000000000
--- a/removed-patches-1-20-5/0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Sat, 13 Sep 2014 23:14:43 -0400
-Subject: [PATCH] Configurable Keep Spawn Loaded range per world
-
-This lets you disable it for some worlds and lower it for others.
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 176378ddbf21d758694e8e624cc6c555c78e0fab..6342b7a3c4ccad528f026384da64e973e630f030 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -768,30 +768,33 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     // CraftBukkit start
-     public void prepareLevels(ChunkProgressListener worldloadlistener, ServerLevel worldserver) {
-+        ServerChunkCache chunkproviderserver = worldserver.getChunkSource(); // Paper - Configurable Keep Spawn Loaded range per world
-         // WorldServer worldserver = this.overworld();
-         this.forceTicks = true;
-         // CraftBukkit end
-+        if (worldserver.getWorld().getKeepSpawnInMemory()) { // Paper - Configurable Keep Spawn Loaded range per world
- 
-         MinecraftServer.LOGGER.info("Preparing start region for dimension {}", worldserver.dimension().location());
-         BlockPos blockposition = worldserver.getSharedSpawnPos();
- 
-         worldloadlistener.updateSpawnPos(new ChunkPos(blockposition));
--        ServerChunkCache chunkproviderserver = worldserver.getChunkSource();
-+        //ChunkProviderServer chunkproviderserver = worldserver.getChunkProvider(); // Paper - Configurable Keep Spawn Loaded range per world; move up
- 
-         this.nextTickTimeNanos = Util.getNanos();
--        // CraftBukkit start
--        if (worldserver.getWorld().getKeepSpawnInMemory()) {
--            chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(blockposition), 11, Unit.INSTANCE);
-+        // Paper start - Configurable Keep Spawn Loaded range per world
-+        int radiusBlocks = worldserver.paperConfig().spawn.keepSpawnLoadedRange * 16;
-+        int radiusChunks = radiusBlocks / 16 + ((radiusBlocks & 15) != 0 ? 1 : 0);
-+        int totalChunks = ((radiusChunks) * 2 + 1);
-+        totalChunks *= totalChunks;
-+        worldloadlistener.setChunkRadius(radiusBlocks / 16);
- 
--            while (chunkproviderserver.getTickingGenerated() != 441) {
--                // this.nextTickTimeNanos = SystemUtils.getNanos() + MinecraftServer.PREPARE_LEVELS_DEFAULT_DELAY_NANOS;
--                this.executeModerately();
--            }
--        }
-+        worldserver.addTicketsForSpawn(radiusBlocks, blockposition);
-+        // Paper end - Configurable Keep Spawn Loaded range per world
- 
-         // this.nextTickTimeNanos = SystemUtils.getNanos() + MinecraftServer.PREPARE_LEVELS_DEFAULT_DELAY_NANOS;
-         this.executeModerately();
-         // Iterator iterator = this.levels.values().iterator();
-+        } // Paper - Configurable Keep Spawn Loaded range per world
- 
-         if (true) {
-             ServerLevel worldserver1 = worldserver;
-@@ -814,7 +817,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         // this.nextTickTimeNanos = SystemUtils.getNanos() + MinecraftServer.PREPARE_LEVELS_DEFAULT_DELAY_NANOS;
-         this.executeModerately();
-         // CraftBukkit end
--        worldloadlistener.stop();
-+        if (worldserver.getWorld().getKeepSpawnInMemory()) worldloadlistener.stop(); // Paper - Configurable Keep Spawn Loaded range per world
-         // CraftBukkit start
-         // this.updateMobSpawningFlags();
-         worldserver.setSpawnSettings(this.isSpawningMonsters(), this.isSpawningAnimals());
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 57f129651778d6c20c695bf7b3a8b4d40c402a20..20de3be232ccc7ec7bbc3c6aee9acf66fd396af1 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1640,12 +1640,84 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         return ((MapIndex) this.getServer().overworld().getDataStorage().computeIfAbsent(MapIndex.factory(), "idcounts")).getFreeAuxValueForMap();
-     }
- 
-+    // Paper start - Configurable Keep Spawn Loaded range per world
-+    public void addTicketsForSpawn(int radiusInBlocks, BlockPos spawn) {
-+        // In order to respect vanilla behavior, which is ensuring everything but the spawn border can tick, we add tickets
-+        // with level 31 for the non-border spawn chunks
-+        ServerChunkCache chunkproviderserver = this.getChunkSource();
-+        int tickRadius = radiusInBlocks - 16;
-+
-+        // add ticking chunks
-+        for (int x = -tickRadius; x <= tickRadius; x += 16) {
-+            for (int z = -tickRadius; z <= tickRadius; z += 16) {
-+                // radius of 2 will have the current chunk be level 31
-+                chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.offset(x, 0, z)), 2, Unit.INSTANCE);
-+            }
-+        }
-+
-+        // add border chunks
-+
-+        // add border along x axis (including corner chunks)
-+        for (int x = -radiusInBlocks; x <= radiusInBlocks; x += 16) {
-+            // top
-+            chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.offset(x, 0, radiusInBlocks)), 1, Unit.INSTANCE); // level 32
-+            // bottom
-+            chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.offset(x, 0, -radiusInBlocks)), 1, Unit.INSTANCE); // level 32
-+        }
-+
-+        // add border along z axis (excluding corner chunks)
-+        for (int z = -radiusInBlocks + 16; z < radiusInBlocks; z += 16) {
-+            // right
-+            chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.offset(radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
-+            // left
-+            chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.offset(-radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
-+        }
-+    }
-+    public void removeTicketsForSpawn(int radiusInBlocks, BlockPos spawn) {
-+        // In order to respect vanilla behavior, which is ensuring everything but the spawn border can tick, we added tickets
-+        // with level 31 for the non-border spawn chunks
-+        ServerChunkCache chunkproviderserver = this.getChunkSource();
-+        int tickRadius = radiusInBlocks - 16;
-+
-+        // remove ticking chunks
-+        for (int x = -tickRadius; x <= tickRadius; x += 16) {
-+            for (int z = -tickRadius; z <= tickRadius; z += 16) {
-+                // radius of 2 will have the current chunk be level 31
-+                chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.offset(x, 0, z)), 2, Unit.INSTANCE);
-+            }
-+        }
-+
-+        // remove border chunks
-+
-+        // remove border along x axis (including corner chunks)
-+        for (int x = -radiusInBlocks; x <= radiusInBlocks; x += 16) {
-+            // top
-+            chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.offset(x, 0, radiusInBlocks)), 1, Unit.INSTANCE); // level 32
-+            // bottom
-+            chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.offset(x, 0, -radiusInBlocks)), 1, Unit.INSTANCE); // level 32
-+        }
-+
-+        // remove border along z axis (excluding corner chunks)
-+        for (int z = -radiusInBlocks + 16; z < radiusInBlocks; z += 16) {
-+            // right
-+            chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.offset(radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
-+            // left
-+            chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.offset(-radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
-+        }
-+    }
-+    // Paper end - Configurable Keep Spawn Loaded range per world
-+
-     public void setDefaultSpawnPos(BlockPos pos, float angle) {
--        ChunkPos chunkcoordintpair = new ChunkPos(new BlockPos(this.levelData.getXSpawn(), 0, this.levelData.getZSpawn()));
-+        // Paper start - Configurable Keep Spawn Loaded range per world
-+        BlockPos prevSpawn = this.getSharedSpawnPos();
-+        //ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(new BlockPosition(this.worldData.a(), 0, this.worldData.c()));
- 
-         this.levelData.setSpawn(pos, angle);
--        this.getChunkSource().removeRegionTicket(TicketType.START, chunkcoordintpair, 11, Unit.INSTANCE);
--        this.getChunkSource().addRegionTicket(TicketType.START, new ChunkPos(pos), 11, Unit.INSTANCE);
-+        if (this.keepSpawnInMemory) {
-+            // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
-+            this.removeTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, prevSpawn);
-+            this.addTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, pos);
-+        }
-         this.getServer().getPlayerList().broadcastAll(new ClientboundSetDefaultSpawnPositionPacket(pos, angle));
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/level/progress/ChunkProgressListener.java b/src/main/java/net/minecraft/server/level/progress/ChunkProgressListener.java
-index 1b565b2809c2d367e21971c5154f35c9763995e6..4792eaa30464f4c4ca7f2d6cf20f734beed81f23 100644
---- a/src/main/java/net/minecraft/server/level/progress/ChunkProgressListener.java
-+++ b/src/main/java/net/minecraft/server/level/progress/ChunkProgressListener.java
-@@ -12,4 +12,6 @@ public interface ChunkProgressListener {
-     void start();
- 
-     void stop();
-+
-+    void setChunkRadius(int radius); // Paper - Configurable Keep Spawn Loaded range per world
- }
-diff --git a/src/main/java/net/minecraft/server/level/progress/LoggerChunkProgressListener.java b/src/main/java/net/minecraft/server/level/progress/LoggerChunkProgressListener.java
-index c9667df492e5681bf933a7f8878b0fdb324afed3..09d0c702132d4cc52ce36712aed11d30efe89f54 100644
---- a/src/main/java/net/minecraft/server/level/progress/LoggerChunkProgressListener.java
-+++ b/src/main/java/net/minecraft/server/level/progress/LoggerChunkProgressListener.java
-@@ -11,12 +11,19 @@ import org.slf4j.Logger;
- 
- public class LoggerChunkProgressListener implements ChunkProgressListener {
-     private static final Logger LOGGER = LogUtils.getLogger();
--    private final int maxCount;
-+    private int maxCount; // Paper - remove final
-     private int count;
-     private long startTime;
-     private long nextTickTime = Long.MAX_VALUE;
- 
-     public LoggerChunkProgressListener(int radius) {
-+        // Paper start - Configurable Keep Spawn Loaded range per world
-+        this.setChunkRadius(radius); // Move to method
-+    }
-+
-+    @Override
-+    public void setChunkRadius(int radius) {
-+        // Paper end - Configurable Keep Spawn Loaded range per world
-         int i = radius * 2 + 1;
-         this.maxCount = i * i;
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4001a8c13ceed6037174bb81fd06d9758fa0336c..b39721208f8b66c1478e89553a592070cf90fb97 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1411,15 +1411,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
- 
-     @Override
-     public void setKeepSpawnInMemory(boolean keepLoaded) {
-+        // Paper start - Configurable spawn radius
-+        if (keepLoaded == this.world.keepSpawnInMemory) {
-+            // do nothing, nothing has changed
-+            return;
-+        }
-         this.world.keepSpawnInMemory = keepLoaded;
-         // Grab the worlds spawn chunk
-         BlockPos chunkcoordinates = this.world.getSharedSpawnPos();
-         if (keepLoaded) {
--            this.world.getChunkSource().addRegionTicket(TicketType.START, new ChunkPos(chunkcoordinates), 11, Unit.INSTANCE);
-+            this.world.addTicketsForSpawn(this.world.paperConfig().spawn.keepSpawnLoadedRange * 16, chunkcoordinates);
-         } else {
--            // TODO: doesn't work well if spawn changed....
--            this.world.getChunkSource().removeRegionTicket(TicketType.START, new ChunkPos(chunkcoordinates), 11, Unit.INSTANCE);
-+            // TODO: doesn't work well if spawn changed.... // Paper - resolved
-+            this.world.removeTicketsForSpawn(this.world.paperConfig().spawn.keepSpawnLoadedRange * 16, chunkcoordinates);
-         }
-+        // Paper end
-     }
- 
-     @Override