Use net.kyori.ansi for console logging (#9313)

Uses the new ANSIComponentSerializer introduced in Adventure 4.14.0 to
serialize components when logging them via the ComponentLogger, or when
sending messages to the console.

This replaces the old solution which uses legacy jank and custom color
conversions, with a new library that handles the conversion and config

425 files changed, 250 insertions, 452 deletions

diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
index 286eef9c75..0c3c77d746 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -14,7 +14,7 @@ public org.spigotmc.SpigotWorldConfig getString(Ljava/lang/String;Ljava/lang/Str
 public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f3f20b34a3ebcbb75004003892e903ee4fd0edd3..d8da21801eda8ea5d04c8eb2941bbef968cb7951 100644
+index 952dde5d0d9fa6bcf97ae5cafe482cca1f5b3a78..9ab4d3e462c02e4d23b45adb46965eb75eb2178e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,6 +13,7 @@ dependencies {
@@ -440,10 +440,10 @@ index 0000000000000000000000000000000000000000..9ef6712c70fcd8912a79f3f61e351aac
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..52b02cb1f02d1c65b840f38cfc8baee500aa2259
+index 0000000000000000000000000000000000000000..8633fdfa7e8aeac7414c232006fc298b3bfe1b58
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -0,0 +1,277 @@
+@@ -0,0 +1,276 @@
 +package io.papermc.paper.configuration;
 +
 +import co.aikar.timings.MinecraftTimings;
@@ -604,7 +604,6 @@ index 0000000000000000000000000000000000000000..52b02cb1f02d1c65b840f38cfc8baee5
 +    public class Logging extends ConfigurationPart {
 +        public boolean logPlayerIpAddresses = true;
 +        public boolean deobfuscateStacktraces = true;
-+        public boolean useRgbForNamedTextColors = true;
 +    }
 +
 +    public Scoreboards scoreboards;
@@ -1379,10 +1378,10 @@ index 0000000000000000000000000000000000000000..f6b9d216c24d8858802f85209fe1a869
 +}
 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..1bb16fc7598cd53e822d84b69d6a9727b37f484f
+index 0000000000000000000000000000000000000000..efe7fc0bb92b70ef244875219f285724af9bfa24
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
-@@ -0,0 +1,63 @@
+@@ -0,0 +1,64 @@
 +package io.papermc.paper.configuration;
 +
 +import org.spongepowered.configurate.NodePath;
@@ -1442,7 +1441,8 @@ index 0000000000000000000000000000000000000000..1bb16fc7598cd53e822d84b69d6a9727
 +        path("commandErrorMessage"),
 +        path("baby-zombie-movement-speed"),
 +        path("limit-player-interactions"),
-+        path("warnWhenSettingExcessiveVelocity")
++        path("warnWhenSettingExcessiveVelocity"),
++        path("logging", "use-rgb-for-named-text-colors")
 +    };
 +
 +}
diff --git a/patches/server/0019-Rewrite-chunk-system.patch b/patches/server/0019-Rewrite-chunk-system.patch
index 59092bf1f4..8821599536 100644
--- a/patches/server/0019-Rewrite-chunk-system.patch
+++ b/patches/server/0019-Rewrite-chunk-system.patch
@@ -15660,7 +15660,7 @@ index 0000000000000000000000000000000000000000..962d3cae6340fc11607b59355e291629
 +
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 52b02cb1f02d1c65b840f38cfc8baee500aa2259..3294da27227b5a332904398afa56d21ea97d55f0 100644
+index 8633fdfa7e8aeac7414c232006fc298b3bfe1b58..eb12227b009b1fb766a5f9e338e5d2394d498376 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -116,21 +116,6 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -15685,7 +15685,7 @@ index 52b02cb1f02d1c65b840f38cfc8baee500aa2259..3294da27227b5a332904398afa56d21e
      public UnsupportedSettings unsupportedSettings;
  
      public class UnsupportedSettings extends ConfigurationPart {
-@@ -274,4 +259,43 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -273,4 +258,43 @@ public class GlobalConfiguration extends ConfigurationPart {
          public boolean useDimensionTypeForCustomSpawners = false;
          public boolean strictAdvancementDimensionCheck = false;
      }
diff --git a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
index b8a5fb9a59..73f833a46a 100644
--- a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -6,6 +6,10 @@ Subject: [PATCH] Use TerminalConsoleAppender for console improvements
 Rewrite console improvements (console colors, tab completion,
 persistent input line, ...) using JLine 3.x and TerminalConsoleAppender.
 
+Also uses the new ANSIComponentSerializer to serialize components when
+logging them via the ComponentLogger, or when sending messages to the
+console, for hex color support.
+
 New features:
   - Support console colors for Vanilla commands
   - Add console colors for warnings and errors
@@ -18,11 +22,13 @@ Other changes:
   - Server starts 1-2 seconds faster thanks to optimizations in Log4j
     configuration
 
+Co-Authored-By: Emilia Kond <[email protected]>
+
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d8da21801eda8ea5d04c8eb2941bbef968cb7951..38c08ee8e935d3fdf5ad4e443352e3563609e3c0 100644
+index 9ab4d3e462c02e4d23b45adb46965eb75eb2178e..700be2fdc10d14222f06e482681bb3a2e9a0aee6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -8,7 +8,17 @@ plugins {
+@@ -8,7 +8,19 @@ plugins {
  
  dependencies {
      implementation(project(":paper-api"))
@@ -30,6 +36,7 @@ index d8da21801eda8ea5d04c8eb2941bbef968cb7951..38c08ee8e935d3fdf5ad4e443352e356
 +    // Paper start
 +    implementation("org.jline:jline-terminal-jansi:3.21.0")
 +    implementation("net.minecrell:terminalconsoleappender:1.3.0")
++    implementation("net.kyori:adventure-text-serializer-ansi")
 +    /*
 +          Required to add the missing Log4j2Plugins.dat file from log4j-core
 +          which has been removed by Mojang. Without it, log4j has to classload
@@ -37,6 +44,7 @@ index d8da21801eda8ea5d04c8eb2941bbef968cb7951..38c08ee8e935d3fdf5ad4e443352e356
 +          Scanning takes about 1-2 seconds so adding this speeds up the server start.
 +     */
 +    runtimeOnly("org.apache.logging.log4j:log4j-core:2.14.1")
++    annotationProcessor("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - Needed to generate meta for our Log4j plugins
 +    // Paper end
      implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
      implementation("org.ow2.asm:asm:9.4")
@@ -90,29 +98,141 @@ index 0000000000000000000000000000000000000000..a4070b59e261f0f1ac4beec47b11492f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..685deaa0e5d1ddc13e3a7c0471b1cfcf1710c869
+index 0000000000000000000000000000000000000000..8f07539a82f449ad217e316a7513a1708781fb63
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,26 @@
 +package com.destroystokyo.paper.console;
 +
++import net.kyori.adventure.audience.MessageType;
++import net.kyori.adventure.identity.Identity;
++import net.kyori.adventure.text.Component;
++import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
++import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 +import org.apache.logging.log4j.LogManager;
-+import org.apache.logging.log4j.Logger;
 +import org.bukkit.craftbukkit.command.CraftConsoleCommandSender;
 +
 +public class TerminalConsoleCommandSender extends CraftConsoleCommandSender {
 +
-+    private static final Logger LOGGER = LogManager.getRootLogger();
++    private static final ComponentLogger LOGGER = ComponentLogger.logger(LogManager.getRootLogger().getName());
 +
 +    @Override
 +    public void sendRawMessage(String message) {
-+        // TerminalConsoleAppender supports color codes directly in log messages
++        final Component msg = LegacyComponentSerializer.legacySection().deserialize(message);
++        this.sendMessage(Identity.nil(), msg, MessageType.SYSTEM);
++    }
++
++    @Override
++    public void sendMessage(Identity identity, Component message, MessageType type) {
 +        LOGGER.info(message);
 +    }
 +
 +}
+diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
+index 3dc613116c086444ece88bcb0a569eeea953074f..db54a9c32578defa02fa58dc694c96684a4885ac 100644
+--- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
++++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
+@@ -20,6 +20,7 @@ import net.kyori.adventure.text.TranslatableComponent;
+ import net.kyori.adventure.text.flattener.ComponentFlattener;
+ import net.kyori.adventure.text.format.TextColor;
+ import net.kyori.adventure.text.serializer.ComponentSerializer;
++import net.kyori.adventure.text.serializer.ansi.ANSIComponentSerializer;
+ import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
+ import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
+ import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+@@ -107,6 +108,9 @@ public final class PaperAdventure {
+     public static final AttributeKey<Locale> LOCALE_ATTRIBUTE = AttributeKey.valueOf("adventure:locale"); // init after FLATTENER because classloading triggered here might create a logger
+     @Deprecated
+     public static final PlainComponentSerializer PLAIN = PlainComponentSerializer.builder().flattener(FLATTENER).build();
++
++    public static final ANSIComponentSerializer ANSI_SERIALIZER = ANSIComponentSerializer.builder().flattener(FLATTENER).build();
++
+     private static final Codec<CompoundTag, String, IOException, IOException> NBT_CODEC = new Codec<CompoundTag, String, IOException, IOException>() {
+         @Override
+         public @NotNull CompoundTag decode(final @NotNull String encoded) throws IOException {
+diff --git a/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java b/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java
+index c3631efda9c7fa531a8a9f18fbee7b5f8655382b..769f6489632302627fa1730cc08e77f51eb54eb4 100644
+--- a/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java
++++ b/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java
+@@ -1,9 +1,11 @@
+ package io.papermc.paper.adventure.providers;
+ 
+ import io.papermc.paper.adventure.PaperAdventure;
++import java.util.Locale;
+ import net.kyori.adventure.text.Component;
+ import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
+ import net.kyori.adventure.text.logger.slf4j.ComponentLoggerProvider;
++import net.kyori.adventure.translation.GlobalTranslator;
+ import org.jetbrains.annotations.NotNull;
+ import org.slf4j.LoggerFactory;
+ 
+@@ -14,6 +16,6 @@ public class ComponentLoggerProviderImpl implements ComponentLoggerProvider {
+     }
+ 
+     private String serialize(final Component message) {
+-        return PaperAdventure.asPlain(message, null);
++        return PaperAdventure.ANSI_SERIALIZER.serialize(GlobalTranslator.render(message, Locale.getDefault()));
+     }
+ }
+diff --git a/src/main/java/io/papermc/paper/console/StripANSIConverter.java b/src/main/java/io/papermc/paper/console/StripANSIConverter.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..91547f6e6fe90006713beb2818da634304bdd236
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/console/StripANSIConverter.java
+@@ -0,0 +1,51 @@
++package io.papermc.paper.console;
++
++import org.apache.logging.log4j.core.LogEvent;
++import org.apache.logging.log4j.core.config.Configuration;
++import org.apache.logging.log4j.core.config.plugins.Plugin;
++import org.apache.logging.log4j.core.layout.PatternLayout;
++import org.apache.logging.log4j.core.pattern.ConverterKeys;
++import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
++import org.apache.logging.log4j.core.pattern.PatternConverter;
++import org.apache.logging.log4j.core.pattern.PatternFormatter;
++import org.apache.logging.log4j.core.pattern.PatternParser;
++
++import java.util.List;
++import java.util.regex.Pattern;
++
++@Plugin(name = "stripAnsi", category = PatternConverter.CATEGORY)
++@ConverterKeys({"stripAnsi"})
++public final class StripANSIConverter extends LogEventPatternConverter {
++    final private Pattern ANSI_PATTERN = Pattern.compile("\\e\\[[\\d;]*[^\\d;]");
++
++    private final List<PatternFormatter> formatters;
++
++    private StripANSIConverter(List<PatternFormatter> formatters) {
++        super("stripAnsi", null);
++        this.formatters = formatters;
++    }
++
++    @Override
++    public void format(LogEvent event, StringBuilder toAppendTo) {
++        int start = toAppendTo.length();
++        for (PatternFormatter formatter : formatters) {
++            formatter.format(event, toAppendTo);
++        }
++        String content = toAppendTo.substring(start);
++        content = ANSI_PATTERN.matcher(content).replaceAll("");
++
++        toAppendTo.setLength(start);
++        toAppendTo.append(content);
++    }
++
++    public static StripANSIConverter newInstance(Configuration config, String[] options) {
++        if (options.length != 1) {
++            LOGGER.error("Incorrect number of options on stripAnsi. Expected exactly 1, received " + options.length);
++            return null;
++        }
++
++        PatternParser parser = PatternLayout.createPatternParser(config);
++        List<PatternFormatter> formatters = parser.parse(options[0]);
++        return new StripANSIConverter(formatters);
++    }
++}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 79b4139b653a09142e1b624849ad7c529c35450d..bc96a5c546c01b092f513f202e833b7b5f320e72 100644
+index 79b4139b653a09142e1b624849ad7c529c35450d..54108afdf1f88f8d9056b744ee9b0d3ebf009fcb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -165,7 +165,7 @@ import com.mojang.datafixers.util.Pair;
@@ -166,7 +286,7 @@ index 79b4139b653a09142e1b624849ad7c529c35450d..bc96a5c546c01b092f513f202e833b7b
      @Override
      public void sendSystemMessage(Component message) {
 -        MinecraftServer.LOGGER.info(message.getString());
-+        MinecraftServer.LOGGER.info(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(io.papermc.paper.adventure.PaperAdventure.asAdventure(message))); // Paper - Log message with colors
++        MinecraftServer.LOGGER.info(io.papermc.paper.adventure.PaperAdventure.ANSI_SERIALIZER.serialize(io.papermc.paper.adventure.PaperAdventure.asAdventure(message))); // Paper - Log message with colors
      }
  
      public KeyPair getKeyPair() {
@@ -221,6 +341,19 @@ index 81a0a897a1fd2a408bfe43f24ed5e5f4bbefe161..24f62f9c4d288297d7a324e806745cc1
  
          System.setOut(IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream());
          System.setErr(IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream());
+diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
+index 75083eeb9b413e6dd5375007360dce6857a08fff..d292fdb165436f0b9b46b32110f5e09ad0e517a1 100644
+--- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
++++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
+@@ -166,7 +166,7 @@ public class MinecraftServerGui extends JComponent {
+         this.finalizers.forEach(Runnable::run);
+     }
+ 
+-    private static final java.util.regex.Pattern ANSI = java.util.regex.Pattern.compile("\\x1B\\[([0-9]{1,2}(;[0-9]{1,2})*)?[m|K]"); // CraftBukkit
++    private static final java.util.regex.Pattern ANSI = java.util.regex.Pattern.compile("\\e\\[[\\d;]*[^\\d;]"); // CraftBukkit // Paper
+     public void print(JTextArea textArea, JScrollPane scrollPane, String message) {
+         if (!SwingUtilities.isEventDispatchThread()) {
+             SwingUtilities.invokeLater(() -> {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
 index a9cab02b97f85fec31ad636f7a340066d409be36..03ea44619bc3445956f3e4539fc0e2923a29a92d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -478,7 +611,7 @@ index 0000000000000000000000000000000000000000..0694b21465fb9e4164e71862ff24b622
 @@ -0,0 +1 @@
 +log4j.skipJansi=true
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 722ca84968cbbbdeffd09939abff0cccd0a84010..620b9490e5f159080e50289d127404a1b56adbef 100644
+index 722ca84968cbbbdeffd09939abff0cccd0a84010..a994ec0f8621b1f267b40049306f63479c050e2f 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,17 +1,14 @@
@@ -495,11 +628,11 @@ index 722ca84968cbbbdeffd09939abff0cccd0a84010..620b9490e5f159080e50289d127404a1
 -            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
 -        </Queue>
 +        <TerminalConsole name="TerminalConsole">
-+            <PatternLayout pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}" />
++            <PatternLayout pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx}" />
 +        </TerminalConsole>
          <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
 -            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
-+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n" />
++            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n" />
              <Policies>
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
diff --git a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
index da2d8e20f1..f502abb948 100644
--- a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -15,18 +15,18 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 38c08ee8e935d3fdf5ad4e443352e3563609e3c0..97f1a5bafdd1f520fee5f31fda87b4c251aea33f 100644
+index 700be2fdc10d14222f06e482681bb3a2e9a0aee6..5524d44f8b97480bce3ed5ec7e154aae1fb13a2d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -17,7 +17,7 @@ dependencies {
+@@ -18,7 +18,7 @@ dependencies {
            all its classes to check if they are plugins.
            Scanning takes about 1-2 seconds so adding this speeds up the server start.
       */
 -    runtimeOnly("org.apache.logging.log4j:log4j-core:2.14.1")
 +    implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation
+     annotationProcessor("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - Needed to generate meta for our Log4j plugins
      // Paper end
      implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
-     implementation("org.ow2.asm:asm:9.4")
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
 index 0a0aa6de31a94a701074cc5f43c94be7515a185c..489ce6f439778b26eb33ede9432681d4bf9e0116 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
@@ -41,29 +41,29 @@ index 0a0aa6de31a94a701074cc5f43c94be7515a185c..489ce6f439778b26eb33ede9432681d4
  
      public static int playerShuffle;
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 620b9490e5f159080e50289d127404a1b56adbef..a8bdaaeaa1a9316848416f0533739b9b083ca151 100644
+index a994ec0f8621b1f267b40049306f63479c050e2f..bba2de3f3feb5e6a876f9df1eee6da0c7d93e271 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -5,10 +5,22 @@
              <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />
          </Queue>
          <TerminalConsole name="TerminalConsole">
--            <PatternLayout pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}" />
+-            <PatternLayout pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx}" />
 +            <PatternLayout>
-+                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %minecraftFormatting{%msg}%n%xEx}">
++                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %msg%n%xEx}">
 +                    <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
 +                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang."
-+                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}" />
++                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx}" />
 +                </LoggerNamePatternSelector>
 +            </PatternLayout>
          </TerminalConsole>
          <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
--            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n" />
+-            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n" />
 +            <PatternLayout>
-+                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %minecraftFormatting{%msg}{strip}%n">
++                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %stripAnsi{%msg}%n">
 +                    <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
 +                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang."
-+                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n" />
++                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n" />
 +                </LoggerNamePatternSelector>
 +            </PatternLayout>
              <Policies>
diff --git a/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch
index 5afb9562c0..06b30f0a00 100644
--- a/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch
+++ b/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch
@@ -14,34 +14,34 @@ log. Disable the logger prefix for these plugins so the messages
 show up correctly.
 
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index a8bdaaeaa1a9316848416f0533739b9b083ca151..476f4a5cbe664ddd05474cb88553018bd334a5b8 100644
+index bba2de3f3feb5e6a876f9df1eee6da0c7d93e271..88957220d5574e5590e8a545605d76c0c7b0a10e 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -6,19 +6,21 @@
          </Queue>
          <TerminalConsole name="TerminalConsole">
              <PatternLayout>
--                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %minecraftFormatting{%msg}%n%xEx}">
-+                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %minecraftFormatting{%msg}%n%xEx{full}}">
+-                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %msg%n%xEx}">
++                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %msg%n%xEx{full}}">
                      <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
 -                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang."
--                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}" />
+-                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx}" />
 +                    <!-- Disable prefix for various plugins that bypass the plugin logger -->
 +                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE"
-+                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx{full}}" />
++                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx{full}}" />
                  </LoggerNamePatternSelector>
              </PatternLayout>
          </TerminalConsole>
          <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
              <PatternLayout>
--                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %minecraftFormatting{%msg}{strip}%n">
-+                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %minecraftFormatting{%msg}{strip}%n%xEx{full}">
+-                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %stripAnsi{%msg}%n">
++                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %stripAnsi{%msg}%n%xEx{full}">
                      <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
 -                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang."
--                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n" />
+-                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n" />
 +                    <!-- Disable prefix for various plugins that bypass the plugin logger -->
 +                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE"
-+                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n%xEx{full}" />
++                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n%xEx{full}" />
                  </LoggerNamePatternSelector>
              </PatternLayout>
              <Policies>
diff --git a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index e7ee569d1e..4e4cf25665 100644
--- a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 97f1a5bafdd1f520fee5f31fda87b4c251aea33f..41485437cdf438cfb837a9fcd276c2dd70b84b42 100644
+index 5524d44f8b97480bce3ed5ec7e154aae1fb13a2d..02f26dd4a4a75ca35a124ab2e6e426e72121f55b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -27,6 +27,7 @@ dependencies {
+@@ -29,6 +29,7 @@ dependencies {
      implementation("commons-lang:commons-lang:2.6")
      runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
      runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
@@ -17,7 +17,7 @@ index 97f1a5bafdd1f520fee5f31fda87b4c251aea33f..41485437cdf438cfb837a9fcd276c2dd
      runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.2")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 476f4a5cbe664ddd05474cb88553018bd334a5b8..3dc317e466e1b93dff030794dd7f29ca1b266778 100644
+index 88957220d5574e5590e8a545605d76c0c7b0a10e..ea4e2161c0bd43884055cc6b8d70b2139f70e720 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -29,15 +29,18 @@
diff --git a/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 2be0b10356..16a9f30507 100644
--- a/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -6,18 +6,10 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9617477e8ef0ef5b1af4733ce4e87ddd796a7be2..e6731ada5a7f0f66322fd958f6244b3d5b8887bf 100644
+index 9183b71f6ca78b4a3bc7d804f8d9c4c6db65d5cc..f1fd98bd3d39b4c34043b269e8c43cff073f2726 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -19,6 +19,7 @@ dependencies {
-           Scanning takes about 1-2 seconds so adding this speeds up the server start.
-      */
-     implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation
-+    annotationProcessor("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - Needed to generate meta for our Log4j plugins
-     // Paper end
-     implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
-     implementation("org.ow2.asm:asm:9.4")
-@@ -26,6 +27,7 @@ dependencies {
+@@ -28,6 +28,7 @@ dependencies {
      testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito
      implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
@@ -25,7 +17,7 @@ index 9617477e8ef0ef5b1af4733ce4e87ddd796a7be2..e6731ada5a7f0f66322fd958f6244b3d
      runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
      runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
-@@ -105,6 +107,18 @@ tasks.check {
+@@ -107,6 +108,18 @@ tasks.check {
  }
  // Paper end
  
@@ -504,7 +496,7 @@ index 5308f016baf3001ffd1468633cde446493ca581e..1b6d090afea5b0a49b601b73cefeedc0
  
      protected void channelRead0(ChannelHandlerContext channelhandlercontext, Packet<?> packet) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 71b395db734c257a64ec3297eebbe52883ea4cc7..072888f891c8e25a2b4daaf561e124930df2be1e 100644
+index aaad6b0de19872c6e54591adf90c30d2c2ed5223..6a4c7783146ff6b6703e9ae814134a8d1086cf7f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -195,6 +195,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -643,7 +635,7 @@ index 383c52c62f49b17db2fbf58009d6ea132d124bea..e0a71bfc1498a517456b21747ab6ef3f
              log.log( Level.SEVERE, "\t\t" + stack );
          }
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index d285dbec16272db6b8a71865e05924ad66087407..1a05d23ff886b015fb9396f119822c678a47ec6f 100644
+index 266b4e6fb3988b5848021c83fdc68e342c70b188..2b247d55e39246fbef31279b14c45fc40f956bfb 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -30,10 +30,14 @@
diff --git a/patches/server/0393-Implement-Mob-Goal-API.patch b/patches/server/0393-Implement-Mob-Goal-API.patch
index b8706e49a0..5781049a4c 100644
--- a/patches/server/0393-Implement-Mob-Goal-API.patch
+++ b/patches/server/0393-Implement-Mob-Goal-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e6731ada5a7f0f66322fd958f6244b3d5b8887bf..f57bd7863e90afb461158ab54ce4e3bcd6deb6cf 100644
+index f1fd98bd3d39b4c34043b269e8c43cff073f2726..b65278b9addf9a26b0f63975f439d333fd3fdf87 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -36,6 +36,7 @@ dependencies {
+@@ -37,6 +37,7 @@ dependencies {
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
  
diff --git a/patches/server/0561-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0561-Add-support-for-hex-color-codes-in-console.patch
deleted file mode 100644
index 3182b003b4..0000000000
--- a/patches/server/0561-Add-support-for-hex-color-codes-in-console.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Josh Roy <[email protected]>
-Date: Sat, 20 Feb 2021 13:09:59 -0500
-Subject: [PATCH] Add support for hex color codes in console
-
-Converts upstream's hex color code legacy format into actual hex color codes in the console.
-
-diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-index 685deaa0e5d1ddc13e3a7c0471b1cfcf1710c869..8f07539a82f449ad217e316a7513a1708781fb63 100644
---- a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-+++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-@@ -1,16 +1,25 @@
- package com.destroystokyo.paper.console;
- 
-+import net.kyori.adventure.audience.MessageType;
-+import net.kyori.adventure.identity.Identity;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
-+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
- import org.apache.logging.log4j.LogManager;
--import org.apache.logging.log4j.Logger;
- import org.bukkit.craftbukkit.command.CraftConsoleCommandSender;
- 
- public class TerminalConsoleCommandSender extends CraftConsoleCommandSender {
- 
--    private static final Logger LOGGER = LogManager.getRootLogger();
-+    private static final ComponentLogger LOGGER = ComponentLogger.logger(LogManager.getRootLogger().getName());
- 
-     @Override
-     public void sendRawMessage(String message) {
--        // TerminalConsoleAppender supports color codes directly in log messages
-+        final Component msg = LegacyComponentSerializer.legacySection().deserialize(message);
-+        this.sendMessage(Identity.nil(), msg, MessageType.SYSTEM);
-+    }
-+
-+    @Override
-+    public void sendMessage(Identity identity, Component message, MessageType type) {
-         LOGGER.info(message);
-     }
- 
-diff --git a/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java b/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java
-index c3631efda9c7fa531a8a9f18fbee7b5f8655382b..9a3c1314d5a0aa20380662595359580b1a97be89 100644
---- a/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java
-+++ b/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java
-@@ -1,9 +1,11 @@
- package io.papermc.paper.adventure.providers;
- 
--import io.papermc.paper.adventure.PaperAdventure;
-+import io.papermc.paper.console.HexFormattingConverter;
-+import java.util.Locale;
- import net.kyori.adventure.text.Component;
- import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
- import net.kyori.adventure.text.logger.slf4j.ComponentLoggerProvider;
-+import net.kyori.adventure.translation.GlobalTranslator;
- import org.jetbrains.annotations.NotNull;
- import org.slf4j.LoggerFactory;
- 
-@@ -14,6 +16,6 @@ public class ComponentLoggerProviderImpl implements ComponentLoggerProvider {
-     }
- 
-     private String serialize(final Component message) {
--        return PaperAdventure.asPlain(message, null);
-+        return HexFormattingConverter.SERIALIZER.serialize(GlobalTranslator.render(message, Locale.getDefault()));
-     }
- }
-diff --git a/src/main/java/io/papermc/paper/console/HexFormattingConverter.java b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..b9922b07cb105618390187d98acdf89e728e1f5a
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java
-@@ -0,0 +1,213 @@
-+package io.papermc.paper.console;
-+
-+import io.papermc.paper.configuration.GlobalConfiguration;
-+import io.papermc.paper.adventure.PaperAdventure;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import net.kyori.adventure.text.format.TextColor;
-+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-+import net.minecrell.terminalconsole.TerminalConsoleAppender;
-+import org.apache.logging.log4j.core.LogEvent;
-+import org.apache.logging.log4j.core.config.Configuration;
-+import org.apache.logging.log4j.core.config.plugins.Plugin;
-+import org.apache.logging.log4j.core.layout.PatternLayout;
-+import org.apache.logging.log4j.core.pattern.ConverterKeys;
-+import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
-+import org.apache.logging.log4j.core.pattern.PatternConverter;
-+import org.apache.logging.log4j.core.pattern.PatternFormatter;
-+import org.apache.logging.log4j.core.pattern.PatternParser;
-+import org.apache.logging.log4j.util.PerformanceSensitive;
-+import org.apache.logging.log4j.util.PropertiesUtil;
-+
-+import java.util.List;
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
-+
-+import static net.minecrell.terminalconsole.MinecraftFormattingConverter.KEEP_FORMATTING_PROPERTY;
-+
-+/**
-+ * Modified version of <a href="https://github.com/Minecrell/TerminalConsoleAppender/blob/master/src/main/java/net/minecrell/terminalconsole/MinecraftFormattingConverter.java">
-+ * TerminalConsoleAppender's MinecraftFormattingConverter</a> to support hex color codes using the Adventure [char]#rrggbb format.
-+ */
-+@Plugin(name = "paperMinecraftFormatting", category = PatternConverter.CATEGORY)
-+@ConverterKeys({"paperMinecraftFormatting"})
-+@PerformanceSensitive("allocation")
-+public final class HexFormattingConverter extends LogEventPatternConverter {
-+
-+    private static final boolean KEEP_FORMATTING = PropertiesUtil.getProperties().getBooleanProperty(KEEP_FORMATTING_PROPERTY);
-+
-+    private static final String ANSI_RESET = "\u001B[m";
-+
-+    private static final char COLOR_CHAR = 0x7f;
-+    public static final LegacyComponentSerializer SERIALIZER = LegacyComponentSerializer.builder()
-+        .hexColors()
-+        .flattener(PaperAdventure.FLATTENER)
-+        .character(HexFormattingConverter.COLOR_CHAR)
-+        .build();
-+    private static final String LOOKUP = "0123456789abcdefklmnor";
-+
-+    private static final String RGB_ANSI = "\u001B[38;2;%d;%d;%dm";
-+    private static final String RESET_RGB_ANSI = ANSI_RESET + RGB_ANSI;
-+    private static final Pattern NAMED_PATTERN = Pattern.compile(COLOR_CHAR + "[0-9a-fk-orA-FK-OR]");
-+    private static final Pattern RGB_PATTERN = Pattern.compile(COLOR_CHAR + "#([0-9a-fA-F]){6}");
-+
-+    private static final String[] RGB_ANSI_CODES = new String[]{
-+        formatHexAnsi(NamedTextColor.BLACK),         // Black §0
-+        formatHexAnsi(NamedTextColor.DARK_BLUE),     // Dark Blue §1
-+        formatHexAnsi(NamedTextColor.DARK_GREEN),    // Dark Green §2
-+        formatHexAnsi(NamedTextColor.DARK_AQUA),     // Dark Aqua §3
-+        formatHexAnsi(NamedTextColor.DARK_RED),      // Dark Red §4
-+        formatHexAnsi(NamedTextColor.DARK_PURPLE),   // Dark Purple §5
-+        formatHexAnsi(NamedTextColor.GOLD),          // Gold §6
-+        formatHexAnsi(NamedTextColor.GRAY),          // Gray §7
-+        formatHexAnsi(NamedTextColor.DARK_GRAY),     // Dark Gray §8
-+        formatHexAnsi(NamedTextColor.BLUE),          // Blue §9
-+        formatHexAnsi(NamedTextColor.GREEN),         // Green §a
-+        formatHexAnsi(NamedTextColor.AQUA),          // Aqua §b
-+        formatHexAnsi(NamedTextColor.RED),           // Red §c
-+        formatHexAnsi(NamedTextColor.LIGHT_PURPLE),  // Light Purple §d
-+        formatHexAnsi(NamedTextColor.YELLOW),        // Yellow §e
-+        formatHexAnsi(NamedTextColor.WHITE),         // White §f
-+        "\u001B[5m",                                 // Obfuscated §k
-+        "\u001B[1m",                                 // Bold §l
-+        "\u001B[9m",                                 // Strikethrough §m
-+        "\u001B[4m",                                 // Underline §n
-+        "\u001B[3m",                                 // Italic §o
-+        ANSI_RESET,                                  // Reset §r
-+    };
-+    private static final String[] ANSI_ANSI_CODES = new String[]{
-+        ANSI_RESET + "\u001B[0;30m",    // Black §0
-+        ANSI_RESET + "\u001B[0;34m",    // Dark Blue §1
-+        ANSI_RESET + "\u001B[0;32m",    // Dark Green §2
-+        ANSI_RESET + "\u001B[0;36m",    // Dark Aqua §3
-+        ANSI_RESET + "\u001B[0;31m",    // Dark Red §4
-+        ANSI_RESET + "\u001B[0;35m",    // Dark Purple §5
-+        ANSI_RESET + "\u001B[0;33m",    // Gold §6
-+        ANSI_RESET + "\u001B[0;37m",    // Gray §7
-+        ANSI_RESET + "\u001B[0;30;1m",  // Dark Gray §8
-+        ANSI_RESET + "\u001B[0;34;1m",  // Blue §9
-+        ANSI_RESET + "\u001B[0;32;1m",  // Green §a
-+        ANSI_RESET + "\u001B[0;36;1m",  // Aqua §b
-+        ANSI_RESET + "\u001B[0;31;1m",  // Red §c
-+        ANSI_RESET + "\u001B[0;35;1m",  // Light Purple §d
-+        ANSI_RESET + "\u001B[0;33;1m",  // Yellow §e
-+        ANSI_RESET + "\u001B[0;37;1m",  // White §f
-+                     "\u001B[5m",       // Obfuscated §k
-+                     "\u001B[1m",       // Bold §l
-+                     "\u001B[9m",       // Strikethrough §m
-+                     "\u001B[4m",       // Underline §n
-+                     "\u001B[3m",       // Italic §o
-+        ANSI_RESET,                     // Reset §r
-+    };
-+
-+    private final boolean ansi;
-+    private final List<PatternFormatter> formatters;
-+
-+    /**
-+     * Construct the converter.
-+     *
-+     * @param formatters The pattern formatters to generate the text to manipulate
-+     * @param strip      If true, the converter will strip all formatting codes
-+     */
-+    protected HexFormattingConverter(List<PatternFormatter> formatters, boolean strip) {
-+        super("paperMinecraftFormatting", null);
-+        this.formatters = formatters;
-+        this.ansi = !strip;
-+    }
-+
-+    @Override
-+    public void format(LogEvent event, StringBuilder toAppendTo) {
-+        int start = toAppendTo.length();
-+        //noinspection ForLoopReplaceableByForEach
-+        for (int i = 0, size = formatters.size(); i < size; i++) {
-+            formatters.get(i).format(event, toAppendTo);
-+        }
-+
-+        if (KEEP_FORMATTING || toAppendTo.length() == start) {
-+            // Skip replacement if disabled or if the content is empty
-+            return;
-+        }
-+
-+        boolean useAnsi = ansi && TerminalConsoleAppender.isAnsiSupported();
-+        String content = toAppendTo.substring(start);
-+        content = useAnsi ? convertRGBColors(content) : stripRGBColors(content);
-+        format(content, toAppendTo, start, useAnsi);
-+    }
-+
-+    private static String convertRGBColors(final String input) {
-+        return RGB_PATTERN.matcher(input).replaceAll(result -> {
-+            final int hex = Integer.decode(result.group().substring(1));
-+            return formatHexAnsi(hex);
-+        });
-+    }
-+
-+    private static String formatHexAnsi(final TextColor color) {
-+        return formatHexAnsi(color.value());
-+    }
-+
-+    private static String formatHexAnsi(final int color) {
-+        final int red = color >> 16 & 0xFF;
-+        final int green = color >> 8 & 0xFF;
-+        final int blue = color & 0xFF;
-+        return String.format(RESET_RGB_ANSI, red, green, blue);
-+    }
-+
-+    private static String stripRGBColors(final String input) {
-+        return RGB_PATTERN.matcher(input).replaceAll("");
-+    }
-+
-+    static void format(String content, StringBuilder result, int start, boolean ansi) {
-+        int next = content.indexOf(COLOR_CHAR);
-+        int last = content.length() - 1;
-+        if (next == -1 || next == last) {
-+            result.setLength(start);
-+            result.append(content);
-+            if (ansi) {
-+                result.append(ANSI_RESET);
-+            }
-+            return;
-+        }
-+
-+        Matcher matcher = NAMED_PATTERN.matcher(content);
-+        StringBuilder buffer = new StringBuilder();
-+        final String[] ansiCodes = GlobalConfiguration.get().logging.useRgbForNamedTextColors ? RGB_ANSI_CODES : ANSI_ANSI_CODES;
-+        while (matcher.find()) {
-+            int format = LOOKUP.indexOf(Character.toLowerCase(matcher.group().charAt(1)));
-+            if (format != -1) {
-+                matcher.appendReplacement(buffer, ansi ? ansiCodes[format] : "");
-+            }
-+        }
-+        matcher.appendTail(buffer);
-+
-+        result.setLength(start);
-+        result.append(buffer);
-+        if (ansi) {
-+            result.append(ANSI_RESET);
-+        }
-+    }
-+
-+    /**
-+     * Gets a new instance of the {@link HexFormattingConverter} with the
-+     * specified options.
-+     *
-+     * @param config  The current configuration
-+     * @param options The pattern options
-+     * @return The new instance
-+     * @see HexFormattingConverter
-+     */
-+    public static HexFormattingConverter newInstance(Configuration config, String[] options) {
-+        if (options.length < 1 || options.length > 2) {
-+            LOGGER.error("Incorrect number of options on paperMinecraftFormatting. Expected at least 1, max 2 received " + options.length);
-+            return null;
-+        }
-+        if (options[0] == null) {
-+            LOGGER.error("No pattern supplied on paperMinecraftFormatting");
-+            return null;
-+        }
-+
-+        PatternParser parser = PatternLayout.createPatternParser(config);
-+        List<PatternFormatter> formatters = parser.parse(options[0]);
-+        boolean strip = options.length > 1 && "strip".equals(options[1]);
-+        return new HexFormattingConverter(formatters, strip);
-+    }
-+
-+}
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5ac5937c72286d96c394a4da90cbc4436e22ed59..607651ca570483e98786aded8986a535301f3e80 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1706,7 +1706,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     @Override
-     public void sendSystemMessage(Component message) {
--        MinecraftServer.LOGGER.info(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(io.papermc.paper.adventure.PaperAdventure.asAdventure(message))); // Paper - Log message with colors
-+        MinecraftServer.LOGGER.info(io.papermc.paper.console.HexFormattingConverter.SERIALIZER.serialize(io.papermc.paper.adventure.PaperAdventure.asAdventure(message))); // Paper - Log message with colors
-     }
- 
-     public KeyPair getKeyPair() {
-diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 1a05d23ff886b015fb9396f119822c678a47ec6f..2e421eaac80cf251b32e0bb504dd54a73edf4986 100644
---- a/src/main/resources/log4j2.xml
-+++ b/src/main/resources/log4j2.xml
-@@ -6,21 +6,21 @@
-         </Queue>
-         <TerminalConsole name="TerminalConsole">
-             <PatternLayout>
--                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %minecraftFormatting{%msg}%n%xEx{full}}">
-+                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %paperMinecraftFormatting{%msg}%n%xEx{full}}">
-                     <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
-                     <!-- Disable prefix for various plugins that bypass the plugin logger -->
-                     <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE"
--                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx{full}}" />
-+                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %paperMinecraftFormatting{%msg}%n%xEx{full}}" />
-                 </LoggerNamePatternSelector>
-             </PatternLayout>
-         </TerminalConsole>
-         <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
-             <PatternLayout>
--                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %minecraftFormatting{%msg}{strip}%n%xEx{full}">
-+                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %paperMinecraftFormatting{%msg}{strip}%n%xEx{full}">
-                     <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
-                     <!-- Disable prefix for various plugins that bypass the plugin logger -->
-                     <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE"
--                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n%xEx{full}" />
-+                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %paperMinecraftFormatting{%msg}{strip}%n%xEx{full}" />
-                 </LoggerNamePatternSelector>
-             </PatternLayout>
-             <Policies>
diff --git a/patches/server/0562-Expose-Tracked-Players.patch b/patches/server/0561-Expose-Tracked-Players.patch
index d84718662d..d84718662d 100644
--- a/patches/server/0562-Expose-Tracked-Players.patch
+++ b/patches/server/0561-Expose-Tracked-Players.patch
diff --git a/patches/server/0563-Remove-streams-from-SensorNearest.patch b/patches/server/0562-Remove-streams-from-SensorNearest.patch
index a7ae5d1a98..a7ae5d1a98 100644
--- a/patches/server/0563-Remove-streams-from-SensorNearest.patch
+++ b/patches/server/0562-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0564-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0563-Throw-proper-exception-on-empty-JsonList-file.patch
index e013e32526..e013e32526 100644
--- a/patches/server/0564-Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/server/0563-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0565-Improve-ServerGUI.patch b/patches/server/0564-Improve-ServerGUI.patch
index e573bd2f58..9606c8a72f 100644
--- a/patches/server/0565-Improve-ServerGUI.patch
+++ b/patches/server/0564-Improve-ServerGUI.patch
@@ -39,7 +39,7 @@ index 23239679d6584f1088b2b94c46eb9a5c1f9ad91d..fa56cd09102a89692b42f1d142579905
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-index 66464c10a6b33414c6d1b67b926a66c343d5f887..c07918aa1ed2469ad7a76a0add60ab648ff7f421 100644
+index 2e93eec8733c5b548a15269a322fe4dd1f189b7d..dd9f611efc95f7d06fd3011fedd5d0317b1d0a85 100644
 --- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
 +++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
 @@ -59,6 +59,15 @@ public class MinecraftServerGui extends JComponent {
diff --git a/patches/server/0566-fix-converting-txt-to-json-file.patch b/patches/server/0565-fix-converting-txt-to-json-file.patch
index 5115096195..5c89a8730e 100644
--- a/patches/server/0566-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0565-fix-converting-txt-to-json-file.patch
@@ -21,7 +21,7 @@ index a20d47f54f12dfc0a5f76dd969238e34c958b618..935dac757280731bfeb0a8f033cbe315
          this.saveUserBanList();
          this.loadIpBanList();
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 6c1db5d6bf11184205073a4ce755e7f4e987643a..01e67001435dfa74062fda386072c552b39f2377 100644
+index 1ffd3854239862414e6ceecf2764ba3d6bd7942a..030b6e33fe80f6c50c473dbaa8f9aa9d4384a6b2 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -198,6 +198,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0567-Add-worldborder-events.patch b/patches/server/0566-Add-worldborder-events.patch
index 176d1259e4..176d1259e4 100644
--- a/patches/server/0567-Add-worldborder-events.patch
+++ b/patches/server/0566-Add-worldborder-events.patch
diff --git a/patches/server/0568-added-PlayerNameEntityEvent.patch b/patches/server/0567-added-PlayerNameEntityEvent.patch
index d5a8060153..d5a8060153 100644
--- a/patches/server/0568-added-PlayerNameEntityEvent.patch
+++ b/patches/server/0567-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0569-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0568-Prevent-grindstones-from-overstacking-items.patch
index dc68619ad1..dc68619ad1 100644
--- a/patches/server/0569-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0568-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0570-Add-recipe-to-cook-events.patch b/patches/server/0569-Add-recipe-to-cook-events.patch
index 6599e0cc50..6599e0cc50 100644
--- a/patches/server/0570-Add-recipe-to-cook-events.patch
+++ b/patches/server/0569-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0571-Add-Block-isValidTool.patch b/patches/server/0570-Add-Block-isValidTool.patch
index d525f7d600..d525f7d600 100644
--- a/patches/server/0571-Add-Block-isValidTool.patch
+++ b/patches/server/0570-Add-Block-isValidTool.patch
diff --git a/patches/server/0572-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0571-Allow-using-signs-inside-spawn-protection.patch
index 740ba7d58f..d2ff2b0366 100644
--- a/patches/server/0572-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0571-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index df9d65167346152d9c589e3072e3d3d6882db5c6..6c695a80b1e175a6207a89c3f38e6c5faa3742e6 100644
+index ad19b3870fcc8ebd20fe429de3123731a0c2df07..fa808d6e3288996fab06e4b577957185e0009bce 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1826,7 +1826,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0573-Expand-world-key-API.patch b/patches/server/0572-Expand-world-key-API.patch
index f86cd7dd43..f86cd7dd43 100644
--- a/patches/server/0573-Expand-world-key-API.patch
+++ b/patches/server/0572-Expand-world-key-API.patch
diff --git a/patches/server/0574-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0573-Add-fast-alternative-constructor-for-Rotations.patch
index bbdcc665bb..bbdcc665bb 100644
--- a/patches/server/0574-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0573-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0575-Item-Rarity-API.patch b/patches/server/0574-Item-Rarity-API.patch
index de26718a34..de26718a34 100644
--- a/patches/server/0575-Item-Rarity-API.patch
+++ b/patches/server/0574-Item-Rarity-API.patch
diff --git a/patches/server/0576-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0575-Drop-carried-item-when-player-has-disconnected.patch
index 5d01be88b2..5d01be88b2 100644
--- a/patches/server/0576-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0575-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0577-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0576-forced-whitelist-use-configurable-kick-message.patch
index e1def93afa..5b96e8d5dd 100644
--- a/patches/server/0577-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0576-forced-whitelist-use-configurable-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 607651ca570483e98786aded8986a535301f3e80..cd531eff22742cff16ce4888853cba53861792dd 100644
+index 34658ffabd88abbc84bfc19f44c9cd391f2cb1bb..b3f04bb7afee65584566591b302feb8dfa850e87 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2150,7 +2150,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0578-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0577-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 36faaa1a65..b6708ac38a 100644
--- a/patches/server/0578-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0577-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6c695a80b1e175a6207a89c3f38e6c5faa3742e6..7eb9ddbdb1c2a57674f4ca91e0bda88e42f364ed 100644
+index fa808d6e3288996fab06e4b577957185e0009bce..4495dcbf340fb7a89060b0836a7e2b0cca4bc2b4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1290,7 +1290,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0579-Expose-protocol-version.patch b/patches/server/0578-Expose-protocol-version.patch
index 4447e72ad3..4447e72ad3 100644
--- a/patches/server/0579-Expose-protocol-version.patch
+++ b/patches/server/0578-Expose-protocol-version.patch
diff --git a/patches/server/0580-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0579-Enhance-console-tab-completions-for-brigadier-comman.patch
index 7bc82ce08e..1069662178 100644
--- a/patches/server/0580-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0579-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..dd9d77d7c7f1a5a130a1f4c15e5b1e68
 +    public void setErrorIndex(final int errorIndex) {}
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 01e67001435dfa74062fda386072c552b39f2377..6c159945384586e9dbed871d180ae55f1e83e56a 100644
+index 030b6e33fe80f6c50c473dbaa8f9aa9d4384a6b2..3f230a32346d6923a9fe4c2311142fbf4b088373 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -173,7 +173,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0581-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0580-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index a873a9e9da..a873a9e9da 100644
--- a/patches/server/0581-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0580-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0582-Add-bypass-host-check.patch b/patches/server/0581-Add-bypass-host-check.patch
index 05f0f5396e..05f0f5396e 100644
--- a/patches/server/0582-Add-bypass-host-check.patch
+++ b/patches/server/0581-Add-bypass-host-check.patch
diff --git a/patches/server/0583-Set-area-affect-cloud-rotation.patch b/patches/server/0582-Set-area-affect-cloud-rotation.patch
index 01bee08450..01bee08450 100644
--- a/patches/server/0583-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0582-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0584-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0583-add-isDeeplySleeping-to-HumanEntity.patch
index 2395939fc1..2395939fc1 100644
--- a/patches/server/0584-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0583-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0585-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0584-add-consumeFuel-to-FurnaceBurnEvent.patch
index 8596f43f62..8596f43f62 100644
--- a/patches/server/0585-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0584-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0586-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0585-add-get-set-drop-chance-to-EntityEquipment.patch
index 9720fcdaf4..9720fcdaf4 100644
--- a/patches/server/0586-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0585-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0587-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0586-fix-PigZombieAngerEvent-cancellation.patch
index 195a80293d..195a80293d 100644
--- a/patches/server/0587-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0586-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0588-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0587-fix-PlayerItemHeldEvent-firing-twice.patch
index 18c4033798..2d0d5e0c3e 100644
--- a/patches/server/0588-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0587-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7eb9ddbdb1c2a57674f4ca91e0bda88e42f364ed..4f4b6348da714854fc87ed992d16ff567a5690aa 100644
+index 4495dcbf340fb7a89060b0836a7e2b0cca4bc2b4..7451b61d28c22555619a80b741744b376d92ce58 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2040,6 +2040,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0589-Added-PlayerDeepSleepEvent.patch b/patches/server/0588-Added-PlayerDeepSleepEvent.patch
index cbc35ad165..cbc35ad165 100644
--- a/patches/server/0589-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0588-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0590-More-World-API.patch b/patches/server/0589-More-World-API.patch
index f57028fb31..f57028fb31 100644
--- a/patches/server/0590-More-World-API.patch
+++ b/patches/server/0589-More-World-API.patch
diff --git a/patches/server/0591-Added-PlayerBedFailEnterEvent.patch b/patches/server/0590-Added-PlayerBedFailEnterEvent.patch
index dd4d2712ed..dd4d2712ed 100644
--- a/patches/server/0591-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0590-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0592-Entity-load-save-limit-per-chunk.patch b/patches/server/0591-Entity-load-save-limit-per-chunk.patch
index e706c5e31f..e706c5e31f 100644
--- a/patches/server/0592-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0591-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0593-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0592-Implement-methods-to-convert-between-Component-and-B.patch
index ff26ebe100..65beeb5f10 100644
--- a/patches/server/0593-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0592-Implement-methods-to-convert-between-Component-and-B.patch
@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..dd6012b6a097575b2d1471be5069ecce
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 6c159945384586e9dbed871d180ae55f1e83e56a..91ed7311d365c9134c9a2598ca5ed9f94263b6e9 100644
+index 3f230a32346d6923a9fe4c2311142fbf4b088373..75c0ea2a59963334555efa1af03693fdff0fac32 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -209,6 +209,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0594-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0593-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 6e2fe236e6..6e2fe236e6 100644
--- a/patches/server/0594-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0593-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0595-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0594-Introduce-beacon-activation-deactivation-events.patch
index fc24c634c3..fc24c634c3 100644
--- a/patches/server/0595-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0594-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0596-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0595-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 65ed1e5c23..e91901fe8e 100644
--- a/patches/server/0596-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0595-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4f4b6348da714854fc87ed992d16ff567a5690aa..d27eeef0cfeda8de66710f7b3ca1b9056270fea4 100644
+index 7451b61d28c22555619a80b741744b376d92ce58..b3a75c6c1639b756084fb880ec085dd3541adcb4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2780,7 +2780,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0597-Add-Channel-initialization-listeners.patch b/patches/server/0596-Add-Channel-initialization-listeners.patch
index efd683b7d1..efd683b7d1 100644
--- a/patches/server/0597-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0596-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0598-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0597-Send-empty-commands-if-tab-completion-is-disabled.patch
index 4d853da0a7..4d853da0a7 100644
--- a/patches/server/0598-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0597-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0599-Add-more-WanderingTrader-API.patch b/patches/server/0598-Add-more-WanderingTrader-API.patch
index 9e5ed86cee..9e5ed86cee 100644
--- a/patches/server/0599-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0598-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0600-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0599-Add-EntityBlockStorage-clearEntities.patch
index 5b7203c33d..5b7203c33d 100644
--- a/patches/server/0600-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0599-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0601-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0600-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 167e55814a..167e55814a 100644
--- a/patches/server/0601-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0600-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0602-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0601-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 32ba58aa32..32ba58aa32 100644
--- a/patches/server/0602-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0601-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0603-Inventory-close.patch b/patches/server/0602-Inventory-close.patch
index 69dc365057..69dc365057 100644
--- a/patches/server/0603-Inventory-close.patch
+++ b/patches/server/0602-Inventory-close.patch
diff --git a/patches/server/0604-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0603-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 45fefcead5..45fefcead5 100644
--- a/patches/server/0604-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0603-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0605-Fix-CraftPotionBrewer-cache.patch b/patches/server/0604-Fix-CraftPotionBrewer-cache.patch
index 2d8295382f..2d8295382f 100644
--- a/patches/server/0605-Fix-CraftPotionBrewer-cache.patch
+++ b/patches/server/0604-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0606-Add-basic-Datapack-API.patch b/patches/server/0605-Add-basic-Datapack-API.patch
index 28ec4ee721..28ec4ee721 100644
--- a/patches/server/0606-Add-basic-Datapack-API.patch
+++ b/patches/server/0605-Add-basic-Datapack-API.patch
diff --git a/patches/server/0607-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0606-Add-environment-variable-to-disable-server-gui.patch
index 463d626c8f..463d626c8f 100644
--- a/patches/server/0607-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0606-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0608-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0607-additions-to-PlayerGameModeChangeEvent.patch
index 895e7265f1..8ecfa20520 100644
--- a/patches/server/0608-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0607-additions-to-PlayerGameModeChangeEvent.patch
@@ -131,7 +131,7 @@ index 43221bf57fb4eeb70823c12b48f4df0bb817eb0b..e903371b370034f6447c5f23562fe5c9
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d27eeef0cfeda8de66710f7b3ca1b9056270fea4..a4baf4e5cba66e0e5d9418ddf7ca8d612854f22e 100644
+index b3a75c6c1639b756084fb880ec085dd3541adcb4..3e825ec345fd1074e3ab7ec8549bd1bc7a8f3e8e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2789,7 +2789,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0609-ItemStack-repair-check-API.patch b/patches/server/0608-ItemStack-repair-check-API.patch
index d68a2b6156..d68a2b6156 100644
--- a/patches/server/0609-ItemStack-repair-check-API.patch
+++ b/patches/server/0608-ItemStack-repair-check-API.patch
diff --git a/patches/server/0610-More-Enchantment-API.patch b/patches/server/0609-More-Enchantment-API.patch
index ed087b154b..ed087b154b 100644
--- a/patches/server/0610-More-Enchantment-API.patch
+++ b/patches/server/0609-More-Enchantment-API.patch
diff --git a/patches/server/0611-Move-range-check-for-block-placing-up.patch b/patches/server/0610-Move-range-check-for-block-placing-up.patch
index 6f8a75c9cb..e91cd03b23 100644
--- a/patches/server/0611-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0610-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a4baf4e5cba66e0e5d9418ddf7ca8d612854f22e..2060f20a4da4c4005b8de03f82f497626f83d9b0 100644
+index 3e825ec345fd1074e3ab7ec8549bd1bc7a8f3e8e..aaeacc33183774aa3969aaff2e5304936f7041d4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1812,6 +1812,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0612-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0611-Fix-and-optimise-world-force-upgrading.patch
index 460f947bcf..9aa24f531c 100644
--- a/patches/server/0612-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0611-Fix-and-optimise-world-force-upgrading.patch
@@ -275,7 +275,7 @@ index 98385550084c9f975e494668961bac6ccb0700ab..1147044f2c4c2e9510cb6e5c38b6abe8
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, dimensionOptionsRegistry, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cd531eff22742cff16ce4888853cba53861792dd..e1ca7910cb7c605e8aa175ff6b978e901f405f56 100644
+index b3f04bb7afee65584566591b302feb8dfa850e87..21d893bb1867aa5cae7924734a0e843d4c35aa94 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -554,11 +554,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0613-Add-Mob-lookAt-API.patch b/patches/server/0612-Add-Mob-lookAt-API.patch
index 2179be5193..2179be5193 100644
--- a/patches/server/0613-Add-Mob-lookAt-API.patch
+++ b/patches/server/0612-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0614-Add-Unix-domain-socket-support.patch b/patches/server/0613-Add-Unix-domain-socket-support.patch
index d8e75b4bc9..74b575b599 100644
--- a/patches/server/0614-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0613-Add-Unix-domain-socket-support.patch
@@ -11,7 +11,7 @@ Tested-by: Mariell Hoversholm <[email protected]>
 Reviewed-by: Mariell Hoversholm <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 91ed7311d365c9134c9a2598ca5ed9f94263b6e9..4757d6432631f0c5379597b40fda169ac7cd8621 100644
+index 75c0ea2a59963334555efa1af03693fdff0fac32..1fbe7a58707ddd40f80d71e3703ff3fefff672f4 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -219,6 +219,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -91,7 +91,7 @@ index 29a0a720f22f56ca3d844efef1ecde3980fb1c12..838244e3680ea6020701e10bafbde7f5
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2060f20a4da4c4005b8de03f82f497626f83d9b0..707f0e0bdd3617fac987dacea36df6c363ca71ca 100644
+index aaeacc33183774aa3969aaff2e5304936f7041d4..1349efcfb368305d5437ec464a5f32a17177f0ca 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2624,6 +2624,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0615-Add-EntityInsideBlockEvent.patch b/patches/server/0614-Add-EntityInsideBlockEvent.patch
index 96a5c26841..96a5c26841 100644
--- a/patches/server/0615-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0614-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0616-Attributes-API-for-item-defaults.patch b/patches/server/0615-Attributes-API-for-item-defaults.patch
index 86638e1bcc..86638e1bcc 100644
--- a/patches/server/0616-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0615-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0617-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0616-Add-cause-to-Weather-ThunderChangeEvents.patch
index dfe89cd593..dfe89cd593 100644
--- a/patches/server/0617-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0616-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0618-More-Lidded-Block-API.patch b/patches/server/0617-More-Lidded-Block-API.patch
index 135fd68698..135fd68698 100644
--- a/patches/server/0618-More-Lidded-Block-API.patch
+++ b/patches/server/0617-More-Lidded-Block-API.patch
diff --git a/patches/server/0619-Limit-item-frame-cursors-on-maps.patch b/patches/server/0618-Limit-item-frame-cursors-on-maps.patch
index 8e8559a185..8e8559a185 100644
--- a/patches/server/0619-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0618-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0620-Add-PlayerKickEvent-causes.patch b/patches/server/0619-Add-PlayerKickEvent-causes.patch
index 0089d0d1da..1445892a9d 100644
--- a/patches/server/0620-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0619-Add-PlayerKickEvent-causes.patch
@@ -36,7 +36,7 @@ index b5f54ee82905e3e6ab5bfde35ab625f5feeb1393..c0a80824a0307ea673805015119cc834
  
          public boolean shouldDisconnect() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e1ca7910cb7c605e8aa175ff6b978e901f405f56..b800249823e413933a5d469e431a003f977f59e7 100644
+index 21d893bb1867aa5cae7924734a0e843d4c35aa94..76bdca305277d8d2a659b029f035bb4da25a076e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2153,7 +2153,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -88,7 +88,7 @@ index c68bac4727f6b2ca95fc8c438303097af14286f2..bb629ec263959c8268de88ca807bddb6
                  return Component.translatable("commands.kick.success", serverPlayer.getDisplayName(), reason);
              }, true);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 707f0e0bdd3617fac987dacea36df6c363ca71ca..2f04823ef4143223ae1e1d108f9ff5721c575039 100644
+index 1349efcfb368305d5437ec464a5f32a17177f0ca..0a39701d26eb37504980c8a399c259f612e0286a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -362,7 +362,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0621-Add-PufferFishStateChangeEvent.patch b/patches/server/0620-Add-PufferFishStateChangeEvent.patch
index 091a042a02..091a042a02 100644
--- a/patches/server/0621-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0620-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0622-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0621-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index adbc2300b0..adbc2300b0 100644
--- a/patches/server/0622-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0621-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0623-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0622-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 21b2143546..21b2143546 100644
--- a/patches/server/0623-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0622-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0624-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0623-Add-option-to-fix-items-merging-through-walls.patch
index ca8770c5bd..ca8770c5bd 100644
--- a/patches/server/0624-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0623-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0625-Add-BellRevealRaiderEvent.patch b/patches/server/0624-Add-BellRevealRaiderEvent.patch
index ed8e81f6a2..ed8e81f6a2 100644
--- a/patches/server/0625-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0624-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0626-Fix-invulnerable-end-crystals.patch b/patches/server/0625-Fix-invulnerable-end-crystals.patch
index b023697625..b023697625 100644
--- a/patches/server/0626-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0625-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0627-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0626-Add-ElderGuardianAppearanceEvent.patch
index 76665d8084..76665d8084 100644
--- a/patches/server/0627-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0626-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0628-Fix-dangerous-end-portal-logic.patch b/patches/server/0627-Fix-dangerous-end-portal-logic.patch
index 79d4ba5f81..79d4ba5f81 100644
--- a/patches/server/0628-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0627-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0629-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0628-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index ef457d74af..ef457d74af 100644
--- a/patches/server/0629-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0628-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0630-Make-item-validations-configurable.patch b/patches/server/0629-Make-item-validations-configurable.patch
index c25f67167d..c25f67167d 100644
--- a/patches/server/0630-Make-item-validations-configurable.patch
+++ b/patches/server/0629-Make-item-validations-configurable.patch
diff --git a/patches/server/0631-Line-Of-Sight-Changes.patch b/patches/server/0630-Line-Of-Sight-Changes.patch
index 5f0149d296..5f0149d296 100644
--- a/patches/server/0631-Line-Of-Sight-Changes.patch
+++ b/patches/server/0630-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0632-add-per-world-spawn-limits.patch b/patches/server/0631-add-per-world-spawn-limits.patch
index 6555137e8e..6555137e8e 100644
--- a/patches/server/0632-add-per-world-spawn-limits.patch
+++ b/patches/server/0631-add-per-world-spawn-limits.patch
diff --git a/patches/server/0633-Fix-potions-splash-events.patch b/patches/server/0632-Fix-potions-splash-events.patch
index ac9546298b..ac9546298b 100644
--- a/patches/server/0633-Fix-potions-splash-events.patch
+++ b/patches/server/0632-Fix-potions-splash-events.patch
diff --git a/patches/server/0634-Add-more-LimitedRegion-API.patch b/patches/server/0633-Add-more-LimitedRegion-API.patch
index 0701fb43d1..0701fb43d1 100644
--- a/patches/server/0634-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0633-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0635-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0634-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 20cc2dfe64..20cc2dfe64 100644
--- a/patches/server/0635-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0634-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0636-Missing-Entity-Behavior-API.patch b/patches/server/0635-Missing-Entity-Behavior-API.patch
index d1cd66fa4c..d1cd66fa4c 100644
--- a/patches/server/0636-Missing-Entity-Behavior-API.patch
+++ b/patches/server/0635-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0637-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0636-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 4b9116113b..e11ae310c2 100644
--- a/patches/server/0637-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0636-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2f04823ef4143223ae1e1d108f9ff5721c575039..febb8df46cd2d82e9109366c78f8fc3452121cd3 100644
+index 0a39701d26eb37504980c8a399c259f612e0286a..81998223bcee27a489cdcc1bf3fb7a894718c478 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1209,7 +1209,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0638-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0637-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index e5a0109248..e5a0109248 100644
--- a/patches/server/0638-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0637-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0639-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0638-Use-getChunkIfLoadedImmediately-in-places.patch
index c5f7bc04c3..c5f7bc04c3 100644
--- a/patches/server/0639-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0638-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0640-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0639-Fix-commands-from-signs-not-firing-command-events.patch
index 642ec71ff4..642ec71ff4 100644
--- a/patches/server/0640-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0639-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0641-Adds-PlayerArmSwingEvent.patch b/patches/server/0640-Adds-PlayerArmSwingEvent.patch
index d49bf72168..2bf2ddfeb2 100644
--- a/patches/server/0641-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0640-Adds-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index febb8df46cd2d82e9109366c78f8fc3452121cd3..54bbe187860c8aecd4da8bd3eb1c25c18b29dddf 100644
+index 81998223bcee27a489cdcc1bf3fb7a894718c478..4d2c3a03236e95283473e3290f5efe95f2a196bb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2491,7 +2491,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0642-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0641-Fixes-kick-event-leave-message-not-being-sent.patch
index 785a8e335e..28965b98d3 100644
--- a/patches/server/0642-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0641-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -17,7 +17,7 @@ index dc134bfac4fb2bef6d99c7c88cb680d87808a5f7..62906422a96995ca4eac5a4d8ad2af30
      public boolean isRealPlayer; // Paper
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 54bbe187860c8aecd4da8bd3eb1c25c18b29dddf..f0aa3519f90d00e5f1d3bcc3cd431f3c57744412 100644
+index 4d2c3a03236e95283473e3290f5efe95f2a196bb..8141d09c2b31053f0fbf3696dbc857d743873454 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -514,7 +514,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0643-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0642-Add-config-for-mobs-immune-to-default-effects.patch
index acf783ec1b..004b00f0db 100644
--- a/patches/server/0643-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0642-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c65aa2ed46ac8cef2306eb4035c7a0742a3e8b08..f82323c18792882dbbadc78a382dc7ffa9a4612f 100644
+index 62e8586d30950eed81868ccbb48212a426774da3..9cc26c870d3785c7ab798cf53f10ad8fd942bfb0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1164,7 +1164,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0644-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0643-Fix-incorrect-message-for-outdated-client.patch
index 73f722f54d..73f722f54d 100644
--- a/patches/server/0644-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0643-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0645-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0644-Don-t-apply-cramming-damage-to-players.patch
index de6cc08fd7..de6cc08fd7 100644
--- a/patches/server/0645-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0644-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0646-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0645-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 297c6b3a06..297c6b3a06 100644
--- a/patches/server/0646-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0645-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0647-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0646-Add-a-bunch-of-missing-forceDrop-toggles.patch
index cbd167929b..cbd167929b 100644
--- a/patches/server/0647-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0646-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0648-Stinger-API.patch b/patches/server/0647-Stinger-API.patch
index a5a2a838f7..a5a2a838f7 100644
--- a/patches/server/0648-Stinger-API.patch
+++ b/patches/server/0647-Stinger-API.patch
diff --git a/patches/server/0649-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0648-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index c9f7c064a5..c9f7c064a5 100644
--- a/patches/server/0649-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0648-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0650-Add-System.out-err-catcher.patch b/patches/server/0649-Add-System.out-err-catcher.patch
index f0508a65a3..f0508a65a3 100644
--- a/patches/server/0650-Add-System.out-err-catcher.patch
+++ b/patches/server/0649-Add-System.out-err-catcher.patch
diff --git a/patches/server/0651-Fix-test-not-bootstrapping.patch b/patches/server/0650-Fix-test-not-bootstrapping.patch
index 6c582bf1e6..6c582bf1e6 100644
--- a/patches/server/0651-Fix-test-not-bootstrapping.patch
+++ b/patches/server/0650-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0652-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0651-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 10cd90749d..a02cafdd72 100644
--- a/patches/server/0652-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0651-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
@@ -230,7 +230,7 @@ index 0000000000000000000000000000000000000000..34734bb969a1a74c7a4f9c17d40ebf00
 +    }
 +}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 2e421eaac80cf251b32e0bb504dd54a73edf4986..74ccc67e3c12dc5182602fb691ef3ddeb5b53280 100644
+index 2b247d55e39246fbef31279b14c45fc40f956bfb..675cd61221e807aadf28322b46c3daa1370241b5 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -34,6 +34,10 @@
diff --git a/patches/server/0653-Improve-boat-collision-performance.patch b/patches/server/0652-Improve-boat-collision-performance.patch
index 4836f8e064..4836f8e064 100644
--- a/patches/server/0653-Improve-boat-collision-performance.patch
+++ b/patches/server/0652-Improve-boat-collision-performance.patch
diff --git a/patches/server/0654-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0653-Prevent-AFK-kick-while-watching-end-credits.patch
index f982d9439c..d77603e26d 100644
--- a/patches/server/0654-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0653-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits.
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f0aa3519f90d00e5f1d3bcc3cd431f3c57744412..ee3325c1035a0427e608ce22c462085c3c677e48 100644
+index 8141d09c2b31053f0fbf3696dbc857d743873454..ce1a8355e155faaec9d8eebf89a41b7929dcbd12 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -431,7 +431,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0655-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0654-Allow-skipping-writing-of-comments-to-server.propert.patch
index c456bcd235..c456bcd235 100644
--- a/patches/server/0655-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0654-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0656-Add-PlayerSetSpawnEvent.patch b/patches/server/0655-Add-PlayerSetSpawnEvent.patch
index e2b6777b92..e2b6777b92 100644
--- a/patches/server/0656-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0655-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0657-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0656-Make-hoppers-respect-inventory-max-stack-size.patch
index 929c4e2715..929c4e2715 100644
--- a/patches/server/0657-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0656-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0658-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0657-Optimize-entity-tracker-passenger-checks.patch
index b832093f21..b832093f21 100644
--- a/patches/server/0658-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0657-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0659-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0658-Config-option-for-Piglins-guarding-chests.patch
index 23ef76f3e7..23ef76f3e7 100644
--- a/patches/server/0659-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0658-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0660-Added-EntityDamageItemEvent.patch b/patches/server/0659-Added-EntityDamageItemEvent.patch
index 7a458b966f..7a458b966f 100644
--- a/patches/server/0660-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0659-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0661-Optimize-indirect-passenger-iteration.patch b/patches/server/0660-Optimize-indirect-passenger-iteration.patch
index 8df21dc37e..8df21dc37e 100644
--- a/patches/server/0661-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0660-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0662-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0661-Configurable-item-frame-map-cursor-update-interval.patch
index 898bee5973..898bee5973 100644
--- a/patches/server/0662-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0661-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0663-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0662-Make-EntityUnleashEvent-cancellable.patch
index 3d733321df..3d733321df 100644
--- a/patches/server/0663-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0662-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0664-Clear-bucket-NBT-after-dispense.patch b/patches/server/0663-Clear-bucket-NBT-after-dispense.patch
index 9705f1b9dd..9705f1b9dd 100644
--- a/patches/server/0664-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0663-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0665-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0664-Change-EnderEye-target-without-changing-other-things.patch
index 22293dd5c1..22293dd5c1 100644
--- a/patches/server/0665-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0664-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0666-Add-BlockBreakBlockEvent.patch b/patches/server/0665-Add-BlockBreakBlockEvent.patch
index 83bda7fe59..83bda7fe59 100644
--- a/patches/server/0666-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0665-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0667-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0666-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index d9f83ce872..d9f83ce872 100644
--- a/patches/server/0667-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0666-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0668-More-CommandBlock-API.patch b/patches/server/0667-More-CommandBlock-API.patch
index 3cbd2436d3..3cbd2436d3 100644
--- a/patches/server/0668-More-CommandBlock-API.patch
+++ b/patches/server/0667-More-CommandBlock-API.patch
diff --git a/patches/server/0669-Add-missing-team-sidebar-display-slots.patch b/patches/server/0668-Add-missing-team-sidebar-display-slots.patch
index 0ffc852554..0ffc852554 100644
--- a/patches/server/0669-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0668-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0670-Add-back-EntityPortalExitEvent.patch b/patches/server/0669-Add-back-EntityPortalExitEvent.patch
index f5cef8ac0f..f5cef8ac0f 100644
--- a/patches/server/0670-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0669-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0671-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0670-Add-methods-to-find-targets-for-lightning-strikes.patch
index 64c6192aa1..64c6192aa1 100644
--- a/patches/server/0671-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0670-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0672-Get-entity-default-attributes.patch b/patches/server/0671-Get-entity-default-attributes.patch
index c80a55e699..c80a55e699 100644
--- a/patches/server/0672-Get-entity-default-attributes.patch
+++ b/patches/server/0671-Get-entity-default-attributes.patch
diff --git a/patches/server/0673-Left-handed-API.patch b/patches/server/0672-Left-handed-API.patch
index 3b4077b54a..3b4077b54a 100644
--- a/patches/server/0673-Left-handed-API.patch
+++ b/patches/server/0672-Left-handed-API.patch
diff --git a/patches/server/0674-Add-more-advancement-API.patch b/patches/server/0673-Add-more-advancement-API.patch
index 451dbda15c..451dbda15c 100644
--- a/patches/server/0674-Add-more-advancement-API.patch
+++ b/patches/server/0673-Add-more-advancement-API.patch
diff --git a/patches/server/0675-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0674-Add-ItemFactory-getSpawnEgg-API.patch
index 76f8c54c26..76f8c54c26 100644
--- a/patches/server/0675-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0674-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0676-Add-critical-damage-API.patch b/patches/server/0675-Add-critical-damage-API.patch
index 83a6931d96..83a6931d96 100644
--- a/patches/server/0676-Add-critical-damage-API.patch
+++ b/patches/server/0675-Add-critical-damage-API.patch
diff --git a/patches/server/0677-Fix-issues-with-mob-conversion.patch b/patches/server/0676-Fix-issues-with-mob-conversion.patch
index c5a854da3b..c5a854da3b 100644
--- a/patches/server/0677-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0676-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0678-Add-isCollidable-methods-to-various-places.patch b/patches/server/0677-Add-isCollidable-methods-to-various-places.patch
index 9e718ffd89..9e718ffd89 100644
--- a/patches/server/0678-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0677-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0679-Goat-ram-API.patch b/patches/server/0678-Goat-ram-API.patch
index 2d8433a918..2d8433a918 100644
--- a/patches/server/0679-Goat-ram-API.patch
+++ b/patches/server/0678-Goat-ram-API.patch
diff --git a/patches/server/0680-Add-API-for-resetting-a-single-score.patch b/patches/server/0679-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9..c2e1fd93b9 100644
--- a/patches/server/0680-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0679-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0681-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0680-Add-Raw-Byte-Entity-Serialization.patch
index f5b6d863d8..f5b6d863d8 100644
--- a/patches/server/0681-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0680-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0682-Vanilla-command-permission-fixes.patch b/patches/server/0681-Vanilla-command-permission-fixes.patch
index 53008d51e9..53008d51e9 100644
--- a/patches/server/0682-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0681-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0683-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0682-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 0323f3318d..0323f3318d 100644
--- a/patches/server/0683-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0682-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0684-Fix-GameProfileCache-concurrency.patch b/patches/server/0683-Fix-GameProfileCache-concurrency.patch
index 8c22da1dde..8c22da1dde 100644
--- a/patches/server/0684-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0683-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0685-Improve-and-expand-AsyncCatcher.patch b/patches/server/0684-Improve-and-expand-AsyncCatcher.patch
index 7ebc09e231..822bef6e4f 100644
--- a/patches/server/0685-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0684-Improve-and-expand-AsyncCatcher.patch
@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ee3325c1035a0427e608ce22c462085c3c677e48..cbf76edc482c51a0b0f0633f65186e0933dee599 100644
+index ce1a8355e155faaec9d8eebf89a41b7929dcbd12..8b85b4ea7411e9b523647e39c366bf63e27d0d2b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1653,6 +1653,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -29,7 +29,7 @@ index ee3325c1035a0427e608ce22c462085c3c677e48..cbf76edc482c51a0b0f0633f65186e09
          if (player.isRemoved()) {
              LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 090d256dc5594edf1b053cc072b177cbf92143bb..27da81c4577ea3c4efaf4e719c2b8256d4707920 100644
+index 0378b20decc9f22a480f68e8062c3b60d01d966e..dd95550877d67d8521a96f1e31994cff894502e1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1120,7 +1120,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0686-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0685-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 814d6c5557..814d6c5557 100644
--- a/patches/server/0686-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0685-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0687-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0686-Sanitize-ResourceLocation-error-logging.patch
index d8427b5ba0..d8427b5ba0 100644
--- a/patches/server/0687-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0686-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0688-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0687-Allow-controlled-flushing-for-network-manager.patch
index 0cecd8e3e4..0cecd8e3e4 100644
--- a/patches/server/0688-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/server/0687-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0689-Optimise-general-POI-access.patch b/patches/server/0688-Optimise-general-POI-access.patch
index 02fe35aa9d..02fe35aa9d 100644
--- a/patches/server/0689-Optimise-general-POI-access.patch
+++ b/patches/server/0688-Optimise-general-POI-access.patch
diff --git a/patches/server/0690-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0689-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index fe1cc645eb..fe1cc645eb 100644
--- a/patches/server/0690-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0689-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0691-Optimise-chunk-tick-iteration.patch b/patches/server/0690-Optimise-chunk-tick-iteration.patch
index 701231d24f..701231d24f 100644
--- a/patches/server/0691-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0690-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0692-Execute-chunk-tasks-mid-tick.patch b/patches/server/0691-Execute-chunk-tasks-mid-tick.patch
index edd4022302..2172f471d7 100644
--- a/patches/server/0692-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0691-Execute-chunk-tasks-mid-tick.patch
@@ -19,7 +19,7 @@ index 4d861f9a58f8ea238471af22f387854d855b1801..efbf77024d235d8af9f7efc938c17afd
  
      private MinecraftTimings() {}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b800249823e413933a5d469e431a003f977f59e7..d8fa1cb0b340f97debceb7e5b90051d29448fc58 100644
+index 76bdca305277d8d2a659b029f035bb4da25a076e..e5612808261f5e94ed02afa2bd070db56496fa79 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1305,6 +1305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0693-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 293669046c..293669046c 100644
--- a/patches/server/0693-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0694-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0693-Custom-table-implementation-for-blockstate-state-loo.patch
index 0318d05517..0318d05517 100644
--- a/patches/server/0694-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0693-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0695-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0694-Detail-more-information-in-watchdog-dumps.patch
index d4e6413e24..d4e6413e24 100644
--- a/patches/server/0695-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0694-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0696-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0695-Manually-inline-methods-in-BlockPosition.patch
index c8b8adfce9..c8b8adfce9 100644
--- a/patches/server/0696-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0695-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0697-Distance-manager-tick-timings.patch b/patches/server/0696-Distance-manager-tick-timings.patch
index 1ea0186cb3..1ea0186cb3 100644
--- a/patches/server/0697-Distance-manager-tick-timings.patch
+++ b/patches/server/0696-Distance-manager-tick-timings.patch
diff --git a/patches/server/0698-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0697-Name-craft-scheduler-threads-according-to-the-plugin.patch
index e2e0d713f0..e2e0d713f0 100644
--- a/patches/server/0698-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0697-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0699-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0698-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 336cbb88f7..336cbb88f7 100644
--- a/patches/server/0699-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0698-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0700-Add-packet-limiter-config.patch b/patches/server/0699-Add-packet-limiter-config.patch
index 52e12fb5a0..52e12fb5a0 100644
--- a/patches/server/0700-Add-packet-limiter-config.patch
+++ b/patches/server/0699-Add-packet-limiter-config.patch
diff --git a/patches/server/0701-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0700-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 30ce1f4f3d..30ce1f4f3d 100644
--- a/patches/server/0701-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0700-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0702-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0701-Consolidate-flush-calls-for-entity-tracker-packets.patch
index 6846952891..6846952891 100644
--- a/patches/server/0702-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/server/0701-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0703-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0702-Don-t-lookup-fluid-state-when-raytracing.patch
index 3497fb942c..3497fb942c 100644
--- a/patches/server/0703-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0702-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0704-Time-scoreboard-search.patch b/patches/server/0703-Time-scoreboard-search.patch
index 2f812b0753..2f812b0753 100644
--- a/patches/server/0704-Time-scoreboard-search.patch
+++ b/patches/server/0703-Time-scoreboard-search.patch
diff --git a/patches/server/0705-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0704-Send-full-pos-packets-for-hard-colliding-entities.patch
index dba17c9f63..dba17c9f63 100644
--- a/patches/server/0705-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0704-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0706-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0705-Do-not-run-raytrace-logic-for-AIR.patch
index 61d1c10cc0..61d1c10cc0 100644
--- a/patches/server/0706-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0705-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0707-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0706-Oprimise-map-impl-for-tracked-players.patch
index 6d88849131..6d88849131 100644
--- a/patches/server/0707-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0706-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0708-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0707-Optimise-BlockSoil-nearby-water-lookup.patch
index ed636e2ee2..ed636e2ee2 100644
--- a/patches/server/0708-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0707-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0709-Optimise-random-block-ticking.patch b/patches/server/0708-Optimise-random-block-ticking.patch
index 4157e93a2c..4157e93a2c 100644
--- a/patches/server/0709-Optimise-random-block-ticking.patch
+++ b/patches/server/0708-Optimise-random-block-ticking.patch
diff --git a/patches/server/0710-Optimise-non-flush-packet-sending.patch b/patches/server/0709-Optimise-non-flush-packet-sending.patch
index fdc4b312bf..fdc4b312bf 100644
--- a/patches/server/0710-Optimise-non-flush-packet-sending.patch
+++ b/patches/server/0709-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0711-Optimise-nearby-player-lookups.patch b/patches/server/0710-Optimise-nearby-player-lookups.patch
index 43c9989b3d..43c9989b3d 100644
--- a/patches/server/0711-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0710-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0712-Remove-streams-for-villager-AI.patch b/patches/server/0711-Remove-streams-for-villager-AI.patch
index b4ef086afb..b4ef086afb 100644
--- a/patches/server/0712-Remove-streams-for-villager-AI.patch
+++ b/patches/server/0711-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0713-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0712-Use-Velocity-compression-and-cipher-natives.patch
index 0a3e52e519..49eaa6b1a0 100644
--- a/patches/server/0713-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0712-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f57bd7863e90afb461158ab54ce4e3bcd6deb6cf..9b37c31b97a95faeb4b31ed2ead82c07cf3ce6d0 100644
+index b65278b9addf9a26b0f63975f439d333fd3fdf87..23782232e4d334502721b8fd1d69f5e916624f14 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -31,6 +31,11 @@ dependencies {
+@@ -32,6 +32,11 @@ dependencies {
      runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
      runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
diff --git a/patches/server/0714-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0713-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 125dc57c81..125dc57c81 100644
--- a/patches/server/0714-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0713-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0715-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0714-Fix-Bukkit-NamespacedKey-shenanigans.patch
index c77b9ae0d6..c77b9ae0d6 100644
--- a/patches/server/0715-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0714-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0716-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0715-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 175e6eef47..175e6eef47 100644
--- a/patches/server/0716-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0715-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0717-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0716-Check-requirement-before-suggesting-root-nodes.patch
index 4f135f41df..4f135f41df 100644
--- a/patches/server/0717-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0716-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0718-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0717-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index a47e1da159..fec922ac5a 100644
--- a/patches/server/0718-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0717-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cbf76edc482c51a0b0f0633f65186e0933dee599..674b57f31b15a47054c4b07093ab43294a289171 100644
+index 8b85b4ea7411e9b523647e39c366bf63e27d0d2b..8c0cbe36eeb60b355413a19b5f8e66b996a833d7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -847,6 +847,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0719-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0718-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 8bc6527cd8..8bc6527cd8 100644
--- a/patches/server/0719-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0718-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0720-Ensure-valid-vehicle-status.patch b/patches/server/0719-Ensure-valid-vehicle-status.patch
index 9189776594..9189776594 100644
--- a/patches/server/0720-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0719-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0721-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0720-Prevent-softlocked-end-exit-portal-generation.patch
index 4b7141d625..4b7141d625 100644
--- a/patches/server/0721-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0720-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0722-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0721-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index b415f668ab..b415f668ab 100644
--- a/patches/server/0722-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0721-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0723-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0722-Don-t-log-debug-logging-being-disabled.patch
index 82e266f96e..82e266f96e 100644
--- a/patches/server/0723-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0722-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0724-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0723-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0724-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0723-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0725-Preserve-overstacked-loot.patch b/patches/server/0724-Preserve-overstacked-loot.patch
index 940c8f47ca..940c8f47ca 100644
--- a/patches/server/0725-Preserve-overstacked-loot.patch
+++ b/patches/server/0724-Preserve-overstacked-loot.patch
diff --git a/patches/server/0726-Update-head-rotation-in-missing-places.patch b/patches/server/0725-Update-head-rotation-in-missing-places.patch
index 682fe4b2b1..682fe4b2b1 100644
--- a/patches/server/0726-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0725-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0727-prevent-unintended-light-block-manipulation.patch b/patches/server/0726-prevent-unintended-light-block-manipulation.patch
index 745b4cd9b5..745b4cd9b5 100644
--- a/patches/server/0727-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0726-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0728-Fix-CraftCriteria-defaults-map.patch b/patches/server/0727-Fix-CraftCriteria-defaults-map.patch
index 65eeffccea..65eeffccea 100644
--- a/patches/server/0728-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0727-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0729-Fix-upstreams-block-state-factories.patch b/patches/server/0728-Fix-upstreams-block-state-factories.patch
index 42689cf062..42689cf062 100644
--- a/patches/server/0729-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0728-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0730-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0729-Add-config-option-for-logging-player-ip-addresses.patch
index aac66e43f6..aac66e43f6 100644
--- a/patches/server/0730-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0729-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0731-Configurable-feature-seeds.patch b/patches/server/0730-Configurable-feature-seeds.patch
index 2e7ba7f297..2e7ba7f297 100644
--- a/patches/server/0731-Configurable-feature-seeds.patch
+++ b/patches/server/0730-Configurable-feature-seeds.patch
diff --git a/patches/server/0732-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0731-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
index 54bf3f7028..54bf3f7028 100644
--- a/patches/server/0732-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ b/patches/server/0731-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0733-Add-root-admin-user-detection.patch b/patches/server/0732-Add-root-admin-user-detection.patch
index 4450954cc7..bc171867c0 100644
--- a/patches/server/0733-Add-root-admin-user-detection.patch
+++ b/patches/server/0732-Add-root-admin-user-detection.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 4757d6432631f0c5379597b40fda169ac7cd8621..9951e999b1440ef623f14bdd46b5e42a90387f1e 100644
+index 1fbe7a58707ddd40f80d71e3703ff3fefff672f4..9a45921cbb1e7a39e6ef46cc93c14766ee8229ad 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -179,6 +179,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0734-Always-allow-item-changing-in-Fireball.patch b/patches/server/0733-Always-allow-item-changing-in-Fireball.patch
index f8453901a9..f8453901a9 100644
--- a/patches/server/0734-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0733-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0735-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0734-don-t-attempt-to-teleport-dead-entities.patch
index 910c13ba80..910c13ba80 100644
--- a/patches/server/0735-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0734-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0736-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0735-Prevent-excessive-velocity-through-repeated-crits.patch
index 5cdbdc4130..5cdbdc4130 100644
--- a/patches/server/0736-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0735-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0737-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0736-Remove-client-side-code-using-deprecated-for-removal.patch
index 573119e335..573119e335 100644
--- a/patches/server/0737-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0736-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0738-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0737-Fix-removing-recipes-from-RecipeIterator.patch
index 6b05db044c..6b05db044c 100644
--- a/patches/server/0738-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0737-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0739-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0738-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 92abda7e55..92abda7e55 100644
--- a/patches/server/0739-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0738-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0740-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0739-Hide-unnecessary-itemmeta-from-clients.patch
index fa21cf9e34..96891e42dd 100644
--- a/patches/server/0740-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0739-Hide-unnecessary-itemmeta-from-clients.patch
@@ -18,7 +18,7 @@ index 71a8812365503d840f6702a21d504a37d67c7194..63561c0044375465fa0023b2b563a651
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 674b57f31b15a47054c4b07093ab43294a289171..6297f05bdaaa53cfab2ef019e2d30622f34c076c 100644
+index 8c0cbe36eeb60b355413a19b5f8e66b996a833d7..8d4421e24feca1c8d1a05890c9e9fbb8fea92a8b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2705,8 +2705,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0741-Fix-Spigot-growth-modifiers.patch b/patches/server/0740-Fix-Spigot-growth-modifiers.patch
index 7530d5438f..7530d5438f 100644
--- a/patches/server/0741-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0740-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0742-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0741-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 62a65ff130..62a65ff130 100644
--- a/patches/server/0742-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0741-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0743-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0742-Add-PlayerItemFrameChangeEvent.patch
index 6214bdbdef..6214bdbdef 100644
--- a/patches/server/0743-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0742-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0744-Add-player-health-update-API.patch b/patches/server/0743-Add-player-health-update-API.patch
index dc4c1becce..dc4c1becce 100644
--- a/patches/server/0744-Add-player-health-update-API.patch
+++ b/patches/server/0743-Add-player-health-update-API.patch
diff --git a/patches/server/0745-Optimize-HashMapPalette.patch b/patches/server/0744-Optimize-HashMapPalette.patch
index 52a28a4fd3..52a28a4fd3 100644
--- a/patches/server/0745-Optimize-HashMapPalette.patch
+++ b/patches/server/0744-Optimize-HashMapPalette.patch
diff --git a/patches/server/0746-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0745-Allow-delegation-to-vanilla-chunk-gen.patch
index a872c107fd..a872c107fd 100644
--- a/patches/server/0746-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0745-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0747-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index b26948317b..b26948317b 100644
--- a/patches/server/0747-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0748-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0747-Optimise-collision-checking-in-player-move-packet-ha.patch
index 1bb232a446..e0811f8050 100644
--- a/patches/server/0748-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0747-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN
 CHECK ME
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6297f05bdaaa53cfab2ef019e2d30622f34c076c..f211eb2b56fc758512862c0b1e5a049bc7c76685 100644
+index 8d4421e24feca1c8d1a05890c9e9fbb8fea92a8b..74b0d2ddcea648d017e4acbe20536352102bad95 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -647,7 +647,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0749-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0748-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 78d359b1d9..78d359b1d9 100644
--- a/patches/server/0749-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0748-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0750-Add-more-Campfire-API.patch b/patches/server/0749-Add-more-Campfire-API.patch
index da279b0a50..da279b0a50 100644
--- a/patches/server/0750-Add-more-Campfire-API.patch
+++ b/patches/server/0749-Add-more-Campfire-API.patch
diff --git a/patches/server/0751-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0750-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 0246c3f0d5..0246c3f0d5 100644
--- a/patches/server/0751-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0750-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0752-Fix-tripwire-state-inconsistency.patch b/patches/server/0751-Fix-tripwire-state-inconsistency.patch
index eba71d4136..eba71d4136 100644
--- a/patches/server/0752-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0751-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0753-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0752-Forward-CraftEntity-in-teleport-command.patch
index 2cbd423590..2cbd423590 100644
--- a/patches/server/0753-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0752-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0754-Improve-scoreboard-entries.patch b/patches/server/0753-Improve-scoreboard-entries.patch
index 2a65cbf36c..2a65cbf36c 100644
--- a/patches/server/0754-Improve-scoreboard-entries.patch
+++ b/patches/server/0753-Improve-scoreboard-entries.patch
diff --git a/patches/server/0755-Entity-powdered-snow-API.patch b/patches/server/0754-Entity-powdered-snow-API.patch
index a53af1711e..a53af1711e 100644
--- a/patches/server/0755-Entity-powdered-snow-API.patch
+++ b/patches/server/0754-Entity-powdered-snow-API.patch
diff --git a/patches/server/0756-Add-API-for-item-entity-health.patch b/patches/server/0755-Add-API-for-item-entity-health.patch
index 66df625d46..66df625d46 100644
--- a/patches/server/0756-Add-API-for-item-entity-health.patch
+++ b/patches/server/0755-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0757-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0756-Fix-entity-type-tags-suggestions-in-selectors.patch
index 913bb30928..913bb30928 100644
--- a/patches/server/0757-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0756-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0758-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0757-Configurable-max-block-light-for-monster-spawning.patch
index baf913d352..baf913d352 100644
--- a/patches/server/0758-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0757-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0759-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0758-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index d4f3ab6d9f..d4f3ab6d9f 100644
--- a/patches/server/0759-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0758-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0760-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0759-Load-effect-amplifiers-greater-than-127-correctly.patch
index 2b10cf2e71..2b10cf2e71 100644
--- a/patches/server/0760-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0759-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0761-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0760-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 9f3ee548ee..9f3ee548ee 100644
--- a/patches/server/0761-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0760-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0762-Fix-bees-aging-inside-hives.patch b/patches/server/0761-Fix-bees-aging-inside-hives.patch
index 2be01a557c..2be01a557c 100644
--- a/patches/server/0762-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0761-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0763-Bucketable-API.patch b/patches/server/0762-Bucketable-API.patch
index 3dd4d8263f..3dd4d8263f 100644
--- a/patches/server/0763-Bucketable-API.patch
+++ b/patches/server/0762-Bucketable-API.patch
diff --git a/patches/server/0764-Validate-usernames.patch b/patches/server/0763-Validate-usernames.patch
index d088b7ad1b..d088b7ad1b 100644
--- a/patches/server/0764-Validate-usernames.patch
+++ b/patches/server/0763-Validate-usernames.patch
diff --git a/patches/server/0765-Make-water-animal-spawn-height-configurable.patch b/patches/server/0764-Make-water-animal-spawn-height-configurable.patch
index 9e90672eb5..9e90672eb5 100644
--- a/patches/server/0765-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0764-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0766-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0765-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index c5a9ac0e03..2177d3dd25 100644
--- a/patches/server/0766-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0765-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d8fa1cb0b340f97debceb7e5b90051d29448fc58..d55c798657bf8922f3d43d84620cfeed1effa054 100644
+index e5612808261f5e94ed02afa2bd070db56496fa79..edb90f6630bc19c66579890f59cc1f296fd82a75 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -564,7 +564,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0767-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0766-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0767-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0766-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0768-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0767-Add-new-overload-to-PersistentDataContainer-has.patch
index d19f7179e1..d19f7179e1 100644
--- a/patches/server/0768-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/server/0767-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0769-Multiple-Entries-with-Scoreboards.patch b/patches/server/0768-Multiple-Entries-with-Scoreboards.patch
index b644176ac9..b644176ac9 100644
--- a/patches/server/0769-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0768-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0770-Reset-placed-block-on-exception.patch b/patches/server/0769-Reset-placed-block-on-exception.patch
index 308089d693..308089d693 100644
--- a/patches/server/0770-Reset-placed-block-on-exception.patch
+++ b/patches/server/0769-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0771-Add-configurable-height-for-slime-spawn.patch b/patches/server/0770-Add-configurable-height-for-slime-spawn.patch
index 65b8d6d80d..65b8d6d80d 100644
--- a/patches/server/0771-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0770-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0772-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0771-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index f2c95ba6c0..f2c95ba6c0 100644
--- a/patches/server/0772-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0771-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0773-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0772-Fix-xp-reward-for-baby-zombies.patch
index 399ad48f22..399ad48f22 100644
--- a/patches/server/0773-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0772-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0774-Kick-on-main-for-illegal-chat.patch b/patches/server/0773-Kick-on-main-for-illegal-chat.patch
index 16fddd4fdd..382ae32781 100644
--- a/patches/server/0774-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0773-Kick-on-main-for-illegal-chat.patch
@@ -7,7 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for
 illegal characters or chat out-of-order errors.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f211eb2b56fc758512862c0b1e5a049bc7c76685..f8e808819409d1d9caf4347d042de19ac64722c6 100644
+index 74b0d2ddcea648d017e4acbe20536352102bad95..c47d838ad26e4a32de065d9adc2af35e1a915b0c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2162,7 +2162,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0775-Multi-Block-Change-API-Implementation.patch b/patches/server/0774-Multi-Block-Change-API-Implementation.patch
index 528fd87162..528fd87162 100644
--- a/patches/server/0775-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0774-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0776-Fix-NotePlayEvent.patch b/patches/server/0775-Fix-NotePlayEvent.patch
index 5104743fbe..5104743fbe 100644
--- a/patches/server/0776-Fix-NotePlayEvent.patch
+++ b/patches/server/0775-Fix-NotePlayEvent.patch
diff --git a/patches/server/0777-Freeze-Tick-Lock-API.patch b/patches/server/0776-Freeze-Tick-Lock-API.patch
index 18ef99da47..18ef99da47 100644
--- a/patches/server/0777-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0776-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0778-Dolphin-API.patch b/patches/server/0777-Dolphin-API.patch
index 9fd01d6fb1..9fd01d6fb1 100644
--- a/patches/server/0778-Dolphin-API.patch
+++ b/patches/server/0777-Dolphin-API.patch
diff --git a/patches/server/0779-More-PotionEffectType-API.patch b/patches/server/0778-More-PotionEffectType-API.patch
index 15d2f7a5ec..15d2f7a5ec 100644
--- a/patches/server/0779-More-PotionEffectType-API.patch
+++ b/patches/server/0778-More-PotionEffectType-API.patch
diff --git a/patches/server/0780-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0779-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 839a5f95d4..839a5f95d4 100644
--- a/patches/server/0780-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0779-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0781-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0780-API-for-creating-command-sender-which-forwards-feedb.patch
index c2777a1918..c2777a1918 100644
--- a/patches/server/0781-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0780-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0782-Add-missing-structure-set-seed-configs.patch b/patches/server/0781-Add-missing-structure-set-seed-configs.patch
index 40285a58a1..40285a58a1 100644
--- a/patches/server/0782-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0781-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0783-Implement-regenerateChunk.patch b/patches/server/0782-Implement-regenerateChunk.patch
index 98e8a8ddd5..98e8a8ddd5 100644
--- a/patches/server/0783-Implement-regenerateChunk.patch
+++ b/patches/server/0782-Implement-regenerateChunk.patch
diff --git a/patches/server/0784-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0783-Fix-cancelled-powdered-snow-bucket-placement.patch
index cd73c1c14d..cd73c1c14d 100644
--- a/patches/server/0784-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0783-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0785-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0784-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index b3024ef399..b3024ef399 100644
--- a/patches/server/0785-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0784-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0786-Add-GameEvent-tags.patch b/patches/server/0785-Add-GameEvent-tags.patch
index 091acd03cf..091acd03cf 100644
--- a/patches/server/0786-Add-GameEvent-tags.patch
+++ b/patches/server/0785-Add-GameEvent-tags.patch
diff --git a/patches/server/0787-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0786-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 89d9aca043..9ef9dbd884 100644
--- a/patches/server/0787-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0786-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d55c798657bf8922f3d43d84620cfeed1effa054..ccad086c4d3d78921606c92c4b48da2dae8a6224 100644
+index edb90f6630bc19c66579890f59cc1f296fd82a75..fe363bb2aff031c0efb812fa7e12d585984e2b29 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1308,6 +1308,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0788-Furnace-RecipesUsed-API.patch b/patches/server/0787-Furnace-RecipesUsed-API.patch
index 2e6cf1c2fe..2e6cf1c2fe 100644
--- a/patches/server/0788-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0787-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0789-Configurable-sculk-sensor-listener-range.patch b/patches/server/0788-Configurable-sculk-sensor-listener-range.patch
index c68e2d2cc3..c68e2d2cc3 100644
--- a/patches/server/0789-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0788-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0790-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0789-Add-missing-block-data-mins-and-maxes.patch
index 2096473939..2096473939 100644
--- a/patches/server/0790-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0789-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0791-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0790-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 3c95e17260..8f273c8446 100644
--- a/patches/server/0791-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0790-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ccad086c4d3d78921606c92c4b48da2dae8a6224..f2f5778bc44ed5f7cd9f935bf5df08d2c1cc6d23 100644
+index fe363bb2aff031c0efb812fa7e12d585984e2b29..9c020fafb8a121c9307bac354500b720a3548a80 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -591,7 +591,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0792-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0791-Put-world-into-worldlist-before-initing-the-world.patch
index f2649ab6e0..233433f1d0 100644
--- a/patches/server/0792-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0791-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f2f5778bc44ed5f7cd9f935bf5df08d2c1cc6d23..1f4a3e170188ebde3d56ec59252bb69c9e3305f4 100644
+index 9c020fafb8a121c9307bac354500b720a3548a80..a168a277cb173d6755042f7d0ab9e32961f33dfa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -603,9 +603,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0793-Fix-Entity-Position-Desync.patch b/patches/server/0792-Fix-Entity-Position-Desync.patch
index 3ccd5470c9..3ccd5470c9 100644
--- a/patches/server/0793-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0792-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0794-Custom-Potion-Mixes.patch b/patches/server/0793-Custom-Potion-Mixes.patch
index 7bb42d300a..e6d0292935 100644
--- a/patches/server/0794-Custom-Potion-Mixes.patch
+++ b/patches/server/0793-Custom-Potion-Mixes.patch
@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..6b0bed550763f34e18c9e92f9a47ec0c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1f4a3e170188ebde3d56ec59252bb69c9e3305f4..d373a5f20b017efdb9c339541b124009e07616c8 100644
+index a168a277cb173d6755042f7d0ab9e32961f33dfa..180a476ebdf0932a84ac87f7b687b4339013e6ee 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2060,6 +2060,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0795-Force-close-world-loading-screen.patch b/patches/server/0794-Force-close-world-loading-screen.patch
index 548601c851..548601c851 100644
--- a/patches/server/0795-Force-close-world-loading-screen.patch
+++ b/patches/server/0794-Force-close-world-loading-screen.patch
diff --git a/patches/server/0796-Fix-falling-block-spawn-methods.patch b/patches/server/0795-Fix-falling-block-spawn-methods.patch
index 9d47ce782e..9d47ce782e 100644
--- a/patches/server/0796-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0795-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0797-Expose-furnace-minecart-push-values.patch b/patches/server/0796-Expose-furnace-minecart-push-values.patch
index 4086d94249..4086d94249 100644
--- a/patches/server/0797-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0796-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0798-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0797-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 2d848b1041..2d848b1041 100644
--- a/patches/server/0798-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0797-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0799-More-Projectile-API.patch b/patches/server/0798-More-Projectile-API.patch
index b6b34f5775..b6b34f5775 100644
--- a/patches/server/0799-More-Projectile-API.patch
+++ b/patches/server/0798-More-Projectile-API.patch
diff --git a/patches/server/0800-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0799-Fix-swamp-hut-cat-generation-deadlock.patch
index 018b928494..018b928494 100644
--- a/patches/server/0800-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0799-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0801-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0800-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 11c5c9c385..635ca8d74b 100644
--- a/patches/server/0801-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0800-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f8e808819409d1d9caf4347d042de19ac64722c6..6a8e97cda413762d1b5d02c2d23be71fa36db657 100644
+index c47d838ad26e4a32de065d9adc2af35e1a915b0c..32f14d93a27f340551a157445250ccbc8a133157 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -576,6 +576,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0802-Implement-getComputedBiome-API.patch b/patches/server/0801-Implement-getComputedBiome-API.patch
index 9ef37127d4..9ef37127d4 100644
--- a/patches/server/0802-Implement-getComputedBiome-API.patch
+++ b/patches/server/0801-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0803-Make-some-itemstacks-nonnull.patch b/patches/server/0802-Make-some-itemstacks-nonnull.patch
index e2cba95fe4..e2cba95fe4 100644
--- a/patches/server/0803-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0802-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0804-Implement-enchantWithLevels-API.patch b/patches/server/0803-Implement-enchantWithLevels-API.patch
index f4b2f43353..f4b2f43353 100644
--- a/patches/server/0804-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0803-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0805-Fix-saving-in-unloadWorld.patch b/patches/server/0804-Fix-saving-in-unloadWorld.patch
index 6dc981ae74..6dc981ae74 100644
--- a/patches/server/0805-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0804-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0806-Buffer-OOB-setBlock-calls.patch b/patches/server/0805-Buffer-OOB-setBlock-calls.patch
index 4e1905eb3b..4e1905eb3b 100644
--- a/patches/server/0806-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0805-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0807-Add-TameableDeathMessageEvent.patch b/patches/server/0806-Add-TameableDeathMessageEvent.patch
index b08801fd3d..b08801fd3d 100644
--- a/patches/server/0807-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0806-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0808-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0807-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 0ee11ae770..0ee11ae770 100644
--- a/patches/server/0808-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0807-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0809-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0808-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 34a373a439..34a373a439 100644
--- a/patches/server/0809-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0808-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0810-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0809-Ensure-entity-passenger-world-matches-ridden-entity.patch
index f27bc852e9..f27bc852e9 100644
--- a/patches/server/0810-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0809-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0811-Guard-against-invalid-entity-positions.patch b/patches/server/0810-Guard-against-invalid-entity-positions.patch
index 4ee5d3edbb..4ee5d3edbb 100644
--- a/patches/server/0811-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0810-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0812-cache-resource-keys.patch b/patches/server/0811-cache-resource-keys.patch
index 18bd2f0eaf..18bd2f0eaf 100644
--- a/patches/server/0812-cache-resource-keys.patch
+++ b/patches/server/0811-cache-resource-keys.patch
diff --git a/patches/server/0813-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0812-Allow-to-change-the-podium-for-the-EnderDragon.patch
index 5ed62ee0e3..5ed62ee0e3 100644
--- a/patches/server/0813-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0812-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0814-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0813-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 5fb11187b2..5fb11187b2 100644
--- a/patches/server/0814-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0813-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0815-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0814-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index fbb9b72b07..fbb9b72b07 100644
--- a/patches/server/0815-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/server/0814-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0816-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0815-Prevent-tile-entity-copies-loading-chunks.patch
index 870f708ef5..61903d329d 100644
--- a/patches/server/0816-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0815-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6a8e97cda413762d1b5d02c2d23be71fa36db657..fafe71b267d514840cb6c9337817c30f3e466d35 100644
+index 32f14d93a27f340551a157445250ccbc8a133157..7e7cf1951b3a9bb1233f7a05dff685718881c1a2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3308,7 +3308,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0817-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0816-Use-username-instead-of-display-name-in-PlayerList-g.patch
index e16514b7c7..e16514b7c7 100644
--- a/patches/server/0817-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0816-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0818-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0817-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index e809e65ba8..e809e65ba8 100644
--- a/patches/server/0818-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/server/0817-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0819-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0818-Pass-ServerLevel-for-gamerule-callbacks.patch
index a0d16729d8..aca427ff3a 100644
--- a/patches/server/0819-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0818-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Pass ServerLevel for gamerule callbacks
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 9951e999b1440ef623f14bdd46b5e42a90387f1e..91e6161449dc5625331e467d9e8375759686709e 100644
+index 9a45921cbb1e7a39e6ef46cc93c14766ee8229ad..8115cf64a30b6438721769df6045e1b77acf88ce 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -304,7 +304,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -18,7 +18,7 @@ index 9951e999b1440ef623f14bdd46b5e42a90387f1e..91e6161449dc5625331e467d9e837575
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fafe71b267d514840cb6c9337817c30f3e466d35..2c93b0657a21a48d70941e4eee26df4c61fc3fe2 100644
+index 7e7cf1951b3a9bb1233f7a05dff685718881c1a2..0b0a839fafca6b1889adde84af9a66071df191ce 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2898,7 +2898,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0820-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0819-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 46b984988b..46b984988b 100644
--- a/patches/server/0820-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0819-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0821-WorldCreator-keepSpawnLoaded.patch b/patches/server/0820-WorldCreator-keepSpawnLoaded.patch
index 4d12867285..4d12867285 100644
--- a/patches/server/0821-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0820-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0822-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0821-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 91934e5589..91934e5589 100644
--- a/patches/server/0822-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0821-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0823-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0822-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 83deaddd5f..83deaddd5f 100644
--- a/patches/server/0823-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0822-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0824-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0823-Fire-CauldronLevelChange-on-initial-fill.patch
index bcc871d7bc..bcc871d7bc 100644
--- a/patches/server/0824-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0823-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0825-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0824-fix-powder-snow-cauldrons-not-turning-to-water.patch
index fec28b7e17..fec28b7e17 100644
--- a/patches/server/0825-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0824-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0826-Add-PlayerStopUsingItemEvent.patch b/patches/server/0825-Add-PlayerStopUsingItemEvent.patch
index 78a9eb0f99..78a9eb0f99 100644
--- a/patches/server/0826-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0825-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0827-FallingBlock-auto-expire-setting.patch b/patches/server/0826-FallingBlock-auto-expire-setting.patch
index ed07517265..ed07517265 100644
--- a/patches/server/0827-FallingBlock-auto-expire-setting.patch
+++ b/patches/server/0826-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0828-Don-t-tick-markers.patch b/patches/server/0827-Don-t-tick-markers.patch
index 0e75fac529..0e75fac529 100644
--- a/patches/server/0828-Don-t-tick-markers.patch
+++ b/patches/server/0827-Don-t-tick-markers.patch
diff --git a/patches/server/0829-Do-not-accept-invalid-client-settings.patch b/patches/server/0828-Do-not-accept-invalid-client-settings.patch
index 01917c8ec7..a9c4ffb6dc 100644
--- a/patches/server/0829-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0828-Do-not-accept-invalid-client-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2c93b0657a21a48d70941e4eee26df4c61fc3fe2..79708158c748eb877dbd3c225da45938e51781bf 100644
+index 0b0a839fafca6b1889adde84af9a66071df191ce..3382303303626a2a71ba7e70a1ced615a619d408 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3450,6 +3450,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0830-Add-support-for-Proxy-Protocol.patch b/patches/server/0829-Add-support-for-Proxy-Protocol.patch
index d02eeb6d9b..c117b9d366 100644
--- a/patches/server/0830-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0829-Add-support-for-Proxy-Protocol.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add support for Proxy Protocol
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9b37c31b97a95faeb4b31ed2ead82c07cf3ce6d0..a3a76b9b7efa773117d2ee1ce53ef784b09b277d 100644
+index 23782232e4d334502721b8fd1d69f5e916624f14..2d5bf482a59e8b8b8b2a8579ce1c499d800dd734 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -20,6 +20,7 @@ dependencies {
+@@ -21,6 +21,7 @@ dependencies {
       */
      implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation
      annotationProcessor("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - Needed to generate meta for our Log4j plugins
diff --git a/patches/server/0831-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0830-Fix-OfflinePlayer-getBedSpawnLocation.patch
index f74dc698da..f74dc698da 100644
--- a/patches/server/0831-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0830-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0832-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0831-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 59fabed7e4..59fabed7e4 100644
--- a/patches/server/0832-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0831-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0833-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0832-Sanitize-Sent-BlockEntity-NBT.patch
index 52fcd344ad..52fcd344ad 100644
--- a/patches/server/0833-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/server/0832-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0834-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0833-Disable-component-selector-resolving-in-books-by-def.patch
index 72862c20c5..72862c20c5 100644
--- a/patches/server/0834-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0833-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0835-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0834-Prevent-entity-loading-causing-async-lookups.patch
index 06d9dea85e..06d9dea85e 100644
--- a/patches/server/0835-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0834-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0836-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0835-Throw-exception-on-world-create-while-being-ticked.patch
index 3db48852f1..12272ad6f2 100644
--- a/patches/server/0836-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0835-Throw-exception-on-world-create-while-being-ticked.patch
@@ -7,7 +7,7 @@ There are no plans to support creating worlds while worlds are
 being ticked themselvess.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d373a5f20b017efdb9c339541b124009e07616c8..37441421a50867eeecf5cf3aed3e7096c526d7ef 100644
+index 180a476ebdf0932a84ac87f7b687b4339013e6ee..d25c532745ff543503ca681096fe764f853b34a8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -312,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0837-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0836-Add-Alternate-Current-redstone-implementation.patch
index 2638138390..2638138390 100644
--- a/patches/server/0837-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0836-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0838-Dont-resent-entity-on-art-update.patch b/patches/server/0837-Dont-resent-entity-on-art-update.patch
index ff4ac47ad6..ff4ac47ad6 100644
--- a/patches/server/0838-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0837-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0839-Add-WardenAngerChangeEvent.patch b/patches/server/0838-Add-WardenAngerChangeEvent.patch
index 2e66f62a0c..2e66f62a0c 100644
--- a/patches/server/0839-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0838-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0840-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0839-Add-option-for-strict-advancement-dimension-checks.patch
index c95ba56d09..c95ba56d09 100644
--- a/patches/server/0840-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0839-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0841-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0840-Add-missing-important-BlockStateListPopulator-method.patch
index cdb1bc89a3..cdb1bc89a3 100644
--- a/patches/server/0841-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0840-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0842-Nameable-Banner-API.patch b/patches/server/0841-Nameable-Banner-API.patch
index 78f176be32..78f176be32 100644
--- a/patches/server/0842-Nameable-Banner-API.patch
+++ b/patches/server/0841-Nameable-Banner-API.patch
diff --git a/patches/server/0843-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0842-Don-t-broadcast-messages-to-command-blocks.patch
index e0724ba67d..e0724ba67d 100644
--- a/patches/server/0843-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0842-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0844-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0843-Prevent-empty-items-from-being-added-to-world.patch
index af7950c0cb..af7950c0cb 100644
--- a/patches/server/0844-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0843-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0845-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0844-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index ad894dbcce..ad894dbcce 100644
--- a/patches/server/0845-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0844-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0846-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0845-Don-t-print-component-in-resource-pack-rejection-mes.patch
index 4dc45be5c8..1dadb31a04 100644
--- a/patches/server/0846-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/server/0845-Don-t-print-component-in-resource-pack-rejection-mes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't print component in resource pack rejection message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 79708158c748eb877dbd3c225da45938e51781bf..82007c6527ac932a22f68b7c7051e3bf6f204117 100644
+index 3382303303626a2a71ba7e70a1ced615a619d408..615d27a99cb999c1d5f64ff9f768c406b81940b3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2032,7 +2032,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0847-Add-Player-getFishHook.patch b/patches/server/0846-Add-Player-getFishHook.patch
index b3c5a59462..b3c5a59462 100644
--- a/patches/server/0847-Add-Player-getFishHook.patch
+++ b/patches/server/0846-Add-Player-getFishHook.patch
diff --git a/patches/server/0848-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0847-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 3956916b04..3956916b04 100644
--- a/patches/server/0848-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0847-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0849-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0848-Add-various-missing-EntityDropItemEvent-calls.patch
index 29d67eb1c5..29d67eb1c5 100644
--- a/patches/server/0849-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0848-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0850-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0849-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 505585a567..0b9dd64884 100644
--- a/patches/server/0850-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0849-Add-some-minimal-debug-information-to-chat-packet-er.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors
 TODO: potentially add some kick leeway
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 82007c6527ac932a22f68b7c7051e3bf6f204117..b504ecc5e98c74b3eee2b0e7552156a46815adf3 100644
+index 615d27a99cb999c1d5f64ff9f768c406b81940b3..022512b42811e53a057c58bb599f4ebc1aa5fe5d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2290,7 +2290,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0851-Fix-Bee-flower-NPE.patch b/patches/server/0850-Fix-Bee-flower-NPE.patch
index 8e5627e598..8e5627e598 100644
--- a/patches/server/0851-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0850-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0852-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0851-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 455e7e8795..2ecccc51ce 100644
--- a/patches/server/0852-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0851-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b504ecc5e98c74b3eee2b0e7552156a46815adf3..3bad487618a096c4970b5e99bd588001a3cd6716 100644
+index 022512b42811e53a057c58bb599f4ebc1aa5fe5d..83ed0a00afdf91cf2cbdb629f6c17b6ed97f2f98 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2537,7 +2537,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0853-More-Teleport-API.patch b/patches/server/0852-More-Teleport-API.patch
index b1da07e3f2..7a284a682c 100644
--- a/patches/server/0853-More-Teleport-API.patch
+++ b/patches/server/0852-More-Teleport-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] More Teleport API
 public net.minecraft.server.network.ServerGamePacketListenerImpl internalTeleport(DDDFFLjava/util/Set;Z)V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3bad487618a096c4970b5e99bd588001a3cd6716..e596cb762e038325ffc7979f9dc0276b812388f7 100644
+index 83ed0a00afdf91cf2cbdb629f6c17b6ed97f2f98..5ad9ffbb8344c345dd23f8362b1c24b6e3214763 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1708,11 +1708,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0854-Add-EntityPortalReadyEvent.patch b/patches/server/0853-Add-EntityPortalReadyEvent.patch
index 8e0b2d6643..8e0b2d6643 100644
--- a/patches/server/0854-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0853-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0855-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0854-Don-t-use-level-random-in-entity-constructors.patch
index c3f35be4a5..c3f35be4a5 100644
--- a/patches/server/0855-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0854-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0856-Send-block-entities-after-destroy-prediction.patch b/patches/server/0855-Send-block-entities-after-destroy-prediction.patch
index af323d6830..20e86fee03 100644
--- a/patches/server/0856-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0855-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index a88d9c733a647d4b3ad9e079b289f2979d092b07..257fa5207b889f882b77885d375564a8
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e596cb762e038325ffc7979f9dc0276b812388f7..b198e6d9b78d9d76bf0571c15a691e638e7bf1b7 100644
+index 5ad9ffbb8344c345dd23f8362b1c24b6e3214763..528b3365ae8536d621c7f8d0c20b754b4179dee7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1854,8 +1854,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0857-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0856-Warn-on-plugins-accessing-faraway-chunks.patch
index fdbf36a54d..fdbf36a54d 100644
--- a/patches/server/0857-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0856-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0858-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0857-Custom-Chat-Completion-Suggestions-API.patch
index ce000ef24f..ce000ef24f 100644
--- a/patches/server/0858-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0857-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0859-Add-missing-BlockFadeEvents.patch b/patches/server/0858-Add-missing-BlockFadeEvents.patch
index e939b49a21..e939b49a21 100644
--- a/patches/server/0859-Add-missing-BlockFadeEvents.patch
+++ b/patches/server/0858-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0860-Collision-API.patch b/patches/server/0859-Collision-API.patch
index 38fea82179..38fea82179 100644
--- a/patches/server/0860-Collision-API.patch
+++ b/patches/server/0859-Collision-API.patch
diff --git a/patches/server/0861-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0860-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index aa73cbbddf..aa73cbbddf 100644
--- a/patches/server/0861-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0860-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0862-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0861-Remove-invalid-signature-login-stacktrace.patch
index 85de582081..8ef46fe393 100644
--- a/patches/server/0862-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/server/0861-Remove-invalid-signature-login-stacktrace.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove invalid signature login stacktrace
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b198e6d9b78d9d76bf0571c15a691e638e7bf1b7..f525320635dc428610c0ff5259c9ea9a0115ac9e 100644
+index 528b3365ae8536d621c7f8d0c20b754b4179dee7..b46c46fcde19aff16321876bf50b6725233bb09a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3585,7 +3585,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0863-Block-Ticking-API.patch b/patches/server/0862-Block-Ticking-API.patch
index a6c8ba9019..a6c8ba9019 100644
--- a/patches/server/0863-Block-Ticking-API.patch
+++ b/patches/server/0862-Block-Ticking-API.patch
diff --git a/patches/server/0864-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0863-Add-Velocity-IP-Forwarding-Support.patch
index 52180d7986..c1abeeeac8 100644
--- a/patches/server/0864-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0863-Add-Velocity-IP-Forwarding-Support.patch
@@ -95,7 +95,7 @@ index 0000000000000000000000000000000000000000..c4934979b1ed85bfc4f8d9e6f8848b2b
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 91e6161449dc5625331e467d9e8375759686709e..7f0b8cdae07e7e4745a099242a4f0c5914be8667 100644
+index 8115cf64a30b6438721769df6045e1b77acf88ce..9f422cbeaa52b3e6a0a27af4f8ad4ddb7808483f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -274,13 +274,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0865-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0864-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index 2e38ad24c3..2e38ad24c3 100644
--- a/patches/server/0865-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0864-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0866-Add-NamespacedKey-biome-methods.patch b/patches/server/0865-Add-NamespacedKey-biome-methods.patch
index 4f53bd9282..4f53bd9282 100644
--- a/patches/server/0866-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0865-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0867-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0866-Fix-plugin-loggers-on-server-shutdown.patch
index 0c9f365e19..2e7f0573af 100644
--- a/patches/server/0867-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0866-Fix-plugin-loggers-on-server-shutdown.patch
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 37441421a50867eeecf5cf3aed3e7096c526d7ef..2c3577c6f59e482d68c80d3d414ed43942dfcfbb 100644
+index d25c532745ff543503ca681096fe764f853b34a8..aa0dcb02aaec2caa016397e7f5cc859a22ca4b6d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1000,6 +1000,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0868-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0867-Stop-large-look-changes-from-crashing-the-server.patch
index 1a4fc80ccb..1a4fc80ccb 100644
--- a/patches/server/0868-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0867-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0869-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0868-Fire-EntityChangeBlockEvent-in-more-places.patch
index c7fbbaaa64..c7fbbaaa64 100644
--- a/patches/server/0869-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0868-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0870-Missing-eating-regain-reason.patch b/patches/server/0869-Missing-eating-regain-reason.patch
index b5a99bc0ef..b5a99bc0ef 100644
--- a/patches/server/0870-Missing-eating-regain-reason.patch
+++ b/patches/server/0869-Missing-eating-regain-reason.patch
diff --git a/patches/server/0871-Missing-effect-cause.patch b/patches/server/0870-Missing-effect-cause.patch
index 2b4bcfc188..2b4bcfc188 100644
--- a/patches/server/0871-Missing-effect-cause.patch
+++ b/patches/server/0870-Missing-effect-cause.patch
diff --git a/patches/server/0872-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0871-Added-byte-array-serialization-deserialization-for-P.patch
index 3553cbd00c..3553cbd00c 100644
--- a/patches/server/0872-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0871-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0873-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0872-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 4a40322b2d..4a40322b2d 100644
--- a/patches/server/0873-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0872-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0874-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0873-Call-BlockPhysicsEvent-more-often.patch
index 83450685d0..83450685d0 100644
--- a/patches/server/0874-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0873-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0875-Configurable-chat-thread-limit.patch b/patches/server/0874-Configurable-chat-thread-limit.patch
index 1ebc6454e1..d6404f007b 100644
--- a/patches/server/0875-Configurable-chat-thread-limit.patch
+++ b/patches/server/0874-Configurable-chat-thread-limit.patch
@@ -22,10 +22,10 @@ is actually processed, this is honestly really just exposed for the misnomers or
 who just wanna ensure that this won't grow over a specific size if chat gets stupidly active
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 3294da27227b5a332904398afa56d21ea97d55f0..77d05f7efdcdceef681a75692c208075d873d368 100644
+index eb12227b009b1fb766a5f9e338e5d2394d498376..ffbab76e55807f04ebb25242eadbea114004b1b3 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -239,13 +239,26 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -238,13 +238,26 @@ public class GlobalConfiguration extends ConfigurationPart {
      public Misc misc;
  
      public class Misc extends ConfigurationPart {
diff --git a/patches/server/0876-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0875-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 793883a2f4..793883a2f4 100644
--- a/patches/server/0876-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0875-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0877-fix-Jigsaw-block-kicking-user.patch b/patches/server/0876-fix-Jigsaw-block-kicking-user.patch
index 6206d8d028..6206d8d028 100644
--- a/patches/server/0877-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0876-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0878-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0877-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 7cd7034099..7cd7034099 100644
--- a/patches/server/0878-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0877-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0879-Add-getDrops-to-BlockState.patch b/patches/server/0878-Add-getDrops-to-BlockState.patch
index 2984a969f8..2984a969f8 100644
--- a/patches/server/0879-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0878-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0880-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0879-Fix-a-bunch-of-vanilla-bugs.patch
index 193fb96886..193fb96886 100644
--- a/patches/server/0880-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0879-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0881-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0880-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 758839864f..758839864f 100644
--- a/patches/server/0881-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0880-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0882-Fix-custom-piglin-loved-items.patch b/patches/server/0881-Fix-custom-piglin-loved-items.patch
index e768ba98b8..e768ba98b8 100644
--- a/patches/server/0882-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0881-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0883-EntityPickupItemEvent-fixes.patch b/patches/server/0882-EntityPickupItemEvent-fixes.patch
index 8c7fe9dd48..8c7fe9dd48 100644
--- a/patches/server/0883-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0882-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0884-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0883-Correctly-handle-interactions-with-items-on-cooldown.patch
index cf990e4602..cf990e4602 100644
--- a/patches/server/0884-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0883-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0885-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0884-Add-PlayerInventorySlotChangeEvent.patch
index 2ae4584d34..2ae4584d34 100644
--- a/patches/server/0885-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0884-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0886-Elder-Guardian-appearance-API.patch b/patches/server/0885-Elder-Guardian-appearance-API.patch
index a39f8d2f49..a39f8d2f49 100644
--- a/patches/server/0886-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0885-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0887-Allow-changing-bed-s-occupied-property.patch b/patches/server/0886-Allow-changing-bed-s-occupied-property.patch
index 4d0128b6d3..4d0128b6d3 100644
--- a/patches/server/0887-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0886-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0888-Add-entity-knockback-API.patch b/patches/server/0887-Add-entity-knockback-API.patch
index 8fb1163c50..8fb1163c50 100644
--- a/patches/server/0888-Add-entity-knockback-API.patch
+++ b/patches/server/0887-Add-entity-knockback-API.patch
diff --git a/patches/server/0889-Detect-headless-JREs.patch b/patches/server/0888-Detect-headless-JREs.patch
index 9d49be7a76..9d49be7a76 100644
--- a/patches/server/0889-Detect-headless-JREs.patch
+++ b/patches/server/0888-Detect-headless-JREs.patch
diff --git a/patches/server/0890-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0889-fixed-entity-vehicle-collision-event-not-called.patch
index 19c5cdfd72..19c5cdfd72 100644
--- a/patches/server/0890-fixed-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0889-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0891-optimized-dirt-and-snow-spreading.patch b/patches/server/0890-optimized-dirt-and-snow-spreading.patch
index 08a3761309..08a3761309 100644
--- a/patches/server/0891-optimized-dirt-and-snow-spreading.patch
+++ b/patches/server/0890-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0892-Added-EntityToggleSitEvent.patch b/patches/server/0891-Added-EntityToggleSitEvent.patch
index 3545a2f37d..3545a2f37d 100644
--- a/patches/server/0892-Added-EntityToggleSitEvent.patch
+++ b/patches/server/0891-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0893-Add-fire-tick-delay-option.patch b/patches/server/0892-Add-fire-tick-delay-option.patch
index e9a876ed2b..e9a876ed2b 100644
--- a/patches/server/0893-Add-fire-tick-delay-option.patch
+++ b/patches/server/0892-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0894-Add-Moving-Piston-API.patch b/patches/server/0893-Add-Moving-Piston-API.patch
index 53df041ba1..53df041ba1 100644
--- a/patches/server/0894-Add-Moving-Piston-API.patch
+++ b/patches/server/0893-Add-Moving-Piston-API.patch
diff --git a/patches/server/0895-Ignore-impossible-spawn-tick.patch b/patches/server/0894-Ignore-impossible-spawn-tick.patch
index a5ecb9692b..a5ecb9692b 100644
--- a/patches/server/0895-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0894-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0896-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0895-Track-projectile-source-for-fireworks-from-dispenser.patch
index 389dfc4431..389dfc4431 100644
--- a/patches/server/0896-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/server/0895-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0897-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0896-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index af543e8884..a840f9a576 100644
--- a/patches/server/0897-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0896-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
@@ -9,7 +9,7 @@ suggestions, which especially matters when we force suggestions to
 the server for this type
 
 diff --git a/src/main/java/net/minecraft/commands/arguments/EntityArgument.java b/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
-index a2ea64b7ec5f47224312a1e08dd64347be6f7c43..b3c65f6b757c9ca7d26f5e95293c6021ab771a2f 100644
+index a71726cee91fb406875a4540c9fb7c0ecf757294..150daf6bf4b27a6ff984d872a28002f19beef51c 100644
 --- a/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
 +++ b/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
 @@ -128,7 +128,12 @@ public class EntityArgument implements ArgumentType<EntitySelector> {
diff --git a/patches/server/0898-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0897-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 2aed8d8bb3..2aed8d8bb3 100644
--- a/patches/server/0898-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0897-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0899-Prevent-compass-from-loading-chunks.patch b/patches/server/0898-Prevent-compass-from-loading-chunks.patch
index fd21636990..fd21636990 100644
--- a/patches/server/0899-Prevent-compass-from-loading-chunks.patch
+++ b/patches/server/0898-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0900-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0899-Add-PrePlayerAttackEntityEvent.patch
index 01fbd77bb2..01fbd77bb2 100644
--- a/patches/server/0900-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0899-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0901-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0900-ensure-reset-EnderDragon-boss-event-name.patch
index 0f1fd322ef..0f1fd322ef 100644
--- a/patches/server/0901-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0900-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0902-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0901-fix-MC-252817-green-map-markers-do-not-disappear.patch
index e5593afbc6..e5593afbc6 100644
--- a/patches/server/0902-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0901-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0903-Add-Player-Warden-Warning-API.patch b/patches/server/0902-Add-Player-Warden-Warning-API.patch
index c034e86f87..c034e86f87 100644
--- a/patches/server/0903-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0902-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0904-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0903-More-vanilla-friendly-methods-to-update-trades.patch
index 54dfe176f7..54dfe176f7 100644
--- a/patches/server/0904-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0903-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0905-Add-paper-dumplisteners-command.patch b/patches/server/0904-Add-paper-dumplisteners-command.patch
index cbf1598dd5..cbf1598dd5 100644
--- a/patches/server/0905-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0904-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0906-check-global-player-list-where-appropriate.patch b/patches/server/0905-check-global-player-list-where-appropriate.patch
index be6c2d1321..be6c2d1321 100644
--- a/patches/server/0906-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0905-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0907-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0906-Fix-async-entity-add-due-to-fungus-trees.patch
index fab31f58d5..fab31f58d5 100644
--- a/patches/server/0907-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0906-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0908-ItemStack-damage-API.patch b/patches/server/0907-ItemStack-damage-API.patch
index 3d5c08cf7b..3d5c08cf7b 100644
--- a/patches/server/0908-ItemStack-damage-API.patch
+++ b/patches/server/0907-ItemStack-damage-API.patch
diff --git a/patches/server/0909-Friction-API.patch b/patches/server/0908-Friction-API.patch
index a8d5128969..c9cd1ef7ef 100644
--- a/patches/server/0909-Friction-API.patch
+++ b/patches/server/0908-Friction-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Friction API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d688308e12f44100e6296740f600ec3b064efe88..bbb062f6a9e340492fb8535b259ddebe1e85cae9 100644
+index e59738a15c3db0d11bb7007af160aa1845cafd28..6e955e940ab95c5be22a8fb331b3c61347a77f92 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -263,6 +263,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0910-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0909-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 458d74cc9c..458d74cc9c 100644
--- a/patches/server/0910-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0909-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0911-Fix-player-kick-on-shutdown.patch b/patches/server/0910-Fix-player-kick-on-shutdown.patch
index b954657690..b954657690 100644
--- a/patches/server/0911-Fix-player-kick-on-shutdown.patch
+++ b/patches/server/0910-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0912-Sync-offhand-slot-in-menus.patch b/patches/server/0911-Sync-offhand-slot-in-menus.patch
index d58c97aaa6..d58c97aaa6 100644
--- a/patches/server/0912-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0911-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0913-Player-Entity-Tracking-Events.patch b/patches/server/0912-Player-Entity-Tracking-Events.patch
index 15dee0455c..15dee0455c 100644
--- a/patches/server/0913-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0912-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0914-Limit-pet-look-distance.patch b/patches/server/0913-Limit-pet-look-distance.patch
index 724bcbffa1..724bcbffa1 100644
--- a/patches/server/0914-Limit-pet-look-distance.patch
+++ b/patches/server/0913-Limit-pet-look-distance.patch
diff --git a/patches/server/0915-Properly-resend-entities.patch b/patches/server/0914-Properly-resend-entities.patch
index 012882a5e1..0baf83a9a0 100644
--- a/patches/server/0915-Properly-resend-entities.patch
+++ b/patches/server/0914-Properly-resend-entities.patch
@@ -66,7 +66,7 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..bf6a70a69bb695ec1a202cd1e863c468
      public static class DataItem<T> {
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f525320635dc428610c0ff5259c9ea9a0115ac9e..6c850f8a39f20f30ad744ef946420de453f8ce45 100644
+index b46c46fcde19aff16321876bf50b6725233bb09a..5654777aa3ed772cd5e37c1c630c68a83194f6bb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2796,7 +2796,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0916-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0915-Fixes-and-additions-to-the-SpawnReason-API.patch
index f7f6ee5b61..f7f6ee5b61 100644
--- a/patches/server/0916-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0915-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0917-fix-Instruments.patch b/patches/server/0916-fix-Instruments.patch
index 3495ef15b0..3495ef15b0 100644
--- a/patches/server/0917-fix-Instruments.patch
+++ b/patches/server/0916-fix-Instruments.patch
diff --git a/patches/server/0918-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0917-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index f4f36a8f11..f4f36a8f11 100644
--- a/patches/server/0918-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0917-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0919-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0918-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 923b2ffa50..923b2ffa50 100644
--- a/patches/server/0919-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0918-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0920-Improve-logging-and-errors.patch b/patches/server/0919-Improve-logging-and-errors.patch
index 5f9461d68e..5f9461d68e 100644
--- a/patches/server/0920-Improve-logging-and-errors.patch
+++ b/patches/server/0919-Improve-logging-and-errors.patch
diff --git a/patches/server/0921-Add-BlockLockCheckEvent.patch b/patches/server/0920-Add-BlockLockCheckEvent.patch
index 29e8b68880..29e8b68880 100644
--- a/patches/server/0921-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0920-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0922-Add-Sneaking-API-for-Entities.patch b/patches/server/0921-Add-Sneaking-API-for-Entities.patch
index 264874161f..264874161f 100644
--- a/patches/server/0922-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0921-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0923-Improve-PortalEvents.patch b/patches/server/0922-Improve-PortalEvents.patch
index 1f628c43d5..1f628c43d5 100644
--- a/patches/server/0923-Improve-PortalEvents.patch
+++ b/patches/server/0922-Improve-PortalEvents.patch
diff --git a/patches/server/0924-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0923-Add-config-option-for-spider-worldborder-climbing.patch
index 9a76df29f8..9a76df29f8 100644
--- a/patches/server/0924-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0923-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0925-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0924-Add-missing-SpigotConfig-logCommands-check.patch
index 5de7e7c74a..3c61f54554 100644
--- a/patches/server/0925-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0924-Add-missing-SpigotConfig-logCommands-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6c850f8a39f20f30ad744ef946420de453f8ce45..b9d86e030aafe526f07e4335e772bcd9c0d8fe2a 100644
+index 5654777aa3ed772cd5e37c1c630c68a83194f6bb..1572c2b682c44d1445e97c3ebdc7df3f9c3bb7c4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2254,7 +2254,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0926-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0925-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 04dbb4d045..04dbb4d045 100644
--- a/patches/server/0926-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0925-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0927-Flying-Fall-Damage.patch b/patches/server/0926-Flying-Fall-Damage.patch
index 416df8c728..416df8c728 100644
--- a/patches/server/0927-Flying-Fall-Damage.patch
+++ b/patches/server/0926-Flying-Fall-Damage.patch
diff --git a/patches/server/0928-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0927-Add-exploded-block-state-to-BlockExplodeEvent.patch
index 333c886d63..a968490b2b 100644
--- a/patches/server/0928-Add-exploded-block-state-to-BlockExplodeEvent.patch
+++ b/patches/server/0927-Add-exploded-block-state-to-BlockExplodeEvent.patch
@@ -112,7 +112,7 @@ index b9903c29bdea8d1e3b6fce0e97be6bd9493cfdf4..2ed78cf83c0ae66a6ddba1ff307da89a
  
      public static boolean canSetSpawn(Level world) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
-index dc8e173ff40c164bf6149db4caedf0ee8dce727b..f0acbb472830350f803b41f19126f3613d39e322 100644
+index da4609caecc8183d02c301c7cedbca52ed39323f..716021520c228b5bbced525b751f5d4126d882eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
 @@ -273,6 +273,12 @@ public final class CraftBlockStates {
diff --git a/patches/server/0929-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0928-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index d170d979cb..d170d979cb 100644
--- a/patches/server/0929-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0928-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0930-config-for-disabling-entity-tag-tags.patch b/patches/server/0929-config-for-disabling-entity-tag-tags.patch
index e7680c986a..e7680c986a 100644
--- a/patches/server/0930-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0929-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0931-Use-single-player-info-update-packet-on-join.patch b/patches/server/0930-Use-single-player-info-update-packet-on-join.patch
index b413cd9660..63ae383420 100644
--- a/patches/server/0931-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0930-Use-single-player-info-update-packet-on-join.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b9d86e030aafe526f07e4335e772bcd9c0d8fe2a..b94def027095f4decc00d5f415a220df9408bad6 100644
+index 1572c2b682c44d1445e97c3ebdc7df3f9c3bb7c4..01ed2f2bc2b888f0c8e3c47f51114fac82f7a368 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3600,7 +3600,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0932-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0931-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 8bcfc9f077..48e1f8b1ec 100644
--- a/patches/server/0932-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0931-Correctly-shrink-items-during-EntityResurrectEvent.patch
@@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem
 of undying was found and the event was called uncancelled.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bbb062f6a9e340492fb8535b259ddebe1e85cae9..3746bcda0972c5c0f48df894248aa4398983c267 100644
+index 6e955e940ab95c5be22a8fb331b3c61347a77f92..98a6480b32a1897dfcae84ed72409441519a827f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1592,7 +1592,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0933-Win-Screen-API.patch b/patches/server/0932-Win-Screen-API.patch
index 426b72554d..426b72554d 100644
--- a/patches/server/0933-Win-Screen-API.patch
+++ b/patches/server/0932-Win-Screen-API.patch
diff --git a/patches/server/0934-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0933-Remove-CraftItemStack-setAmount-null-assignment.patch
index 6e71a44d88..6e71a44d88 100644
--- a/patches/server/0934-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0933-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0935-Fix-force-opening-enchantment-tables.patch b/patches/server/0934-Fix-force-opening-enchantment-tables.patch
index c655e789f0..c655e789f0 100644
--- a/patches/server/0935-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0934-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0936-Add-Entity-Body-Yaw-API.patch b/patches/server/0935-Add-Entity-Body-Yaw-API.patch
index 1d612ad759..1d612ad759 100644
--- a/patches/server/0936-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0935-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0937-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0936-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index efaf1a6e90..efaf1a6e90 100644
--- a/patches/server/0937-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0936-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0938-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0937-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 097c2e3932..097c2e3932 100644
--- a/patches/server/0938-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0937-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0939-Add-EntityFertilizeEggEvent.patch b/patches/server/0938-Add-EntityFertilizeEggEvent.patch
index 7b65a3ef54..7b65a3ef54 100644
--- a/patches/server/0939-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0938-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0940-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0939-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index c1393c0c4f..c1393c0c4f 100644
--- a/patches/server/0940-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0939-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0941-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0940-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index c09b36b849..c09b36b849 100644
--- a/patches/server/0941-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0940-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0942-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0941-Correctly-handle-ArmorStand-invisibility.patch
index 103ddcbb11..103ddcbb11 100644
--- a/patches/server/0942-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0941-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0943-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0942-Fix-advancement-triggers-for-entity-damage.patch
index 549fd4f631..549fd4f631 100644
--- a/patches/server/0943-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0942-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0944-Fix-text-display-error-on-spawn.patch b/patches/server/0943-Fix-text-display-error-on-spawn.patch
index cb6ccd7e5e..cb6ccd7e5e 100644
--- a/patches/server/0944-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0943-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0945-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0944-Fix-certain-inventories-returning-null-Locations.patch
index e69fe4eb74..e69fe4eb74 100644
--- a/patches/server/0945-Fix-certain-inventories-returning-null-Locations.patch
+++ b/patches/server/0944-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0946-Add-Shearable-API.patch b/patches/server/0945-Add-Shearable-API.patch
index 950ecc2beb..950ecc2beb 100644
--- a/patches/server/0946-Add-Shearable-API.patch
+++ b/patches/server/0945-Add-Shearable-API.patch
diff --git a/patches/server/0947-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0946-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 4c90082c28..4c90082c28 100644
--- a/patches/server/0947-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0946-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0948-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0947-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
index 75e0c90780..75e0c90780 100644
--- a/patches/server/0948-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
+++ b/patches/server/0947-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
diff --git a/patches/server/0949-Optimize-Hoppers.patch b/patches/server/0948-Optimize-Hoppers.patch
index 7b6b38c931..8eb02d2e2e 100644
--- a/patches/server/0949-Optimize-Hoppers.patch
+++ b/patches/server/0948-Optimize-Hoppers.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] Optimize Hoppers
 * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2c3577c6f59e482d68c80d3d414ed43942dfcfbb..fb82bb52f219e7683fe1d3c0fb3acbe2251de8d4 100644
+index aa0dcb02aaec2caa016397e7f5cc859a22ca4b6d..763df0f016e2970fd12603d0c7d6c4e4871345f9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1524,6 +1524,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0950-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0949-Fix-beehives-generating-from-using-bonemeal.patch
index 48fda8c1b9..48fda8c1b9 100644
--- a/patches/server/0950-Fix-beehives-generating-from-using-bonemeal.patch
+++ b/patches/server/0949-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0951-Fix-api-checking-banned-ips.patch b/patches/server/0950-Fix-api-checking-banned-ips.patch
index a69b2e70fd..a69b2e70fd 100644
--- a/patches/server/0951-Fix-api-checking-banned-ips.patch
+++ b/patches/server/0950-Fix-api-checking-banned-ips.patch
diff --git a/patches/server/0952-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0951-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index f4282269d8..f4282269d8 100644
--- a/patches/server/0952-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0951-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0953-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0952-Treat-sequence-violations-like-they-should-be.patch
index 8cac9bfc29..3da8a71205 100644
--- a/patches/server/0953-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0952-Treat-sequence-violations-like-they-should-be.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b94def027095f4decc00d5f415a220df9408bad6..e7af33c702fcfe187c549b795c65029c727c6517 100644
+index 01ed2f2bc2b888f0c8e3c47f51114fac82f7a368..ed19c6c2eb72800af7b978df677ff317f05795ba 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2124,6 +2124,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0954-remove-duplicate-animate-packet-for-records.patch b/patches/server/0953-remove-duplicate-animate-packet-for-records.patch
index 0958982027..0958982027 100644
--- a/patches/server/0954-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0953-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0955-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0954-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 3053f7c554..bb76297470 100644
--- a/patches/server/0955-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0954-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -24,7 +24,7 @@ index 23e0e6937e28f09271a4ec7c35e0076a576cf3d3..4aa8b483841028fbcc43f9ed47730881
          UPDATE_GAME_MODE((serialized, buf) -> {
              serialized.gameMode = GameType.byId(buf.readVarInt());
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e7af33c702fcfe187c549b795c65029c727c6517..ae82ab0e3d8e99f87ca8465fbcbb44b5ce18bf96 100644
+index ed19c6c2eb72800af7b978df677ff317f05795ba..4dd04aa5f4affd42afbce718ec3dfaf7f1fafe2f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -296,6 +296,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0956-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0955-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 6671aa6357..6671aa6357 100644
--- a/patches/server/0956-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0955-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0957-Use-array-for-gamerule-storage.patch b/patches/server/0956-Use-array-for-gamerule-storage.patch
index 52052561af..52052561af 100644
--- a/patches/server/0957-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0956-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0958-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0957-Fix-a-couple-of-upstream-bed-issues.patch
index f4a4393fa2..f4a4393fa2 100644
--- a/patches/server/0958-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0957-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0959-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0958-Fix-demo-flag-not-enabling-demo-mode.patch
index 195413f40e..195413f40e 100644
--- a/patches/server/0959-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0958-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0960-Add-Mob-Experience-reward-API.patch b/patches/server/0959-Add-Mob-Experience-reward-API.patch
index 3c07d5e971..3c07d5e971 100644
--- a/patches/server/0960-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0959-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0961-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0960-Break-redstone-on-top-of-trap-doors-early.patch
index 461e4c40ca..461e4c40ca 100644
--- a/patches/server/0961-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0960-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0962-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0961-Fix-DamageCause-for-Falling-Blocks.patch
index d2e0a69c52..3197bd1c72 100644
--- a/patches/server/0962-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/server/0961-Fix-DamageCause-for-Falling-Blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix DamageCause for Falling Blocks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 97808ee1c087b44cacbaebf0bc9450ddca911008..20cdce9720c19925e5154f44cab36a7c7cc40ea2 100644
+index 576e982ac53fe6cdc6ca921ad46c36e895509f84..0ed5035044a3fc3ad725ce702720a0742a19ed44 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1030,6 +1030,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0963-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0962-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index 809f5d1710..809f5d1710 100644
--- a/patches/server/0963-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0962-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0964-More-accurate-isInOpenWater-impl.patch b/patches/server/0963-More-accurate-isInOpenWater-impl.patch
index 39f99272f6..39f99272f6 100644
--- a/patches/server/0964-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0963-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0965-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0964-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
index 2127f28b00..2127f28b00 100644
--- a/patches/server/0965-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
+++ b/patches/server/0964-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0966-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0965-Optimise-recalcBlockCounts-for-empty-sections.patch
index 2f061397e0..2f061397e0 100644
--- a/patches/server/0966-Optimise-recalcBlockCounts-for-empty-sections.patch
+++ b/patches/server/0965-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0967-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0966-Fix-destroying-beehive-without-any-players-nearby-th.patch
index b166366059..b166366059 100644
--- a/patches/server/0967-Fix-destroying-beehive-without-any-players-nearby-th.patch
+++ b/patches/server/0966-Fix-destroying-beehive-without-any-players-nearby-th.patch
diff --git a/patches/server/0968-Expand-PlayerItemMendEvent.patch b/patches/server/0967-Expand-PlayerItemMendEvent.patch
index ce8538f171..8dc094546e 100644
--- a/patches/server/0968-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0967-Expand-PlayerItemMendEvent.patch
@@ -51,7 +51,7 @@ index 991f3f947810ebd7e4f2c51a4012115fee8a34ec..548eddde8b0558b780f672d321507cfc
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 20cdce9720c19925e5154f44cab36a7c7cc40ea2..49e3715b6648e7c44127030930e06dc9432a8374 100644
+index 0ed5035044a3fc3ad725ce702720a0742a19ed44..a9a58f0bb19e034cffdafcc38fdc9003744a5d6c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1262,10 +1262,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0969-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0968-Refresh-ProjectileSource-for-projectiles.patch
index 04eaeb9354..04eaeb9354 100644
--- a/patches/server/0969-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0968-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0970-Add-transient-modifier-API.patch b/patches/server/0969-Add-transient-modifier-API.patch
index e3b704e242..e3b704e242 100644
--- a/patches/server/0970-Add-transient-modifier-API.patch
+++ b/patches/server/0969-Add-transient-modifier-API.patch
diff --git a/patches/server/0971-Fix-block-place-logic.patch b/patches/server/0970-Fix-block-place-logic.patch
index e534f4f285..e534f4f285 100644
--- a/patches/server/0971-Fix-block-place-logic.patch
+++ b/patches/server/0970-Fix-block-place-logic.patch
diff --git a/patches/server/0972-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0971-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index 1fbc769545..1fbc769545 100644
--- a/patches/server/0972-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0971-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0973-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0972-Ignore-inline-definitions-of-trim-material-pattern.patch
index 9b113e0bfe..9b113e0bfe 100644
--- a/patches/server/0973-Ignore-inline-definitions-of-trim-material-pattern.patch
+++ b/patches/server/0972-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0974-Call-BlockGrowEvent-for-the-pitcher-crop.patch b/patches/server/0973-Call-BlockGrowEvent-for-the-pitcher-crop.patch
index 98e7c69d60..98e7c69d60 100644
--- a/patches/server/0974-Call-BlockGrowEvent-for-the-pitcher-crop.patch
+++ b/patches/server/0973-Call-BlockGrowEvent-for-the-pitcher-crop.patch
diff --git a/patches/server/0975-Add-API-for-waxed-signs.patch b/patches/server/0974-Add-API-for-waxed-signs.patch
index 70908f9bbb..70908f9bbb 100644
--- a/patches/server/0975-Add-API-for-waxed-signs.patch
+++ b/patches/server/0974-Add-API-for-waxed-signs.patch
diff --git a/patches/server/0976-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0975-Properly-remove-the-experimental-smithing-inventory-.patch
index a1493ce3d9..a1493ce3d9 100644
--- a/patches/server/0976-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/server/0975-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/server/0977-Fix-sendSignChange0-s-usage-of-SignText.patch b/patches/server/0976-Fix-sendSignChange0-s-usage-of-SignText.patch
index 47e2230eef..47e2230eef 100644
--- a/patches/server/0977-Fix-sendSignChange0-s-usage-of-SignText.patch
+++ b/patches/server/0976-Fix-sendSignChange0-s-usage-of-SignText.patch