Remove ChatColor usages (#7543)

908 files changed, 904 insertions, 794 deletions

diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch
index 49d6d3ec93..3526d2ac7e 100644
--- a/patches/api/0005-Adventure.patch
+++ b/patches/api/0005-Adventure.patch
@@ -1284,7 +1284,7 @@ index ab6b0ec328e94bf65a0dafd0403e5ee3b870296c..c8d37184d8e882a4084a1bfef85faa33
  
      /**
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 4bfc214685164a38ba4261b2bae7faa8a3bd297e..8edd78adb042013bf702027f59455045d3b3e14f 100644
+index 4bfc214685164a38ba4261b2bae7faa8a3bd297e..11af71edd7eaefb3cce3c2b59d390ff92e95ec64 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -32,8 +32,7 @@ public abstract class Command {
@@ -1340,7 +1340,7 @@ index 4bfc214685164a38ba4261b2bae7faa8a3bd297e..8edd78adb042013bf702027f59455045
          return this;
      }
  
-@@ -399,6 +402,25 @@ public abstract class Command {
+@@ -399,13 +402,47 @@ public abstract class Command {
          this.usageMessage = (usage == null) ? "" : usage;
          return this;
      }
@@ -1366,6 +1366,43 @@ index 4bfc214685164a38ba4261b2bae7faa8a3bd297e..8edd78adb042013bf702027f59455045
  
      public static void broadcastCommandMessage(@NotNull CommandSender source, @NotNull String message) {
          broadcastCommandMessage(source, message, true);
+     }
+ 
+     public static void broadcastCommandMessage(@NotNull CommandSender source, @NotNull String message, boolean sendToSource) {
+-        String result = source.getName() + ": " + message;
++        // Paper start
++        broadcastCommandMessage(source, net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message), sendToSource);
++    }
++
++    public static void broadcastCommandMessage(@NotNull CommandSender source, @NotNull net.kyori.adventure.text.Component message) {
++        broadcastCommandMessage(source, message, true);
++    }
++
++    public static void broadcastCommandMessage(@NotNull CommandSender source, @NotNull net.kyori.adventure.text.Component message, boolean sendToSource) {
++        net.kyori.adventure.text.TextComponent.Builder result = net.kyori.adventure.text.Component.text()
++            .color(net.kyori.adventure.text.format.NamedTextColor.WHITE)
++            .decoration(net.kyori.adventure.text.format.TextDecoration.ITALIC, false)
++            .append(source.name())
++            .append(net.kyori.adventure.text.Component.text(": "))
++            .append(message);
++        // Paper end
+ 
+         if (source instanceof BlockCommandSender) {
+             BlockCommandSender blockCommandSender = (BlockCommandSender) source;
+@@ -424,7 +461,12 @@ public abstract class Command {
+         }
+ 
+         Set<Permissible> users = Bukkit.getPluginManager().getPermissionSubscriptions(Server.BROADCAST_CHANNEL_ADMINISTRATIVE);
+-        String colored = ChatColor.GRAY + "" + ChatColor.ITALIC + "[" + result + ChatColor.GRAY + ChatColor.ITALIC + "]";
++        // Paper start
++        net.kyori.adventure.text.TextComponent.Builder colored = net.kyori.adventure.text.Component.text()
++            .color(net.kyori.adventure.text.format.NamedTextColor.GRAY)
++            .decorate(net.kyori.adventure.text.format.TextDecoration.ITALIC)
++            .append(net.kyori.adventure.text.Component.text("["), result, net.kyori.adventure.text.Component.text("]"));
++        // Paper end
+ 
+         if (sendToSource && !(source instanceof ConsoleCommandSender)) {
+             source.sendMessage(message);
 diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
 index 284be63a125624a8ae43d2c164aede810ce6bfe5..22b654efdcc49d6dc6d52c9d6afa1c9dc7978e35 100644
 --- a/src/main/java/org/bukkit/command/CommandSender.java
@@ -3639,7 +3676,7 @@ index 94852d50e88d0594b84b581cd627174043629995..36bcbb3f3acedf7ebecbf6f6b358cf64
              throw new UnsupportedOperationException("Not supported yet.");
          }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 91eee1470f0969e9eef0753c0c700ae5354f1acc..69f68ca2d62c2cfe07a193776054c14c352a5942 100644
+index 2fbb0b7640dd9b9b0e70d4bc60fbb0310d5ec250..a19635c38705e6221ae25d58e976e483e7ed17e4 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -31,6 +31,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
diff --git a/patches/api/0007-Timings-v2.patch b/patches/api/0007-Timings-v2.patch
index f570434c87..5f818cb168 100644
--- a/patches/api/0007-Timings-v2.patch
+++ b/patches/api/0007-Timings-v2.patch
@@ -1559,10 +1559,10 @@ index 0000000000000000000000000000000000000000..da76e1aaee1dee794e38ddd4e0a28e00
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f7c2245a310a084367ff25db539b3c967d5cb141
+index 0000000000000000000000000000000000000000..c01606bddbcf123ca322d14cbccfc3095777dd4c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsCommand.java
-@@ -0,0 +1,119 @@
+@@ -0,0 +1,120 @@
 +/*
 + * This file is licensed under the MIT License (MIT).
 + *
@@ -1589,8 +1589,8 @@ index 0000000000000000000000000000000000000000..f7c2245a310a084367ff25db539b3c96
 +package co.aikar.timings;
 +
 +import com.google.common.collect.ImmutableList;
++import net.kyori.adventure.text.format.NamedTextColor;
 +import org.apache.commons.lang.Validate;
-+import org.bukkit.ChatColor;
 +import org.bukkit.command.CommandSender;
 +import org.bukkit.command.defaults.BukkitCommand;
 +import org.bukkit.util.StringUtil;
@@ -1598,7 +1598,8 @@ index 0000000000000000000000000000000000000000..f7c2245a310a084367ff25db539b3c96
 +import java.util.ArrayList;
 +import java.util.List;
 +import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
++
++import static net.kyori.adventure.text.Component.text;
 +
 +
 +public class TimingsCommand extends BukkitCommand {
@@ -1618,41 +1619,41 @@ index 0000000000000000000000000000000000000000..f7c2245a310a084367ff25db539b3c96
 +            return true;
 +        }
 +        if (args.length < 1) {
-+            sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage);
++            sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED));
 +            return true;
 +        }
 +        final String arg = args[0];
 +        if ("on".equalsIgnoreCase(arg)) {
 +            Timings.setTimingsEnabled(true);
-+            sender.sendMessage("Enabled Timings & Reset");
++            sender.sendMessage(text("Enabled Timings & Reset"));
 +            return true;
 +        } else if ("off".equalsIgnoreCase(arg)) {
 +            Timings.setTimingsEnabled(false);
-+            sender.sendMessage("Disabled Timings");
++            sender.sendMessage(text("Disabled Timings"));
 +            return true;
 +        }
 +
 +        if (!Timings.isTimingsEnabled()) {
-+            sender.sendMessage("Please enable timings by typing /timings on");
++            sender.sendMessage(text("Please enable timings by typing /timings on"));
 +            return true;
 +        }
 +
 +        long now = System.currentTimeMillis();
 +        if ("verbon".equalsIgnoreCase(arg)) {
 +            Timings.setVerboseTimingsEnabled(true);
-+            sender.sendMessage("Enabled Verbose Timings");
++            sender.sendMessage(text("Enabled Verbose Timings"));
 +            return true;
 +        } else if ("verboff".equalsIgnoreCase(arg)) {
 +            Timings.setVerboseTimingsEnabled(false);
-+            sender.sendMessage("Disabled Verbose Timings");
++            sender.sendMessage(text("Disabled Verbose Timings"));
 +            return true;
 +        } else if ("reset".equalsIgnoreCase(arg)) {
 +            if (now - lastResetAttempt < 30000) {
 +                TimingsManager.reset();
-+                sender.sendMessage(ChatColor.RED + "Timings reset. Please wait 5-10 minutes before using /timings report.");
++                sender.sendMessage(text("Timings reset. Please wait 5-10 minutes before using /timings report.", NamedTextColor.RED));
 +            } else {
 +                lastResetAttempt = now;
-+                sender.sendMessage(ChatColor.RED + "WARNING: Timings v2 should not be reset. If you are encountering lag, please wait 3 minutes and then issue a report. The best timings will include 10+ minutes, with data before and after your lag period. If you really want to reset, run this command again within 30 seconds.");
++                sender.sendMessage(text("WARNING: Timings v2 should not be reset. If you are experiencing lag, please wait 3 minutes and then issue a report. The best timings will include 10+ minutes, with data before and after your lag period. If you really want to reset, run this command again within 30 seconds.", NamedTextColor.RED));
 +            }
 +        } else  if (
 +            "paste".equalsIgnoreCase(arg) ||
@@ -1663,7 +1664,7 @@ index 0000000000000000000000000000000000000000..f7c2245a310a084367ff25db539b3c96
 +            ) {
 +            Timings.generateReport(sender);
 +        } else {
-+            sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage);
++            sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED));
 +        }
 +        return true;
 +    }
@@ -2887,7 +2888,7 @@ index 0000000000000000000000000000000000000000..f9a00aecca5ec41b460bf41dfe1c6969
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 8edd78adb042013bf702027f59455045d3b3e14f..53f9262f7c61985eeef1f418098bd764522d3c9a 100644
+index 11af71edd7eaefb3cce3c2b59d390ff92e95ec64..8d7a61b711cec7eff0e71b9ae942f3050196d955 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -33,6 +33,8 @@ public abstract class Command {
diff --git a/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch
index acdf609209..ef5351eecd 100644
--- a/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -35,7 +35,7 @@ index 75bc4937f7a895c1bbf0a0800035ad8f7e0c5f46..be5f25a51a12082cb6732445c221d612
 +    void reloadPermissions(); // Paper
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-index 50cc311be7904cc8fc6070a21c8e4de3a489fd20..c62da4131b17e66892678e8b618fb9ba3de93b56 100644
+index 50cc311be7904cc8fc6070a21c8e4de3a489fd20..5fa9d648bc780e874f658597f1a24715bccac5cb 100644
 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 @@ -13,15 +13,35 @@ public class ReloadCommand extends BukkitCommand {
@@ -58,17 +58,17 @@ index 50cc311be7904cc8fc6070a21c8e4de3a489fd20..c62da4131b17e66892678e8b618fb9ba
 +        if (args.length == 1) {
 +            if (args[0].equalsIgnoreCase("permissions")) {
 +                Bukkit.getServer().reloadPermissions();
-+                Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Permissions successfully reloaded.");
++                Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Permissions successfully reloaded.", net.kyori.adventure.text.format.NamedTextColor.GREEN));
 +                return true;
 +            } else if ("confirm".equalsIgnoreCase(args[0])) {
 +                confirmed = true;
 +            } else {
-+                Command.broadcastCommandMessage(sender, ChatColor.RED + "Usage: " + usageMessage);
++                Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Usage: " + usageMessage, net.kyori.adventure.text.format.NamedTextColor.RED));
 +                return true;
 +            }
 +        }
 +        if (!confirmed) {
-+            Command.broadcastCommandMessage(sender, ChatColor.RED + "Are you sure you wish to reload your server? Doing so may cause bugs and memory leaks. It is recommended to restart instead of using /reload. To confirm, please type " + ChatColor.YELLOW + "/reload confirm");
++            Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Are you sure you wish to reload your server? Doing so may cause bugs and memory leaks. It is recommended to restart instead of using /reload. To confirm, please type ", net.kyori.adventure.text.format.NamedTextColor.RED).append(net.kyori.adventure.text.Component.text("/reload confirm", net.kyori.adventure.text.format.NamedTextColor.YELLOW)));
 +            return true;
 +        }
 +        // Paper end
diff --git a/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch
index 13b14fe769..af64f14c90 100644
--- a/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch
@@ -72,7 +72,7 @@ index adfc7aae2c0f49bbcdd358e83b04a0cf078a7d52..460fda05a62b12db2edcfb7ea8b2a5dd
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-index c62da4131b17e66892678e8b618fb9ba3de93b56..0c7ba0718de2b93d013968ca0fec34ffd423990f 100644
+index 5fa9d648bc780e874f658597f1a24715bccac5cb..3ec32b46264cfff857b50129b5e0fa5584943ec6 100644
 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 @@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand {
@@ -86,13 +86,13 @@ index c62da4131b17e66892678e8b618fb9ba3de93b56..0c7ba0718de2b93d013968ca0fec34ff
      }
 @@ -29,6 +29,13 @@ public class ReloadCommand extends BukkitCommand {
                  Bukkit.getServer().reloadPermissions();
-                 Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Permissions successfully reloaded.");
+                 Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Permissions successfully reloaded.", net.kyori.adventure.text.format.NamedTextColor.GREEN));
                  return true;
 +            } else if ("commands".equalsIgnoreCase(args[0])) {
 +                if (Bukkit.getServer().reloadCommandAliases()) {
-+                    Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Command aliases successfully reloaded.");
++                    Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Command aliases successfully reloaded.", net.kyori.adventure.text.format.NamedTextColor.GREEN));
 +                } else {
-+                    Command.broadcastCommandMessage(sender, ChatColor.RED + "An error occurred while trying to reload command aliases.");
++                    Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("An error occurred while trying to reload command aliases.", net.kyori.adventure.text.format.NamedTextColor.RED));
 +                }
 +                return true;
              } else if ("confirm".equalsIgnoreCase(args[0])) {
diff --git a/patches/server/0004-Paper-config-files.patch b/patches/server/0004-Paper-config-files.patch
index a8971ef784..183226be43 100644
--- a/patches/server/0004-Paper-config-files.patch
+++ b/patches/server/0004-Paper-config-files.patch
@@ -5,297 +5,6 @@ Subject: [PATCH] Paper config files
 
 Loads each yml file for early init too so it can be used for early options
 
-diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..a7182a4c64980aa19b8493ac9c2bb762603e615b
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-@@ -0,0 +1,285 @@
-+package com.destroystokyo.paper;
-+
-+import com.google.common.base.Functions;
-+import com.google.common.base.Joiner;
-+import com.google.common.collect.ImmutableSet;
-+import com.google.common.collect.Iterables;
-+import com.google.common.collect.Lists;
-+import com.google.common.collect.Maps;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.server.MinecraftServer;
-+import net.minecraft.server.level.ServerChunkCache;
-+import net.minecraft.server.level.ServerLevel;
-+import net.minecraft.world.entity.Entity;
-+import net.minecraft.world.entity.EntityType;
-+import net.minecraft.world.level.ChunkPos;
-+import org.apache.commons.lang3.tuple.MutablePair;
-+import org.apache.commons.lang3.tuple.Pair;
-+import org.bukkit.Bukkit;
-+import org.bukkit.ChatColor;
-+import org.bukkit.Location;
-+import org.bukkit.World;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.craftbukkit.CraftServer;
-+import org.bukkit.craftbukkit.CraftWorld;
-+import org.bukkit.entity.Player;
-+
-+import java.io.File;
-+import java.time.LocalDateTime;
-+import java.time.format.DateTimeFormatter;
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+import java.util.Collection;
-+import java.util.Collections;
-+import java.util.Iterator;
-+import java.util.List;
-+import java.util.Locale;
-+import java.util.Map;
-+import java.util.Set;
-+import java.util.stream.Collectors;
-+
-+public class PaperCommand extends Command {
-+    private static final String BASE_PERM = "bukkit.command.paper.";
-+    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version").build();
-+
-+    public PaperCommand(String name) {
-+        super(name);
-+        this.description = "Paper related commands";
-+        this.usageMessage = "/paper [" + Joiner.on(" | ").join(SUBCOMMANDS) + "]";
-+        this.setPermission("bukkit.command.paper;" + Joiner.on(';').join(SUBCOMMANDS.stream().map(s -> BASE_PERM + s).collect(Collectors.toSet())));
-+    }
-+
-+    private static boolean testPermission(CommandSender commandSender, String permission) {
-+        if (commandSender.hasPermission(BASE_PERM + permission) || commandSender.hasPermission("bukkit.command.paper")) return true;
-+        commandSender.sendMessage(ChatColor.RED + "I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error."); // Sorry, kashike
-+        return false;
-+    }
-+
-+    @Override
-+    public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException {
-+        if (args.length <= 1)
-+            return getListMatchingLast(sender, args, SUBCOMMANDS);
-+
-+        switch (args[0].toLowerCase(Locale.ENGLISH))
-+        {
-+            case "entity":
-+                if (args.length == 2)
-+                    return getListMatchingLast(sender, args, "help", "list");
-+                if (args.length == 3)
-+                    return getListMatchingLast(sender, args, EntityType.getEntityNameList().stream().map(ResourceLocation::toString).sorted().toArray(String[]::new));
-+                break;
-+        }
-+        return Collections.emptyList();
-+    }
-+
-+    // Code from Mojang - copyright them
-+    public static List<String> getListMatchingLast(CommandSender sender, String[] args, String... matches) {
-+        return getListMatchingLast(sender, args, (Collection) Arrays.asList(matches));
-+    }
-+
-+    public static boolean matches(String s, String s1) {
-+        return s1.regionMatches(true, 0, s, 0, s.length());
-+    }
-+
-+    public static List<String> getListMatchingLast(CommandSender sender, String[] strings, Collection<?> collection) {
-+        String last = strings[strings.length - 1];
-+        ArrayList<String> results = Lists.newArrayList();
-+
-+        if (!collection.isEmpty()) {
-+            Iterator iterator = Iterables.transform(collection, Functions.toStringFunction()).iterator();
-+
-+            while (iterator.hasNext()) {
-+                String s1 = (String) iterator.next();
-+
-+                if (matches(last, s1) && (sender.hasPermission(BASE_PERM + s1) || sender.hasPermission("bukkit.command.paper"))) {
-+                    results.add(s1);
-+                }
-+            }
-+
-+            if (results.isEmpty()) {
-+                iterator = collection.iterator();
-+
-+                while (iterator.hasNext()) {
-+                    Object object = iterator.next();
-+
-+                    if (object instanceof ResourceLocation && matches(last, ((ResourceLocation) object).getPath())) {
-+                        results.add(String.valueOf(object));
-+                    }
-+                }
-+            }
-+        }
-+
-+        return results;
-+    }
-+    // end copy stuff
-+
-+    @Override
-+    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
-+        if (!testPermission(sender)) return true;
-+
-+        if (args.length == 0) {
-+            sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage);
-+            return false;
-+        }
-+        if (SUBCOMMANDS.contains(args[0].toLowerCase(Locale.ENGLISH))) {
-+            if (!testPermission(sender, args[0].toLowerCase(Locale.ENGLISH))) return true;
-+        }
-+        switch (args[0].toLowerCase(Locale.ENGLISH))  {
-+            case "heap":
-+                dumpHeap(sender);
-+                break;
-+            case "entity":
-+                listEntities(sender, args);
-+                break;
-+            case "reload":
-+                doReload(sender);
-+                break;
-+            case "ver":
-+                if (!testPermission(sender, "version")) break; // "ver" needs a special check because it's an alias. All other commands are checked up before the switch statement (because they are present in the SUBCOMMANDS set)
-+            case "version":
-+                Command ver = MinecraftServer.getServer().server.getCommandMap().getCommand("version");
-+                if (ver != null) {
-+                    ver.execute(sender, commandLabel, new String[0]);
-+                    break;
-+                }
-+                // else - fall through to default
-+            default:
-+                sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage);
-+                return false;
-+        }
-+
-+        return true;
-+    }
-+
-+    /*
-+     * Ported from MinecraftForge - author: LexManos <[email protected]> - License: LGPLv2.1
-+     */
-+    private void listEntities(CommandSender sender, String[] args) {
-+        if (args.length < 2 || args[1].toLowerCase(Locale.ENGLISH).equals("help")) {
-+            sender.sendMessage(ChatColor.RED + "Use /paper entity [list] help for more information on a specific command.");
-+            return;
-+        }
-+
-+        switch (args[1].toLowerCase(Locale.ENGLISH)) {
-+            case "list":
-+                String filter = "*";
-+                if (args.length > 2) {
-+                    if (args[2].toLowerCase(Locale.ENGLISH).equals("help")) {
-+                        sender.sendMessage(ChatColor.RED + "Use /paper entity list [filter] [worldName] to get entity info that matches the optional filter.");
-+                        return;
-+                    }
-+                    filter = args[2];
-+                }
-+                final String cleanfilter = filter.replace("?", ".?").replace("*", ".*?");
-+                Set<ResourceLocation> names = EntityType.getEntityNameList().stream()
-+                        .filter(n -> n.toString().matches(cleanfilter))
-+                        .collect(Collectors.toSet());
-+
-+                if (names.isEmpty()) {
-+                    sender.sendMessage(ChatColor.RED + "Invalid filter, does not match any entities. Use /paper entity list for a proper list");
-+                    sender.sendMessage(ChatColor.RED + "Usage: /paper entity list [filter] [worldName]");
-+                    return;
-+                }
-+
-+                String worldName;
-+                if (args.length > 3) {
-+                    worldName = args[3];
-+                } else if (sender instanceof Player) {
-+                    worldName = ((Player) sender).getWorld().getName();
-+                } else {
-+                    sender.sendMessage(ChatColor.RED + "Please specify the name of a world");
-+                    sender.sendMessage(ChatColor.RED + "To do so without a filter, specify '*' as the filter");
-+                    sender.sendMessage(ChatColor.RED + "Usage: /paper entity list [filter] [worldName]");
-+                    return;
-+                }
-+
-+                Map<ResourceLocation, MutablePair<Integer, Map<ChunkPos, Integer>>> list = Maps.newHashMap();
-+                World bukkitWorld = Bukkit.getWorld(worldName);
-+                if (bukkitWorld == null) {
-+                    sender.sendMessage(ChatColor.RED + "Could not load world for " + worldName + ". Please select a valid world.");
-+                    sender.sendMessage(ChatColor.RED + "Usage: /paper entity list [filter] [worldName]");
-+                    return;
-+                }
-+                ServerLevel world = ((CraftWorld) Bukkit.getWorld(worldName)).getHandle();
-+
-+                Map<ResourceLocation, Integer> nonEntityTicking = Maps.newHashMap();
-+                ServerChunkCache chunkProviderServer = world.getChunkSource();
-+
-+                world.getAllEntities().forEach(e -> {
-+                    ResourceLocation key = EntityType.getKey(e.getType());
-+
-+                    MutablePair<Integer, Map<ChunkPos, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
-+                    ChunkPos chunk = e.chunkPosition();
-+                    info.left++;
-+                    info.right.put(chunk, info.right.getOrDefault(chunk, 0) + 1);
-+                    if (!chunkProviderServer.isPositionTicking(e)) {
-+                        nonEntityTicking.merge(key, Integer.valueOf(1), Integer::sum);
-+                    }
-+                });
-+
-+                if (names.size() == 1) {
-+                    ResourceLocation name = names.iterator().next();
-+                    Pair<Integer, Map<ChunkPos, Integer>> info = list.get(name);
-+                    int nonTicking = nonEntityTicking.getOrDefault(name, Integer.valueOf(0)).intValue();
-+                    if (info == null) {
-+                        sender.sendMessage(ChatColor.RED + "No entities found.");
-+                        return;
-+                    }
-+                    sender.sendMessage("Entity: " + name + " Total Ticking: " + (info.getLeft() - nonTicking) + ", Total Non-Ticking: " + nonTicking);
-+                    info.getRight().entrySet().stream()
-+                            .sorted((a, b) -> !a.getValue().equals(b.getValue()) ? b.getValue() - a.getValue() : a.getKey().toString().compareTo(b.getKey().toString()))
-+                            .limit(10).forEach(e -> sender.sendMessage("  " + e.getValue() + ": " + e.getKey().x + ", " + e.getKey().z + (chunkProviderServer.isPositionTicking(e.getKey().toLong()) ? " (Ticking)" : " (Non-Ticking)")));
-+                } else {
-+                    List<Pair<ResourceLocation, Integer>> info = list.entrySet().stream()
-+                            .filter(e -> names.contains(e.getKey()))
-+                            .map(e -> Pair.of(e.getKey(), e.getValue().left))
-+                            .sorted((a, b) -> !a.getRight().equals(b.getRight()) ? b.getRight() - a.getRight() : a.getKey().toString().compareTo(b.getKey().toString()))
-+                            .collect(Collectors.toList());
-+
-+                    if (info == null || info.size() == 0) {
-+                        sender.sendMessage(ChatColor.RED + "No entities found.");
-+                        return;
-+                    }
-+
-+                    int count = info.stream().mapToInt(Pair::getRight).sum();
-+                    int nonTickingCount = nonEntityTicking.values().stream().mapToInt(Integer::intValue).sum();
-+                    sender.sendMessage("Total Ticking: " + (count - nonTickingCount) + ", Total Non-Ticking: " + nonTickingCount);
-+                    info.forEach(e -> {
-+                        int nonTicking = nonEntityTicking.getOrDefault(e.getKey(), Integer.valueOf(0)).intValue();
-+                        sender.sendMessage("  " + (e.getValue() - nonTicking) + " (" + nonTicking + ") " + ": " + e.getKey());
-+                    });
-+                    sender.sendMessage("* First number is ticking entities, second number is non-ticking entities");
-+                }
-+                break;
-+        }
-+    }
-+
-+    private void dumpHeap(CommandSender sender) {
-+        java.nio.file.Path dir = java.nio.file.Paths.get("./dumps");
-+        String name = "heap-dump-" + DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss").format(LocalDateTime.now());
-+
-+        Command.broadcastCommandMessage(sender, ChatColor.YELLOW + "Writing JVM heap data...");
-+
-+        java.nio.file.Path file = CraftServer.dumpHeap(dir, name);
-+        if (file != null) {
-+            Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Heap dump saved to " + file);
-+        } else {
-+            Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed to write heap dump, see sever log for details");
-+        }
-+    }
-+
-+    private void doReload(CommandSender sender) {
-+        Command.broadcastCommandMessage(sender, ChatColor.RED + "Please note that this command is not supported and may cause issues.");
-+        Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server.");
-+
-+        MinecraftServer console = MinecraftServer.getServer();
-+        com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings"));
-+        for (ServerLevel world : console.getAllLevels()) {
-+            world.paperConfig.init();
-+        }
-+        console.server.reloadCount++;
-+
-+        Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Paper config reload complete.");
-+    }
-+}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..80a3d5890aab91e6a48d5734140187851106bde3
diff --git a/patches/server/0009-Paper-command.patch b/patches/server/0009-Paper-command.patch
new file mode 100644
index 0000000000..4d90a3e7c9
--- /dev/null
+++ b/patches/server/0009-Paper-command.patch
@@ -0,0 +1,301 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <[email protected]>
+Date: Mon, 29 Feb 2016 21:02:09 -0600
+Subject: [PATCH] Paper command
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..0c7738412ce5c9b8c66e3f1c1e13fcd2a2154195
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
+@@ -0,0 +1,289 @@
++package com.destroystokyo.paper;
++
++import com.google.common.base.Functions;
++import com.google.common.base.Joiner;
++import com.google.common.collect.ImmutableSet;
++import com.google.common.collect.Iterables;
++import com.google.common.collect.Lists;
++import com.google.common.collect.Maps;
++import net.minecraft.resources.ResourceLocation;
++import net.minecraft.server.MinecraftServer;
++import net.minecraft.server.level.ServerChunkCache;
++import net.minecraft.server.level.ServerLevel;
++import net.minecraft.world.entity.Entity;
++import net.minecraft.world.entity.EntityType;
++import net.minecraft.world.level.ChunkPos;
++import org.apache.commons.lang3.tuple.MutablePair;
++import org.apache.commons.lang3.tuple.Pair;
++import org.bukkit.Bukkit;
++import org.bukkit.Location;
++import org.bukkit.World;
++import org.bukkit.command.Command;
++import org.bukkit.command.CommandSender;
++import org.bukkit.craftbukkit.CraftServer;
++import org.bukkit.craftbukkit.CraftWorld;
++import org.bukkit.entity.Player;
++
++import java.io.File;
++import java.time.LocalDateTime;
++import java.time.format.DateTimeFormatter;
++import java.util.ArrayList;
++import java.util.Arrays;
++import java.util.Collection;
++import java.util.Collections;
++import java.util.Iterator;
++import java.util.List;
++import java.util.Locale;
++import java.util.Map;
++import java.util.Set;
++import java.util.stream.Collectors;
++
++import static net.kyori.adventure.text.Component.text;
++import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
++import static net.kyori.adventure.text.format.NamedTextColor.RED;
++import static net.kyori.adventure.text.format.NamedTextColor.YELLOW;
++
++public class PaperCommand extends Command {
++    private static final String BASE_PERM = "bukkit.command.paper.";
++    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version").build();
++
++    public PaperCommand(String name) {
++        super(name);
++        this.description = "Paper related commands";
++        this.usageMessage = "/paper [" + Joiner.on(" | ").join(SUBCOMMANDS) + "]";
++        this.setPermission("bukkit.command.paper;" + Joiner.on(';').join(SUBCOMMANDS.stream().map(s -> BASE_PERM + s).collect(Collectors.toSet())));
++    }
++
++    private static boolean testPermission(CommandSender commandSender, String permission) {
++        if (commandSender.hasPermission(BASE_PERM + permission) || commandSender.hasPermission("bukkit.command.paper")) return true;
++        commandSender.sendMessage(text("I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error.", RED));
++        return false;
++    }
++
++    @Override
++    public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException {
++        if (args.length <= 1)
++            return getListMatchingLast(sender, args, SUBCOMMANDS);
++
++        switch (args[0].toLowerCase(Locale.ENGLISH))
++        {
++            case "entity":
++                if (args.length == 2)
++                    return getListMatchingLast(sender, args, "help", "list");
++                if (args.length == 3)
++                    return getListMatchingLast(sender, args, EntityType.getEntityNameList().stream().map(ResourceLocation::toString).sorted().toArray(String[]::new));
++                break;
++        }
++        return Collections.emptyList();
++    }
++
++    // Code from Mojang - copyright them
++    public static List<String> getListMatchingLast(CommandSender sender, String[] args, String... matches) {
++        return getListMatchingLast(sender, args, (Collection) Arrays.asList(matches));
++    }
++
++    public static boolean matches(String s, String s1) {
++        return s1.regionMatches(true, 0, s, 0, s.length());
++    }
++
++    public static List<String> getListMatchingLast(CommandSender sender, String[] strings, Collection<?> collection) {
++        String last = strings[strings.length - 1];
++        ArrayList<String> results = Lists.newArrayList();
++
++        if (!collection.isEmpty()) {
++            Iterator iterator = Iterables.transform(collection, Functions.toStringFunction()).iterator();
++
++            while (iterator.hasNext()) {
++                String s1 = (String) iterator.next();
++
++                if (matches(last, s1) && (sender.hasPermission(BASE_PERM + s1) || sender.hasPermission("bukkit.command.paper"))) {
++                    results.add(s1);
++                }
++            }
++
++            if (results.isEmpty()) {
++                iterator = collection.iterator();
++
++                while (iterator.hasNext()) {
++                    Object object = iterator.next();
++
++                    if (object instanceof ResourceLocation && matches(last, ((ResourceLocation) object).getPath())) {
++                        results.add(String.valueOf(object));
++                    }
++                }
++            }
++        }
++
++        return results;
++    }
++    // end copy stuff
++
++    @Override
++    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
++        if (!testPermission(sender)) return true;
++
++        if (args.length == 0) {
++            sender.sendMessage(text("Usage: " + this.usageMessage, RED));
++            return false;
++        }
++        if (SUBCOMMANDS.contains(args[0].toLowerCase(Locale.ENGLISH))) {
++            if (!testPermission(sender, args[0].toLowerCase(Locale.ENGLISH))) return true;
++        }
++        switch (args[0].toLowerCase(Locale.ENGLISH))  {
++            case "heap":
++                dumpHeap(sender);
++                break;
++            case "entity":
++                listEntities(sender, args);
++                break;
++            case "reload":
++                doReload(sender);
++                break;
++            case "ver":
++                if (!testPermission(sender, "version")) break; // "ver" needs a special check because it's an alias. All other commands are checked up before the switch statement (because they are present in the SUBCOMMANDS set)
++            case "version":
++                Command ver = MinecraftServer.getServer().server.getCommandMap().getCommand("version");
++                if (ver != null) {
++                    ver.execute(sender, commandLabel, new String[0]);
++                    break;
++                }
++                // else - fall through to default
++            default:
++                sender.sendMessage(text("Usage: " + this.usageMessage, RED));
++                return false;
++        }
++
++        return true;
++    }
++
++    /*
++     * Ported from MinecraftForge - author: LexManos <[email protected]> - License: LGPLv2.1
++     */
++    private void listEntities(CommandSender sender, String[] args) {
++        if (args.length < 2 || args[1].toLowerCase(Locale.ENGLISH).equals("help")) {
++            sender.sendMessage(text("Use /paper entity [list] help for more information on a specific command", RED));
++            return;
++        }
++
++        switch (args[1].toLowerCase(Locale.ENGLISH)) {
++            case "list":
++                String filter = "*";
++                if (args.length > 2) {
++                    if (args[2].toLowerCase(Locale.ENGLISH).equals("help")) {
++                        sender.sendMessage(text("Use /paper entity list [filter] [worldName] to get entity info that matches the optional filter.", RED));
++                        return;
++                    }
++                    filter = args[2];
++                }
++                final String cleanfilter = filter.replace("?", ".?").replace("*", ".*?");
++                Set<ResourceLocation> names = EntityType.getEntityNameList().stream()
++                        .filter(n -> n.toString().matches(cleanfilter))
++                        .collect(Collectors.toSet());
++
++                if (names.isEmpty()) {
++                    sender.sendMessage(text("Invalid filter, does not match any entities. Use /paper entity list for a proper list", RED));
++                    sender.sendMessage(text("Usage: /paper entity list [filter] [worldName]", RED));
++                    return;
++                }
++
++                String worldName;
++                if (args.length > 3) {
++                    worldName = args[3];
++                } else if (sender instanceof Player) {
++                    worldName = ((Player) sender).getWorld().getName();
++                } else {
++                    sender.sendMessage(text("Please specify the name of a world", RED));
++                    sender.sendMessage(text("To do so without a filter, specify '*' as the filter", RED));
++                    sender.sendMessage(text("Usage: /paper entity list [filter] [worldName]", RED));
++                    return;
++                }
++
++                Map<ResourceLocation, MutablePair<Integer, Map<ChunkPos, Integer>>> list = Maps.newHashMap();
++                World bukkitWorld = Bukkit.getWorld(worldName);
++                if (bukkitWorld == null) {
++                    sender.sendMessage(text("Could not load world for " + worldName + ". Please select a valid world.", RED));
++                    sender.sendMessage(text("Usage: /paper entity list [filter] [worldName]", RED));
++                    return;
++                }
++                ServerLevel world = ((CraftWorld) Bukkit.getWorld(worldName)).getHandle();
++
++                Map<ResourceLocation, Integer> nonEntityTicking = Maps.newHashMap();
++                ServerChunkCache chunkProviderServer = world.getChunkSource();
++
++                world.getAllEntities().forEach(e -> {
++                    ResourceLocation key = EntityType.getKey(e.getType());
++
++                    MutablePair<Integer, Map<ChunkPos, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
++                    ChunkPos chunk = e.chunkPosition();
++                    info.left++;
++                    info.right.put(chunk, info.right.getOrDefault(chunk, 0) + 1);
++                    if (!chunkProviderServer.isPositionTicking(e)) {
++                        nonEntityTicking.merge(key, Integer.valueOf(1), Integer::sum);
++                    }
++                });
++
++                if (names.size() == 1) {
++                    ResourceLocation name = names.iterator().next();
++                    Pair<Integer, Map<ChunkPos, Integer>> info = list.get(name);
++                    int nonTicking = nonEntityTicking.getOrDefault(name, Integer.valueOf(0)).intValue();
++                    if (info == null) {
++                        sender.sendMessage(text("No entities found.", RED));
++                        return;
++                    }
++                    sender.sendMessage("Entity: " + name + " Total Ticking: " + (info.getLeft() - nonTicking) + ", Total Non-Ticking: " + nonTicking);
++                    info.getRight().entrySet().stream()
++                            .sorted((a, b) -> !a.getValue().equals(b.getValue()) ? b.getValue() - a.getValue() : a.getKey().toString().compareTo(b.getKey().toString()))
++                            .limit(10).forEach(e -> sender.sendMessage("  " + e.getValue() + ": " + e.getKey().x + ", " + e.getKey().z + (chunkProviderServer.isPositionTicking(e.getKey().toLong()) ? " (Ticking)" : " (Non-Ticking)")));
++                } else {
++                    List<Pair<ResourceLocation, Integer>> info = list.entrySet().stream()
++                            .filter(e -> names.contains(e.getKey()))
++                            .map(e -> Pair.of(e.getKey(), e.getValue().left))
++                            .sorted((a, b) -> !a.getRight().equals(b.getRight()) ? b.getRight() - a.getRight() : a.getKey().toString().compareTo(b.getKey().toString()))
++                            .collect(Collectors.toList());
++
++                    if (info == null || info.size() == 0) {
++                        sender.sendMessage(text("No entities found.", RED));
++                        return;
++                    }
++
++                    int count = info.stream().mapToInt(Pair::getRight).sum();
++                    int nonTickingCount = nonEntityTicking.values().stream().mapToInt(Integer::intValue).sum();
++                    sender.sendMessage("Total Ticking: " + (count - nonTickingCount) + ", Total Non-Ticking: " + nonTickingCount);
++                    info.forEach(e -> {
++                        int nonTicking = nonEntityTicking.getOrDefault(e.getKey(), Integer.valueOf(0)).intValue();
++                        sender.sendMessage("  " + (e.getValue() - nonTicking) + " (" + nonTicking + ") " + ": " + e.getKey());
++                    });
++                    sender.sendMessage("* First number is ticking entities, second number is non-ticking entities");
++                }
++                break;
++        }
++    }
++
++    private void dumpHeap(CommandSender sender) {
++        java.nio.file.Path dir = java.nio.file.Paths.get("./dumps");
++        String name = "heap-dump-" + DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss").format(LocalDateTime.now());
++
++        Command.broadcastCommandMessage(sender, text("Writing JVM heap data...", YELLOW));
++
++        java.nio.file.Path file = CraftServer.dumpHeap(dir, name);
++        if (file != null) {
++            Command.broadcastCommandMessage(sender, text("Heap dump saved to " + file, GREEN));
++        } else {
++            Command.broadcastCommandMessage(sender, text("Failed to write heap dump, see server log for details", RED));
++        }
++    }
++
++    private void doReload(CommandSender sender) {
++        Command.broadcastCommandMessage(sender, text("Please note that this command is not supported and may cause issues.", RED));
++        Command.broadcastCommandMessage(sender, text("If you encounter any issues please use the /stop command to restart your server.", RED));
++
++        MinecraftServer console = MinecraftServer.getServer();
++        com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings"));
++        for (ServerLevel world : console.getAllLevels()) {
++            world.paperConfig.init();
++        }
++        console.server.reloadCount++;
++
++        Command.broadcastCommandMessage(sender, text("Paper config reload complete.", GREEN));
++    }
++}
diff --git a/patches/server/0009-Not-implemeneted.patch b/patches/server/0010-Not-implemeneted.patch
index 8820930234..8820930234 100644
--- a/patches/server/0009-Not-implemeneted.patch
+++ b/patches/server/0010-Not-implemeneted.patch
diff --git a/patches/server/0010-Paper-Metrics.patch b/patches/server/0011-Paper-Metrics.patch
index f84c4495fd..9d3f659bbc 100644
--- a/patches/server/0010-Paper-Metrics.patch
+++ b/patches/server/0011-Paper-Metrics.patch
@@ -690,7 +690,7 @@ index 0000000000000000000000000000000000000000..e3b74dbdf8e14219a56fab939f3174e0
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 15927e8b747e536a5136d9b59edc8d6f50354c42..64511d966043ca5a3c2b8588ef387ea37bf2de93 100644
+index c1eb4201ecb0541c606ef0d05b828ae9c87c8a2c..52e9dca37dab4cacdded3b084c40d4dd75182bb5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -42,6 +42,7 @@ public class PaperConfig {
diff --git a/patches/server/0011-Timings-v2.patch b/patches/server/0012-Timings-v2.patch
index e9e05e9499..5c25b37c87 100644
--- a/patches/server/0011-Timings-v2.patch
+++ b/patches/server/0012-Timings-v2.patch
@@ -163,10 +163,10 @@ index 0000000000000000000000000000000000000000..b47b7dce26805badd422c1867733ff4b
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..ee72086b2dee2bd6415803e77825b2b1cb83cd3d
+index 0000000000000000000000000000000000000000..4092a227a540a1c5cfb95efcc2a36e049b9a979c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -0,0 +1,383 @@
+@@ -0,0 +1,384 @@
 +/*
 + * This file is licensed under the MIT License (MIT).
 + *
@@ -193,14 +193,15 @@ index 0000000000000000000000000000000000000000..ee72086b2dee2bd6415803e77825b2b1
 +package co.aikar.timings;
 +
 +import com.google.common.collect.Sets;
++import io.papermc.paper.adventure.PaperAdventure;
++import net.kyori.adventure.text.format.NamedTextColor;
++import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 +import net.minecraft.server.MinecraftServer;
 +import org.apache.commons.lang.StringUtils;
 +import org.bukkit.Bukkit;
-+import org.bukkit.ChatColor;
 +import org.bukkit.Material;
 +import org.bukkit.configuration.ConfigurationSection;
 +import org.bukkit.configuration.MemorySection;
-+import org.bukkit.craftbukkit.util.CraftChatMessage;
 +import org.bukkit.entity.EntityType;
 +import org.json.simple.JSONObject;
 +import org.json.simple.JSONValue;
@@ -230,6 +231,7 @@ index 0000000000000000000000000000000000000000..ee72086b2dee2bd6415803e77825b2b1
 +import static co.aikar.util.JSONUtil.toArray;
 +import static co.aikar.util.JSONUtil.toArrayMapper;
 +import static co.aikar.util.JSONUtil.toObjectMapper;
++import static net.kyori.adventure.text.Component.text;
 +
 +@SuppressWarnings({"rawtypes", "SuppressionAnnotation"})
 +public class TimingsExport extends Thread {
@@ -260,17 +262,17 @@ index 0000000000000000000000000000000000000000..ee72086b2dee2bd6415803e77825b2b1
 +        long now = System.currentTimeMillis();
 +        final long lastReportDiff = now - lastReport;
 +        if (lastReportDiff < 60000) {
-+            listeners.sendMessage(ChatColor.RED + "Please wait at least 1 minute in between Timings reports. (" + (int)((60000 - lastReportDiff) / 1000) + " seconds)");
++            listeners.sendMessage(text("Please wait at least 1 minute in between Timings reports. (" + (int)((60000 - lastReportDiff) / 1000) + " seconds)", NamedTextColor.RED));
 +            listeners.done();
 +            return;
 +        }
 +        final long lastStartDiff = now - TimingsManager.timingStart;
 +        if (lastStartDiff < 180000) {
-+            listeners.sendMessage(ChatColor.RED + "Please wait at least 3 minutes before generating a Timings report. Unlike Timings v1, v2 benefits from longer timings and is not as useful with short timings. (" + (int)((180000 - lastStartDiff) / 1000) + " seconds)");
++            listeners.sendMessage(text("Please wait at least 3 minutes before generating a Timings report. Unlike Timings v1, v2 benefits from longer timings and is not as useful with short timings. (" + (int)((180000 - lastStartDiff) / 1000) + " seconds)", NamedTextColor.RED));
 +            listeners.done();
 +            return;
 +        }
-+        listeners.sendMessage(ChatColor.GREEN + "Preparing Timings Report...");
++        listeners.sendMessage(text("Preparing Timings Report...", NamedTextColor.GREEN));
 +        lastReport = now;
 +        Map parent = createObject(
 +            // Get some basic system details about the server
@@ -281,7 +283,7 @@ index 0000000000000000000000000000000000000000..ee72086b2dee2bd6415803e77825b2b1
 +            pair("online-mode", Bukkit.getServer().getOnlineMode()),
 +            pair("sampletime", (System.currentTimeMillis() - TimingsManager.timingStart) / 1000),
 +            pair("datapacks", toArrayMapper(MinecraftServer.getServer().getPackRepository().getSelectedPacks(), pack -> {
-+                return ChatColor.stripColor(CraftChatMessage.fromComponent(pack.getChatLink(true)));
++                return PlainTextComponentSerializer.plainText().serialize(PaperAdventure.asAdventure(pack.getChatLink(true)));
 +            }))
 +        );
 +        if (!TimingsManager.privacy) {
@@ -500,9 +502,8 @@ index 0000000000000000000000000000000000000000..ee72086b2dee2bd6415803e77825b2b1
 +            response = getResponse(con);
 +
 +            if (con.getResponseCode() != 302) {
-+                listeners.sendMessage(
-+                    ChatColor.RED + "Upload Error: " + con.getResponseCode() + ": " + con.getResponseMessage());
-+                listeners.sendMessage(ChatColor.RED + "Check your logs for more information");
++                listeners.sendMessage(text( "Upload Error: " + con.getResponseCode() + ": " + con.getResponseMessage(), NamedTextColor.RED));
++                listeners.sendMessage(text("Check your logs for more information", NamedTextColor.RED));
 +                if (response != null) {
 +                    Bukkit.getLogger().log(Level.SEVERE, response);
 +                }
@@ -510,13 +511,13 @@ index 0000000000000000000000000000000000000000..ee72086b2dee2bd6415803e77825b2b1
 +            }
 +
 +            timingsURL = con.getHeaderField("Location");
-+            listeners.sendMessage(ChatColor.GREEN + "View Timings Report: " + timingsURL);
++            listeners.sendMessage(text("View Timings Report: " + timingsURL, NamedTextColor.GREEN));
 +
 +            if (response != null && !response.isEmpty()) {
 +                Bukkit.getLogger().log(Level.INFO, "Timing Response: " + response);
 +            }
 +        } catch (IOException ex) {
-+            listeners.sendMessage(ChatColor.RED + "Error uploading timings, check your logs for more information");
++            listeners.sendMessage(text("Error uploading timings, check your logs for more information", NamedTextColor.RED));
 +            if (response != null) {
 +                Bukkit.getLogger().log(Level.SEVERE, response);
 +            }
@@ -540,7 +541,7 @@ index 0000000000000000000000000000000000000000..ee72086b2dee2bd6415803e77825b2b1
 +            return bos.toString();
 +
 +        } catch (IOException ex) {
-+            listeners.sendMessage(ChatColor.RED + "Error uploading timings, check your logs for more information");
++            listeners.sendMessage(text("Error uploading timings, check your logs for more information", NamedTextColor.RED));
 +            Bukkit.getLogger().log(Level.WARNING, con.getResponseMessage(), ex);
 +            return null;
 +        } finally {
@@ -1497,7 +1498,7 @@ index d790c37753f019b682fe00bea392359ba18bf204..8699a3bd63e2df83615ae39a6873d987
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c94c62e7e32f55d322ddfed930e1aaa6c1343b29..d9244b1d0ac1ae52aa9692884260cce5e2bc74bb 100644
+index c2b768c949cbf8d5e1db5a99812eb31c47194e0e..c8e59de21c1fc217068f40fc5c4c87cbfa58d329 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -139,7 +139,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
diff --git a/patches/server/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index 7057b50175..0657f70afc 100644
--- a/patches/server/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1bb8ce8e9de38a7a8342b6e8372f3e763b5d8373..70b10d1ff4433e3a487e618582577f5b39e2cec0 100644
+index 4a04536ecdeb055fd32272884f6057e5d04f1035..9a0765ea17bd8ba36427a84caf7594d010bfdf1a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -399,10 +399,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0013-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/server/0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch
index 089185b9f7..089185b9f7 100644
--- a/patches/server/0013-Configurable-cactus-bamboo-and-reed-growth-heights.patch
+++ b/patches/server/0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch
diff --git a/patches/server/0014-Configurable-baby-zombie-movement-speed.patch b/patches/server/0015-Configurable-baby-zombie-movement-speed.patch
index c9304b1dcb..c9304b1dcb 100644
--- a/patches/server/0014-Configurable-baby-zombie-movement-speed.patch
+++ b/patches/server/0015-Configurable-baby-zombie-movement-speed.patch
diff --git a/patches/server/0015-Configurable-fishing-time-ranges.patch b/patches/server/0016-Configurable-fishing-time-ranges.patch
index e9af278520..e9af278520 100644
--- a/patches/server/0015-Configurable-fishing-time-ranges.patch
+++ b/patches/server/0016-Configurable-fishing-time-ranges.patch
diff --git a/patches/server/0016-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
index c0df09cf34..c0df09cf34 100644
--- a/patches/server/0016-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
+++ b/patches/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
diff --git a/patches/server/0017-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch
index 1f45f2f1cd..1f45f2f1cd 100644
--- a/patches/server/0017-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/patches/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch
diff --git a/patches/server/0018-Allow-for-toggling-of-spawn-chunks.patch b/patches/server/0019-Allow-for-toggling-of-spawn-chunks.patch
index f3cc095d85..f3cc095d85 100644
--- a/patches/server/0018-Allow-for-toggling-of-spawn-chunks.patch
+++ b/patches/server/0019-Allow-for-toggling-of-spawn-chunks.patch
diff --git a/patches/server/0019-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/server/0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 1f376dec56..2660c701a3 100644
--- a/patches/server/0019-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/patches/server/0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -47,7 +47,7 @@ index 7e1594e8df4fd09cd1aecbc5f3784797b04a8337..26ab6d0c98560e4dfebbad3482fd3088
                  BlockPos blockposition = this.blockPosition();
                  boolean flag = this.blockState.getBlock() instanceof ConcretePowderBlock;
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 9fa752370a43f6d91c019316914a033f213e7126..1f61dcc3d6f33f69fbebaaaee0554403c3e13adf 100644
+index e24b46820394c5f220d5bf7c4e763ef95ff9e9ab..bbe15c66917781a8b6950307449f0243ffc3c8c7 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -68,6 +68,12 @@ public class PrimedTnt extends Entity {
@@ -64,7 +64,7 @@ index 9fa752370a43f6d91c019316914a033f213e7126..1f61dcc3d6f33f69fbebaaaee0554403
          if (this.onGround) {
              this.setDeltaMovement(this.getDeltaMovement().multiply(0.7D, -0.5D, 0.7D));
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java b/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
-index 01d3247501ad228882e9e0a03f964a18e051d4c4..4572a3cf0a067b64f2bd6c31139a773cddf4e872 100644
+index 3e64b1743042a293e2be9e1c16daa979b601e1ed..e430d9214d5abb367fa503e65af463f0e926563e 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
 @@ -45,6 +45,12 @@ public class MinecartTNT extends AbstractMinecart {
diff --git a/patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 2bd7fa11d2..91b78febe9 100644
--- a/patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -32,7 +32,7 @@ index f1c94ec44233ce0007a43922d1ca7ba5e71d68bd..eef07309b24e88820d35517dd868fff2
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 70b10d1ff4433e3a487e618582577f5b39e2cec0..8d60fc971875b3c9f8beb8b2a27e280a68166de9 100644
+index 9a0765ea17bd8ba36427a84caf7594d010bfdf1a..85e9d97d8a805e7b86213d3460eb62f9b4a5e7b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -246,7 +246,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
diff --git a/patches/server/0021-Implement-Paper-VersionChecker.patch b/patches/server/0022-Implement-Paper-VersionChecker.patch
index 727c5e9c9d..564e31bb38 100644
--- a/patches/server/0021-Implement-Paper-VersionChecker.patch
+++ b/patches/server/0022-Implement-Paper-VersionChecker.patch
@@ -140,7 +140,7 @@ index 0000000000000000000000000000000000000000..351159bbdb0c8045f4983f54dee34430
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index d8a0b596e9abef83c9ffc851f45cce4fe6e50b2f..0bfbb84004381940af6cfade3eb95c292d51d398 100644
+index 6c5dfff9616cf6bbfc09471a3a81059acb4ffcbb..a47f81c690b9d2a63c21f126ca2727a1d23e626c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -421,6 +421,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0022-Add-version-history-to-version-command.patch b/patches/server/0023-Add-version-history-to-version-command.patch
index 442f727387..55eed6ba0b 100644
--- a/patches/server/0022-Add-version-history-to-version-command.patch
+++ b/patches/server/0023-Add-version-history-to-version-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add version history to version command
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 91d7afc710a2d52b4f429e0381cf64176ecb6415..ece77f5ea4b14bbed7c070131b3251ea86764538 100644
+index 351159bbdb0c8045f4983f54dee34430dbcc423e..bf42969859545a8a520923ef1836ffa4a5cc24a0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 @@ -7,6 +7,8 @@ import com.google.gson.*;
diff --git a/patches/server/0023-Player-affects-spawning-API.patch b/patches/server/0024-Player-affects-spawning-API.patch
index 1dd22a2c37..1dd22a2c37 100644
--- a/patches/server/0023-Player-affects-spawning-API.patch
+++ b/patches/server/0024-Player-affects-spawning-API.patch
diff --git a/patches/server/0024-Further-improve-server-tick-loop.patch b/patches/server/0025-Further-improve-server-tick-loop.patch
index 2c05bacc5d..f250adfc3e 100644
--- a/patches/server/0024-Further-improve-server-tick-loop.patch
+++ b/patches/server/0025-Further-improve-server-tick-loop.patch
@@ -144,7 +144,7 @@ index eef07309b24e88820d35517dd868fff25f777262..e26818bd6fb2216ab9b363affe99e4b6
                      this.startMetricsRecordingTick();
                      this.profiler.push("tick");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8d60fc971875b3c9f8beb8b2a27e280a68166de9..6a47b5d48f178822bf49740b5cef03e237dfc056 100644
+index 85e9d97d8a805e7b86213d3460eb62f9b4a5e7b4..ec97233239d38b3e7b4256eb4e5d5f5c28b904c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2385,6 +2385,17 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0025-Only-refresh-abilities-if-needed.patch b/patches/server/0026-Only-refresh-abilities-if-needed.patch
index ec23ed75e9..ec23ed75e9 100644
--- a/patches/server/0025-Only-refresh-abilities-if-needed.patch
+++ b/patches/server/0026-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0026-Entity-Origin-API.patch b/patches/server/0027-Entity-Origin-API.patch
index aa7ec87a1c..4353084dbe 100644
--- a/patches/server/0026-Entity-Origin-API.patch
+++ b/patches/server/0027-Entity-Origin-API.patch
@@ -113,7 +113,7 @@ index 26ab6d0c98560e4dfebbad3482fd308861818e30..242e02646b8584a8d2a512374ad03729
  
      public void setHurtsEntities(float fallHurtAmount, int fallHurtMax) {
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 1f61dcc3d6f33f69fbebaaaee0554403c3e13adf..7135e22a2ee274eaef52804d60f15002176ff1db 100644
+index bbe15c66917781a8b6950307449f0243ffc3c8c7..dfcca1fac06de7a4be9be3c238a738a0599fcd24 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -120,6 +120,14 @@ public class PrimedTnt extends Entity {
diff --git a/patches/server/0027-Prevent-tile-entity-and-entity-crashes.patch b/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch
index ee6101afaf..ee6101afaf 100644
--- a/patches/server/0027-Prevent-tile-entity-and-entity-crashes.patch
+++ b/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch
diff --git a/patches/server/0028-Configurable-top-of-nether-void-damage.patch b/patches/server/0029-Configurable-top-of-nether-void-damage.patch
index 681cbe3812..04abd015ab 100644
--- a/patches/server/0028-Configurable-top-of-nether-void-damage.patch
+++ b/patches/server/0029-Configurable-top-of-nether-void-damage.patch
@@ -29,7 +29,7 @@ index 70bcd7cae2777c2c7fbf995b8783ece31d9349e5..0ba54e24944c9e30bc06dc2556e9c856
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ac540cacc1858697b54950e86e84efbff54e07a1..e9b8d4add28a8ba11eae057740c0cf057e414da2 100644
+index ae6c1abe1443f3758fce35a20387f0ed93748af5..2f35ce076a468ac260e28ba90ac55f7717ee1b13 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -648,7 +648,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0029-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch
index 64f713e616..64f713e616 100644
--- a/patches/server/0029-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0030-Always-tick-falling-blocks.patch b/patches/server/0031-Always-tick-falling-blocks.patch
index c52ac50408..c52ac50408 100644
--- a/patches/server/0030-Always-tick-falling-blocks.patch
+++ b/patches/server/0031-Always-tick-falling-blocks.patch
diff --git a/patches/server/0031-Configurable-end-credits.patch b/patches/server/0032-Configurable-end-credits.patch
index 32316f03ed..f5e0bd7c52 100644
--- a/patches/server/0031-Configurable-end-credits.patch
+++ b/patches/server/0032-Configurable-end-credits.patch
@@ -20,7 +20,7 @@ index 0ba54e24944c9e30bc06dc2556e9c856d2b335bc..cb6add86fadcb4684ed917a8b05ada84
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a29450df13bc32d5bc700a944541793a696a94d2..58943b2c2cb416753c60ca5cd4445911ab98eeb6 100644
+index d4d444b5864073fe86bfc7b5a68344b5aae8c05f..726c5f4ef0ad083d18b23990f1f7b61e3866290c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -980,6 +980,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0032-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch
index 1e41454268..1e41454268 100644
--- a/patches/server/0032-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch
diff --git a/patches/server/0033-Optimize-explosions.patch b/patches/server/0034-Optimize-explosions.patch
index 2a3b7b10f2..2a3b7b10f2 100644
--- a/patches/server/0033-Optimize-explosions.patch
+++ b/patches/server/0034-Optimize-explosions.patch
diff --git a/patches/server/0034-Disable-explosion-knockback.patch b/patches/server/0035-Disable-explosion-knockback.patch
index 1a5a11cfe6..661cf59ddd 100644
--- a/patches/server/0034-Disable-explosion-knockback.patch
+++ b/patches/server/0035-Disable-explosion-knockback.patch
@@ -19,7 +19,7 @@ index e4873fa644790d6d1db0160688123fc5a60d0bb0..230f89329c31a65813b25addb4f6552e
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d9244b1d0ac1ae52aa9692884260cce5e2bc74bb..4ec047456f45bfceb9ba7a249a0fc0774e20b126 100644
+index c8e59de21c1fc217068f40fc5c4c87cbfa58d329..91579d3ead3900ed6ff5b050f80ae031b141c24d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1376,6 +1376,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0035-Disable-thunder.patch b/patches/server/0036-Disable-thunder.patch
index 8966f656cd..8966f656cd 100644
--- a/patches/server/0035-Disable-thunder.patch
+++ b/patches/server/0036-Disable-thunder.patch
diff --git a/patches/server/0036-Disable-ice-and-snow.patch b/patches/server/0037-Disable-ice-and-snow.patch
index 2cdf33a325..2cdf33a325 100644
--- a/patches/server/0036-Disable-ice-and-snow.patch
+++ b/patches/server/0037-Disable-ice-and-snow.patch
diff --git a/patches/server/0037-Configurable-mob-spawner-tick-rate.patch b/patches/server/0038-Configurable-mob-spawner-tick-rate.patch
index d5a4f20fd6..d5a4f20fd6 100644
--- a/patches/server/0037-Configurable-mob-spawner-tick-rate.patch
+++ b/patches/server/0038-Configurable-mob-spawner-tick-rate.patch
diff --git a/patches/server/0038-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0039-Implement-PlayerLocaleChangeEvent.patch
index 0708928324..0708928324 100644
--- a/patches/server/0038-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0039-Implement-PlayerLocaleChangeEvent.patch
diff --git a/patches/server/0039-Per-Player-View-Distance-API-placeholders.patch b/patches/server/0040-Per-Player-View-Distance-API-placeholders.patch
index 2b3d9ed383..2b3d9ed383 100644
--- a/patches/server/0039-Per-Player-View-Distance-API-placeholders.patch
+++ b/patches/server/0040-Per-Player-View-Distance-API-placeholders.patch
diff --git a/patches/server/0040-Add-BeaconEffectEvent.patch b/patches/server/0041-Add-BeaconEffectEvent.patch
index 8eb9548fe5..8eb9548fe5 100644
--- a/patches/server/0040-Add-BeaconEffectEvent.patch
+++ b/patches/server/0041-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0041-Configurable-container-update-tick-rate.patch b/patches/server/0042-Configurable-container-update-tick-rate.patch
index f6189d11eb..105be8fe5e 100644
--- a/patches/server/0041-Configurable-container-update-tick-rate.patch
+++ b/patches/server/0042-Configurable-container-update-tick-rate.patch
@@ -19,7 +19,7 @@ index 6b527d72309a38eec35de5d8d30a9def9f6df783..421e51892ca431409b9b52e7901ca42c
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a2227d2b29f2f78d0b7fc8f0650f107b51ca97fc..948d42f77b7c284e53f9d90f8e51fbf2b906732a 100644
+index e8cda0032a6c80e939d24be190507cba006a0280..8eb9a96e879a28841fcc338ff5c90f86908414bc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -219,6 +219,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0042-Use-UserCache-for-player-heads.patch b/patches/server/0043-Use-UserCache-for-player-heads.patch
index 2381324116..2381324116 100644
--- a/patches/server/0042-Use-UserCache-for-player-heads.patch
+++ b/patches/server/0043-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0043-Disable-spigot-tick-limiters.patch b/patches/server/0044-Disable-spigot-tick-limiters.patch
index e562468965..e562468965 100644
--- a/patches/server/0043-Disable-spigot-tick-limiters.patch
+++ b/patches/server/0044-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0044-Add-PlayerInitialSpawnEvent.patch b/patches/server/0045-Add-PlayerInitialSpawnEvent.patch
index d685e6d5c0..de6c87d154 100644
--- a/patches/server/0044-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/server/0045-Add-PlayerInitialSpawnEvent.patch
@@ -9,7 +9,7 @@ This is a duplicate API from spigot, so use our duplicate subclass and
 improve setPosition to use raw
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index bfec1beb0af39e2af6be7c6423bf1eaab32e1062..8e331babd8fdeba77aa3707b7e2e08591fa0d546 100644
+index 5d7298a045ea827a5530faee62061d0f4ea34e2b..68835bcd519e41808669df51c0a9b04aa21727cb 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -217,7 +217,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0045-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch
index a890564ea6..a890564ea6 100644
--- a/patches/server/0045-Configurable-Disabling-Cat-Chest-Detection.patch
+++ b/patches/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/0046-Ensure-commands-are-not-ran-async.patch b/patches/server/0047-Ensure-commands-are-not-ran-async.patch
index 7cc0be9b0f..361a7c1a18 100644
--- a/patches/server/0046-Ensure-commands-are-not-ran-async.patch
+++ b/patches/server/0047-Ensure-commands-are-not-ran-async.patch
@@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5a321df55ce16c20d7235bea630058b3aa390475..44039e85bbb53e7bf89f9572c29c21fb4b147cc7 100644
+index 628ae2171c42d04b418001bf542e25ebe12bb18e..f20233b5b6afd0fd5cc824094eab3bd8b780da29 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1872,6 +1872,29 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -48,7 +48,7 @@ index 5a321df55ce16c20d7235bea630058b3aa390475..44039e85bbb53e7bf89f9572c29c21fb
          } else if (this.player.getChatVisibility() == ChatVisiblity.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6a47b5d48f178822bf49740b5cef03e237dfc056..51e3c23a43309155730b6d19bc90943d666ca81e 100644
+index ec97233239d38b3e7b4256eb4e5d5f5c28b904c4..7a3017c13405acebc1c8519855fc84a44323289d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -857,6 +857,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0047-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch
index ae1354d496..ae1354d496 100644
--- a/patches/server/0047-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/patches/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch
diff --git a/patches/server/0048-Expose-server-CommandMap.patch b/patches/server/0049-Expose-server-CommandMap.patch
index 240018b7a0..47f5b6e772 100644
--- a/patches/server/0048-Expose-server-CommandMap.patch
+++ b/patches/server/0049-Expose-server-CommandMap.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 51e3c23a43309155730b6d19bc90943d666ca81e..304e532bfd1e9e9417e8a3171e4c29a289dbc3da 100644
+index 7a3017c13405acebc1c8519855fc84a44323289d..5ed1c47fd7725ffc148bd2e21275f690fab9a6fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1975,6 +1975,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
index edd16859a7..edd16859a7 100644
--- a/patches/server/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/patches/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0050-Ensure-inv-drag-is-in-bounds.patch b/patches/server/0051-Ensure-inv-drag-is-in-bounds.patch
index 942b4ab775..0616b53169 100644
--- a/patches/server/0050-Ensure-inv-drag-is-in-bounds.patch
+++ b/patches/server/0051-Ensure-inv-drag-is-in-bounds.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure inv drag is in bounds
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 3c00795a4196de1429e7086b0f9cbf9671726b07..52f890fb91041757e6b8cba8831c890cbe9e111d 100644
+index fc8c3798643c1a8cf29298f02c8ec057b950a2fc..eecb852e4946c774ad295c53dbd904571262055a 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -418,7 +418,7 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0051-Player-Tab-List-and-Title-APIs.patch b/patches/server/0052-Player-Tab-List-and-Title-APIs.patch
index 174f8a7532..14ebb4ed82 100644
--- a/patches/server/0051-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/server/0052-Player-Tab-List-and-Title-APIs.patch
@@ -63,7 +63,7 @@ index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a4
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c5630c292dbcdd8b1c0fcf149df888707a550846..69182e10af84315cae3cc842c26ca3ff0feb8794 100644
+index 34b2b30ba5bf1f163ed647db1ea75e57323fb042..0f04ae8e52f8dca80cfa71b2162a4c477dc0c4db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0052-Add-configurable-portal-search-radius.patch b/patches/server/0053-Add-configurable-portal-search-radius.patch
index a98ccdfccf..a98ccdfccf 100644
--- a/patches/server/0052-Add-configurable-portal-search-radius.patch
+++ b/patches/server/0053-Add-configurable-portal-search-radius.patch
diff --git a/patches/server/0053-Add-velocity-warnings.patch b/patches/server/0054-Add-velocity-warnings.patch
index a2b3504290..6104cabba8 100644
--- a/patches/server/0053-Add-velocity-warnings.patch
+++ b/patches/server/0054-Add-velocity-warnings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 304e532bfd1e9e9417e8a3171e4c29a289dbc3da..f3d0cf0f3d5458e587a3da724bee05acacf10594 100644
+index 5ed1c47fd7725ffc148bd2e21275f690fab9a6fe..139c681d379f65f7ef591a3c84042d75f541b847 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -279,6 +279,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0054-Configurable-inter-world-teleportation-safety.patch b/patches/server/0055-Configurable-inter-world-teleportation-safety.patch
index ae13130ff8..ae13130ff8 100644
--- a/patches/server/0054-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/server/0055-Configurable-inter-world-teleportation-safety.patch
diff --git a/patches/server/0055-Add-exception-reporting-event.patch b/patches/server/0056-Add-exception-reporting-event.patch
index 119710f7ae..119710f7ae 100644
--- a/patches/server/0055-Add-exception-reporting-event.patch
+++ b/patches/server/0056-Add-exception-reporting-event.patch
diff --git a/patches/server/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index c569f0e66c..c569f0e66c 100644
--- a/patches/server/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
diff --git a/patches/server/0057-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch
index 46252c2108..af829fefed 100644
--- a/patches/server/0057-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch
@@ -37,7 +37,7 @@ index 4329563bccfefe5d56c12d0fa341f1ffd4ce22a1..79dddb060d967303be70b690df83c3b2
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4ec047456f45bfceb9ba7a249a0fc0774e20b126..3bdc374b604ef1edb4e2925bef5a9586d4d8346a 100644
+index 91579d3ead3900ed6ff5b050f80ae031b141c24d..cb7cccee34e897195d0a258ba6623b75e797ee7c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -800,6 +800,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index b73f1a823f..b73f1a823f 100644
--- a/patches/server/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0059-Chunk-Save-Reattempt.patch b/patches/server/0060-Chunk-Save-Reattempt.patch
index 82a269b220..82a269b220 100644
--- a/patches/server/0059-Chunk-Save-Reattempt.patch
+++ b/patches/server/0060-Chunk-Save-Reattempt.patch
diff --git a/patches/server/0060-Complete-resource-pack-API.patch b/patches/server/0061-Complete-resource-pack-API.patch
index 73848d7b36..73848d7b36 100644
--- a/patches/server/0060-Complete-resource-pack-API.patch
+++ b/patches/server/0061-Complete-resource-pack-API.patch
diff --git a/patches/server/0061-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0062-Default-loading-permissions.yml-before-plugins.patch
index 5ba4c19c83..ef011f95cc 100644
--- a/patches/server/0061-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/server/0062-Default-loading-permissions.yml-before-plugins.patch
@@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 11e703e8e78fb49a5f53bdbc20d62422b573ae55..364f9196fb89a6e1bb9cd892971b486205b0c631 100644
+index 7bbcee19248933f67fd40f46db43363890593c73..16707c734f33f6080875e5e3ea338affe2d2fa0c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -234,4 +234,9 @@ public class PaperConfig {
@@ -30,7 +30,7 @@ index 11e703e8e78fb49a5f53bdbc20d62422b573ae55..364f9196fb89a6e1bb9cd892971b4862
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f3d0cf0f3d5458e587a3da724bee05acacf10594..68ccd0b0797b77c1238aaa2cfed5823f08af9857 100644
+index 139c681d379f65f7ef591a3c84042d75f541b847..1ef1d0d9341ab8c633d3899336a990688b7f79dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -456,6 +456,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0062-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch
index 6234cbab6d..2e69a099b6 100644
--- a/patches/server/0062-Allow-Reloading-of-Custom-Permissions.patch
+++ b/patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 68ccd0b0797b77c1238aaa2cfed5823f08af9857..7b7669eea3e86cde007be324e8c567c292c1ebda 100644
+index 1ef1d0d9341ab8c633d3899336a990688b7f79dd..d317d6853e2b129e9b638f4e76b383f0d53d3cf7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2515,5 +2515,23 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0063-Remove-Metadata-on-reload.patch b/patches/server/0064-Remove-Metadata-on-reload.patch
index ec4b45e7db..dfc35537ae 100644
--- a/patches/server/0063-Remove-Metadata-on-reload.patch
+++ b/patches/server/0064-Remove-Metadata-on-reload.patch
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7b7669eea3e86cde007be324e8c567c292c1ebda..d09b9dfdfea5848dcb60ad05d4399b5ed871a795 100644
+index d317d6853e2b129e9b638f4e76b383f0d53d3cf7..83cb2762b9dc078602fd94852da847220c3190d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -945,8 +945,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0064-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch
index 00d853415e..00d853415e 100644
--- a/patches/server/0064-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch
diff --git a/patches/server/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index ba0480b581..ba0480b581 100644
--- a/patches/server/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/patches/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch
diff --git a/patches/server/0066-Add-World-Util-Methods.patch b/patches/server/0067-Add-World-Util-Methods.patch
index e777866fe1..e777866fe1 100644
--- a/patches/server/0066-Add-World-Util-Methods.patch
+++ b/patches/server/0067-Add-World-Util-Methods.patch
diff --git a/patches/server/0067-Custom-replacement-for-eaten-items.patch b/patches/server/0068-Custom-replacement-for-eaten-items.patch
index 1bd6dd4cf5..93d941e6ae 100644
--- a/patches/server/0067-Custom-replacement-for-eaten-items.patch
+++ b/patches/server/0068-Custom-replacement-for-eaten-items.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3bdc374b604ef1edb4e2925bef5a9586d4d8346a..f364978ff256aecb078cca2b6c3fd433d9a4820b 100644
+index cb7cccee34e897195d0a258ba6623b75e797ee7c..c5a24e50b4314b2eae63c50a6575ab3ba8165ef8 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3552,9 +3552,10 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index c604730c4d..c5021f6903 100644
--- a/patches/server/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f364978ff256aecb078cca2b6c3fd433d9a4820b..5f7a16651a0ca5497b20d8723e9c170506668267 100644
+index c5a24e50b4314b2eae63c50a6575ab3ba8165ef8..c358c3d20669a9063439cee4a77555b5aa43bbf2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -761,7 +761,13 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0069-Use-a-Shared-Random-for-Entities.patch b/patches/server/0070-Use-a-Shared-Random-for-Entities.patch
index 81647eb019..0fda7a051f 100644
--- a/patches/server/0069-Use-a-Shared-Random-for-Entities.patch
+++ b/patches/server/0070-Use-a-Shared-Random-for-Entities.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 68a1756e5a259fd1165d51835890127e0416dfd6..d400b612557cfc976e9644a740be94757e0d20bb 100644
+index 79dddb060d967303be70b690df83c3b2a2b1f67e..f35f6221f839504329f0d87c417ad40ad68bc178 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -155,6 +155,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0070-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch
index 33b3079a12..33b3079a12 100644
--- a/patches/server/0070-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch
diff --git a/patches/server/0071-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index b930154132..034d5f424e 100644
--- a/patches/server/0071-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
@@ -88,7 +88,7 @@ index 82a4f5fb84884d229d258134fbfe62d34ad30d80..37e7f766e0de7b47c7240c9365bb134f
      @Override
      public FluidState getFluidState(BlockPos pos) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 108c7ec010f826f9b9bb2db0987d2bcc18266482..aa8524af06132096cf593614301cde6a814ff41f 100644
+index 7a63c26e360fd054bf237df3eeffc466d73d5dfb..8a1084318f271dd64842c9243166eb89764660d4 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -288,12 +288,29 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index 5c42084c66..5c42084c66 100644
--- a/patches/server/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
diff --git a/patches/server/0073-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch
index e1a15a5613..e1a15a5613 100644
--- a/patches/server/0073-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/server/0074-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0075-Configurable-Chunk-Inhabited-Time.patch
index 4d37e8c5ad..37974144ec 100644
--- a/patches/server/0074-Configurable-Chunk-Inhabited-Time.patch
+++ b/patches/server/0075-Configurable-Chunk-Inhabited-Time.patch
@@ -30,7 +30,7 @@ index 1162490776712755dad0ec25b40a1420c0a01488..1471965911d9fd3bfad9c4d85607c02e
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index aa8524af06132096cf593614301cde6a814ff41f..7b964beaaa66ac1c8b20dd7bda665ee30ca61b98 100644
+index 8a1084318f271dd64842c9243166eb89764660d4..e2ecbd60ed5200589313d767a17600dca1231931 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -281,6 +281,13 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0075-EntityPathfindEvent.patch b/patches/server/0076-EntityPathfindEvent.patch
index 44aaa32494..44aaa32494 100644
--- a/patches/server/0075-EntityPathfindEvent.patch
+++ b/patches/server/0076-EntityPathfindEvent.patch
diff --git a/patches/server/0076-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch
index 0ee9a6d085..5745095f53 100644
--- a/patches/server/0076-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -11,7 +11,7 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 364f9196fb89a6e1bb9cd892971b486205b0c631..30abe81164347134c7fa1f16e9e1f2537377a079 100644
+index 16707c734f33f6080875e5e3ea338affe2d2fa0c..584d3a0f839cbcb6b3161f695c7f7d4869d04577 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -239,4 +239,9 @@ public class PaperConfig {
diff --git a/patches/server/0077-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0078-Do-not-load-chunks-for-Pathfinding.patch
index 0a002dd1f7..0a002dd1f7 100644
--- a/patches/server/0077-Do-not-load-chunks-for-Pathfinding.patch
+++ b/patches/server/0078-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0078-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch
index 14d27d6671..a6ead0838e 100644
--- a/patches/server/0078-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch
@@ -20,7 +20,7 @@ index 8834ed411a7db86b4d2b88183a1315317107d719..c45b5ab6776f3ac79f856c3a6467c510
      static final ServerboundInteractPacket.Action ATTACK_ACTION = new ServerboundInteractPacket.Action() {
          @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1ff86d507700ac39752efcbfbbc9b29dcbeb1fc1..2dbccb6320374acd90f85e4ee06dbad6cbf0650d 100644
+index 3c1ba48beeac8793c05055da4525b084adefa4c0..df741167eb98645aaf60616a7bfc5e1f0cb7c824 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2220,8 +2220,37 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0079-Configurable-Grass-Spread-Tick-Rate.patch b/patches/server/0080-Configurable-Grass-Spread-Tick-Rate.patch
index 7add776d6e..7add776d6e 100644
--- a/patches/server/0079-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/patches/server/0080-Configurable-Grass-Spread-Tick-Rate.patch
diff --git a/patches/server/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 9e15d02785..9e15d02785 100644
--- a/patches/server/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/patches/server/0081-Optimize-DataBits.patch b/patches/server/0082-Optimize-DataBits.patch
index e95ff4c431..e95ff4c431 100644
--- a/patches/server/0081-Optimize-DataBits.patch
+++ b/patches/server/0082-Optimize-DataBits.patch
diff --git a/patches/server/0082-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index db432de505..db432de505 100644
--- a/patches/server/0082-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/patches/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0083-Configurable-Player-Collision.patch b/patches/server/0084-Configurable-Player-Collision.patch
index 6f1dfb6005..6417e02eed 100644
--- a/patches/server/0083-Configurable-Player-Collision.patch
+++ b/patches/server/0084-Configurable-Player-Collision.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable Player Collision
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 30abe81164347134c7fa1f16e9e1f2537377a079..77a8c86103bc91c696cb4f74e8cfcf4d57ca6c10 100644
+index 584d3a0f839cbcb6b3161f695c7f7d4869d04577..ae48897bd52934d35fcb10c545ae79cc4fb57d5a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -244,4 +244,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index 30abe81164347134c7fa1f16e9e1f2537377a079..77a8c86103bc91c696cb4f74e8cfcf4d
 +    }
  }
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
-index 8993d8809c109212ab278e15c09cebab9e89342f..005a3058c51a41a39f050b1817e2079be93ad366 100644
+index 1294b38262505b0d54089e428df9b363219de1f0..c5339618c195507c1d1482e4e77e262e8db240a5 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
 @@ -193,7 +193,7 @@ public class ClientboundSetPlayerTeamPacket implements Packet<ClientGamePacketLi
@@ -65,7 +65,7 @@ index 16dbd40ab7394450fd97ced74954ae1554c79aa8..66ba45e0a3c4970df9f8b3a0b8b5cfda
          this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
          this.connection.acceptConnections();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8e331babd8fdeba77aa3707b7e2e08591fa0d546..5a7ca495a78f33e5449d47ce71dbf9b11678551f 100644
+index 68835bcd519e41808669df51c0a9b04aa21727cb..3d3e647fbfbb8007b6e7dc87808d63ca4465fc21 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -88,6 +88,7 @@ import net.minecraft.world.level.storage.PlayerDataStorage;
diff --git a/patches/server/0084-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index b501dca4d5..b501dca4d5 100644
--- a/patches/server/0084-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0085-Configurable-RCON-IP-address.patch b/patches/server/0086-Configurable-RCON-IP-address.patch
index 1dc723e8a3..1dc723e8a3 100644
--- a/patches/server/0085-Configurable-RCON-IP-address.patch
+++ b/patches/server/0086-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0086-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch
index c698f66703..6402812618 100644
--- a/patches/server/0086-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5f7a16651a0ca5497b20d8723e9c170506668267..2ce597f594142d64a239649e1b812b3b7b0af340 100644
+index c358c3d20669a9063439cee4a77555b5aa43bbf2..fdf44f109d548d36d84e77fce5aa7fce865448dd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1227,10 +1227,16 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0087-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0088-Add-ability-to-configure-frosted_ice-properties.patch
index c21cf21fdd..c21cf21fdd 100644
--- a/patches/server/0087-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/patches/server/0088-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0088-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0089-remove-null-possibility-for-getServer-singleton.patch
index 5a2e76c50e..5a2e76c50e 100644
--- a/patches/server/0088-remove-null-possibility-for-getServer-singleton.patch
+++ b/patches/server/0089-remove-null-possibility-for-getServer-singleton.patch
diff --git a/patches/server/0089-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 8a73474774..8a73474774 100644
--- a/patches/server/0089-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0090-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch
index 6c09b70158..1014b4f6f8 100644
--- a/patches/server/0090-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/patches/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -515,7 +515,7 @@ index 0000000000000000000000000000000000000000..3377b86c337d0234bbb9b0349e4034a7
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d400b612557cfc976e9644a740be94757e0d20bb..5a6aa26ee937a456ede56a9b18cf3bf58aba892d 100644
+index f35f6221f839504329f0d87c417ad40ad68bc178..20863d4294ab29c8ad851a50d03200e498843399 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -170,6 +170,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0091-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index baec7cdb36..5f9e08e9ce 100644
--- a/patches/server/0091-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 77a8c86103bc91c696cb4f74e8cfcf4d57ca6c10..fc1933160f0bc70438c40fd3c0adb5675093af07 100644
+index ae48897bd52934d35fcb10c545ae79cc4fb57d5a..46ec9016e17805664531a61a75fc046e041b0848 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -249,4 +249,9 @@ public class PaperConfig {
diff --git a/patches/server/0092-System-property-for-disabling-watchdoge.patch b/patches/server/0093-System-property-for-disabling-watchdoge.patch
index 8d880e6928..8d880e6928 100644
--- a/patches/server/0092-System-property-for-disabling-watchdoge.patch
+++ b/patches/server/0093-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0093-Async-GameProfileCache-saving.patch b/patches/server/0094-Async-GameProfileCache-saving.patch
index 40c10d3fe4..40c10d3fe4 100644
--- a/patches/server/0093-Async-GameProfileCache-saving.patch
+++ b/patches/server/0094-Async-GameProfileCache-saving.patch
diff --git a/patches/server/0094-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0095-Optional-TNT-doesn-t-move-in-water.patch
index 63f2f5d6b4..747bb69d9a 100644
--- a/patches/server/0094-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/server/0095-Optional-TNT-doesn-t-move-in-water.patch
@@ -37,7 +37,7 @@ index c9cc096183753d61d9f53ceca05af07c04bbff3b..861f3790179e18f6192ac8b2fb5d2ecb
      public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
          this.trackedPlayers = trackedPlayers;
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 7135e22a2ee274eaef52804d60f15002176ff1db..114ea3c898a23575bb2b06bf5c754330c38495e7 100644
+index dfcca1fac06de7a4be9be3c238a738a0599fcd24..445d9d1ec6f02f32d819d8555ceddb8e1ada7acd 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -97,6 +97,27 @@ public class PrimedTnt extends Entity {
diff --git a/patches/server/0095-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0096-Faster-redstone-torch-rapid-clock-removal.patch
index 2e7cf46f46..2e7cf46f46 100644
--- a/patches/server/0095-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/server/0096-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/0096-Add-server-name-parameter.patch b/patches/server/0097-Add-server-name-parameter.patch
index 4c801e60c3..4c801e60c3 100644
--- a/patches/server/0096-Add-server-name-parameter.patch
+++ b/patches/server/0097-Add-server-name-parameter.patch
diff --git a/patches/server/0097-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/patches/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index e7dc00e609..e7dc00e609 100644
--- a/patches/server/0097-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/patches/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
diff --git a/patches/server/0098-Fix-Old-Sign-Conversion.patch b/patches/server/0099-Fix-Old-Sign-Conversion.patch
index a26c037a5a..a26c037a5a 100644
--- a/patches/server/0098-Fix-Old-Sign-Conversion.patch
+++ b/patches/server/0099-Fix-Old-Sign-Conversion.patch
diff --git a/patches/server/0099-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch
index 56a2d048af..56a2d048af 100644
--- a/patches/server/0099-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0100-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index cd84d9aaf9..cd84d9aaf9 100644
--- a/patches/server/0100-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0101-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
index 3869a04b49..dfa1fd6da8 100644
--- a/patches/server/0101-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add setting for proxy online mode status
 TODO: Add isProxyOnlineMode check to Metrics
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index fc1933160f0bc70438c40fd3c0adb5675093af07..96fbac179e6970f4eeeed9fdc07c1ac1d8e8be0a 100644
+index 46ec9016e17805664531a61a75fc046e041b0848..01b1eb60894a79bd10a035404cc796ce0d3725c8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -23,6 +23,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
@@ -67,7 +67,7 @@ index b7b98832be6178a2bca534bf974519ede977b282..aa3caccc58f1cec8d5f396813d7fc40b
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d09b9dfdfea5848dcb60ad05d4399b5ed871a795..265fbc13c571bcfb7d921445a75add522ec9de52 100644
+index 83cb2762b9dc078602fd94852da847220c3190d6..a380fb3b192dea5805126f616390da52312749c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1703,7 +1703,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0102-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch
index 9a9dcd4259..a827aa97e9 100644
--- a/patches/server/0102-Optimise-BlockState-s-hashCode-equals.patch
+++ b/patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch
@@ -51,7 +51,7 @@ index c3ec7f91794d802e5b9ddac3fffccce378dace68..72f508321ebffcca31240fbdd068b4d1
              return true;
          } else if (object instanceof IntegerProperty && super.equals(object)) {
 diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/Property.java b/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
-index 0617eb280b2b7ab7558c478e0249a48f3e18e087..1d0f0099571e7295f5f83004c45b6e992a4af83a 100644
+index 5a973c1536291e79aa8377ca5bda8ef84127e20a..a37424bbc6bee02354abaa793aa0865c556c6bbe 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
 @@ -68,14 +68,7 @@ public abstract class Property<T extends Comparable<T>> {
diff --git a/patches/server/0103-Configurable-packet-in-spam-threshold.patch b/patches/server/0104-Configurable-packet-in-spam-threshold.patch
index 89048c4a54..c65c1a7c57 100644
--- a/patches/server/0103-Configurable-packet-in-spam-threshold.patch
+++ b/patches/server/0104-Configurable-packet-in-spam-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 96fbac179e6970f4eeeed9fdc07c1ac1d8e8be0a..081761cd2177bd3cea5a489a85e7088c46d12725 100644
+index 01b1eb60894a79bd10a035404cc796ce0d3725c8..77e1a4b9b0734734bbcf03b6adc1cf0552063d1f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -264,4 +264,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 96fbac179e6970f4eeeed9fdc07c1ac1d8e8be0a..081761cd2177bd3cea5a489a85e7088c
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2dbccb6320374acd90f85e4ee06dbad6cbf0650d..66fa0c05da7b5ca6a9a89b45bd796b50afe55a39 100644
+index df741167eb98645aaf60616a7bfc5e1f0cb7c824..8f0a93e16860bbd062718248b958b72d7c6db0ee 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1503,13 +1503,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0104-Configurable-flying-kick-messages.patch b/patches/server/0105-Configurable-flying-kick-messages.patch
index c2c87428cc..49de587c8c 100644
--- a/patches/server/0104-Configurable-flying-kick-messages.patch
+++ b/patches/server/0105-Configurable-flying-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 081761cd2177bd3cea5a489a85e7088c46d12725..6f36c7a233ec0335d713523e87a28ba9b5e46d88 100644
+index 77e1a4b9b0734734bbcf03b6adc1cf0552063d1f..2440e81ef23c3b8c91ca5bdf13347f13cb66f549 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -273,4 +273,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 081761cd2177bd3cea5a489a85e7088c46d12725..6f36c7a233ec0335d713523e87a28ba9
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 66fa0c05da7b5ca6a9a89b45bd796b50afe55a39..2259f6d9be2390aaa8ffc43b3c2e37b0036b43ac 100644
+index 8f0a93e16860bbd062718248b958b72d7c6db0ee..192b0fae5ef200efefeb9727a68c17e3ca962027 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -300,7 +300,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0105-Add-EntityZapEvent.patch b/patches/server/0106-Add-EntityZapEvent.patch
index f236547b74..f236547b74 100644
--- a/patches/server/0105-Add-EntityZapEvent.patch
+++ b/patches/server/0106-Add-EntityZapEvent.patch
diff --git a/patches/server/0106-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/patches/server/0107-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index b0972c4a15..b0972c4a15 100644
--- a/patches/server/0106-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/patches/server/0107-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
diff --git a/patches/server/0107-Cache-user-authenticator-threads.patch b/patches/server/0108-Cache-user-authenticator-threads.patch
index a2659f2b46..a2659f2b46 100644
--- a/patches/server/0107-Cache-user-authenticator-threads.patch
+++ b/patches/server/0108-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0108-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0109-Allow-Reloading-of-Command-Aliases.patch
index c66e8e41b3..4da1f8166d 100644
--- a/patches/server/0108-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/server/0109-Allow-Reloading-of-Command-Aliases.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 265fbc13c571bcfb7d921445a75add522ec9de52..a93cf50004a68b0648f96d2f0ff2f9e4fd65ffc4 100644
+index a380fb3b192dea5805126f616390da52312749c1..028f2e2d24a6a1eac07c04d79c44bbdfe87108cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2541,5 +2541,24 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0109-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch
index 75e2ca8d17..75e2ca8d17 100644
--- a/patches/server/0109-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0110-Add-ProjectileCollideEvent.patch b/patches/server/0111-Add-ProjectileCollideEvent.patch
index 2d50deadad..2d50deadad 100644
--- a/patches/server/0110-Add-ProjectileCollideEvent.patch
+++ b/patches/server/0111-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0111-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0112-Prevent-Pathfinding-out-of-World-Border.patch
index df13150cc1..df13150cc1 100644
--- a/patches/server/0111-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/patches/server/0112-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0112-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/server/0113-Optimize-World.isLoaded-BlockPosition-Z.patch
index c6fb2bcab4..c6fb2bcab4 100644
--- a/patches/server/0112-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/patches/server/0113-Optimize-World.isLoaded-BlockPosition-Z.patch
diff --git a/patches/server/0113-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0114-Bound-Treasure-Maps-to-World-Border.patch
index 8217544b69..8217544b69 100644
--- a/patches/server/0113-Bound-Treasure-Maps-to-World-Border.patch
+++ b/patches/server/0114-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0114-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0115-Configurable-Cartographer-Treasure-Maps.patch
index 7697c114f1..7697c114f1 100644
--- a/patches/server/0114-Configurable-Cartographer-Treasure-Maps.patch
+++ b/patches/server/0115-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0115-Optimize-ItemStack.isEmpty.patch b/patches/server/0116-Optimize-ItemStack.isEmpty.patch
index d850c3dd8e..d850c3dd8e 100644
--- a/patches/server/0115-Optimize-ItemStack.isEmpty.patch
+++ b/patches/server/0116-Optimize-ItemStack.isEmpty.patch
diff --git a/patches/server/0116-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0117-Add-API-methods-to-control-if-armour-stands-can-move.patch
index c641c7f9fa..c641c7f9fa 100644
--- a/patches/server/0116-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/server/0117-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/server/0117-String-based-Action-Bar-API.patch b/patches/server/0118-String-based-Action-Bar-API.patch
index 6fba7cf532..e5e7ffc658 100644
--- a/patches/server/0117-String-based-Action-Bar-API.patch
+++ b/patches/server/0118-String-based-Action-Bar-API.patch
@@ -26,7 +26,7 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5bfa459e4182d27aa1424d93c872511897c8706d..479f33c109258f5ddd781fc30e43ec1681095014 100644
+index 9c69ea97f00791b0757db93fa9a6a5eb03577864..cebdc80d286a5daf1fdc9329dcff4f888890f91b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -277,6 +277,26 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0118-Properly-fix-item-duplication-bug.patch b/patches/server/0119-Properly-fix-item-duplication-bug.patch
index b7d5d263d4..b2543d10ad 100644
--- a/patches/server/0118-Properly-fix-item-duplication-bug.patch
+++ b/patches/server/0119-Properly-fix-item-duplication-bug.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 948d42f77b7c284e53f9d90f8e51fbf2b906732a..a6b600a9dd2cd4acb1a714d944a9ee682a7cc7a6 100644
+index 8eb9a96e879a28841fcc338ff5c90f86908414bc..eaa968b6d91160947235fad29d3b955b3ee149f3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2162,7 +2162,7 @@ public class ServerPlayer extends Player {
@@ -19,7 +19,7 @@ index 948d42f77b7c284e53f9d90f8e51fbf2b906732a..a6b600a9dd2cd4acb1a714d944a9ee68
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2259f6d9be2390aaa8ffc43b3c2e37b0036b43ac..3f8dcf091ac81c431bbe572d9c2bd65ea003b86a 100644
+index 192b0fae5ef200efefeb9727a68c17e3ca962027..28c768e758a10d2d109a4cd12779d6d40e9c43f8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2846,7 +2846,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0119-Firework-API-s.patch b/patches/server/0120-Firework-API-s.patch
index a574505f2d..a574505f2d 100644
--- a/patches/server/0119-Firework-API-s.patch
+++ b/patches/server/0120-Firework-API-s.patch
diff --git a/patches/server/0120-PlayerTeleportEndGatewayEvent.patch b/patches/server/0121-PlayerTeleportEndGatewayEvent.patch
index 16c800730a..16c800730a 100644
--- a/patches/server/0120-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/server/0121-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0121-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch
index 6323609291..3632c109a6 100644
--- a/patches/server/0121-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -20,7 +20,7 @@ index 567cc347af00eed98fdf8832ef6c9468332b94e4..d22b7edc9ddea765c11e82346afd3942
      private boolean tickingBlockEntities;
      public final Thread thread;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c36b862f4019d899c834177f42b1983818ab0138..f1df6ac7bc8ceeb87bdee577132c4d07c9786d20 100644
+index be8b7170f3746e53985286066138781099930934..982b6dabf2aa8ac79596a235ffff1be948492b72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -145,6 +145,57 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0122-Enforce-Sync-Player-Saves.patch b/patches/server/0123-Enforce-Sync-Player-Saves.patch
index 99d1138169..734dd2272c 100644
--- a/patches/server/0122-Enforce-Sync-Player-Saves.patch
+++ b/patches/server/0123-Enforce-Sync-Player-Saves.patch
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5a7ca495a78f33e5449d47ce71dbf9b11678551f..288a046b8335a611e0c7a155a6d0565e6f7c272a 100644
+index 3d3e647fbfbb8007b6e7dc87808d63ca4465fc21..c6dd833e5cc503d6b24fbbdf4a1a8be16200717b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1036,11 +1036,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0123-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch
index 20a52302e5..20a52302e5 100644
--- a/patches/server/0123-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/patches/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch
diff --git a/patches/server/0124-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index c8ec25be04..fb32909a22 100644
--- a/patches/server/0124-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -129,7 +129,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..227aca795efc99c4f81dfb30c00d31d2
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2ce597f594142d64a239649e1b812b3b7b0af340..7df80e251dbdaff32cdc0f3e7dffc9ea6d163b09 100644
+index fdf44f109d548d36d84e77fce5aa7fce865448dd..27ba3a28c18b0af18eb20a7441f361a46700a4bd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1700,7 +1700,8 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0125-Cap-Entity-Collisions.patch b/patches/server/0126-Cap-Entity-Collisions.patch
index c313a37acf..afe9d39092 100644
--- a/patches/server/0125-Cap-Entity-Collisions.patch
+++ b/patches/server/0126-Cap-Entity-Collisions.patch
@@ -27,7 +27,7 @@ index cfe37643eea0fbff097ecf770977f9fefd94dece..9a3940e93e87a0b2b17d4a35bd71f0a4
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 081a95e3bb448a44565f6e75ebbc18bbc5fe1b18..005c44bbabf706d7f35476219153ed91e32665d2 100644
+index 74a5b29ee48964aef9587939ecb3a66f52f658b5..336f6209089d3f076bfdd332bfc80d69509ca209 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -317,6 +317,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -39,7 +39,7 @@ index 081a95e3bb448a44565f6e75ebbc18bbc5fe1b18..005c44bbabf706d7f35476219153ed91
      private org.bukkit.util.Vector origin;
      @javax.annotation.Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7df80e251dbdaff32cdc0f3e7dffc9ea6d163b09..f7d100d5fa85cd2e705e78be8dc6373f02d0adc0 100644
+index 27ba3a28c18b0af18eb20a7441f361a46700a4bd..a7e09145160f9c26b19a8d61564bf9c04e2616b1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3228,8 +3228,11 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0126-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0127-Remove-CraftScheduler-Async-Task-Debugger.patch
index eacad1fb97..eacad1fb97 100644
--- a/patches/server/0126-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/patches/server/0127-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0127-Do-not-let-armorstands-drown.patch b/patches/server/0128-Do-not-let-armorstands-drown.patch
index 3c8b3ef332..3c8b3ef332 100644
--- a/patches/server/0127-Do-not-let-armorstands-drown.patch
+++ b/patches/server/0128-Do-not-let-armorstands-drown.patch
diff --git a/patches/server/0128-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/patches/server/0129-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 99a97de584..99a97de584 100644
--- a/patches/server/0128-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/patches/server/0129-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
diff --git a/patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
index e180c31457..113a7fe3ad 100644
--- a/patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
@@ -64,7 +64,7 @@ index 49c354fa65e0047a367f0a5410c79b8da8693df9..aa02ab4ea7890d9a477be55ce6c0be0a
          if (flag) {
              try {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 288a046b8335a611e0c7a155a6d0565e6f7c272a..5b1dcf148d24bbd61728d8c2af611b7c4f8dd166 100644
+index c6dd833e5cc503d6b24fbbdf4a1a8be16200717b..17afebfc2091392c5ec9aa9f6734ff71d67c9dac 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1147,8 +1147,15 @@ public abstract class PlayerList {
diff --git a/patches/server/0130-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index f1564bb7c1..e33f73f14f 100644
--- a/patches/server/0130-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -26,7 +26,7 @@ index 9a3940e93e87a0b2b17d4a35bd71f0a40a139cea..49c4d84266c000b26dac30074076057b
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3f8dcf091ac81c431bbe572d9c2bd65ea003b86a..0abdb8524dcd9d7bb62c200cd96e2d156bddfd0e 100644
+index 28c768e758a10d2d109a4cd12779d6d40e9c43f8..f38c6482651cb9a8a8dc2a25c55aaf2a7deccc7b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2070,6 +2070,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0131-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
index 32b9203ca1..d95eef1b74 100644
--- a/patches/server/0131-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6f36c7a233ec0335d713523e87a28ba9b5e46d88..bbf5dae44b52941452c65ce4d0820172f0f03f3d 100644
+index 2440e81ef23c3b8c91ca5bdf13347f13cb66f549..2a4aacd2461401a109d749eee262813367fe4a70 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -280,4 +280,9 @@ public class PaperConfig {
@@ -20,7 +20,7 @@ index 6f36c7a233ec0335d713523e87a28ba9b5e46d88..bbf5dae44b52941452c65ce4d0820172
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a93cf50004a68b0648f96d2f0ff2f9e4fd65ffc4..984c62117372f9d8cb54ec430c456ec79c20e5bb 100644
+index 028f2e2d24a6a1eac07c04d79c44bbdfe87108cb..e0460aa4154ea31743c6b99ff0ec009a37f7fee4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2560,5 +2560,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
index 0e8995e4c3..0e49e51073 100644
--- a/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d39ed9a8a32913193aec1bba2a59a352b8032dae..dccb73a4e1bc38cd64bb0a654cb92117aa76692a 100644
+index 9af9165b900d18baffb736b7105409210717ccef..1a07dccd90d1748d766343c427484ecf23049e9c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -8,7 +8,17 @@ plugins {
@@ -112,7 +112,7 @@ index 0000000000000000000000000000000000000000..685deaa0e5d1ddc13e3a7c0471b1cfcf
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index aa02ab4ea7890d9a477be55ce6c0be0a2a0d4b52..f846d9163ca97901ac1508ef8a476dabbf6dc454 100644
+index aa02ab4ea7890d9a477be55ce6c0be0a2a0d4b52..22c4598e00d1a27d86584e7bfcbb73038f2f2c1a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -169,7 +169,7 @@ import org.slf4j.Logger;
@@ -236,7 +236,7 @@ index 17afebfc2091392c5ec9aa9f6734ff71d67c9dac..caf92576ed2023f721810b7dd09dd194
  
          this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 984c62117372f9d8cb54ec430c456ec79c20e5bb..c7136bddf38583167f3944e56df6a26f4c56308f 100644
+index e0460aa4154ea31743c6b99ff0ec009a37f7fee4..39a64d8257b2405aa3f94b01fdb858ced0a9342d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -45,7 +45,6 @@ import java.util.logging.Level;
diff --git a/patches/server/0133-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch
index 7efea35611..7efea35611 100644
--- a/patches/server/0133-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0134-Item-canEntityPickup.patch b/patches/server/0135-Item-canEntityPickup.patch
index 1adabea9a2..1152d5a651 100644
--- a/patches/server/0134-Item-canEntityPickup.patch
+++ b/patches/server/0135-Item-canEntityPickup.patch
@@ -21,7 +21,7 @@ index 3d54fa71b2d3532e93fe3636a86150e10fcba31a..09b2ac6b071fd7c55db6c940beab650d
                  }
              }
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 1f9e1a7284a02ba7486cf9d1b1498a7799b8d3da..e5c97ffc4ceafcda2939d28fdc7cd729cf902db4 100644
+index 4ddeed2e685c1239a4596b7996adbb8168a1537c..d0dcdb5dcce9aac8c404f94c1ec27d600b59f1b5 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -52,6 +52,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0135-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch
index dcfbc30eef..b3f80fab65 100644
--- a/patches/server/0135-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index e5c97ffc4ceafcda2939d28fdc7cd729cf902db4..f5afd05e9011e05c4c49a903baa2d1d81e102bee 100644
+index d0dcdb5dcce9aac8c404f94c1ec27d600b59f1b5..101e1b62a1aa45cbb6bfe7d4adf995f2f890ea34 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -380,6 +380,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0136-PlayerAttemptPickupItemEvent.patch b/patches/server/0137-PlayerAttemptPickupItemEvent.patch
index 63863ce126..10488922c0 100644
--- a/patches/server/0136-PlayerAttemptPickupItemEvent.patch
+++ b/patches/server/0137-PlayerAttemptPickupItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index f5afd05e9011e05c4c49a903baa2d1d81e102bee..943c2bd2a0836eda5b4da382c459ade6cbe40fea 100644
+index 101e1b62a1aa45cbb6bfe7d4adf995f2f890ea34..430809523d02801088c247e11bce351a99b8bc05 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -36,6 +36,7 @@ import net.minecraft.util.Mth;
diff --git a/patches/server/0137-Add-UnknownCommandEvent.patch b/patches/server/0138-Add-UnknownCommandEvent.patch
index 9c7f76e216..743e93af20 100644
--- a/patches/server/0137-Add-UnknownCommandEvent.patch
+++ b/patches/server/0138-Add-UnknownCommandEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c7136bddf38583167f3944e56df6a26f4c56308f..6f1b1191426d864719e1b5cbd42bf5699e6193e3 100644
+index 39a64d8257b2405aa3f94b01fdb858ced0a9342d..b28f2e8fa2c62562cf87cf264e97b6d7c233297b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -886,7 +886,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0138-Basic-PlayerProfile-API.patch b/patches/server/0139-Basic-PlayerProfile-API.patch
index 42b4b646e4..7a14f71d18 100644
--- a/patches/server/0138-Basic-PlayerProfile-API.patch
+++ b/patches/server/0139-Basic-PlayerProfile-API.patch
@@ -621,7 +621,7 @@ index c4142568c3188c89142799cc4911dd7eae32a45f..f379e108ec3c762940bddea878a0a711
          String s1 = name.toLowerCase(Locale.ROOT);
          GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6f1b1191426d864719e1b5cbd42bf5699e6193e3..4dad4b95f263bd7cd086d87848ee8c8a862e1577 100644
+index b28f2e8fa2c62562cf87cf264e97b6d7c233297b..e6db5d649d01c4952dc5e3bf08f9ce15afbd0963 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -244,6 +244,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
diff --git a/patches/server/0139-Shoulder-Entities-Release-API.patch b/patches/server/0140-Shoulder-Entities-Release-API.patch
index fbdd1baa23..0e590f7f65 100644
--- a/patches/server/0139-Shoulder-Entities-Release-API.patch
+++ b/patches/server/0140-Shoulder-Entities-Release-API.patch
@@ -58,7 +58,7 @@ index fe715c81ea755f83fae0020e66f5e61304c51867..7fc4cd29bd487955886c81e6997d832a
      @Override
      public abstract boolean isSpectator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index ebd5372fdd7aa3e5e67a8b3b916176eeb6ff54bf..8b6452f21e7bbd90ce8311513f1dae0f936b6c3d 100644
+index ea952e82078acc2256757b599d1d4ca457f951b5..013e68d483a1c2e707b61bfd0e2859fdc093fffa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -503,6 +503,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0140-Profile-Lookup-Events.patch b/patches/server/0141-Profile-Lookup-Events.patch
index a9a4210f19..a9a4210f19 100644
--- a/patches/server/0140-Profile-Lookup-Events.patch
+++ b/patches/server/0141-Profile-Lookup-Events.patch
diff --git a/patches/server/0141-Block-player-logins-during-server-shutdown.patch b/patches/server/0142-Block-player-logins-during-server-shutdown.patch
index b22e55320c..b22e55320c 100644
--- a/patches/server/0141-Block-player-logins-during-server-shutdown.patch
+++ b/patches/server/0142-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0142-Entity-fromMobSpawner.patch b/patches/server/0143-Entity-fromMobSpawner.patch
index 37206e31d0..37206e31d0 100644
--- a/patches/server/0142-Entity-fromMobSpawner.patch
+++ b/patches/server/0143-Entity-fromMobSpawner.patch
diff --git a/patches/server/0143-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0144-Improve-the-Saddle-API-for-Horses.patch
index ccd3b7baf4..ccd3b7baf4 100644
--- a/patches/server/0143-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/server/0144-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0144-Implement-ensureServerConversions-API.patch b/patches/server/0145-Implement-ensureServerConversions-API.patch
index 87c132bd17..87c132bd17 100644
--- a/patches/server/0144-Implement-ensureServerConversions-API.patch
+++ b/patches/server/0145-Implement-ensureServerConversions-API.patch
diff --git a/patches/server/0145-Implement-getI18NDisplayName.patch b/patches/server/0146-Implement-getI18NDisplayName.patch
index 9587ee50b2..9587ee50b2 100644
--- a/patches/server/0145-Implement-getI18NDisplayName.patch
+++ b/patches/server/0146-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0146-ProfileWhitelistVerifyEvent.patch b/patches/server/0147-ProfileWhitelistVerifyEvent.patch
index 2191e69d7d..073107790a 100644
--- a/patches/server/0146-ProfileWhitelistVerifyEvent.patch
+++ b/patches/server/0147-ProfileWhitelistVerifyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 03fc0bca0c1a11db43d315236ca05dfea137ddb3..a1ca0c0c08f6793ce3440733f802a40f99890d85 100644
+index caf92576ed2023f721810b7dd09dd194b1cb3d8c..2b7a9e6a5098aabbe62ea74c1f4eb5a9e5111e19 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -615,9 +615,9 @@ public abstract class PlayerList {
diff --git a/patches/server/0147-Fix-this-stupid-bullshit.patch b/patches/server/0148-Fix-this-stupid-bullshit.patch
index 880976788e..880976788e 100644
--- a/patches/server/0147-Fix-this-stupid-bullshit.patch
+++ b/patches/server/0148-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0148-LivingEntity-setKiller.patch b/patches/server/0149-LivingEntity-setKiller.patch
index c8eb4f6720..c8eb4f6720 100644
--- a/patches/server/0148-LivingEntity-setKiller.patch
+++ b/patches/server/0149-LivingEntity-setKiller.patch
diff --git a/patches/server/0149-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch
index 7607c56745..7607c56745 100644
--- a/patches/server/0149-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0150-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 9b68ceeb8c..9b68ceeb8c 100644
--- a/patches/server/0150-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0151-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch
index d856e67015..8d9b763ee8 100644
--- a/patches/server/0151-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index bbf5dae44b52941452c65ce4d0820172f0f03f3d..13cd1da1277615a695f5bf92e2f7005dd99a534e 100644
+index 2a4aacd2461401a109d749eee262813367fe4a70..a8de81b1a153525b2d0d6b01802b7733947527a2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0152-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch
index b9a3c17795..841b141ef2 100644
--- a/patches/server/0152-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -15,7 +15,7 @@ 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 dccb73a4e1bc38cd64bb0a654cb92117aa76692a..ef1359ed87282dc9aab7ea49afcc1f0db345018d 100644
+index 1a07dccd90d1748d766343c427484ecf23049e9c..244529d90f0d98cff31743e8934ba63c41ffd1a2 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -17,7 +17,7 @@ dependencies {
diff --git a/patches/server/0153-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch
index 5afb9562c0..5afb9562c0 100644
--- a/patches/server/0153-Improve-Log4J-Configuration-Plugin-Loggers.patch
+++ b/patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0154-Add-PlayerJumpEvent.patch b/patches/server/0155-Add-PlayerJumpEvent.patch
index 275424294a..a138bd6b69 100644
--- a/patches/server/0154-Add-PlayerJumpEvent.patch
+++ b/patches/server/0155-Add-PlayerJumpEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0abdb8524dcd9d7bb62c200cd96e2d156bddfd0e..acca4c663d4c6141c77b591bcb0c35157e5dd8fc 100644
+index f38c6482651cb9a8a8dc2a25c55aaf2a7deccc7b..f52fcfc8763bff9635eb117a201cc954cc7f8154 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1186,7 +1186,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0155-handle-PacketPlayInKeepAlive-async.patch b/patches/server/0156-handle-PacketPlayInKeepAlive-async.patch
index 0e08005136..600c3e2336 100644
--- a/patches/server/0155-handle-PacketPlayInKeepAlive-async.patch
+++ b/patches/server/0156-handle-PacketPlayInKeepAlive-async.patch
@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index acca4c663d4c6141c77b591bcb0c35157e5dd8fc..4ab220e1a0f4d6fe2686657e6e282b9cc5c03c15 100644
+index f52fcfc8763bff9635eb117a201cc954cc7f8154..abde2821d59717517bda456b45a28a1d5054c6ba 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2805,14 +2805,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0156-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
index 40ad643082..da01e9809a 100644
--- a/patches/server/0156-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
@@ -90,7 +90,7 @@ index 63cc89c7769bfcc9d663a1827ad525e3ddd82fe5..a95b2ee0e80832f786bdb8f3d0bc00cb
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 479f33c109258f5ddd781fc30e43ec1681095014..9f0f4d48b0b856379a90a49a58c912f29a47b883 100644
+index cebdc80d286a5daf1fdc9329dcff4f888890f91b..bb75dd9d6280f36f4ce03236558606c75026059e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -221,6 +221,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0157-revert-serverside-behavior-of-keepalives.patch b/patches/server/0158-revert-serverside-behavior-of-keepalives.patch
index e4d961cfca..2277d6e5c0 100644
--- a/patches/server/0157-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/0158-revert-serverside-behavior-of-keepalives.patch
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4ab220e1a0f4d6fe2686657e6e282b9cc5c03c15..205b8643df701fd4ee7f31e257ad7867afa10f73 100644
+index abde2821d59717517bda456b45a28a1d5054c6ba..f6fd0aa58927b51803c42b342abbf571b3d5638b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -221,9 +221,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0158-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index ed1bc704af..ed1bc704af 100644
--- a/patches/server/0158-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0159-Add-PlayerArmorChangeEvent.patch b/patches/server/0160-Add-PlayerArmorChangeEvent.patch
index 0154d914e6..acb13c7386 100644
--- a/patches/server/0159-Add-PlayerArmorChangeEvent.patch
+++ b/patches/server/0160-Add-PlayerArmorChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f7d100d5fa85cd2e705e78be8dc6373f02d0adc0..41ffeca4a65a801a81bf7b7f37a39f6bf459e81a 100644
+index a7e09145160f9c26b19a8d61564bf9c04e2616b1..2449cd753ec52b7e2d2213fcd3979d616a33c677 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0160-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch
index 9be38dd147..9be38dd147 100644
--- a/patches/server/0160-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0161-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index bfd6705b79..bfd6705b79 100644
--- a/patches/server/0161-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/patches/server/0162-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch
index b448867fdd..b448867fdd 100644
--- a/patches/server/0162-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0163-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch
index f3b9b0813c..f3b9b0813c 100644
--- a/patches/server/0163-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0164-AsyncTabCompleteEvent.patch b/patches/server/0165-AsyncTabCompleteEvent.patch
index c9196d8d84..92babe53c4 100644
--- a/patches/server/0164-AsyncTabCompleteEvent.patch
+++ b/patches/server/0165-AsyncTabCompleteEvent.patch
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 205b8643df701fd4ee7f31e257ad7867afa10f73..586692eff023d9e6bb9c6ecaa051bd0c90ab0e37 100644
+index f6fd0aa58927b51803c42b342abbf571b3d5638b..228465eb602e4c289fdfc93bab06921a50be7638 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -708,10 +708,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -72,7 +72,7 @@ index 205b8643df701fd4ee7f31e257ad7867afa10f73..586692eff023d9e6bb9c6ecaa051bd0c
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 59f3167c276d93c36b0b36ff0e36918cf498424b..9278bc9a3e29cbdf268049c601d42d0b2b9aed11 100644
+index e6db5d649d01c4952dc5e3bf08f9ce15afbd0963..7d66377a431a3aedfd1338664cba2b83d100cae2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2078,7 +2078,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0165-PlayerPickupExperienceEvent.patch b/patches/server/0166-PlayerPickupExperienceEvent.patch
index 6b3e21f677..6b3e21f677 100644
--- a/patches/server/0165-PlayerPickupExperienceEvent.patch
+++ b/patches/server/0166-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0166-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
index 5994a73d94..5994a73d94 100644
--- a/patches/server/0166-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/0167-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
index 2cf123a9f9..f05e6a7396 100644
--- a/patches/server/0167-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
@@ -60,7 +60,7 @@ index d198303d4d0cff34156c00176ec2f3f2ad42ada4..f2d92cd125cbc1bd6fdab774e7002d6b
  
              while (iterator1.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a6b600a9dd2cd4acb1a714d944a9ee682a7cc7a6..824502e053ab975d4ffb3f69712577c94b18fa56 100644
+index eaa968b6d91160947235fad29d3b955b3ee149f3..3c780c0679ba004577393b3d801ee18ac7e847b9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0168-PreCreatureSpawnEvent.patch b/patches/server/0169-PreCreatureSpawnEvent.patch
index b697821844..b697821844 100644
--- a/patches/server/0168-PreCreatureSpawnEvent.patch
+++ b/patches/server/0169-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
index a87a829f5b..a87a829f5b 100644
--- a/patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0170-Fill-Profile-Property-Events.patch b/patches/server/0171-Fill-Profile-Property-Events.patch
index 30643d081c..30643d081c 100644
--- a/patches/server/0170-Fill-Profile-Property-Events.patch
+++ b/patches/server/0171-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0171-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0172-PlayerAdvancementCriterionGrantEvent.patch
index 24c1ee0c73..24c1ee0c73 100644
--- a/patches/server/0171-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/server/0172-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0172-Add-ArmorStand-Item-Meta.patch b/patches/server/0173-Add-ArmorStand-Item-Meta.patch
index 159aa8fb7e..159aa8fb7e 100644
--- a/patches/server/0172-Add-ArmorStand-Item-Meta.patch
+++ b/patches/server/0173-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0173-Extend-Player-Interact-cancellation.patch b/patches/server/0174-Extend-Player-Interact-cancellation.patch
index f775b34e77..f775b34e77 100644
--- a/patches/server/0173-Extend-Player-Interact-cancellation.patch
+++ b/patches/server/0174-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0174-Tameable-getOwnerUniqueId-API.patch b/patches/server/0175-Tameable-getOwnerUniqueId-API.patch
index 7fca628e8a..7fca628e8a 100644
--- a/patches/server/0174-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/server/0175-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0175-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 3fa69d8a40..3fa69d8a40 100644
--- a/patches/server/0175-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/patches/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/patches/server/0176-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch
index 1ccb5ac583..1ccb5ac583 100644
--- a/patches/server/0176-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0177-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch
index a0fdb8ec3d..5a45cbe4b0 100644
--- a/patches/server/0177-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch
@@ -190,7 +190,7 @@ index 67455a5ba75c9b816213e44d6872c5ddf8e27e98..23efad80934930beadf15e65781551d4
  
      public ClientboundStatusResponsePacket(ServerStatus metadata) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f846d9163ca97901ac1508ef8a476dabbf6dc454..4da9491425649b2b930b2304c4aa6692540ff4cb 100644
+index 22c4598e00d1a27d86584e7bfcbb73038f2f2c1a..c7881eebb02424ce488d2c04aa736f17402109a0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2,6 +2,9 @@ package net.minecraft.server;
diff --git a/patches/server/0178-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index ea12180ec7..ea12180ec7 100644
--- a/patches/server/0178-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/server/0179-Player.setPlayerProfile-API.patch b/patches/server/0180-Player.setPlayerProfile-API.patch
index d77c6b52ab..d77c6b52ab 100644
--- a/patches/server/0179-Player.setPlayerProfile-API.patch
+++ b/patches/server/0180-Player.setPlayerProfile-API.patch
diff --git a/patches/server/0180-getPlayerUniqueId-API.patch b/patches/server/0181-getPlayerUniqueId-API.patch
index 2723330d9f..d05e12bcfd 100644
--- a/patches/server/0180-getPlayerUniqueId-API.patch
+++ b/patches/server/0181-getPlayerUniqueId-API.patch
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9278bc9a3e29cbdf268049c601d42d0b2b9aed11..9ef4ba665c4f8abaf7ccefa254e15fa11e814fc9 100644
+index 7d66377a431a3aedfd1338664cba2b83d100cae2..882a2afed87c1b0d23733831c33391b414c4efcb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1705,6 +1705,25 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0181-Improved-Async-Task-Scheduler.patch b/patches/server/0182-Improved-Async-Task-Scheduler.patch
index b62fddc7b9..b62fddc7b9 100644
--- a/patches/server/0181-Improved-Async-Task-Scheduler.patch
+++ b/patches/server/0182-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0182-Upstream-config-migrations.patch b/patches/server/0183-Upstream-config-migrations.patch
index 041a89afbf..8e2f48f541 100644
--- a/patches/server/0182-Upstream-config-migrations.patch
+++ b/patches/server/0183-Upstream-config-migrations.patch
@@ -7,7 +7,7 @@ This patch contains config migrations for when upstream adds options
 which Paper already had.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 13cd1da1277615a695f5bf92e2f7005dd99a534e..fddc40fc7b6bfbdab3ab54dae273a0d99198da5f 100644
+index a8de81b1a153525b2d0d6b01802b7733947527a2..e2fed9b89ec1acb63a140f0f67814587ab6942bc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -291,4 +291,23 @@ public class PaperConfig {
diff --git a/patches/server/0183-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch
index fa9de2b263..fa9de2b263 100644
--- a/patches/server/0183-Make-legacy-ping-handler-more-reliable.patch
+++ b/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 6b87008391..6b87008391 100644
--- a/patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0185-Flag-to-disable-the-channel-limit.patch b/patches/server/0186-Flag-to-disable-the-channel-limit.patch
index d3b714bcab..d3b714bcab 100644
--- a/patches/server/0185-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0186-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0186-Add-openSign-method-to-HumanEntity.patch b/patches/server/0187-Add-openSign-method-to-HumanEntity.patch
index b96d95ac06..abd4a96f64 100644
--- a/patches/server/0186-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/server/0187-Add-openSign-method-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add openSign method to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 9d513b3a1a50e67284ee7ebdc5607e4f44bd0a4b..bfa2345642142ea45460552fce97d5b411a5e48e 100644
+index 26f21754b5ec3d1cbd455c4d9d04af299fc10b1b..09ea221665bd17bc853274d0146987ebadefe46f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -118,15 +118,15 @@ public class CraftSign extends CraftBlockEntityState<SignBlockEntity> implements
@@ -28,7 +28,7 @@ index 9d513b3a1a50e67284ee7ebdc5607e4f44bd0a4b..bfa2345642142ea45460552fce97d5b4
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 8b6452f21e7bbd90ce8311513f1dae0f936b6c3d..c0ed3dd9ebcaf710d202ae8b38007e6a1f20b57e 100644
+index 013e68d483a1c2e707b61bfd0e2859fdc093fffa..6c708f65b3a3718c7b53e0c2cc12ee8ad62ff2b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -613,6 +613,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0187-Configurable-sprint-interruption-on-attack.patch b/patches/server/0188-Configurable-sprint-interruption-on-attack.patch
index 5ecc2e4e16..5ecc2e4e16 100644
--- a/patches/server/0187-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/server/0188-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 36865a90d1..15b76b6f89 100644
--- a/patches/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 586692eff023d9e6bb9c6ecaa051bd0c90ab0e37..4c428351426177f647c483f6178512fe4fad42fa 100644
+index 228465eb602e4c289fdfc93bab06921a50be7638..99d2a71133b82f5a72869a8c424fe2b42ae5b760 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2811,9 +2811,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0189-EndermanEscapeEvent.patch b/patches/server/0190-EndermanEscapeEvent.patch
index e9d52a5b2d..e9d52a5b2d 100644
--- a/patches/server/0189-EndermanEscapeEvent.patch
+++ b/patches/server/0190-EndermanEscapeEvent.patch
diff --git a/patches/server/0190-Enderman.teleportRandomly.patch b/patches/server/0191-Enderman.teleportRandomly.patch
index 86bca4b671..86bca4b671 100644
--- a/patches/server/0190-Enderman.teleportRandomly.patch
+++ b/patches/server/0191-Enderman.teleportRandomly.patch
diff --git a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
index 3cffff648f..3cffff648f 100644
--- a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
index 694b4d4b2e..694b4d4b2e 100644
--- a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index 616f34fdc9..616f34fdc9 100644
--- a/patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0194-EndermanAttackPlayerEvent.patch b/patches/server/0195-EndermanAttackPlayerEvent.patch
index be33ff581c..be33ff581c 100644
--- a/patches/server/0194-EndermanAttackPlayerEvent.patch
+++ b/patches/server/0195-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0195-WitchConsumePotionEvent.patch b/patches/server/0196-WitchConsumePotionEvent.patch
index f054a8dd3c..f054a8dd3c 100644
--- a/patches/server/0195-WitchConsumePotionEvent.patch
+++ b/patches/server/0196-WitchConsumePotionEvent.patch
diff --git a/patches/server/0196-WitchThrowPotionEvent.patch b/patches/server/0197-WitchThrowPotionEvent.patch
index 86ba404bc1..86ba404bc1 100644
--- a/patches/server/0196-WitchThrowPotionEvent.patch
+++ b/patches/server/0197-WitchThrowPotionEvent.patch
diff --git a/patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index 5cab56c188..5cab56c188 100644
--- a/patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/0198-WitchReadyPotionEvent.patch b/patches/server/0199-WitchReadyPotionEvent.patch
index 99ac9dce10..99ac9dce10 100644
--- a/patches/server/0198-WitchReadyPotionEvent.patch
+++ b/patches/server/0199-WitchReadyPotionEvent.patch
diff --git a/patches/server/0199-ItemStack-getMaxItemUseDuration.patch b/patches/server/0200-ItemStack-getMaxItemUseDuration.patch
index a54b637d4c..a54b637d4c 100644
--- a/patches/server/0199-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/server/0200-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0200-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch
index 541316c571..541316c571 100644
--- a/patches/server/0200-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0201-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 462155cf04..462155cf04 100644
--- a/patches/server/0201-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0202-Fix-CraftEntity-hashCode.patch b/patches/server/0203-Fix-CraftEntity-hashCode.patch
index ae135df932..ae135df932 100644
--- a/patches/server/0202-Fix-CraftEntity-hashCode.patch
+++ b/patches/server/0203-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0203-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch
index ba08f35691..d7284ced98 100644
--- a/patches/server/0203-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index fddc40fc7b6bfbdab3ab54dae273a0d99198da5f..114a65963b65597ff915ec3a0d75bb78f33bd774 100644
+index e2fed9b89ec1acb63a140f0f67814587ab6942bc..b46b10c726b53b1106cc74ec9a5d6ca6f45c96fe 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -310,4 +310,12 @@ public class PaperConfig {
diff --git a/patches/server/0204-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch
index 1fa6aa9aac..1fa6aa9aac 100644
--- a/patches/server/0204-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0205-Make-shield-blocking-delay-configurable.patch b/patches/server/0206-Make-shield-blocking-delay-configurable.patch
index 7a558469ee..05db84d5b4 100644
--- a/patches/server/0205-Make-shield-blocking-delay-configurable.patch
+++ b/patches/server/0206-Make-shield-blocking-delay-configurable.patch
@@ -19,7 +19,7 @@ index 7a25d602a016c4113cf93f58fa5dfcb8613067fe..9b2f958b70eaf44d3686c5dafc29f81f
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 41ffeca4a65a801a81bf7b7f37a39f6bf459e81a..04ba5e773e2e1ecd54023370e986c4c85e54cde5 100644
+index 2449cd753ec52b7e2d2213fcd3979d616a33c677..1610cf860b7f72a1ca8a1df69115d2f4bedc5d1b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3658,12 +3658,24 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0206-Improve-EntityShootBowEvent.patch b/patches/server/0207-Improve-EntityShootBowEvent.patch
index d2b406c4ad..d2b406c4ad 100644
--- a/patches/server/0206-Improve-EntityShootBowEvent.patch
+++ b/patches/server/0207-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0207-PlayerReadyArrowEvent.patch b/patches/server/0208-PlayerReadyArrowEvent.patch
index 164b5f9475..164b5f9475 100644
--- a/patches/server/0207-PlayerReadyArrowEvent.patch
+++ b/patches/server/0208-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0208-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch
index 9417bad18d..53caca1176 100644
--- a/patches/server/0208-Implement-EntityKnockbackByEntityEvent.patch
+++ b/patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 04ba5e773e2e1ecd54023370e986c4c85e54cde5..7436cf1b9cce14494bd514cb7f4ed03536170c87 100644
+index 1610cf860b7f72a1ca8a1df69115d2f4bedc5d1b..1cf4c80d03b8843be9abbb72baba8cde0bbd329b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1433,7 +1433,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0209-Expand-Explosions-API.patch b/patches/server/0210-Expand-Explosions-API.patch
index cdb708ac85..cdb708ac85 100644
--- a/patches/server/0209-Expand-Explosions-API.patch
+++ b/patches/server/0210-Expand-Explosions-API.patch
diff --git a/patches/server/0210-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
index b8c1582431..b8c1582431 100644
--- a/patches/server/0210-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0211-RangedEntity-API.patch b/patches/server/0212-RangedEntity-API.patch
index 558957b92c..558957b92c 100644
--- a/patches/server/0211-RangedEntity-API.patch
+++ b/patches/server/0212-RangedEntity-API.patch
diff --git a/patches/server/0212-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch
index 5b73d41538..5b73d41538 100644
--- a/patches/server/0212-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0213-Implement-World.getEntity-UUID-API.patch b/patches/server/0214-Implement-World.getEntity-UUID-API.patch
index 5bda941dfa..5bda941dfa 100644
--- a/patches/server/0213-Implement-World.getEntity-UUID-API.patch
+++ b/patches/server/0214-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0214-InventoryCloseEvent-Reason-API.patch b/patches/server/0215-InventoryCloseEvent-Reason-API.patch
index 477ce0b147..477ce0b147 100644
--- a/patches/server/0214-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0215-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/server/0215-Vex-get-setSummoner-API.patch b/patches/server/0216-Vex-get-setSummoner-API.patch
index b39cab89d2..b39cab89d2 100644
--- a/patches/server/0215-Vex-get-setSummoner-API.patch
+++ b/patches/server/0216-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index f704e58d6f..29ba8ef6d0 100644
--- a/patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2faa2a9980d7139695be3583f80b05d99b6179d8..76628de17e8fb374801b5b9e25f7ff6bd1465c30 100644
+index 6a550b076e0cbcb8c90c74cdf5dcea21c643a2f6..e2da92d30ee405875dd711c1c118a97d2532b38e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2235,6 +2235,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0217-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/server/0218-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index b0d7831485..b0d7831485 100644
--- a/patches/server/0217-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/patches/server/0218-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
diff --git a/patches/server/0218-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 5edf06f566..afb7bc1207 100644
--- a/patches/server/0218-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,7 +5,7 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ef1359ed87282dc9aab7ea49afcc1f0db345018d..ad1e2497f2740fb6e9c64e562a95bf064bea981f 100644
+index 244529d90f0d98cff31743e8934ba63c41ffd1a2..004b37cddc8e5e4cb4643f52eb58254796886fe7 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -24,6 +24,7 @@ dependencies {
diff --git a/patches/server/0219-add-more-information-to-Entity.toString.patch b/patches/server/0220-add-more-information-to-Entity.toString.patch
index 2d9c434eb1..2d9c434eb1 100644
--- a/patches/server/0219-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0220-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0220-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch
index e916b52e10..f922ad38ce 100644
--- a/patches/server/0220-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/patches/server/0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion()
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 0bfbb84004381940af6cfade3eb95c292d51d398..6888548989e6b841d2389011f05c5eadb754e532 100644
+index a47f81c690b9d2a63c21f126ca2727a1d23e626c..7fed3c5cbc48fb8de7af006720aa2a6fbe16c556 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -426,6 +426,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0221-EnderDragon-Events.patch b/patches/server/0222-EnderDragon-Events.patch
index 6368f8e07f..6368f8e07f 100644
--- a/patches/server/0221-EnderDragon-Events.patch
+++ b/patches/server/0222-EnderDragon-Events.patch
diff --git a/patches/server/0222-PlayerElytraBoostEvent.patch b/patches/server/0223-PlayerElytraBoostEvent.patch
index 00826b935f..00826b935f 100644
--- a/patches/server/0222-PlayerElytraBoostEvent.patch
+++ b/patches/server/0223-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0223-PlayerLaunchProjectileEvent.patch b/patches/server/0224-PlayerLaunchProjectileEvent.patch
index c01b74cbc8..c01b74cbc8 100644
--- a/patches/server/0223-PlayerLaunchProjectileEvent.patch
+++ b/patches/server/0224-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0224-Improve-BlockPosition-inlining.patch b/patches/server/0225-Improve-BlockPosition-inlining.patch
index c8ba260207..c8ba260207 100644
--- a/patches/server/0224-Improve-BlockPosition-inlining.patch
+++ b/patches/server/0225-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 33a31035bd..33a31035bd 100644
--- a/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0226-Vanished-players-don-t-have-rights.patch b/patches/server/0227-Vanished-players-don-t-have-rights.patch
index f9e1244765..f9e1244765 100644
--- a/patches/server/0226-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0227-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0227-Allow-disabling-armour-stand-ticking.patch b/patches/server/0228-Allow-disabling-armour-stand-ticking.patch
index a1bd82fb0c..a1bd82fb0c 100644
--- a/patches/server/0227-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/server/0228-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/0228-SkeletonHorse-Additions.patch b/patches/server/0229-SkeletonHorse-Additions.patch
index 0145fb6830..0145fb6830 100644
--- a/patches/server/0228-SkeletonHorse-Additions.patch
+++ b/patches/server/0229-SkeletonHorse-Additions.patch
diff --git a/patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0230-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 6327eec23e..6327eec23e 100644
--- a/patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/patches/server/0230-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0230-Implement-Expanded-ArmorStand-API.patch b/patches/server/0231-Implement-Expanded-ArmorStand-API.patch
index ace889510d..ace889510d 100644
--- a/patches/server/0230-Implement-Expanded-ArmorStand-API.patch
+++ b/patches/server/0231-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0231-AnvilDamageEvent.patch b/patches/server/0232-AnvilDamageEvent.patch
index 3f534c2a7f..3f534c2a7f 100644
--- a/patches/server/0231-AnvilDamageEvent.patch
+++ b/patches/server/0232-AnvilDamageEvent.patch
diff --git a/patches/server/0232-Add-hand-to-bucket-events.patch b/patches/server/0233-Add-hand-to-bucket-events.patch
index 9720caf629..410b94d176 100644
--- a/patches/server/0232-Add-hand-to-bucket-events.patch
+++ b/patches/server/0233-Add-hand-to-bucket-events.patch
@@ -86,7 +86,7 @@ index 25f1567660682a122fcb63318f51ec45ffdf0d3b..5406acd65d4e1146f3bd7340ff9a1954
                  int i = blockposition.getX();
                  int j = blockposition.getY();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 658c656c32ebab5b84837473930d4f0680fc45ba..a1529301e4abcafa79d04b9819cf40a05febcac4 100644
+index 8620c065e7709bf8a366760073d58f902215d1c0..6f9498a7064c41e61f7e50cbe6b4a8d6384f902c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -422,6 +422,20 @@ public class CraftEventFactory {
diff --git a/patches/server/0233-Add-TNTPrimeEvent.patch b/patches/server/0234-Add-TNTPrimeEvent.patch
index 63784ce3b7..63784ce3b7 100644
--- a/patches/server/0233-Add-TNTPrimeEvent.patch
+++ b/patches/server/0234-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch
index 9d04624add..5a4f42a9f4 100644
--- a/patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 114a65963b65597ff915ec3a0d75bb78f33bd774..d654affc5565622cfabde9b838aa2b40e4e122bb 100644
+index b46b10c726b53b1106cc74ec9a5d6ca6f45c96fe..c3539fabda1887cca6e82abce26dff088cdc4251 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -318,4 +318,18 @@ public class PaperConfig {
@@ -45,7 +45,7 @@ index 114a65963b65597ff915ec3a0d75bb78f33bd774..d654affc5565622cfabde9b838aa2b40
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 76628de17e8fb374801b5b9e25f7ff6bd1465c30..4cd752ca349fb3cfd0d28f3a993531372e688d79 100644
+index e2da92d30ee405875dd711c1c118a97d2532b38e..be201267110d8cebb8d4c657f3b40191b38b4819 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -227,6 +227,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0236-MC-135506-Experience-should-save-as-Integers.patch
index c0c7c171ff..c0c7c171ff 100644
--- a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
+++ b/patches/server/0236-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/patches/server/0236-Fix-client-rendering-skulls-from-same-user.patch b/patches/server/0237-Fix-client-rendering-skulls-from-same-user.patch
index 4e0e6f3b86..0b0c26a907 100644
--- a/patches/server/0236-Fix-client-rendering-skulls-from-same-user.patch
+++ b/patches/server/0237-Fix-client-rendering-skulls-from-same-user.patch
@@ -54,7 +54,7 @@ index 303b877bc467de7c046cc221d061fac841c1d9f3..896a4237f871d46cf39b0721e909c2cc
              // CraftBukkit end
              return itemstack;
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
-index 069c12ec0b90d07f45b58b960ed41bad0480b5ab..108c5d7fedc125108ca97ce125520b64a083ccd4 100644
+index aec78b6079c3404d934d2b46bc0d2f9d2a871b6d..36d9308a11bde0a631de037cf1bcae1062eaa5d9 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 @@ -152,6 +152,7 @@ public class ClientboundLevelChunkPacketData {
diff --git a/patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index df399c88db..2a4e33d80b 100644
--- a/patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -29,7 +29,7 @@ index 81eb73e9fde37e3b196bd899ecd4d614897d1a98..4206e1c96cdc7b7e324331681215f735
  
      protected void tick() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4d69b6b35f04c904ee9ca9c896baaa9892f8ef9c..5f58aa648a5f0c3e61f6d9d5853583ca003e3620 100644
+index 1d29f6c12d2c9de7918669ec03da7307a899e9ab..e09638b0ac68a685bf71ae3a84475bde19669b1e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -209,6 +209,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -72,7 +72,7 @@ index 4d69b6b35f04c904ee9ca9c896baaa9892f8ef9c..5f58aa648a5f0c3e61f6d9d5853583ca
              return false;
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c8296a685d67413501128fb5a2d86febc7a50206..30fb09933978264df4f476e7668998a5dd95eada 100644
+index 0fe90a47a73266e929022d807d6586e2a76dfb0e..513331442058ee61a08f4ad69b8912fa3e0d6868 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -173,6 +173,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch
index ddcea99d0d..13e3f8433c 100644
--- a/patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d654affc5565622cfabde9b838aa2b40e4e122bb..23ddaffadfafc3b23a09fcba2bf708f570415006 100644
+index c3539fabda1887cca6e82abce26dff088cdc4251..924b890d34c113ce804244dbb6635ff737f974b5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -36,7 +36,7 @@ index d654affc5565622cfabde9b838aa2b40e4e122bb..23ddaffadfafc3b23a09fcba2bf708f5
      public static int tabSpamLimit = 500;
      private static void tabSpamLimiters() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4da9491425649b2b930b2304c4aa6692540ff4cb..d6e6bc73f9bbcae99126876a9abdd3468d6c2a7f 100644
+index c7881eebb02424ce488d2c04aa736f17402109a0..4f070d2a7ff5dfe9890e79c30911a1fe1ec9983b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1096,6 +1096,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -48,7 +48,7 @@ index 4da9491425649b2b930b2304c4aa6692540ff4cb..d6e6bc73f9bbcae99126876a9abdd346
                  long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9ef4ba665c4f8abaf7ccefa254e15fa11e814fc9..dd999bd389e66c8ea00ed5ef5b0d9bbe216aeb94 100644
+index 882a2afed87c1b0d23733831c33391b414c4efcb..32e36ac1955ef02388a492c39c3a2698e229641b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -905,6 +905,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0239-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch
index d11cc073c4..8c4e806662 100644
--- a/patches/server/0239-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch
@@ -23,7 +23,7 @@ Modified isEmpty to use the isEmpty() method instead of the slightly confusing s
 The point of this is readability, but does have a side-benefit of a small microptimization
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b2034239e158ce0388c9b09a52d457271a487d8f..8e8fee668b6a351ef14904e6e065e59014868adb 100644
+index 58ef89a8a3ee74814a0e77e2a28271c2cf4266ca..12451cc9eca34baa5d5ef6e55f4e4a63356365c6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -618,7 +618,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0240-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch
index 742b00ee96..742b00ee96 100644
--- a/patches/server/0240-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index a583e1baff..a583e1baff 100644
--- a/patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0242-Optimize-BlockPosition-helper-methods.patch b/patches/server/0243-Optimize-BlockPosition-helper-methods.patch
index b69dfaf75d..98bff9124a 100644
--- a/patches/server/0242-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/server/0243-Optimize-BlockPosition-helper-methods.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods
 Resolves #1338
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 85bdeafd92aff5d694c4b5dff0b5796f3467a886..0e39b49f603bea0f731652bac71067237b3869b4 100644
+index d425adc1f37b9f926d6ee0c90d2237d89355e1a6..a1060bd5ee1f2f6ce34cfcf2e76a89cddc425c5f 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
 @@ -130,67 +130,84 @@ public class BlockPos extends Vec3i {
diff --git a/patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index 891e5bf4db..891e5bf4db 100644
--- a/patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0244-Slime-Pathfinder-Events.patch b/patches/server/0245-Slime-Pathfinder-Events.patch
index 40c543b870..40c543b870 100644
--- a/patches/server/0244-Slime-Pathfinder-Events.patch
+++ b/patches/server/0245-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0245-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch
index ce3d7f6c74..ce3d7f6c74 100644
--- a/patches/server/0245-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0246-Optimize-CraftBlockData-Creation.patch b/patches/server/0247-Optimize-CraftBlockData-Creation.patch
index 998ef1e21b..998ef1e21b 100644
--- a/patches/server/0246-Optimize-CraftBlockData-Creation.patch
+++ b/patches/server/0247-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0247-Optimize-MappedRegistry.patch b/patches/server/0248-Optimize-MappedRegistry.patch
index b3586a0249..b3586a0249 100644
--- a/patches/server/0247-Optimize-MappedRegistry.patch
+++ b/patches/server/0248-Optimize-MappedRegistry.patch
diff --git a/patches/server/0248-Add-PhantomPreSpawnEvent.patch b/patches/server/0249-Add-PhantomPreSpawnEvent.patch
index e3026cd52d..e3026cd52d 100644
--- a/patches/server/0248-Add-PhantomPreSpawnEvent.patch
+++ b/patches/server/0249-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0249-Add-More-Creeper-API.patch b/patches/server/0250-Add-More-Creeper-API.patch
index b92aff3e3f..b92aff3e3f 100644
--- a/patches/server/0249-Add-More-Creeper-API.patch
+++ b/patches/server/0250-Add-More-Creeper-API.patch
diff --git a/patches/server/0250-Inventory-removeItemAnySlot.patch b/patches/server/0251-Inventory-removeItemAnySlot.patch
index 533e72fb45..533e72fb45 100644
--- a/patches/server/0250-Inventory-removeItemAnySlot.patch
+++ b/patches/server/0251-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 975ee4c615..975ee4c615 100644
--- a/patches/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0252-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0253-Asynchronous-chunk-IO-and-loading.patch
index 6dd1dad6bd..d51d04a5d8 100644
--- a/patches/server/0252-Asynchronous-chunk-IO-and-loading.patch
+++ b/patches/server/0253-Asynchronous-chunk-IO-and-loading.patch
@@ -2318,7 +2318,7 @@ index 8f5784ed4df46f3c7d4c6b4ff76ad839d436be1f..6a006f22d33491be4413fb64649ba9f6
                  DedicatedServer dedicatedserver1 = new DedicatedServer(optionset, config.get(), ops.get(), thread, convertable_conversionsession, resourcepackrepository, worldstem, dedicatedserversettings, DataFixers.getDataFixer(), minecraftsessionservice, gameprofilerepository, usercache, LoggerChunkProgressListener::new);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d6e6bc73f9bbcae99126876a9abdd3468d6c2a7f..785df5ec8a5a4e307149edd5ccf7db75f7edb1fc 100644
+index 4f070d2a7ff5dfe9890e79c30911a1fe1ec9983b..311a51f91f6f4572d56dcd700c652b2690239f75 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -996,7 +996,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2866,7 +2866,7 @@ index 0d536d72ac918fbd403397ff369d10143ee9c204..be677d437d17b74c6188ce1bd5fc6fdc
      private final String name;
      private final Comparator<T> comparator;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4cd752ca349fb3cfd0d28f3a993531372e688d79..a7ee0d00e2688bf84efd25c1c4d679213a783b1b 100644
+index be201267110d8cebb8d4c657f3b40191b38b4819..d8cc0680c73da2e594cb091138fc4626e4eb60ec 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -717,6 +717,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0254-Add-ray-tracing-methods-to-LivingEntity.patch
index a639c0f642..538ab0ac4c 100644
--- a/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/server/0254-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -28,7 +28,7 @@ index 0cf818fceddd76e7704fdc6625456787856b2815..ccdee183f02ab55723e16f41efce55dc
          switch (enumDirection) {
              case DOWN:
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7436cf1b9cce14494bd514cb7f4ed03536170c87..f62dd338c5f0618b6235d398bd56cb6737577a0b 100644
+index 1cf4c80d03b8843be9abbb72baba8cde0bbd329b..c02bca930f1504ff0f294bd60c488c41b05aecdf 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3679,6 +3679,23 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0255-Expose-attack-cooldown-methods-for-Player.patch
index 565f7d82e8..565f7d82e8 100644
--- a/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0255-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0255-Improve-death-events.patch b/patches/server/0256-Improve-death-events.patch
index 30609db1f7..fd2c2c081f 100644
--- a/patches/server/0255-Improve-death-events.patch
+++ b/patches/server/0256-Improve-death-events.patch
@@ -70,7 +70,7 @@ index 495acba272889277768a6673d7b2b2b691d93477..919fcca5d23002d1637c1f03f2255c74
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f62dd338c5f0618b6235d398bd56cb6737577a0b..bd4230a4e5fc9c1264b390b59ddefbd0aa8e73c8 100644
+index c02bca930f1504ff0f294bd60c488c41b05aecdf..681ca7f6049016f7661215e4d5ee56257a32a9b2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -260,6 +260,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0257-Allow-chests-to-be-placed-with-NBT-data.patch
index d8349a70c7..d8349a70c7 100644
--- a/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/server/0257-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0257-Mob-Pathfinding-API.patch b/patches/server/0258-Mob-Pathfinding-API.patch
index 99a04d0b70..49c958043d 100644
--- a/patches/server/0257-Mob-Pathfinding-API.patch
+++ b/patches/server/0258-Mob-Pathfinding-API.patch
@@ -163,7 +163,7 @@ index 4ad2ac8d1e9111933fa58c47442fa1f5e8173fd3..2a335f277bd0e4b8ad0f60d8226eb8aa
      public Path(List<Node> nodes, BlockPos target, boolean reachesTarget) {
          this.nodes = nodes;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 219bdf53a860628335efe92d4f294a5fa52087b2..b0d348061487110993b6c4c8a7dc7208f27361b3 100644
+index 55c27a3d9b540c4c4d7701bd0cdf167bb7af3dd4..28d6e31bfdf31d3e56024c731b833c4424313307 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable;
diff --git a/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0259-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 111c74cacf..111c74cacf 100644
--- a/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/patches/server/0259-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 8e59eff59d..8e59eff59d 100644
--- a/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0261-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index ded712fe98..ded712fe98 100644
--- a/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/patches/server/0261-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 150427b2a7..150427b2a7 100644
--- a/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0263-Implement-furnace-cook-speed-multiplier-API.patch
index d75b53a879..d75b53a879 100644
--- a/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/server/0263-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 740e527815..740e527815 100644
--- a/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/patches/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0264-Honor-EntityAgeable.ageLock.patch b/patches/server/0265-Honor-EntityAgeable.ageLock.patch
index 8a44dcb055..8a44dcb055 100644
--- a/patches/server/0264-Honor-EntityAgeable.ageLock.patch
+++ b/patches/server/0265-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0265-Configurable-connection-throttle-kick-message.patch b/patches/server/0266-Configurable-connection-throttle-kick-message.patch
index 369ed58059..8d23dc2d80 100644
--- a/patches/server/0265-Configurable-connection-throttle-kick-message.patch
+++ b/patches/server/0266-Configurable-connection-throttle-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection throttle kick message
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 0e4cb05e78ff78bce6ca42fd30b6f9ff42f87f7d..b0b3820e9609b301f92545c87289279df975424e 100644
+index 5def23f470c9737884bdf7551e426faf887bca9c..51dd358137d37eb078aff036ccf12db7f01c469b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -294,6 +294,11 @@ public class PaperConfig {
diff --git a/patches/server/0266-Hook-into-CB-plugin-rewrites.patch b/patches/server/0267-Hook-into-CB-plugin-rewrites.patch
index a3aff98067..a3aff98067 100644
--- a/patches/server/0266-Hook-into-CB-plugin-rewrites.patch
+++ b/patches/server/0267-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0267-PreSpawnerSpawnEvent.patch b/patches/server/0268-PreSpawnerSpawnEvent.patch
index 0e9cb1f017..0e9cb1f017 100644
--- a/patches/server/0267-PreSpawnerSpawnEvent.patch
+++ b/patches/server/0268-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0268-Add-LivingEntity-getTargetEntity.patch b/patches/server/0269-Add-LivingEntity-getTargetEntity.patch
index 886dba3bbe..eefafb25f4 100644
--- a/patches/server/0268-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0269-Add-LivingEntity-getTargetEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bd4230a4e5fc9c1264b390b59ddefbd0aa8e73c8..e5c5bdc83804f335d7163cfefba79b57df97310b 100644
+index 681ca7f6049016f7661215e4d5ee56257a32a9b2..1d679a04a49af796074c27d56e8ab07f0b09b002 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -115,6 +115,7 @@ import net.minecraft.world.level.storage.loot.LootTable;
diff --git a/patches/server/0269-Add-sun-related-API.patch b/patches/server/0270-Add-sun-related-API.patch
index 2ce2081d0a..2ce2081d0a 100644
--- a/patches/server/0269-Add-sun-related-API.patch
+++ b/patches/server/0270-Add-sun-related-API.patch
diff --git a/patches/server/0270-Turtle-API.patch b/patches/server/0271-Turtle-API.patch
index fb6ff88d30..fb6ff88d30 100644
--- a/patches/server/0270-Turtle-API.patch
+++ b/patches/server/0271-Turtle-API.patch
diff --git a/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0272-Call-player-spectator-target-events-and-improve-impl.patch
index 70325b903d..ec6af19533 100644
--- a/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0272-Call-player-spectator-target-events-and-improve-impl.patch
@@ -19,7 +19,7 @@ spectate the target entity.
 Co-authored-by: Spottedleaf <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a24e3ecd41cb4930ec42c7838f869d83a8d0da36..0a6617a8f428ddc52ec85209347bf35ce3651431 100644
+index 919fcca5d23002d1637c1f03f2255c74c6df7f5a..02ce18a1904057e74b2953e525818f772c7a5df7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1854,14 +1854,58 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0273-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index 5d84ab043d..5d84ab043d 100644
--- a/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/patches/server/0273-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0274-Add-Velocity-IP-Forwarding-Support.patch
index f3c87cf9cf..c4dcbdcdbc 100644
--- a/patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0274-Add-Velocity-IP-Forwarding-Support.patch
@@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
 login plugin message packet.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b0b3820e9609b301f92545c87289279df975424e..c1fbff8ccfdb95aebc330e2621c4fc9c71ebfb9e 100644
+index 51dd358137d37eb078aff036ccf12db7f01c469b..65df47283afc4aa1453fdd18e65e6f8cb3bd0c3f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -9,6 +9,7 @@ import java.io.IOException;
@@ -225,7 +225,7 @@ index 5ebc450432805d52457b9f8ff1e2b1981bdd78e6..4c06e62e967f28eb844d74237948834e
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dd999bd389e66c8ea00ed5ef5b0d9bbe216aeb94..5bec8257d7f336837d03f7eed48bdeea6179bf1a 100644
+index 32e36ac1955ef02388a492c39c3a2698e229641b..b0f7f44569f119d9e16bc468124b69244c61bf87 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -760,7 +760,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0274-Add-more-Witch-API.patch b/patches/server/0275-Add-more-Witch-API.patch
index 7d2cd72ae6..7d2cd72ae6 100644
--- a/patches/server/0274-Add-more-Witch-API.patch
+++ b/patches/server/0275-Add-more-Witch-API.patch
diff --git a/patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0276-Check-Drowned-for-Villager-Aggression-Config.patch
index 0e81942661..0e81942661 100644
--- a/patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/server/0276-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0277-Add-option-to-prevent-players-from-moving-into-unloa.patch
index ef379e6603..33c7ee69cb 100644
--- a/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0277-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -20,7 +20,7 @@ index dcd64f7d4b3ad4265d82ae82fb0014ab75939161..881cd17e2e9b54683941d58820b8bf0b
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a7ee0d00e2688bf84efd25c1c4d679213a783b1b..02d072816d7599204dd8f4d7b2da1a4598c7d984 100644
+index d8cc0680c73da2e594cb091138fc4626e4eb60ec..4792fd0a8125ed1be1c5c1ee46138cb5b6c03ac5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -498,9 +498,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0277-Reset-players-airTicks-on-respawn.patch b/patches/server/0278-Reset-players-airTicks-on-respawn.patch
index 2735a25172..a705494992 100644
--- a/patches/server/0277-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0278-Reset-players-airTicks-on-respawn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0a6617a8f428ddc52ec85209347bf35ce3651431..b36388f8a6081e3f2b7f6ac93b71ff40518b7b22 100644
+index 02ce18a1904057e74b2953e525818f772c7a5df7..d020dd3ce45835813a40b1432f8e203b1ea9911e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2256,6 +2256,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0279-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index c4f99ad87b..c4f99ad87b 100644
--- a/patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/server/0279-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0280-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 07bee411a0..07bee411a0 100644
--- a/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0280-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0280-Optimize-World-Time-Updates.patch b/patches/server/0281-Optimize-World-Time-Updates.patch
index f74adbcae1..f370ef3f94 100644
--- a/patches/server/0280-Optimize-World-Time-Updates.patch
+++ b/patches/server/0281-Optimize-World-Time-Updates.patch
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index de10fc8a9d08dbab245292a4291590b54b0aa609..a241aa163a957f3c56e7764acf46aa8490758d41 100644
+index 4525b3012269a98fb825273d358d414e01119abd..067fa77d706a193dd3dcb4cc58d2e1b25840e6f3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1419,12 +1419,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0281-Restore-custom-InventoryHolder-support.patch b/patches/server/0282-Restore-custom-InventoryHolder-support.patch
index e6bd4912aa..e6bd4912aa 100644
--- a/patches/server/0281-Restore-custom-InventoryHolder-support.patch
+++ b/patches/server/0282-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0282-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0283-Use-Vanilla-Minecart-Speeds.patch
index 00688862a0..00688862a0 100644
--- a/patches/server/0282-Use-Vanilla-Minecart-Speeds.patch
+++ b/patches/server/0283-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0283-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0284-Fix-SpongeAbsortEvent-handling.patch
index 85241ba175..85241ba175 100644
--- a/patches/server/0283-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/server/0284-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0285-Don-t-allow-digging-into-unloaded-chunks.patch
index 565bdeeeaf..67ebd3e373 100644
--- a/patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0285-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -59,7 +59,7 @@ index 91d6885da13138e1def16e1876910ef893ce244d..eb58536e37af9da5e3ae7e43f874a1ef
  
                  this.level.destroyBlockProgress(this.player.getId(), pos, -1);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 02d072816d7599204dd8f4d7b2da1a4598c7d984..95561ebe675957a9553ef0802c701ab0385dfbec 100644
+index 4792fd0a8125ed1be1c5c1ee46138cb5b6c03ac5..7a4bb44455ddf5f594e4262e1196b23c81e6ec30 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1567,7 +1567,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0285-Make-the-default-permission-message-configurable.patch b/patches/server/0286-Make-the-default-permission-message-configurable.patch
index ad68dc74e9..29b305a658 100644
--- a/patches/server/0285-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0286-Make-the-default-permission-message-configurable.patch
@@ -5,20 +5,20 @@ Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index a7182a4c64980aa19b8493ac9c2bb762603e615b..006f2e900de3a665fa48cac877511277a900be62 100644
+index 0c7738412ce5c9b8c66e3f1c1e13fcd2a2154195..d20fd81524518459635c1b78770de087ad178743 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-@@ -52,7 +52,7 @@ public class PaperCommand extends Command {
+@@ -56,7 +56,7 @@ public class PaperCommand extends Command {
  
      private static boolean testPermission(CommandSender commandSender, String permission) {
          if (commandSender.hasPermission(BASE_PERM + permission) || commandSender.hasPermission("bukkit.command.paper")) return true;
--        commandSender.sendMessage(ChatColor.RED + "I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error."); // Sorry, kashike
+-        commandSender.sendMessage(text("I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error.", RED));
 +        commandSender.sendMessage(Bukkit.getPermissionMessage()); // Sorry, kashike
          return false;
      }
  
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c1fbff8ccfdb95aebc330e2621c4fc9c71ebfb9e..36719c689a24c63e7d9a5b40f8c262c182a31b21 100644
+index 65df47283afc4aa1453fdd18e65e6f8cb3bd0c3f..80306b595b555d4057975a07872084a83abe78ae 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -20,6 +20,7 @@ import java.util.regex.Pattern;
@@ -42,7 +42,7 @@ index c1fbff8ccfdb95aebc330e2621c4fc9c71ebfb9e..36719c689a24c63e7d9a5b40f8c262c1
          Object val = config.get("settings.save-player-data");
          if (val instanceof Boolean) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5bec8257d7f336837d03f7eed48bdeea6179bf1a..90cdaebe9b8b81b5f7d65e7b153daec7d0df0411 100644
+index b0f7f44569f119d9e16bc468124b69244c61bf87..04457c57b971ef16b202768c26f6e98fe9b1602f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2600,6 +2600,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0287-Prevent-rayTrace-from-loading-chunks.patch
index dd9d69d953..dd9d69d953 100644
--- a/patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch
+++ b/patches/server/0287-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0287-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0288-Handle-Large-Packets-disconnecting-client.patch
index 0482070972..97b77cfa23 100644
--- a/patches/server/0287-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0288-Handle-Large-Packets-disconnecting-client.patch
@@ -101,7 +101,7 @@ index 0e076173033278587df2b5dfbd01cc9005651eb5..dbd8b9b09b82c1b75e8be9dc7416d9f0
      public void write(FriendlyByteBuf buf) {
          buf.writeByte(this.containerId);
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
-index 108c5d7fedc125108ca97ce125520b64a083ccd4..4ed3b1291ac443502e9b99f83ecf02b22509451c 100644
+index 36d9308a11bde0a631de037cf1bcae1062eaa5d9..b89965c73bb6f40e688bd29daf6630ccce054100 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 @@ -50,7 +50,7 @@ public class ClientboundLevelChunkPacketData {
diff --git a/patches/server/0288-force-entity-dismount-during-teleportation.patch b/patches/server/0289-force-entity-dismount-during-teleportation.patch
index 546a99e976..8c7100d460 100644
--- a/patches/server/0288-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0289-force-entity-dismount-during-teleportation.patch
@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b36388f8a6081e3f2b7f6ac93b71ff40518b7b22..8bd1e1e521a56065b928b5b76b5fcfe1d9634565 100644
+index d020dd3ce45835813a40b1432f8e203b1ea9911e..85a6204af67c5f8a9bd0dfc8598a2a2db2e3e4c1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1327,11 +1327,13 @@ public class ServerPlayer extends Player {
@@ -93,7 +93,7 @@ index 513331442058ee61a08f4ad69b8912fa3e0d6868..44c53588c54fd275d3f0c7bb5febb678
              if (this.valid) {
                  Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e5c5bdc83804f335d7163cfefba79b57df97310b..853ce6536557b64de134a098d7ed3dde2782ffde 100644
+index 1d679a04a49af796074c27d56e8ab07f0b09b002..8f595222d9b797d03558ec060a5f315ccfd369b3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3347,9 +3347,15 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0289-Add-more-Zombie-API.patch b/patches/server/0290-Add-more-Zombie-API.patch
index 27a69eb714..9c329eb433 100644
--- a/patches/server/0289-Add-more-Zombie-API.patch
+++ b/patches/server/0290-Add-more-Zombie-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 45cfbf30d27139036dee5379a88ed24a5cee51b4..65a85eba15c42d55f52a01d2484e02ba6ba36b35 100644
+index 953f138b6cd48cc94bc23a4321a9684b4214637e..273f5eb930a37046900f706f5f710ae3fcc9b6df 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -93,6 +93,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0290-Book-Size-Limits.patch b/patches/server/0291-Book-Size-Limits.patch
index c4b10ad421..3cb4a40976 100644
--- a/patches/server/0290-Book-Size-Limits.patch
+++ b/patches/server/0291-Book-Size-Limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 36719c689a24c63e7d9a5b40f8c262c182a31b21..83bf428abd3be89e34cf42638bd1357a708ea0e3 100644
+index 80306b595b555d4057975a07872084a83abe78ae..0be8f68c3e61f132ada9381e36b743dd7477eece 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -369,6 +369,13 @@ public class PaperConfig {
@@ -24,7 +24,7 @@ index 36719c689a24c63e7d9a5b40f8c262c182a31b21..83bf428abd3be89e34cf42638bd1357a
      private static void asyncChunks() {
          ConfigurationSection section;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 95561ebe675957a9553ef0802c701ab0385dfbec..934c59f0f65b3751f74dab17b9f730d333d7a0fb 100644
+index 7a4bb44455ddf5f594e4262e1196b23c81e6ec30..237137713a07db847a37af3a79f3489ee25d6350 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1016,6 +1016,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0291-Add-PlayerConnectionCloseEvent.patch b/patches/server/0292-Add-PlayerConnectionCloseEvent.patch
index 5a881a7a41..5a881a7a41 100644
--- a/patches/server/0291-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0292-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0292-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0293-Prevent-Enderman-from-loading-chunks.patch
index 60ad30486e..60ad30486e 100644
--- a/patches/server/0292-Prevent-Enderman-from-loading-chunks.patch
+++ b/patches/server/0293-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0294-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index e49390005a..e49390005a 100644
--- a/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0294-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0295-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 2610aa0267..1b1595839e 100644
--- a/patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0295-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 78a37ed352f9ced438e576f09fb340bc5159ddec..b4f29e8a3cf30043c4295ec6fa57ab8a184eacab 100644
+index 5aebf4d330dda519efb4ab6e7bcdf4ccb174b11a..b26c4933d4b8e782e9cf5de3371162d30b304954 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1569,6 +1569,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0296-Block-Entity-remove-from-being-called-on-Players.patch
index 252637793d..252637793d 100644
--- a/patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/server/0296-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0296-BlockDestroyEvent.patch b/patches/server/0297-BlockDestroyEvent.patch
index 6671426322..6671426322 100644
--- a/patches/server/0296-BlockDestroyEvent.patch
+++ b/patches/server/0297-BlockDestroyEvent.patch
diff --git a/patches/server/0297-Async-command-map-building.patch b/patches/server/0298-Async-command-map-building.patch
index 22cd32cfcc..22cd32cfcc 100644
--- a/patches/server/0297-Async-command-map-building.patch
+++ b/patches/server/0298-Async-command-map-building.patch
diff --git a/patches/server/0298-Implement-Brigadier-Mojang-API.patch b/patches/server/0299-Implement-Brigadier-Mojang-API.patch
index 0db4a53a0a..8959b49b02 100644
--- a/patches/server/0298-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0299-Implement-Brigadier-Mojang-API.patch
@@ -10,7 +10,7 @@ Adds CommandRegisteredEvent
   - Allows manipulating the CommandNode to add more children/metadata for the client
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ad1e2497f2740fb6e9c64e562a95bf064bea981f..1d7bbff8711bfb991046ecc66dce328a5f643c2d 100644
+index 004b37cddc8e5e4cb4643f52eb58254796886fe7..5a609a297ccfa66859b04eb907595741b8ec2160 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -8,6 +8,7 @@ plugins {
@@ -81,7 +81,7 @@ index f3bbe012541a71ab75c1863990d0c056c62d8c6e..4bc28b66788d06d1446284f5adef6a44
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 934c59f0f65b3751f74dab17b9f730d333d7a0fb..10cb5886aa040db25863ee8664ea7529a0f1649f 100644
+index 237137713a07db847a37af3a79f3489ee25d6350..a83f557b39858662e8ca9acf7d751093eb1959ec 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -757,8 +757,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0300-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 903ba48692..903ba48692 100644
--- a/patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/patches/server/0300-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0300-Limit-Client-Sign-length-more.patch b/patches/server/0301-Limit-Client-Sign-length-more.patch
index 05ae302e8e..db67eb26cb 100644
--- a/patches/server/0300-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0301-Limit-Client-Sign-length-more.patch
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 10cb5886aa040db25863ee8664ea7529a0f1649f..7634492e62cdc0a6e309f8bcc096efd905e82135 100644
+index a83f557b39858662e8ca9acf7d751093eb1959ec..cab78d85bda9b4d7113a4fae929224b7c5bfcdb0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -254,6 +254,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0302-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 1f80323016..1f80323016 100644
--- a/patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/patches/server/0302-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0303-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index bdd97d4256..bdd97d4256 100644
--- a/patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0303-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0304-Handle-Oversized-Tile-Entities-in-chunks.patch
index f3b5f4619c..f3b5f4619c 100644
--- a/patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch
+++ b/patches/server/0304-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0305-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index cc6da2d01b..9ca84565f0 100644
--- a/patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/patches/server/0305-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process
 Fixes GH-1887
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 65a85eba15c42d55f52a01d2484e02ba6ba36b35..996613d75f66d97c3bd5241ca1c1346b92ec06dd 100644
+index 273f5eb930a37046900f706f5f710ae3fcc9b6df..0760fcc3bde6b819ae526e2c66486b09a948d98b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -222,6 +222,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0306-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 5fc785eca6..62eff92250 100644
--- a/patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0306-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e889c7f626316ea68e9231d903bd97095f07e9e9..b494d7fc864a2fa734c73c2c4d433e288bccfb26 100644
+index 9e3272a85e760e65217bd75c3ba9bfe21979fd35..cc8d7d56bf30732482ac2a16bdfb22d2c1b18deb 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1123,6 +1123,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0306-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/server/0307-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index 2b7d6b0305..2b7d6b0305 100644
--- a/patches/server/0306-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/patches/server/0307-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/patches/server/0307-Entity-getEntitySpawnReason.patch b/patches/server/0308-Entity-getEntitySpawnReason.patch
index db64fcad8a..ccf42046f7 100644
--- a/patches/server/0307-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0308-Entity-getEntitySpawnReason.patch
@@ -22,7 +22,7 @@ index b57b6f411442827ec1222fbf5bf87947e325d470..19dc74ab02744c70a3b2c75c0a62edb1
              // Paper start
              if (DEBUG_ENTITIES) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b494d7fc864a2fa734c73c2c4d433e288bccfb26..840bfcea9347b50b422eb7a325a1be438da45015 100644
+index cc8d7d56bf30732482ac2a16bdfb22d2c1b18deb..1de3cb1ed15c9efbc602a46a28bbb3473d6c91e1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -342,7 +342,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0308-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0309-Update-entity-Metadata-for-all-tracked-players.patch
index 9c2db47154..2f3a86283a 100644
--- a/patches/server/0308-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/patches/server/0309-Update-entity-Metadata-for-all-tracked-players.patch
@@ -22,7 +22,7 @@ index 861f3790179e18f6192ac8b2fb5d2ecbc54484ad..5e3f489964489e0facc93a823a1cb84b
          this.broadcast.accept(packet);
          if (this.entity instanceof ServerPlayer) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7634492e62cdc0a6e309f8bcc096efd905e82135..97ccab168e609577347b155c22040efc028d3cf8 100644
+index cab78d85bda9b4d7113a4fae929224b7c5bfcdb0..b346c906cea1f6d08203bedb1c6acf61dc6a1d22 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2309,7 +2309,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0309-Fire-event-on-GS4-query.patch b/patches/server/0310-Fire-event-on-GS4-query.patch
index 35d0794ebf..35d0794ebf 100644
--- a/patches/server/0309-Fire-event-on-GS4-query.patch
+++ b/patches/server/0310-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0310-Implement-PlayerPostRespawnEvent.patch b/patches/server/0311-Implement-PlayerPostRespawnEvent.patch
index 8765dc67f9..1f025fa066 100644
--- a/patches/server/0310-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/server/0311-Implement-PlayerPostRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 840bfcea9347b50b422eb7a325a1be438da45015..5623398d3c6fc804a078c10af4bdc24cb63d6ef6 100644
+index 1de3cb1ed15c9efbc602a46a28bbb3473d6c91e1..fbed83f8c49267a657a3df1c6e4b42ce2046b052 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -722,9 +722,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0311-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0312-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 309d46c6a4..7c58eea21b 100644
--- a/patches/server/0311-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0312-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
 vanilla checks for == 0
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index b374d50678e92fabbf1d640729a8a276fc791c62..b72bb3b78a3b19edb67e74bdc03a46060a1f6af3 100644
+index df5064e69f10bb366572e5f1da197514f3067faf..ff3182c40d2e3942190cac8ddb008ba6c5a72d99 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -106,6 +106,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0312-Server-Tick-Events.patch b/patches/server/0313-Server-Tick-Events.patch
index 20e65776b4..fe53c376cd 100644
--- a/patches/server/0312-Server-Tick-Events.patch
+++ b/patches/server/0313-Server-Tick-Events.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a241aa163a957f3c56e7764acf46aa8490758d41..cdf6394401882cb0702be6ed962e9c0683d3f67a 100644
+index 067fa77d706a193dd3dcb4cc58d2e1b25840e6f3..dbf70401a93776f422af4386bceaae6fb9883c4f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1348,6 +1348,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0313-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0314-PlayerDeathEvent-getItemsToKeep.patch
index f7e8c85087..45f593246a 100644
--- a/patches/server/0313-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0314-PlayerDeathEvent-getItemsToKeep.patch
@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b4f29e8a3cf30043c4295ec6fa57ab8a184eacab..ecd52f47f70e26112a221ae62bd81d89bdefbfd0 100644
+index b26c4933d4b8e782e9cf5de3371162d30b304954..572f7092a416793e726c794b7de34def47196e1e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -766,6 +766,46 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0314-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0315-Optimize-Captured-TileEntity-Lookup.patch
index 78a1360904..78a1360904 100644
--- a/patches/server/0314-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/server/0315-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0315-Add-Heightmap-API.patch b/patches/server/0316-Add-Heightmap-API.patch
index 649d8cb90c..28991c8480 100644
--- a/patches/server/0315-Add-Heightmap-API.patch
+++ b/patches/server/0316-Add-Heightmap-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d9763271118ac44a6465464fb097503b86ce925e..0d3cea84314d4aeddc36266789283695d70f2eb7 100644
+index 6871ee1f69b2dced4874c0d28b27b6ba11ef1c9f..7540be1005db97a20d44d55c0e59547113d6ad80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -216,6 +216,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0316-Mob-Spawner-API-Enhancements.patch b/patches/server/0317-Mob-Spawner-API-Enhancements.patch
index 267037a711..267037a711 100644
--- a/patches/server/0316-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0317-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0317-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0318-Fix-CB-call-to-changed-postToMainThread-method.patch
index 93146f6c16..6f0e8c3cd2 100644
--- a/patches/server/0317-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0318-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 97ccab168e609577347b155c22040efc028d3cf8..e668eb2d9734d1b2251f651aa3f2744ac5cf4ce2 100644
+index b346c906cea1f6d08203bedb1c6acf61dc6a1d22..a6017a80e5015929903e8fe29e6335615a322700 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -439,7 +439,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0318-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0319-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index de77003ffb..de77003ffb 100644
--- a/patches/server/0318-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/server/0319-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0319-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index 44ccd38f58..45f46e7ec1 100644
--- a/patches/server/0319-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/patches/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled
 synchronously when the server gets shut down.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cdf6394401882cb0702be6ed962e9c0683d3f67a..5ce1fab4d1e68ad83bd46ae6269446b6f913fa07 100644
+index dbf70401a93776f422af4386bceaae6fb9883c4f..99b4f6ad3a973e400e37d53b977e19573bdfd694 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2333,7 +2333,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -29,7 +29,7 @@ index cdf6394401882cb0702be6ed962e9c0683d3f67a..5ce1fab4d1e68ad83bd46ae6269446b6
  
      public boolean isDebugging() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 90cdaebe9b8b81b5f7d65e7b153daec7d0df0411..a98a9a2eb9f19d37bfff412c1dcebecb07b60014 100644
+index 04457c57b971ef16b202768c26f6e98fe9b1602f..4323bbd4763b9bd5eebd3313c3de3c6070251c42 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2067,7 +2067,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0320-improve-CraftWorld-isChunkLoaded.patch b/patches/server/0321-improve-CraftWorld-isChunkLoaded.patch
index e66756ff92..e66756ff92 100644
--- a/patches/server/0320-improve-CraftWorld-isChunkLoaded.patch
+++ b/patches/server/0321-improve-CraftWorld-isChunkLoaded.patch
diff --git a/patches/server/0321-Implement-CraftBlockSoundGroup.patch b/patches/server/0322-Implement-CraftBlockSoundGroup.patch
index a62be7b054..a62be7b054 100644
--- a/patches/server/0321-Implement-CraftBlockSoundGroup.patch
+++ b/patches/server/0322-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0322-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0323-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 46ce0b398e..39b49bbc91 100644
--- a/patches/server/0322-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0323-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -23,7 +23,7 @@ index 881cd17e2e9b54683941d58820b8bf0baf043f03..bf85efd8ebfafe567c06b54425b9968d
          config.addDefault("world-settings.default." + path, def);
          return config.getBoolean("world-settings." + worldName + "." + path, config.getBoolean("world-settings.default." + path));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5ce1fab4d1e68ad83bd46ae6269446b6f913fa07..25fb2789bcec7cf864b3a401610e765daa1abe22 100644
+index 99b4f6ad3a973e400e37d53b977e19573bdfd694..30c10b151503a1710d3adce81640bfbd727eabe0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -758,31 +758,34 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0323-ChunkMapDistance-CME.patch b/patches/server/0324-ChunkMapDistance-CME.patch
index e2928c7bd5..e2928c7bd5 100644
--- a/patches/server/0323-ChunkMapDistance-CME.patch
+++ b/patches/server/0324-ChunkMapDistance-CME.patch
diff --git a/patches/server/0324-Chunk-debug-command.patch b/patches/server/0325-Chunk-debug-command.patch
index f4bd4f78b9..4e28318b14 100644
--- a/patches/server/0324-Chunk-debug-command.patch
+++ b/patches/server/0325-Chunk-debug-command.patch
@@ -32,7 +32,7 @@ https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528273&page=com.atlass
 https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528577&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-528577
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 006f2e900de3a665fa48cac877511277a900be62..2225f79b17862160701ae3670cda348cc2e45f0a 100644
+index d20fd81524518459635c1b78770de087ad178743..68f3f5ebd2188bf8280fc028f98ef8bb51622c26 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -6,13 +6,15 @@ import com.google.common.collect.ImmutableSet;
@@ -52,7 +52,15 @@ index 006f2e900de3a665fa48cac877511277a900be62..2225f79b17862160701ae3670cda348c
  import org.apache.commons.lang3.tuple.MutablePair;
  import org.apache.commons.lang3.tuple.Pair;
  import org.bukkit.Bukkit;
-@@ -41,7 +43,7 @@ import java.util.stream.Collectors;
+@@ -39,13 +41,15 @@ import java.util.Set;
+ import java.util.stream.Collectors;
+ 
+ import static net.kyori.adventure.text.Component.text;
++import static net.kyori.adventure.text.format.NamedTextColor.BLUE;
++import static net.kyori.adventure.text.format.NamedTextColor.DARK_AQUA;
+ import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
+ import static net.kyori.adventure.text.format.NamedTextColor.RED;
+ import static net.kyori.adventure.text.format.NamedTextColor.YELLOW;
  
  public class PaperCommand extends Command {
      private static final String BASE_PERM = "bukkit.command.paper.";
@@ -61,7 +69,7 @@ index 006f2e900de3a665fa48cac877511277a900be62..2225f79b17862160701ae3670cda348c
  
      public PaperCommand(String name) {
          super(name);
-@@ -69,6 +71,21 @@ public class PaperCommand extends Command {
+@@ -73,6 +77,21 @@ public class PaperCommand extends Command {
                  if (args.length == 3)
                      return getListMatchingLast(sender, args, EntityType.getEntityNameList().stream().map(ResourceLocation::toString).sorted().toArray(String[]::new));
                  break;
@@ -83,7 +91,7 @@ index 006f2e900de3a665fa48cac877511277a900be62..2225f79b17862160701ae3670cda348c
          }
          return Collections.emptyList();
      }
-@@ -135,6 +152,12 @@ public class PaperCommand extends Command {
+@@ -139,6 +158,12 @@ public class PaperCommand extends Command {
              case "reload":
                  doReload(sender);
                  break;
@@ -96,7 +104,7 @@ index 006f2e900de3a665fa48cac877511277a900be62..2225f79b17862160701ae3670cda348c
              case "ver":
                  if (!testPermission(sender, "version")) break; // "ver" needs a special check because it's an alias. All other commands are checked up before the switch statement (because they are present in the SUBCOMMANDS set)
              case "version":
-@@ -152,6 +175,114 @@ public class PaperCommand extends Command {
+@@ -156,6 +181,122 @@ public class PaperCommand extends Command {
          return true;
      }
  
@@ -109,7 +117,7 @@ index 006f2e900de3a665fa48cac877511277a900be62..2225f79b17862160701ae3670cda348c
 +            for (int i = 1; i < args.length; ++i) {
 +                org.bukkit.World world = Bukkit.getWorld(args[i]);
 +                if (world == null) {
-+                    sender.sendMessage(ChatColor.RED + "World '" + args[i] + "' is invalid");
++                    sender.sendMessage(text("World '" + args[i] + "' is invalid", RED));
 +                    return;
 +                }
 +                worlds.add(world);
@@ -162,22 +170,30 @@ index 006f2e900de3a665fa48cac877511277a900be62..2225f79b17862160701ae3670cda348c
 +            accumulatedTicking += ticking;
 +            accumulatedEntityTicking += entityTicking;
 +
-+            sender.sendMessage(ChatColor.BLUE + "Chunks in " + ChatColor.GREEN + bukkitWorld.getName() + ChatColor.DARK_AQUA + ":");
-+            sender.sendMessage(ChatColor.BLUE + "Total: " + ChatColor.DARK_AQUA + total + ChatColor.BLUE + " Inactive: " + ChatColor.DARK_AQUA
-+                               + inactive + ChatColor.BLUE + " Border: " + ChatColor.DARK_AQUA + border + ChatColor.BLUE + " Ticking: "
-+                               + ChatColor.DARK_AQUA + ticking + ChatColor.BLUE + " Entity: " + ChatColor.DARK_AQUA + entityTicking);
++            sender.sendMessage(text().append(text("Chunks in ", BLUE), text(bukkitWorld.getName(), GREEN), text(":")));
++            sender.sendMessage(text().color(DARK_AQUA).append(
++                text("Total: ", BLUE), text(total),
++                text(" Inactive: ", BLUE), text(inactive),
++                text(" Border: ", BLUE), text(border),
++                text(" Ticking: ", BLUE), text(ticking),
++                text(" Entity: ", BLUE), text(entityTicking)
++            ));
 +        }
 +        if (worlds.size() > 1) {
-+            sender.sendMessage(ChatColor.BLUE + "Chunks in " + ChatColor.GREEN + "all listed worlds" + ChatColor.DARK_AQUA + ":");
-+            sender.sendMessage(ChatColor.BLUE + "Total: " + ChatColor.DARK_AQUA + accumulatedTotal + ChatColor.BLUE + " Inactive: " + ChatColor.DARK_AQUA
-+                               + accumulatedInactive + ChatColor.BLUE + " Border: " + ChatColor.DARK_AQUA + accumulatedBorder + ChatColor.BLUE + " Ticking: "
-+                               + ChatColor.DARK_AQUA + accumulatedTicking + ChatColor.BLUE + " Entity: " + ChatColor.DARK_AQUA + accumulatedEntityTicking);
++            sender.sendMessage(text().append(text("Chunks in ", BLUE), text("all listed worlds", GREEN), text(":", DARK_AQUA)));
++            sender.sendMessage(text().color(DARK_AQUA).append(
++                text("Total: ", BLUE), text(accumulatedTotal),
++                text(" Inactive: ", BLUE), text(accumulatedInactive),
++                text(" Border: ", BLUE), text(accumulatedBorder),
++                text(" Ticking: ", BLUE), text(accumulatedTicking),
++                text(" Entity: ", BLUE), text(accumulatedEntityTicking)
++            ));
 +        }
 +    }
 +
 +    private void doDebug(CommandSender sender, String[] args) {
 +        if (args.length < 2) {
-+            sender.sendMessage(ChatColor.RED + "Use /paper debug [chunks] help for more information on a specific command");
++            sender.sendMessage(text("Use /paper debug [chunks] help for more information on a specific command", RED));
 +            return;
 +        }
 +
@@ -185,25 +201,25 @@ index 006f2e900de3a665fa48cac877511277a900be62..2225f79b17862160701ae3670cda348c
 +        switch (debugType) {
 +            case "chunks":
 +                if (args.length >= 3 && args[2].toLowerCase(Locale.ENGLISH).equals("help")) {
-+                    sender.sendMessage(ChatColor.RED + "Use /paper debug chunks to dump loaded chunk information to a file");
++                    sender.sendMessage(text("Use /paper debug chunks [world] to dump loaded chunk information to a file", RED));
 +                    break;
 +                }
 +                File file = new File(new File(new File("."), "debug"),
 +                    "chunks-" + DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss").format(LocalDateTime.now()) + ".txt");
-+                sender.sendMessage(ChatColor.GREEN + "Writing chunk information dump to " + file.toString());
++                sender.sendMessage(text("Writing chunk information dump to " + file, GREEN));
 +                try {
 +                    MCUtil.dumpChunks(file);
-+                    sender.sendMessage(ChatColor.GREEN + "Successfully written chunk information!");
++                    sender.sendMessage(text("Successfully written chunk information!", GREEN));
 +                } catch (Throwable thr) {
 +                    MinecraftServer.LOGGER.warn("Failed to dump chunk information to file " + file.toString(), thr);
-+                    sender.sendMessage(ChatColor.RED + "Failed to dump chunk information, see console");
++                    sender.sendMessage(text("Failed to dump chunk information, see console", RED));
 +                }
 +
 +                break;
 +            case "help":
 +                // fall through to default
 +            default:
-+                sender.sendMessage(ChatColor.RED + "Use /paper debug [chunks] help for more information on a specific command");
++                sender.sendMessage(text("Use /paper debug [chunks] help for more information on a specific command", RED));
 +                return;
 +        }
 +    }
diff --git a/patches/server/0325-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0326-Allow-Saving-of-Oversized-Chunks.patch
index 7a71ae6af9..7a71ae6af9 100644
--- a/patches/server/0325-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0326-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0326-Expose-the-internal-current-tick.patch b/patches/server/0327-Expose-the-internal-current-tick.patch
index b5db8f69c1..ddb68f4d23 100644
--- a/patches/server/0326-Expose-the-internal-current-tick.patch
+++ b/patches/server/0327-Expose-the-internal-current-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 56adf4f5a478a7f4ae1d29a18572be0fcf011fca..e9c8eb1ca3e39840b3791d814b66ad5b5919112f 100644
+index 4323bbd4763b9bd5eebd3313c3de3c6070251c42..669e4b41cf0751afb67d94b6a511bcfd18ce7ef4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2636,5 +2636,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0327-Fix-World-isChunkGenerated-calls.patch b/patches/server/0328-Fix-World-isChunkGenerated-calls.patch
index 16b445c72c..16b445c72c 100644
--- a/patches/server/0327-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0328-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0328-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0329-Show-blockstate-location-if-we-failed-to-read-it.patch
index f593178909..f593178909 100644
--- a/patches/server/0328-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/server/0329-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0329-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0330-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index a10bcbff62..a10bcbff62 100644
--- a/patches/server/0329-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0330-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0330-Configurable-projectile-relative-velocity.patch b/patches/server/0331-Configurable-projectile-relative-velocity.patch
index e5fc7134aa..e5fc7134aa 100644
--- a/patches/server/0330-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0331-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0331-offset-item-frame-ticking.patch b/patches/server/0332-offset-item-frame-ticking.patch
index 982a600c76..982a600c76 100644
--- a/patches/server/0331-offset-item-frame-ticking.patch
+++ b/patches/server/0332-offset-item-frame-ticking.patch
diff --git a/patches/server/0332-Fix-MC-158900.patch b/patches/server/0333-Fix-MC-158900.patch
index 0a3f421920..963f1cf990 100644
--- a/patches/server/0332-Fix-MC-158900.patch
+++ b/patches/server/0333-Fix-MC-158900.patch
@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5623398d3c6fc804a078c10af4bdc24cb63d6ef6..3c176d48e6b1a8e165b5860cd443b36c65397ce9 100644
+index fbed83f8c49267a657a3df1c6e4b42ce2046b052..7b000de3fa232a75cc3737783e4a38025d0d8bde 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -606,8 +606,10 @@ public abstract class PlayerList {
diff --git a/patches/server/0333-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0334-Prevent-consuming-the-wrong-itemstack.patch
index cb72cd0d52..c0768dd23f 100644
--- a/patches/server/0333-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0334-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 853ce6536557b64de134a098d7ed3dde2782ffde..6086c566ac90e6d048202fee0882b72741aa31ce 100644
+index 8f595222d9b797d03558ec060a5f315ccfd369b3..c80c31f7e5c4a5b3f9156ac7b263a6be9456deac 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3564,9 +3564,14 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0334-Dont-send-unnecessary-sign-update.patch b/patches/server/0335-Dont-send-unnecessary-sign-update.patch
index c40220b576..ff20fd7e96 100644
--- a/patches/server/0334-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0335-Dont-send-unnecessary-sign-update.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont send unnecessary sign update
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e668eb2d9734d1b2251f651aa3f2744ac5cf4ce2..6ba2266ea2a40cc4e4ad366803420861c2899345 100644
+index a6017a80e5015929903e8fe29e6335615a322700..db8d4355bfde3777b943984fb7c9e0c035098e64 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2888,6 +2888,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0335-Add-option-to-disable-pillager-patrols.patch b/patches/server/0336-Add-option-to-disable-pillager-patrols.patch
index a57216e6ba..a57216e6ba 100644
--- a/patches/server/0335-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/server/0336-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0336-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0337-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index 86d4c0f7a6..37091dcf88 100644
--- a/patches/server/0336-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/patches/server/0337-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
@@ -7,7 +7,7 @@ Fixes an AssertionError when setting the player's item in hand to null or a new
 Fixes GH-2718
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6ba2266ea2a40cc4e4ad366803420861c2899345..0a41746f630442ed411e0d0c5efe90959191ae99 100644
+index db8d4355bfde3777b943984fb7c9e0c035098e64..e424e29ecd90f17e84d37105f8fdde85df406813 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1757,6 +1757,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0337-Flat-bedrock-generator-settings.patch b/patches/server/0338-Flat-bedrock-generator-settings.patch
index 30730abeba..30730abeba 100644
--- a/patches/server/0337-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0338-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0338-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0339-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index ea3c47b7b2..ea3c47b7b2 100644
--- a/patches/server/0338-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/server/0339-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0339-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0340-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 8accba4935..8accba4935 100644
--- a/patches/server/0339-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/server/0340-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0340-Duplicate-UUID-Resolve-Option.patch b/patches/server/0341-Duplicate-UUID-Resolve-Option.patch
index 076ee95ba7..076ee95ba7 100644
--- a/patches/server/0340-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0341-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0341-Optimize-Hoppers.patch b/patches/server/0342-Optimize-Hoppers.patch
index 310c1dd5f6..89ef035f89 100644
--- a/patches/server/0341-Optimize-Hoppers.patch
+++ b/patches/server/0342-Optimize-Hoppers.patch
@@ -35,7 +35,7 @@ index 90dafb6056a6ca2f60a441e26f9ebfecf18f8ced..34c933dcd7d7adf5c9e631f8b8f60ba4
  }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 25fb2789bcec7cf864b3a401610e765daa1abe22..bec5328f1ab05faab83584f75d54a5a6c830f9b7 100644
+index 30c10b151503a1710d3adce81640bfbd727eabe0..d2580936b6e8a2e8b23331cc3f563bab3434486e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1451,6 +1451,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0342-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0343-PlayerDeathEvent-shouldDropExperience.patch
index 7822bc1558..c94cfd00dc 100644
--- a/patches/server/0342-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0343-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ecd52f47f70e26112a221ae62bd81d89bdefbfd0..fb486997cf61bc155f8171c55369c6cba35591c0 100644
+index 572f7092a416793e726c794b7de34def47196e1e..41392a92af27b85e213eed3ac0fff281bb5c32b3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -888,7 +888,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0343-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0344-Prevent-bees-loading-chunks-checking-hive-position.patch
index 16e42ecce0..16e42ecce0 100644
--- a/patches/server/0343-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0344-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0344-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0345-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 71f28eb22f..71f28eb22f 100644
--- a/patches/server/0344-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/server/0345-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0345-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0346-Guard-against-serializing-mismatching-chunk-coordina.patch
index 64048f55c3..64048f55c3 100644
--- a/patches/server/0345-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/0346-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0346-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0347-Optimise-IEntityAccess-getPlayerByUUID.patch
index c68ba1a6b5..19e02d11be 100644
--- a/patches/server/0346-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/patches/server/0347-Optimise-IEntityAccess-getPlayerByUUID.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID
 Use the world entity map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3c89e7ec876cc11437e1e035d1f43ea32426eec7..7f2b61523ac2293fdc197cf3eaa341357cf6fc31 100644
+index 13966539626742b6914b940c6dd74c83485e588e..9b883af58fd87751bdad909a015cb78ca5647e90 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -385,6 +385,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0347-Fix-items-not-falling-correctly.patch b/patches/server/0348-Fix-items-not-falling-correctly.patch
index c9c3bef8b4..ef789b9361 100644
--- a/patches/server/0347-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0348-Fix-items-not-falling-correctly.patch
@@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking Spigot's entity
 activation range check from an item's move method.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index b72bb3b78a3b19edb67e74bdc03a46060a1f6af3..87c92e73d23a1ebb0646ba0293e1c0d51bb0e059 100644
+index ff3182c40d2e3942190cac8ddb008ba6c5a72d99..4e9e0ef895c29cfc1e925c0c3ffead23c4e4dc0a 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -134,7 +134,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0348-Lag-compensate-eating.patch b/patches/server/0349-Lag-compensate-eating.patch
index 26fdd71e3f..a3c79fe6ad 100644
--- a/patches/server/0348-Lag-compensate-eating.patch
+++ b/patches/server/0349-Lag-compensate-eating.patch
@@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating.
 Change to also use a time check instead if it passes.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6086c566ac90e6d048202fee0882b72741aa31ce..d2450dd5e9aa0958f5db187a82212ae54ac1d864 100644
+index c80c31f7e5c4a5b3f9156ac7b263a6be9456deac..1ebd099af4abd40e848787ac96a53aa7287f469b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3507,6 +3507,11 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0349-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0350-Optimize-call-to-getFluid-for-explosions.patch
index 6dc5f5aa31..6dc5f5aa31 100644
--- a/patches/server/0349-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0350-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0350-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0351-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index 1b7f466946..1b7f466946 100644
--- a/patches/server/0350-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/patches/server/0351-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0351-Add-effect-to-block-break-naturally.patch b/patches/server/0352-Add-effect-to-block-break-naturally.patch
index c254d6a8ee..b911824bb1 100644
--- a/patches/server/0351-Add-effect-to-block-break-naturally.patch
+++ b/patches/server/0352-Add-effect-to-block-break-naturally.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add effect to block break naturally
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 250185af0abcfea380cc00e670c0076f7fe87446..945553bfe218a16ebe4abbb11e0723b6d8fc4910 100644
+index 4ae3c0b2c240f01a1fcea0b02616e91e057a297a..ea3358905dcd39a1a855d98570457c65dcd7513d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -475,6 +475,18 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0352-Entity-Activation-Range-2.0.patch b/patches/server/0353-Entity-Activation-Range-2.0.patch
index a921362a20..a921362a20 100644
--- a/patches/server/0352-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0353-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0353-Increase-Light-Queue-Size.patch b/patches/server/0354-Increase-Light-Queue-Size.patch
index 3b2028a340..fb8d22e915 100644
--- a/patches/server/0353-Increase-Light-Queue-Size.patch
+++ b/patches/server/0354-Increase-Light-Queue-Size.patch
@@ -29,7 +29,7 @@ index 34c933dcd7d7adf5c9e631f8b8f60ba4d4ab53ba..763b54e0d35730186bab3fc69babd9b5
  }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bec5328f1ab05faab83584f75d54a5a6c830f9b7..287014feb99c67083a959f2c09213d49ad5f743d 100644
+index d2580936b6e8a2e8b23331cc3f563bab3434486e..632743678f8c65e078080fda7c8eeee9a2d5753c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -809,7 +809,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0354-Fix-Light-Command.patch b/patches/server/0355-Fix-Light-Command.patch
index 24dc105565..b1497f87bd 100644
--- a/patches/server/0354-Fix-Light-Command.patch
+++ b/patches/server/0355-Fix-Light-Command.patch
@@ -7,7 +7,7 @@ This lets you run /paper fixlight <chunkRadius> (max 5) to automatically
 fix all light data in the chunks.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 2225f79b17862160701ae3670cda348cc2e45f0a..a85678da691debbd68cc07e799a6c397c22ae31d 100644
+index 68f3f5ebd2188bf8280fc028f98ef8bb51622c26..b5756d067b013ee78a55b97ad00375d15ecd483c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -10,7 +10,8 @@ import net.minecraft.server.MinecraftServer;
@@ -20,7 +20,7 @@ index 2225f79b17862160701ae3670cda348cc2e45f0a..a85678da691debbd68cc07e799a6c397
  import net.minecraft.world.entity.EntityType;
  import net.minecraft.world.level.ChunkPos;
  import net.minecraft.resources.ResourceLocation;
-@@ -25,15 +26,18 @@ import org.bukkit.command.Command;
+@@ -24,15 +25,18 @@ import org.bukkit.command.Command;
  import org.bukkit.command.CommandSender;
  import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.craftbukkit.CraftWorld;
@@ -39,7 +39,7 @@ index 2225f79b17862160701ae3670cda348cc2e45f0a..a85678da691debbd68cc07e799a6c397
  import java.util.Iterator;
  import java.util.List;
  import java.util.Locale;
-@@ -43,7 +47,7 @@ import java.util.stream.Collectors;
+@@ -49,7 +53,7 @@ import static net.kyori.adventure.text.format.NamedTextColor.YELLOW;
  
  public class PaperCommand extends Command {
      private static final String BASE_PERM = "bukkit.command.paper.";
@@ -48,7 +48,7 @@ index 2225f79b17862160701ae3670cda348cc2e45f0a..a85678da691debbd68cc07e799a6c397
  
      public PaperCommand(String name) {
          super(name);
-@@ -158,6 +162,9 @@ public class PaperCommand extends Command {
+@@ -164,6 +168,9 @@ public class PaperCommand extends Command {
              case "chunkinfo":
                  doChunkInfo(sender, args);
                  break;
@@ -58,9 +58,9 @@ index 2225f79b17862160701ae3670cda348cc2e45f0a..a85678da691debbd68cc07e799a6c397
              case "ver":
                  if (!testPermission(sender, "version")) break; // "ver" needs a special check because it's an alias. All other commands are checked up before the switch statement (because they are present in the SUBCOMMANDS set)
              case "version":
-@@ -413,4 +420,74 @@ public class PaperCommand extends Command {
+@@ -427,4 +434,74 @@ public class PaperCommand extends Command {
  
-         Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Paper config reload complete.");
+         Command.broadcastCommandMessage(sender, text("Paper config reload complete.", GREEN));
      }
 +    private void doFixLight(CommandSender sender, String[] args) {
 +        if (!(sender instanceof Player)) {
diff --git a/patches/server/0355-Anti-Xray.patch b/patches/server/0356-Anti-Xray.patch
index 1dcef641ff..1dcef641ff 100644
--- a/patches/server/0355-Anti-Xray.patch
+++ b/patches/server/0356-Anti-Xray.patch
diff --git a/patches/server/0356-Implement-alternative-item-despawn-rate.patch b/patches/server/0357-Implement-alternative-item-despawn-rate.patch
index fb9338eb73..f498b8ba98 100644
--- a/patches/server/0356-Implement-alternative-item-despawn-rate.patch
+++ b/patches/server/0357-Implement-alternative-item-despawn-rate.patch
@@ -86,7 +86,7 @@ index 0e5091b50b19cb2c0b491479321ac978f272c04c..91a36bf77095f6c0c0b15dbed941bc95
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 87c92e73d23a1ebb0646ba0293e1c0d51bb0e059..3938bb6aa82bd02359dede6f6b17b7ba6685579b 100644
+index 4e9e0ef895c29cfc1e925c0c3ffead23c4e4dc0a..b56d1229333bb86433d6691f1116f2d195c4b16b 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -54,6 +54,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0357-Tracking-Range-Improvements.patch b/patches/server/0358-Tracking-Range-Improvements.patch
index 2a36982dc4..2a36982dc4 100644
--- a/patches/server/0357-Tracking-Range-Improvements.patch
+++ b/patches/server/0358-Tracking-Range-Improvements.patch
diff --git a/patches/server/0358-Fix-items-vanishing-through-end-portal.patch b/patches/server/0359-Fix-items-vanishing-through-end-portal.patch
index c27cdfd7f2..c27cdfd7f2 100644
--- a/patches/server/0358-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0359-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0359-implement-optional-per-player-mob-spawns.patch b/patches/server/0360-implement-optional-per-player-mob-spawns.patch
index 1984691210..83dcc0c664 100644
--- a/patches/server/0359-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0360-implement-optional-per-player-mob-spawns.patch
@@ -394,7 +394,7 @@ index 98f3b91605ecf81538659220354f78d4de9d203e..39b4ddbb87e6ec2e8103445625ff0d7d
  
              this.lastSpawnState = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fb486997cf61bc155f8171c55369c6cba35591c0..84c3407961f0011f6579498084b11d92cd546170 100644
+index 41392a92af27b85e213eed3ac0fff281bb5c32b3..ba8f8b222e8951e0eea8642ecbb843fbf5146f5d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -226,6 +226,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0360-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0361-Avoid-hopper-searches-if-there-are-no-items.patch
index c5138af81d..9191fd85e3 100644
--- a/patches/server/0360-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/patches/server/0361-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -67,7 +67,7 @@ index 524f3c42964eb83c9109bcc548a1075f1e295411..e9aee7d11798c3bd990466f101e9e342
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/entity/EntitySectionStorage.java b/src/main/java/net/minecraft/world/level/entity/EntitySectionStorage.java
-index 13df7889b2b5249fb81c54fadf55315a4c515116..74210dc2eef63da7360b1f833bb59b278419fb2b 100644
+index 078be552dce5c02f699bad83816c3154cef2b1ec..2e873762530e8f50158886436bd76b35d91953af 100644
 --- a/src/main/java/net/minecraft/world/level/entity/EntitySectionStorage.java
 +++ b/src/main/java/net/minecraft/world/level/entity/EntitySectionStorage.java
 @@ -111,13 +111,20 @@ public class EntitySectionStorage<T extends EntityAccess> {
diff --git a/patches/server/0361-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0362-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 03bd1852c1..03bd1852c1 100644
--- a/patches/server/0361-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0362-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0362-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0363-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 7c34763e94..7c34763e94 100644
--- a/patches/server/0362-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0363-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0363-Add-debug-for-sync-chunk-loads.patch b/patches/server/0364-Add-debug-for-sync-chunk-loads.patch
index c8070b6631..7b76ff6e0b 100644
--- a/patches/server/0363-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0364-Add-debug-for-sync-chunk-loads.patch
@@ -13,7 +13,7 @@ chunks, however it must be enabled by setting the startup flag
   /paper syncloadinfo clear
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index a85678da691debbd68cc07e799a6c397c22ae31d..03ba904f5ac018f7e99bfdb9a07295fd6ef9476c 100644
+index b5756d067b013ee78a55b97ad00375d15ecd483c..64c8ba212855dbdd7d2025126474644bd68c3ec0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -1,11 +1,17 @@
@@ -34,7 +34,7 @@ index a85678da691debbd68cc07e799a6c397c22ae31d..03ba904f5ac018f7e99bfdb9a07295fd
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.level.ChunkHolder;
  import net.minecraft.server.level.ServerChunkCache;
-@@ -30,6 +36,9 @@ import org.bukkit.craftbukkit.entity.CraftPlayer;
+@@ -29,6 +35,9 @@ import org.bukkit.craftbukkit.entity.CraftPlayer;
  import org.bukkit.entity.Player;
  
  import java.io.File;
@@ -44,7 +44,14 @@ index a85678da691debbd68cc07e799a6c397c22ae31d..03ba904f5ac018f7e99bfdb9a07295fd
  import java.time.LocalDateTime;
  import java.time.format.DateTimeFormatter;
  import java.util.ArrayDeque;
-@@ -47,7 +56,7 @@ import java.util.stream.Collectors;
+@@ -47,13 +56,14 @@ import java.util.stream.Collectors;
+ import static net.kyori.adventure.text.Component.text;
+ import static net.kyori.adventure.text.format.NamedTextColor.BLUE;
+ import static net.kyori.adventure.text.format.NamedTextColor.DARK_AQUA;
++import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
+ import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
+ import static net.kyori.adventure.text.format.NamedTextColor.RED;
+ import static net.kyori.adventure.text.format.NamedTextColor.YELLOW;
  
  public class PaperCommand extends Command {
      private static final String BASE_PERM = "bukkit.command.paper.";
@@ -53,7 +60,7 @@ index a85678da691debbd68cc07e799a6c397c22ae31d..03ba904f5ac018f7e99bfdb9a07295fd
  
      public PaperCommand(String name) {
          super(name);
-@@ -90,6 +99,11 @@ public class PaperCommand extends Command {
+@@ -96,6 +106,11 @@ public class PaperCommand extends Command {
                      return getListMatchingLast(sender, args, worldNames);
                  }
                  break;
@@ -65,7 +72,7 @@ index a85678da691debbd68cc07e799a6c397c22ae31d..03ba904f5ac018f7e99bfdb9a07295fd
          }
          return Collections.emptyList();
      }
-@@ -165,6 +179,9 @@ public class PaperCommand extends Command {
+@@ -171,6 +186,9 @@ public class PaperCommand extends Command {
              case "fixlight":
                  this.doFixLight(sender, args);
                  break;
@@ -75,26 +82,26 @@ index a85678da691debbd68cc07e799a6c397c22ae31d..03ba904f5ac018f7e99bfdb9a07295fd
              case "ver":
                  if (!testPermission(sender, "version")) break; // "ver" needs a special check because it's an alias. All other commands are checked up before the switch statement (because they are present in the SUBCOMMANDS set)
              case "version":
-@@ -182,6 +199,47 @@ public class PaperCommand extends Command {
+@@ -188,6 +206,47 @@ public class PaperCommand extends Command {
          return true;
      }
  
 +    private void doSyncLoadInfo(CommandSender sender, String[] args) {
 +        if (!SyncLoadFinder.ENABLED) {
-+            sender.sendMessage(ChatColor.RED + "This command requires the server startup flag '-Dpaper.debug-sync-loads=true' to be set.");
++            sender.sendMessage(text("This command requires the server startup flag '-Dpaper.debug-sync-loads=true' to be set.", RED));
 +            return;
 +        }
 +
 +        if (args.length > 1 && args[1].equals("clear")) {
 +            SyncLoadFinder.clear();
-+            sender.sendMessage(ChatColor.GRAY + "Sync load data cleared.");
++            sender.sendMessage(text("Sync load data cleared.", GRAY));
 +            return;
 +        }
 +
 +        File file = new File(new File(new File("."), "debug"),
 +            "sync-load-info" + DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss").format(LocalDateTime.now()) + ".txt");
 +        file.getParentFile().mkdirs();
-+        sender.sendMessage(ChatColor.GREEN + "Writing sync load info to " + file.toString());
++        sender.sendMessage(text("Writing sync load info to " + file, GREEN));
 +
 +
 +        try {
@@ -113,9 +120,9 @@ index a85678da691debbd68cc07e799a6c397c22ae31d..03ba904f5ac018f7e99bfdb9a07295fd
 +            ) {
 +                out.print(fileData);
 +            }
-+            sender.sendMessage(ChatColor.GREEN + "Successfully written sync load information!");
++            sender.sendMessage(text("Successfully written sync load information!", GREEN));
 +        } catch (Throwable thr) {
-+            sender.sendMessage(ChatColor.RED + "Failed to write sync load information");
++            sender.sendMessage(text("Failed to write sync load information!", RED));
 +            thr.printStackTrace();
 +        }
 +    }
@@ -317,7 +324,7 @@ index dec6aab50cebdfe1d0c93d71a8579b78b0ef7b9d..8f1609bbb5670d3b4acccb2cb4b9238c
              chunkproviderserver_b.managedBlock(completablefuture::isDone);
                  com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8c91e1de2bd9a42259be32322eb36d4979684edc..e0e6915320264da3fefb3f449f27efb8477e1e63 100644
+index 9e779490dfea57112ce088fd398892052b4d9d73..0a7dbafd938141b34dc66d0b4af26dba92a21c06 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -383,6 +383,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0364-Remove-garbage-Java-version-check.patch b/patches/server/0365-Remove-garbage-Java-version-check.patch
index 3c72a283d1..3c72a283d1 100644
--- a/patches/server/0364-Remove-garbage-Java-version-check.patch
+++ b/patches/server/0365-Remove-garbage-Java-version-check.patch
diff --git a/patches/server/0365-Add-ThrownEggHatchEvent.patch b/patches/server/0366-Add-ThrownEggHatchEvent.patch
index c026427598..c026427598 100644
--- a/patches/server/0365-Add-ThrownEggHatchEvent.patch
+++ b/patches/server/0366-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0366-Entity-Jump-API.patch b/patches/server/0367-Entity-Jump-API.patch
index f99b63d8ef..903e91ab9c 100644
--- a/patches/server/0366-Entity-Jump-API.patch
+++ b/patches/server/0367-Entity-Jump-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Jump API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d2450dd5e9aa0958f5db187a82212ae54ac1d864..2e931bf17309b3b679b7ad9c98e1107d9a971e1d 100644
+index 1ebd099af4abd40e848787ac96a53aa7287f469b..b28689f2621ee7d5129ab6d1853d9ee8823bf1d0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3183,8 +3183,10 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0367-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0368-Add-option-to-nerf-pigmen-from-nether-portals.patch
index fb2ea5da33..fb2ea5da33 100644
--- a/patches/server/0367-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0368-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0368-Make-the-GUI-graph-fancier.patch b/patches/server/0369-Make-the-GUI-graph-fancier.patch
index b97ce20f84..b97ce20f84 100644
--- a/patches/server/0368-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0369-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0369-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0370-add-hand-to-BlockMultiPlaceEvent.patch
index 9e73b8bda9..6448fbc1d8 100644
--- a/patches/server/0369-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0370-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5ccf7f5d0c748de6ff1f996089f4db99d39d6dfb..550e30bfbdcf1ae0adf2cc68e3ae3d3dd4faad56 100644
+index f50e8182f0340119cd06f0b7c96f95727903826e..27733f7737945b400d31b432178d792d0b79977d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -345,13 +345,18 @@ public class CraftEventFactory {
diff --git a/patches/server/0370-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0371-Validate-tripwire-hook-placement-before-update.patch
index 9c50f803d4..9c50f803d4 100644
--- a/patches/server/0370-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/server/0371-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0371-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0372-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index 9d3b4d7024..9d3b4d7024 100644
--- a/patches/server/0371-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/server/0372-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0372-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0373-Configurable-chance-of-villager-zombie-infection.patch
index 8e079b9981..8e079b9981 100644
--- a/patches/server/0372-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0373-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0373-Optimise-Chunk-getFluid.patch b/patches/server/0374-Optimise-Chunk-getFluid.patch
index 1fdc56914c..a46d5ac5e5 100644
--- a/patches/server/0373-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0374-Optimise-Chunk-getFluid.patch
@@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it
 easier to inline due to code size
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 75dd63ffb2a7d8ec825162c66c156b07148b2f71..6129ea877c95445d358baf5036be8c4eee1f2770 100644
+index 1a64618e533426147ad6ab1211afb9cc676cc185..f994d393929ca6813d4209fb9c93550e4f692228 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -373,18 +373,20 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0374-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0375-Set-spigots-verbose-world-setting-to-false-by-def.patch
index 0af07e8203..0af07e8203 100644
--- a/patches/server/0374-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0375-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0375-Add-tick-times-API-and-mspt-command.patch b/patches/server/0376-Add-tick-times-API-and-mspt-command.patch
index c9afad933f..81ef973438 100644
--- a/patches/server/0375-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0376-Add-tick-times-API-and-mspt-command.patch
@@ -6,14 +6,14 @@ Subject: [PATCH] Add tick times API and /mspt command
 
 diff --git a/src/main/java/com/destroystokyo/paper/MSPTCommand.java b/src/main/java/com/destroystokyo/paper/MSPTCommand.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d0211d4f39f9d6af1d751ac66342b42cc6d7ba6d
+index 0000000000000000000000000000000000000000..874f0c2a071994c2145848886caa385e0e0bfb9b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MSPTCommand.java
-@@ -0,0 +1,64 @@
+@@ -0,0 +1,99 @@
 +package com.destroystokyo.paper;
 +
++import net.kyori.adventure.text.Component;
 +import net.minecraft.server.MinecraftServer;
-+import org.bukkit.ChatColor;
 +import org.bukkit.Location;
 +import org.bukkit.command.Command;
 +import org.bukkit.command.CommandSender;
@@ -24,8 +24,16 @@ index 0000000000000000000000000000000000000000..d0211d4f39f9d6af1d751ac66342b42c
 +import java.util.Collections;
 +import java.util.List;
 +
++import static net.kyori.adventure.text.Component.text;
++import static net.kyori.adventure.text.format.NamedTextColor.GOLD;
++import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
++import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
++import static net.kyori.adventure.text.format.NamedTextColor.RED;
++import static net.kyori.adventure.text.format.NamedTextColor.YELLOW;
++
 +public class MSPTCommand extends Command {
 +    private static final DecimalFormat DF = new DecimalFormat("########0.0");
++    private static final Component SLASH = text("/");
 +
 +    public MSPTCommand(String name) {
 +        super(name);
@@ -45,17 +53,44 @@ index 0000000000000000000000000000000000000000..d0211d4f39f9d6af1d751ac66342b42c
 +
 +        MinecraftServer server = MinecraftServer.getServer();
 +
-+        List<String> times = new ArrayList<>();
++        List<Component> times = new ArrayList<>();
 +        times.addAll(eval(server.tickTimes5s.getTimes()));
 +        times.addAll(eval(server.tickTimes10s.getTimes()));
 +        times.addAll(eval(server.tickTimes60s.getTimes()));
 +
-+        sender.sendMessage("§6Server tick times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:");
-+        sender.sendMessage(String.format("§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s", times.toArray()));
++        sender.sendMessage(text().content("Server tick times ").color(GOLD)
++            .append(text().color(YELLOW)
++                .append(
++                    text("("),
++                    text("avg", GRAY),
++                    text("/"),
++                    text("min", GRAY),
++                    text("/"),
++                    text("max", GRAY),
++                    text(")")
++                )
++            ).append(
++                text(" from last 5s"),
++                text(",", GRAY),
++                text(" 10s"),
++                text(",", GRAY),
++                text(" 1m"),
++                text(":", YELLOW)
++            )
++        );
++        sender.sendMessage(text().content("◴ ").color(GOLD)
++            .append(text().color(GRAY)
++                .append(
++                    times.get(0), SLASH, times.get(1), SLASH, times.get(2), text(", ", YELLOW),
++                    times.get(3), SLASH, times.get(4), SLASH, times.get(5), text(", ", YELLOW),
++                    times.get(6), SLASH, times.get(7), SLASH, times.get(8)
++                )
++            )
++        );
 +        return true;
 +    }
 +
-+    private static List<String> eval(long[] times) {
++    private static List<Component> eval(long[] times) {
 +        long min = Integer.MAX_VALUE;
 +        long max = 0L;
 +        long total = 0L;
@@ -70,12 +105,12 @@ index 0000000000000000000000000000000000000000..d0211d4f39f9d6af1d751ac66342b42c
 +        return Arrays.asList(getColor(avgD), getColor(minD), getColor(maxD));
 +    }
 +
-+    private static String getColor(double avg) {
-+        return ChatColor.COLOR_CHAR + (avg >= 50 ? "c" : avg >= 40 ? "e" : "a") + DF.format(avg);
++    private static Component getColor(double avg) {
++        return text(DF.format(avg), avg >= 50 ? RED : avg >= 40 ? YELLOW : GREEN);
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2e7c3fe697ac29807107152ecd916dfe21625f0a..3b0fa01342fba7e05f061d398f2f072f3bde9b31 100644
+index 0be8f68c3e61f132ada9381e36b743dd7477eece..8158a00821727104a23958a76e19cd8b01cb4e5a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -69,6 +69,7 @@ public class PaperConfig {
@@ -87,7 +122,7 @@ index 2e7c3fe697ac29807107152ecd916dfe21625f0a..3b0fa01342fba7e05f061d398f2f072f
          version = getInt("config-version", 27);
          set("config-version", 27);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 287014feb99c67083a959f2c09213d49ad5f743d..2e08855085a547151140bcb05dce9bc469d81ff6 100644
+index 632743678f8c65e078080fda7c8eeee9a2d5753c..03ebc2a0476aef9297cbbc7f358915703a469b02 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -244,6 +244,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -146,7 +181,7 @@ index 287014feb99c67083a959f2c09213d49ad5f743d..2e08855085a547151140bcb05dce9bc4
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a6e7a609344f693cd0f51cfc4b122f45e24d0050..8452e72f669b82acb46ef00a7cdbb4177926ebc9 100644
+index 3ff85d9d8518db712ca1d2977a5865daef86f021..e270d7786eb1eae8970ff2ed5896789e05ca6613 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2461,6 +2461,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0376-Expose-MinecraftServer-isRunning.patch b/patches/server/0377-Expose-MinecraftServer-isRunning.patch
index cf2c93b1e4..11866b1bfb 100644
--- a/patches/server/0376-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0377-Expose-MinecraftServer-isRunning.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8452e72f669b82acb46ef00a7cdbb4177926ebc9..1f106b4a622c14d5a9bee9eeefd5e16b2592d3b5 100644
+index e270d7786eb1eae8970ff2ed5896789e05ca6613..a67fc9b0899f9d2128ac202ba0c12776653dfe28 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2651,5 +2651,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0377-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0378-Add-Raw-Byte-ItemStack-Serialization.patch
index c6976b5d11..ab558473fb 100644
--- a/patches/server/0377-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0378-Add-Raw-Byte-ItemStack-Serialization.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization
 Serializes using NBT which is safer for server data migrations than bukkits format.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 6888548989e6b841d2389011f05c5eadb754e532..3b4764986302194882e009fe20a9d6406cf2be8e 100644
+index 7fed3c5cbc48fb8de7af006720aa2a6fbe16c556..b38e0ac6a2eafc0d98bb81665bdc2eafbac2d7d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -431,6 +431,53 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0378-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch
index d1df0bfd37..9680e69dec 100644
--- a/patches/server/0378-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -33,7 +33,7 @@ index 8a78ae8481d0ede674eb9aa56b9c8d5de5f730e9..45770f3511bc2ed3da31bda195e8043a
  
      public boolean generateFlatBedrock = false;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 84c3407961f0011f6579498084b11d92cd546170..b63786439e6571a657e142d27f3a3e901212c301 100644
+index ba8f8b222e8951e0eea8642ecbb843fbf5146f5d..600a774a0cdad4b2582afb3c603734209dac24f7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -222,6 +222,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0379-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index c53005aca2..c53005aca2 100644
--- a/patches/server/0379-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0380-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index 471ca643c3..471ca643c3 100644
--- a/patches/server/0380-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0381-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 44137bcfcb..44137bcfcb 100644
--- a/patches/server/0381-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0382-Don-t-tick-dead-players.patch b/patches/server/0383-Don-t-tick-dead-players.patch
index 1689f835df..85bc002aaa 100644
--- a/patches/server/0382-Don-t-tick-dead-players.patch
+++ b/patches/server/0383-Don-t-tick-dead-players.patch
@@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b63786439e6571a657e142d27f3a3e901212c301..b0d0b04984cb89312f49482b9de10362c4659120 100644
+index 600a774a0cdad4b2582afb3c603734209dac24f7..ef222e90d1dd125c909f00bab98eeb501f547a50 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -643,7 +643,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0383-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch
index b79b2b17bc..b79b2b17bc 100644
--- a/patches/server/0383-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0384-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0385-Optimize-Collision-to-not-load-chunks.patch
index 489030e651..84a6cf3797 100644
--- a/patches/server/0384-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0385-Optimize-Collision-to-not-load-chunks.patch
@@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading
 massive amounts of surrounding chunks due to large AABB lookups.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3c176d48e6b1a8e165b5860cd443b36c65397ce9..c909163f664875bded56656ad3c0ca6c39265abb 100644
+index 7b000de3fa232a75cc3737783e4a38025d0d8bde..52ce9718321b96ffb00b3a1b1b2b0071a91217b6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -791,6 +791,7 @@ public abstract class PlayerList {
@@ -26,7 +26,7 @@ index 3c176d48e6b1a8e165b5860cd443b36c65397ce9..c909163f664875bded56656ad3c0ca6c
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 814ff530067d5abe37782d06d9a05f85733f13d0..3df2ea950b5c5cc18e17d08af14b3caf4cac767e 100644
+index 32e93c0c9c56a00585ede420f488cfe4a1b37ffa..384f4eabb2ebacd459e0f21e268e3dd0cd4b4d20 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -174,6 +174,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0385-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0386-Don-t-move-existing-players-to-world-spawn.patch
index 8ab1060ee8..0519e05dc1 100644
--- a/patches/server/0385-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0386-Don-t-move-existing-players-to-world-spawn.patch
@@ -10,7 +10,7 @@ larger than the keep loaded range.
 By skipping this, we avoid potential for a large spike on server start.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b0d0b04984cb89312f49482b9de10362c4659120..2671b27290a4897c2343e071557785f48375ced1 100644
+index ef222e90d1dd125c909f00bab98eeb501f547a50..888e127e7e59a7ceb63f12ec69046916a0e29fc9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -313,7 +313,7 @@ public class ServerPlayer extends Player {
@@ -32,7 +32,7 @@ index b0d0b04984cb89312f49482b9de10362c4659120..2671b27290a4897c2343e071557785f4
          this.gameMode.setLevel((ServerLevel) world);
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c909163f664875bded56656ad3c0ca6c39265abb..e2991476289f04fce5aac307a95b4c6df9ede85f 100644
+index 52ce9718321b96ffb00b3a1b1b2b0071a91217b6..332bc127230fcefcdab0087922536af8b6ff1e8c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -210,6 +210,8 @@ public abstract class PlayerList {
diff --git a/patches/server/0386-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0387-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index cf8d69b485..cf8d69b485 100644
--- a/patches/server/0386-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0387-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0387-Improved-Watchdog-Support.patch b/patches/server/0388-Improved-Watchdog-Support.patch
index f3c007dfff..b7514bfb13 100644
--- a/patches/server/0387-Improved-Watchdog-Support.patch
+++ b/patches/server/0388-Improved-Watchdog-Support.patch
@@ -71,7 +71,7 @@ index 8cc4cb2163a93b9491550fe6d0f5d980fb216920..4dd14d73a37b32288a64fbd67ee22c43
              cause = cause.getCause();
          }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2e08855085a547151140bcb05dce9bc469d81ff6..c39479a9dffd9f9d7a8a6f99b97fef47391de1cd 100644
+index 03ebc2a0476aef9297cbbc7f358915703a469b02..4ed65f1371013fb91fe60a0e1501e222a6e9c508 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -297,7 +297,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -274,7 +274,7 @@ index 5346109670bedf88f13b4eff47c5292170fb47cc..7776c22744cdd31459e9634d1d549bdf
                  list.stream().map((playerchunk) -> {
                      CompletableFuture completablefuture;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e2991476289f04fce5aac307a95b4c6df9ede85f..903a816ec6f4d1a9c82b7e32bd2b4fc9b78f3a5c 100644
+index 332bc127230fcefcdab0087922536af8b6ff1e8c..936742383a6834bfd687ec48db308475f598d216 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -512,7 +512,7 @@ public abstract class PlayerList {
@@ -311,7 +311,7 @@ index 334fd625829c8e5e9c434b184f6d0084b2d6ccc8..e4c2bd0131a54495fbd1930ad0462251
              final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level.getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
              MinecraftServer.LOGGER.error(msg, throwable);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index e48549ceb50b102495d17a7f05e879fe04e8bc30..9516d5cabbdc2d587bea54cbc02548d02a434893 100644
+index f994d393929ca6813d4209fb9c93550e4f692228..0b049b267a1e1d6b48c035ed54ff24337863fb9e 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -1058,6 +1058,7 @@ public class LevelChunk extends ChunkAccess {
@@ -323,7 +323,7 @@ index e48549ceb50b102495d17a7f05e879fe04e8bc30..9516d5cabbdc2d587bea54cbc02548d0
                          final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
                          net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b74e74d511849c1d94564cc508e832868c304ee9..89db5ba958e7f68691507122227c2a331022f74b 100644
+index a67fc9b0899f9d2128ac202ba0c12776653dfe28..59d0ada796efc4b2cf65d8398911f132320482ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2067,7 +2067,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0388-Optimize-Pathfinding.patch b/patches/server/0389-Optimize-Pathfinding.patch
index 4259e48495..4259e48495 100644
--- a/patches/server/0388-Optimize-Pathfinding.patch
+++ b/patches/server/0389-Optimize-Pathfinding.patch
diff --git a/patches/server/0389-Reduce-Either-Optional-allocation.patch b/patches/server/0390-Reduce-Either-Optional-allocation.patch
index 0f4641263b..0f4641263b 100644
--- a/patches/server/0389-Reduce-Either-Optional-allocation.patch
+++ b/patches/server/0390-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0390-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0391-Reduce-memory-footprint-of-NBTTagCompound.patch
index 740fcbecab..740fcbecab 100644
--- a/patches/server/0390-Reduce-memory-footprint-of-NBTTagCompound.patch
+++ b/patches/server/0391-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0391-Prevent-opening-inventories-when-frozen.patch b/patches/server/0392-Prevent-opening-inventories-when-frozen.patch
index 8edf5911bb..8cc2ba41b0 100644
--- a/patches/server/0391-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0392-Prevent-opening-inventories-when-frozen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2671b27290a4897c2343e071557785f48375ced1..3f4129ba70dd93391189f85ebd5133d23213078b 100644
+index 888e127e7e59a7ceb63f12ec69046916a0e29fc9..45cf2059ea31d3c5c14b9c931a3a65dd3d76c627 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -612,7 +612,7 @@ public class ServerPlayer extends Player {
@@ -27,7 +27,7 @@ index 2671b27290a4897c2343e071557785f48375ced1..3f4129ba70dd93391189f85ebd5133d2
                  this.initMenu(container);
                  return OptionalInt.of(this.containerCounter);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index adfbc156b4c4a8591609f385adaa6b04f984a64f..709bab9ac4eb453caeb0f565b6a0d6d097e2d1e0 100644
+index a6ac2fdcda24ec031d5d2ea9e4492614171acb1e..08625a587c23394b344fed139abfcd82a3185aaf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -322,7 +322,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0392-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0393-Optimise-ArraySetSorted-removeIf.patch
index 1aa31112c4..1aa31112c4 100644
--- a/patches/server/0392-Optimise-ArraySetSorted-removeIf.patch
+++ b/patches/server/0393-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0393-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0394-Don-t-run-entity-collision-code-if-not-needed.patch
index f276bc6cb7..082bd4030b 100644
--- a/patches/server/0393-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0394-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -7,7 +7,7 @@ Will not run if max entity craming is disabled and
 the max collisions per entity is less than or equal to 0
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2e931bf17309b3b679b7ad9c98e1107d9a971e1d..73be677946a5e7b1f522b69bef395b0725996e5c 100644
+index b28689f2621ee7d5129ab6d1853d9ee8823bf1d0..e9efb18ac776cdf92b967aa400d5d112d0481dfc 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3280,10 +3280,16 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0394-Implement-Player-Client-Options-API.patch b/patches/server/0395-Implement-Player-Client-Options-API.patch
index c6e0a2a198..c6e0a2a198 100644
--- a/patches/server/0394-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0395-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0395-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0396-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index fe3a5aca21..fe3a5aca21 100644
--- a/patches/server/0395-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/server/0396-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0396-Broadcast-join-message-to-console.patch b/patches/server/0397-Broadcast-join-message-to-console.patch
index a24b77b0fc..5969707973 100644
--- a/patches/server/0396-Broadcast-join-message-to-console.patch
+++ b/patches/server/0397-Broadcast-join-message-to-console.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Broadcast join message to console
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 903a816ec6f4d1a9c82b7e32bd2b4fc9b78f3a5c..bb7260a179de2652accb79b5bd0f0e6624163ab4 100644
+index 936742383a6834bfd687ec48db308475f598d216..923d86766ee31f590909e398dc86b69529c29f42 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -293,7 +293,9 @@ public abstract class PlayerList {
diff --git a/patches/server/0397-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0398-Fix-Chunk-Post-Processing-deadlock-risk.patch
index 240ccc2344..240ccc2344 100644
--- a/patches/server/0397-Fix-Chunk-Post-Processing-deadlock-risk.patch
+++ b/patches/server/0398-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/0398-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0399-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index c24ca8c5f1..7b70d59367 100644
--- a/patches/server/0398-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0399-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -40,7 +40,7 @@ index 43e5e148f1289ff5e42311981c597c66d98447aa..f4b14d77d5c256852677bd9bc6dbda2b
          if (!(entity instanceof EnderDragonPart)) {
              EntityType<?> entitytypes = entity.getType();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 96932bc40d8a0fd865764ba0b77655ffb55c04f5..95ed3dba34539d07800bd7e34571471d6818e58e 100644
+index bb5b947c92c91768c59bc1ca7c61560a923a1329..318bf4e1aa11798a80ae1779d744545aaa8aa6ee 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -245,6 +245,7 @@ public class ServerPlayer extends Player {
@@ -52,7 +52,7 @@ index 96932bc40d8a0fd865764ba0b77655ffb55c04f5..95ed3dba34539d07800bd7e34571471d
      public String kickLeaveMessage = null; // SPIGOT-3034: Forward leave message to PlayerQuitEvent
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index bb7260a179de2652accb79b5bd0f0e6624163ab4..e7904870da5134b397f93c4de29d804775830947 100644
+index 923d86766ee31f590909e398dc86b69529c29f42..c8f0bed184a0524b18385c6ef44839b90b3549dc 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -276,6 +276,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0399-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0400-Load-Chunks-for-Login-Asynchronously.patch
index 37b2298a49..b8e91009fa 100644
--- a/patches/server/0399-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/server/0400-Load-Chunks-for-Login-Asynchronously.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Load Chunks for Login Asynchronously
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 95ed3dba34539d07800bd7e34571471d6818e58e..d00dfcb2005b07f50c3a7a8a8268c5bc8305f333 100644
+index 318bf4e1aa11798a80ae1779d744545aaa8aa6ee..f8913f10e3e24c4da7c251bc4bc0ab0820807f57 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -173,6 +173,7 @@ public class ServerPlayer extends Player {
@@ -37,7 +37,7 @@ index be677d437d17b74c6188ce1bd5fc6fdc228fd92f..78fbb4c3e52e900956ae0811aaf934c8
      public static final TicketType<ChunkPos> UNKNOWN = TicketType.create("unknown", Comparator.comparingLong(ChunkPos::toLong), 1);
      public static final TicketType<Unit> PLUGIN = TicketType.create("plugin", (a, b) -> 0); // CraftBukkit
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0a41746f630442ed411e0d0c5efe90959191ae99..33d5538c17272d69cdc6207de9fb32fb1bc304c2 100644
+index e424e29ecd90f17e84d37105f8fdde85df406813..b174bfdd8457d5e1a9d8c65c542a544639488ddf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -220,6 +220,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -96,7 +96,7 @@ index 4c06e62e967f28eb844d74237948834e61daeab0..0af65f1698e4ee9d94724f19b0abd61c
              try {
                  ServerPlayer entityplayer1 = this.server.getPlayerList().getPlayerForLogin(this.gameProfile, s); // CraftBukkit - add player reference
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e7904870da5134b397f93c4de29d804775830947..e9470af5a168f54c78383553ca634e77ae2a4cf5 100644
+index c8f0bed184a0524b18385c6ef44839b90b3549dc..4ccb008508a008d782f0c639663b423f1a6dfdef 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -40,6 +40,7 @@ import net.minecraft.network.protocol.Packet;
diff --git a/patches/server/0400-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0401-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index e2b30f446b..e2b30f446b 100644
--- a/patches/server/0400-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0401-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0401-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0402-Add-PlayerAttackEntityCooldownResetEvent.patch
index f55e537dd5..ea4d9caada 100644
--- a/patches/server/0401-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0402-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 73be677946a5e7b1f522b69bef395b0725996e5c..a34566fbdb2e2ffb80f239c0d1d5c94ecf7f91ff 100644
+index e9efb18ac776cdf92b967aa400d5d112d0481dfc..960f56019313977b336cf0de9495aae8e1dc976a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2058,7 +2058,16 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0402-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0403-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 8a5268c81a..8a5268c81a 100644
--- a/patches/server/0402-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0403-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0403-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0404-Add-phantom-creative-and-insomniac-controls.patch
index 570feecc42..570feecc42 100644
--- a/patches/server/0403-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0404-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0404-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0405-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index f0f0b1e864..71e6d1849e 100644
--- a/patches/server/0404-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0405-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -80,7 +80,7 @@ index d387e8cc95f9f54dfbf018d4e52cde5087bfc209..f69bc9d81750feb108119347f984de6b
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a34566fbdb2e2ffb80f239c0d1d5c94ecf7f91ff..479a10b24d5c8d825d3c11d1800c89d769e0f441 100644
+index 960f56019313977b336cf0de9495aae8e1dc976a..2b63a1cac397d80103b172477a0f3933e030e9a3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1622,9 +1622,9 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0405-Villager-Restocks-API.patch b/patches/server/0406-Villager-Restocks-API.patch
index d4af2305a8..d4af2305a8 100644
--- a/patches/server/0405-Villager-Restocks-API.patch
+++ b/patches/server/0406-Villager-Restocks-API.patch
diff --git a/patches/server/0406-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 77fb75c475..442b664947 100644
--- a/patches/server/0406-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 33d5538c17272d69cdc6207de9fb32fb1bc304c2..11448b0263f5354b6d6e6ef9df560ce24c940a3a 100644
+index b174bfdd8457d5e1a9d8c65c542a544639488ddf..3123726036d98c4d7f3b38c753ac0a27b32f5d44 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -885,7 +885,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0407-Expose-game-version.patch b/patches/server/0408-Expose-game-version.patch
index 0d858e703d..ea6ec3a7c0 100644
--- a/patches/server/0407-Expose-game-version.patch
+++ b/patches/server/0408-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 89db5ba958e7f68691507122227c2a331022f74b..0889a9a9eb78fb1030cb538f13a6c2526acbaa3f 100644
+index 59d0ada796efc4b2cf65d8398911f132320482ee..72effec1790b024bd3010207d389b257aa402161 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -573,6 +573,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0408-Optimize-Voxel-Shape-Merging.patch b/patches/server/0409-Optimize-Voxel-Shape-Merging.patch
index 7bfe849396..7bfe849396 100644
--- a/patches/server/0408-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/0409-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0409-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0410-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 735b875279..735b875279 100644
--- a/patches/server/0409-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0410-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0410-misc-debugging-dumps.patch b/patches/server/0411-misc-debugging-dumps.patch
index ef89bbd0c8..f063349bbb 100644
--- a/patches/server/0410-misc-debugging-dumps.patch
+++ b/patches/server/0411-misc-debugging-dumps.patch
@@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c39479a9dffd9f9d7a8a6f99b97fef47391de1cd..6d774f126e31e90d0845fc24b1ad7df5346c7cc9 100644
+index 4ed65f1371013fb91fe60a0e1501e222a6e9c508..abb640370da876a18a3eba952b19cfa9d0f73743 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -915,6 +915,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -74,7 +74,7 @@ index 0af65f1698e4ee9d94724f19b0abd61c437f18f2..d21f45d983bf3047811d2d73f4a38deb
                  this.connection.send(new ClientboundDisconnectPacket(chatmessage));
                  this.connection.disconnect(chatmessage);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0889a9a9eb78fb1030cb538f13a6c2526acbaa3f..c7f43771616310e8404b033b3cd99fb0a0024d69 100644
+index 72effec1790b024bd3010207d389b257aa402161..3a85c5884ebf0c8e1c4fe45925aca383f65531c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -997,6 +997,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0411-Prevent-teleporting-dead-entities.patch b/patches/server/0412-Prevent-teleporting-dead-entities.patch
index 3a10b5d51d..7250b13163 100644
--- a/patches/server/0411-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0412-Prevent-teleporting-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 11448b0263f5354b6d6e6ef9df560ce24c940a3a..f1be2494f254b1d5fc5c602bb6674829a86751b9 100644
+index 3123726036d98c4d7f3b38c753ac0a27b32f5d44..6d4dcfa3a3c62a37192c570e5e3274b550236b45 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1528,6 +1528,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0412-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0413-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index aac8af8094..5ea4209a82 100644
--- a/patches/server/0412-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0413-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1d7bbff8711bfb991046ecc66dce328a5f643c2d..2ea3af07a18094d0bc7e4898c0bb97ecbedf88f3 100644
+index 5a609a297ccfa66859b04eb907595741b8ec2160..398bedaba0a006bcd8ad562486ecd583d9d129ef 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -1,4 +1,6 @@
@@ -80,7 +80,7 @@ index 1d7bbff8711bfb991046ecc66dce328a5f643c2d..2ea3af07a18094d0bc7e4898c0bb97ec
      exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index fda5a623ec6bba0ed4d230415f7b9779ee2e8ccf..af43c63df3c82e910b77afd2a8899b8e6fc6db6d 100644
+index 8158a00821727104a23958a76e19cd8b01cb4e5a..52ba4797d0f27b8aaac262fd5a33dab63e28ebab 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -430,4 +430,9 @@ public class PaperConfig {
diff --git a/patches/server/0413-Implement-Mob-Goal-API.patch b/patches/server/0414-Implement-Mob-Goal-API.patch
index 0dd1fd3652..50bf9e94c5 100644
--- a/patches/server/0413-Implement-Mob-Goal-API.patch
+++ b/patches/server/0414-Implement-Mob-Goal-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2ea3af07a18094d0bc7e4898c0bb97ecbedf88f3..93bfdaeaae9710e271b23f44076e21a5eff6b8ff 100644
+index 398bedaba0a006bcd8ad562486ecd583d9d129ef..6b46f9c94dc051579ca5b51755caad19505e874a 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -36,6 +36,7 @@ dependencies {
@@ -785,7 +785,7 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 785389d11ead646d7f11c883f9784c3950a547aa..7353cfd8316f2c7725bba7d4aee41de135985daa 100644
+index 3a85c5884ebf0c8e1c4fe45925aca383f65531c8..9cdefc0cabae51d37149cda47fff5432c8c9ebed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2664,5 +2664,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0414-Add-villager-reputation-API.patch b/patches/server/0415-Add-villager-reputation-API.patch
index 1a1361c92b..1a1361c92b 100644
--- a/patches/server/0414-Add-villager-reputation-API.patch
+++ b/patches/server/0415-Add-villager-reputation-API.patch
diff --git a/patches/server/0415-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0416-Option-for-maximum-exp-value-when-merging-orbs.patch
index abc364f948..83f1a66288 100644
--- a/patches/server/0415-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0416-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -20,7 +20,7 @@ index c16233c8cabab2efca9846988c5c843aa9441133..fcd5d4e54f339b3435888a2e9842f64a
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d998c0dd9e03b9c0f0a6075e5a52ba50b44ed0c4..931cfbe01240e6382446aa12a545a02e44a407b9 100644
+index 1e16264b533c2205098c0569fadb8e369a032764..fb490fa7d59b1099e34a5adc7993d6dad2f10932 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -640,16 +640,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0416-ExperienceOrbMergeEvent.patch b/patches/server/0417-ExperienceOrbMergeEvent.patch
index 8161999bc5..b5b175e632 100644
--- a/patches/server/0416-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0417-ExperienceOrbMergeEvent.patch
@@ -9,7 +9,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 931cfbe01240e6382446aa12a545a02e44a407b9..aca2b2596a43927222f9894cc2f907cae2a331c1 100644
+index fb490fa7d59b1099e34a5adc7993d6dad2f10932..113e4db1d66b7af5b2ba976d094b4bf548b5800e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -650,7 +650,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0417-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0418-Fix-PotionEffect-ignores-icon-flag.patch
index e542865e62..e542865e62 100644
--- a/patches/server/0417-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0418-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0418-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0419-Optimize-brigadier-child-sorting-performance.patch
index 2d398241d6..2d398241d6 100644
--- a/patches/server/0418-Optimize-brigadier-child-sorting-performance.patch
+++ b/patches/server/0419-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0419-Potential-bed-API.patch b/patches/server/0420-Potential-bed-API.patch
index 45ebcdd575..313f3b066c 100644
--- a/patches/server/0419-Potential-bed-API.patch
+++ b/patches/server/0420-Potential-bed-API.patch
@@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 709bab9ac4eb453caeb0f565b6a0d6d097e2d1e0..f1c3afb478f2ffabb883ab86e132ff43c7c2d821 100644
+index 08625a587c23394b344fed139abfcd82a3185aaf..0bad3e55ede8346531dd0eb1c139c14a13e4b72e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -12,6 +12,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0420-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0421-Wait-for-Async-Tasks-during-shutdown.patch
index 152b635170..98dd78c9a4 100644
--- a/patches/server/0420-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0421-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6d774f126e31e90d0845fc24b1ad7df5346c7cc9..ca228085e07254aa23937219c7ef2b3330ca8fe0 100644
+index abb640370da876a18a3eba952b19cfa9d0f73743..12c1cee3b3055b44d0ca3196eb37e51879fce67b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -950,6 +950,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -22,7 +22,7 @@ index 6d774f126e31e90d0845fc24b1ad7df5346c7cc9..ca228085e07254aa23937219c7ef2b33
          // CraftBukkit end
          if (this.getConnection() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a16cdce0d185d0b42cb266614729c7d6cf7a875d..5953f2a15e150a5c0f7a0db9644d4f9f3388856f 100644
+index 9cdefc0cabae51d37149cda47fff5432c8c9ebed..285fe248bccfcd32521bbab071192abffd762531 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1006,6 +1006,35 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0421-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0422-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index d0006238a9..d0006238a9 100644
--- a/patches/server/0421-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0422-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0422-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0423-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index c3349320c4..0758a42a86 100644
--- a/patches/server/0422-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0423-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -13,7 +13,7 @@ A config is provided if you rather let players use these exploits, and let
 them destroy the worlds End Portals and get on top of the nether easy.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index af43c63df3c82e910b77afd2a8899b8e6fc6db6d..045a49da7c17e48534b3bd5b7aa3968963681e6c 100644
+index 52ba4797d0f27b8aaac262fd5a33dab63e28ebab..855db893080fc8784dc402a4fd7c3080dc9cdc15 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -435,4 +435,15 @@ public class PaperConfig {
diff --git a/patches/server/0423-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0424-Reduce-MutableInt-allocations-from-light-engine.patch
index 881c2f0231..881c2f0231 100644
--- a/patches/server/0423-Reduce-MutableInt-allocations-from-light-engine.patch
+++ b/patches/server/0424-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0424-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0425-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index ad01a02411..ad01a02411 100644
--- a/patches/server/0424-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0425-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0425-Ensure-safe-gateway-teleport.patch b/patches/server/0426-Ensure-safe-gateway-teleport.patch
index 527175e57b..527175e57b 100644
--- a/patches/server/0425-Ensure-safe-gateway-teleport.patch
+++ b/patches/server/0426-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0426-Add-option-for-console-having-all-permissions.patch b/patches/server/0427-Add-option-for-console-having-all-permissions.patch
index 5c9e2f0b04..aabebdbc12 100644
--- a/patches/server/0426-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0427-Add-option-for-console-having-all-permissions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option for console having all permissions
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 045a49da7c17e48534b3bd5b7aa3968963681e6c..5dc7e897fdb2a572b800eb34c40961cdfa3c0309 100644
+index 855db893080fc8784dc402a4fd7c3080dc9cdc15..62a0f6772bacfb8ad90c15493e0d48e29b70fac1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -446,4 +446,9 @@ public class PaperConfig {
diff --git a/patches/server/0427-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0428-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index 1dfe6c2f4d..f94c4f1587 100644
--- a/patches/server/0427-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0428-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
@@ -357,7 +357,7 @@ index cf5a5d98420c3849621bfdfae7bda7d5cb4b2dc9..846e6f41fdb6413b10f908c6b3f5c199
                      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d00dfcb2005b07f50c3a7a8a8268c5bc8305f333..9413ef3398553d2c778bcda6f97d99c9570d3b3e 100644
+index f8913f10e3e24c4da7c251bc4bc0ab0820807f57..90a844229e4a3ef5193cffc2c742b4c5a305a91c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -253,6 +253,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0428-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch
index 9c6ed229cc..77bae1fcb1 100644
--- a/patches/server/0428-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch
@@ -280,7 +280,7 @@ index 63e264c862053874585b0f6aad2f89389c2dadcb..2c9cd3619b0759905637eff746a761eb
              return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 34aed5ecacf325b581252998d26324fa87dc4578..f81bf7d1b0c2f355b71ce2e5f68ec9fb7aad824a 100644
+index f69bc9d81750feb108119347f984de6bca24ae44..14b3f14d2489bdbeb89886a115db2ba78cb97ad7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -54,6 +54,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
diff --git a/patches/server/0429-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0430-Optimize-ServerLevels-chunk-level-checking-methods.patch
index ef41103791..4a79e8342a 100644
--- a/patches/server/0429-Optimize-ServerLevels-chunk-level-checking-methods.patch
+++ b/patches/server/0430-Optimize-ServerLevels-chunk-level-checking-methods.patch
@@ -8,7 +8,7 @@ so inline where possible, and avoid the abstraction of the
 Either class.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5c5f9cf3539aeba4911d27111b0580d99a61f577..42d7802e787d1e2722bf94487f9bf8383aeef660 100644
+index 5009ad1a758e192eaf6ca59baab26d2ba58a6c66..894186d25863a437e49ef0c10b2f2dab34af7ed0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2169,19 +2169,22 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -39,7 +39,7 @@ index 5c5f9cf3539aeba4911d27111b0580d99a61f577..42d7802e787d1e2722bf94487f9bf838
  
      private final class EntityCallbacks implements LevelCallback<Entity> {
 diff --git a/src/main/java/net/minecraft/world/level/ChunkPos.java b/src/main/java/net/minecraft/world/level/ChunkPos.java
-index 4c5f8a103b550a681178926096d5f758654c61a7..d2952a1a84ae7326e2d4a1f19497db8f978e4688 100644
+index 4335132883e959f0c9649d5640b703a291d8a7aa..22d95316eac3731c66dd7dde960e4d71a6b565e2 100644
 --- a/src/main/java/net/minecraft/world/level/ChunkPos.java
 +++ b/src/main/java/net/minecraft/world/level/ChunkPos.java
 @@ -50,7 +50,7 @@ public class ChunkPos {
diff --git a/patches/server/0430-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0431-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index e9e14adef9..e9e14adef9 100644
--- a/patches/server/0430-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/patches/server/0431-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/patches/server/0431-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0432-Fix-villager-trading-demand-MC-163962.patch
index 0850983283..0850983283 100644
--- a/patches/server/0431-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/server/0432-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0432-Maps-shouldn-t-load-chunks.patch b/patches/server/0433-Maps-shouldn-t-load-chunks.patch
index d3c9edb4f2..d3c9edb4f2 100644
--- a/patches/server/0432-Maps-shouldn-t-load-chunks.patch
+++ b/patches/server/0433-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0433-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0434-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 3c0b925e52..3c0b925e52 100644
--- a/patches/server/0433-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/server/0434-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch
index b1be3e839f..b1be3e839f 100644
--- a/patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0435-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0436-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 1cafad18f3..1cafad18f3 100644
--- a/patches/server/0435-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/server/0436-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0436-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0437-Fix-piston-physics-inconsistency-MC-188840.patch
index 4882198947..dfecb91efc 100644
--- a/patches/server/0436-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0437-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -32,7 +32,7 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840
 This patch also fixes rail duping and carpet duping.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5dc7e897fdb2a572b800eb34c40961cdfa3c0309..56b6d8019f72d11e97d30e83467839d8fcb85674 100644
+index 62a0f6772bacfb8ad90c15493e0d48e29b70fac1..c639557108ad9c59ccdd0b543b5507fbab1e0fa4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -451,4 +451,12 @@ public class PaperConfig {
@@ -83,7 +83,7 @@ index edb599da2431fa32f6e656dd3de8f4a6f5e2ed4f..f4f49cc4109d4ae72c0a50f7acbd181d
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
-index 78d252b829e5c1f19532656a728620852403760c..613db573cef142e0ab1b24dc994677105a253042 100644
+index dda0b32a4989bbead35a2219a969a30ba0e975b0..94bd47212b05f66ebc81966eec3bc0abda76252c 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 @@ -285,7 +285,7 @@ public class PistonMovingBlockEntity extends BlockEntity {
diff --git a/patches/server/0437-Fix-sand-duping.patch b/patches/server/0438-Fix-sand-duping.patch
index b1e79fd86e..b1e79fd86e 100644
--- a/patches/server/0437-Fix-sand-duping.patch
+++ b/patches/server/0438-Fix-sand-duping.patch
diff --git a/patches/server/0438-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch
index 0220961ec0..cddd429b38 100644
--- a/patches/server/0438-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch
@@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f1be2494f254b1d5fc5c602bb6674829a86751b9..a0597bf8d948f20becd7ccb748a78f8a14a54cf6 100644
+index 6d4dcfa3a3c62a37192c570e5e3274b550236b45..58c25a32844eec23e60d5e3b814d1a17253c80f7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1342,6 +1342,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0439-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0440-Inventory-getHolder-method-without-block-snapshot.patch
index 9ed9fe0826..9ed9fe0826 100644
--- a/patches/server/0439-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0440-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0440-Improve-Arrow-API.patch b/patches/server/0441-Improve-Arrow-API.patch
index 47bb897a5a..47bb897a5a 100644
--- a/patches/server/0440-Improve-Arrow-API.patch
+++ b/patches/server/0441-Improve-Arrow-API.patch
diff --git a/patches/server/0441-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 51374e4c71..b1303705d8 100644
--- a/patches/server/0441-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a0597bf8d948f20becd7ccb748a78f8a14a54cf6..d55afdb09af8bc07361c06453a028da36ef934eb 100644
+index 58c25a32844eec23e60d5e3b814d1a17253c80f7..6c583e7f1256652434348a355e90fc3d5dbda3aa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2805,9 +2805,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0442-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0443-Hide-sync-chunk-writes-behind-flag.patch
index cb0833f0d3..cb0833f0d3 100644
--- a/patches/server/0442-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0443-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0443-Add-permission-for-command-blocks.patch b/patches/server/0444-Add-permission-for-command-blocks.patch
index 54c9c35ca9..51bf90aa3c 100644
--- a/patches/server/0443-Add-permission-for-command-blocks.patch
+++ b/patches/server/0444-Add-permission-for-command-blocks.patch
@@ -18,7 +18,7 @@ index d4f57fde2f02071dfde08cb2a5c8359984056aef..176e5bbac94cf39805dcacfcae3a3daa
                  return false;
              } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d55afdb09af8bc07361c06453a028da36ef934eb..ddcc780a27a60bd9dcc1695d03bf42e42e87b192 100644
+index 6c583e7f1256652434348a355e90fc3d5dbda3aa..df1535e0bd37f868ac4091fc8626ccef593a4843 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -796,7 +796,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0444-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0445-Ensure-Entity-AABB-s-are-never-invalid.patch
index 7ee204a54e..7ee204a54e 100644
--- a/patches/server/0444-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0445-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0445-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index ef4f624afb..b043efde24 100644
--- a/patches/server/0445-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -8,7 +8,7 @@ makes it so that the server keeps the last difficulty used instead
 of restoring the server.properties every single load.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ca228085e07254aa23937219c7ef2b3330ca8fe0..03ef045c166c92efaeeaf655178b9729549e2296 100644
+index 12c1cee3b3055b44d0ca3196eb37e51879fce67b..f85ee370c89b59ad58f182da2ff6d0d11c6e3a8b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -820,7 +820,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -76,7 +76,7 @@ index cec0082718c2a729044d6f19d74b8e4425816725..8eca8825008713467a20f84d71ed0f32
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9413ef3398553d2c778bcda6f97d99c9570d3b3e..94fb29f8dbf4f60b59740efda68016411b3d74b0 100644
+index 90a844229e4a3ef5193cffc2c742b4c5a305a91c..d60d3ea1ec9c14dafda9f0fffd16ed2ba947789b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1120,7 +1120,7 @@ public class ServerPlayer extends Player {
@@ -89,7 +89,7 @@ index 9413ef3398553d2c778bcda6f97d99c9570d3b3e..94fb29f8dbf4f60b59740efda6801641
  
                  playerlist.sendPlayerPermissionLevel(this);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e2446434e0db09d303c4a831c8f60819ade18f9a..33c0db5e7dc0d824e10577fc73406134d54d62bc 100644
+index df1535e0bd37f868ac4091fc8626ccef593a4843..3b18f7fafce62cb107a3a7c1558ea544ab10454c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3063,7 +3063,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -102,7 +102,7 @@ index e2446434e0db09d303c4a831c8f60819ade18f9a..33c0db5e7dc0d824e10577fc73406134
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5953f2a15e150a5c0f7a0db9644d4f9f3388856f..4756ae3b7e217e3849c6fedfcb6f5b601719735d 100644
+index 285fe248bccfcd32521bbab071192abffd762531..8c61da70f609cd8cd5939cd12edc118d65fc734a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -945,8 +945,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0446-Paper-dumpitem-command.patch b/patches/server/0447-Paper-dumpitem-command.patch
index 1c677ca32c..148a1abacf 100644
--- a/patches/server/0446-Paper-dumpitem-command.patch
+++ b/patches/server/0447-Paper-dumpitem-command.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Paper dumpitem command
 Let's you quickly view the item in your hands NBT data
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 03ba904f5ac018f7e99bfdb9a07295fd6ef9476c..5a30840a2c35d8b721e27e91b4e6816e9b7c1e5a 100644
+index 64c8ba212855dbdd7d2025126474644bd68c3ec0..fa0b824747c5b15cfb29e22b2d30b9c6932c1320 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -20,6 +20,7 @@ import net.minecraft.server.level.ServerPlayer;
@@ -17,7 +17,7 @@ index 03ba904f5ac018f7e99bfdb9a07295fd6ef9476c..5a30840a2c35d8b721e27e91b4e6816e
  import net.minecraft.resources.ResourceLocation;
  import net.minecraft.server.MCUtil;
  import org.apache.commons.lang3.tuple.MutablePair;
-@@ -33,7 +34,9 @@ import org.bukkit.command.CommandSender;
+@@ -32,7 +33,9 @@ import org.bukkit.command.CommandSender;
  import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.craftbukkit.CraftWorld;
  import org.bukkit.craftbukkit.entity.CraftPlayer;
@@ -27,7 +27,7 @@ index 03ba904f5ac018f7e99bfdb9a07295fd6ef9476c..5a30840a2c35d8b721e27e91b4e6816e
  
  import java.io.File;
  import java.io.FileOutputStream;
-@@ -56,7 +59,7 @@ import java.util.stream.Collectors;
+@@ -63,7 +66,7 @@ import static net.kyori.adventure.text.format.NamedTextColor.YELLOW;
  
  public class PaperCommand extends Command {
      private static final String BASE_PERM = "bukkit.command.paper.";
@@ -36,7 +36,7 @@ index 03ba904f5ac018f7e99bfdb9a07295fd6ef9476c..5a30840a2c35d8b721e27e91b4e6816e
  
      public PaperCommand(String name) {
          super(name);
-@@ -170,6 +173,9 @@ public class PaperCommand extends Command {
+@@ -177,6 +180,9 @@ public class PaperCommand extends Command {
              case "reload":
                  doReload(sender);
                  break;
@@ -46,9 +46,9 @@ index 03ba904f5ac018f7e99bfdb9a07295fd6ef9476c..5a30840a2c35d8b721e27e91b4e6816e
              case "debug":
                  doDebug(sender, args);
                  break;
-@@ -478,6 +484,23 @@ public class PaperCommand extends Command {
+@@ -493,6 +499,23 @@ public class PaperCommand extends Command {
  
-         Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Paper config reload complete.");
+         Command.broadcastCommandMessage(sender, text("Paper config reload complete.", GREEN));
      }
 +    private void doDumpItem(CommandSender sender) {
 +        if (!(sender instanceof Player)) {
diff --git a/patches/server/0447-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0448-Don-t-allow-null-UUID-s-for-chat.patch
index 79ac87a844..79ac87a844 100644
--- a/patches/server/0447-Don-t-allow-null-UUID-s-for-chat.patch
+++ b/patches/server/0448-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0448-Improve-Legacy-Component-serialization-size.patch b/patches/server/0449-Improve-Legacy-Component-serialization-size.patch
index 8d30b49c6b..8d30b49c6b 100644
--- a/patches/server/0448-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0449-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0449-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0450-Optimize-Bit-Operations-by-inlining.patch
index 731db38a8f..731db38a8f 100644
--- a/patches/server/0449-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0450-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0450-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 9cd9f1ce29..9cd9f1ce29 100644
--- a/patches/server/0450-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0451-incremental-chunk-and-player-saving.patch b/patches/server/0452-incremental-chunk-and-player-saving.patch
index b75220d719..a0cf66fc49 100644
--- a/patches/server/0451-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0452-incremental-chunk-and-player-saving.patch
@@ -50,7 +50,7 @@ index 634affda96921a5453f89ddcc72fc482b162a085..0167b3f0c3f52f540edc381e532d777b
          config.addDefault("world-settings.default." + path, def);
          return config.getBoolean("world-settings." + worldName + "." + path, config.getBoolean("world-settings.default." + path));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 03ef045c166c92efaeeaf655178b9729549e2296..851d63ba918f1fb2ffb975b0b46c8797e2b3b903 100644
+index f85ee370c89b59ad58f182da2ff6d0d11c6e3a8b..5edb1f4be4d0306a22827d1330a08251e5cb1fbe 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -898,7 +898,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -343,7 +343,7 @@ index 894186d25863a437e49ef0c10b2f2dab34af7ed0..38af4d10e2e09c0917ae8ff265e5a6c6
          ServerChunkCache chunkproviderserver = this.getChunkSource();
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 94fb29f8dbf4f60b59740efda68016411b3d74b0..30e82817418ebe7e61eab3ed290ce938dde42297 100644
+index d60d3ea1ec9c14dafda9f0fffd16ed2ba947789b..0a2c94e289dd0dac88a38516a9be09a03acfc579 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -170,6 +170,7 @@ import org.bukkit.inventory.MainHand;
@@ -355,7 +355,7 @@ index 94fb29f8dbf4f60b59740efda68016411b3d74b0..30e82817418ebe7e61eab3ed290ce938
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
      public ServerGamePacketListenerImpl connection;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e9470af5a168f54c78383553ca634e77ae2a4cf5..f19c9489d0b982a28e2ee8fac6940ecc11fac6af 100644
+index 4ccb008508a008d782f0c639663b423f1a6dfdef..7edadb4795618b38d2fa321faa085cc69f9529bf 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -560,6 +560,7 @@ public abstract class PlayerList {
@@ -403,7 +403,7 @@ index 8038b37bdfdd41eadb4f3cb4dd7ef245051ed3a4..20b288fdef75c9994b174cb4d7d082c5
      // CraftBukkit start - decompile error
      public static record TicksToSave(SerializableTickContainer<Block> blocks, SerializableTickContainer<Fluid> fluids) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 9d667be3fe04b7d86986bd1ecaf4fce8b63198ae..dc95aaa62220f2042e287c7d0d69753b8e891fba 100644
+index 0b049b267a1e1d6b48c035ed54ff24337863fb9e..b9ad77606d88d7ca41c0070063b8599ecc048422 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -87,6 +87,12 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0452-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0453-Stop-copy-on-write-operations-for-updating-light-dat.patch
index 74e5860e6b..74e5860e6b 100644
--- a/patches/server/0452-Stop-copy-on-write-operations-for-updating-light-dat.patch
+++ b/patches/server/0453-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0453-Support-old-UUID-format-for-NBT.patch b/patches/server/0454-Support-old-UUID-format-for-NBT.patch
index 672d8222d0..672d8222d0 100644
--- a/patches/server/0453-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0454-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0454-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0455-Clean-up-duplicated-GameProfile-Properties.patch
index c29e7474a4..c29e7474a4 100644
--- a/patches/server/0454-Clean-up-duplicated-GameProfile-Properties.patch
+++ b/patches/server/0455-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0455-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0456-Convert-legacy-attributes-in-Item-Meta.patch
index 6f109d92c7..4621045255 100644
--- a/patches/server/0455-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0456-Convert-legacy-attributes-in-Item-Meta.patch
@@ -30,7 +30,7 @@ index 0520c45197629cbdc2777d9ae11eef572e793160..46c313d581b9af6aa0a48f97ae3cc800
      public CraftAttributeMap(AttributeMap handle) {
          this.handle = handle;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 200d1cd53b5af8d7368b6c34b1cfb64463f3e782..ab809278b01f08342821bd4883601e814a74a066 100644
+index ac779f3cedb7ddd74f39a18f08afbcdad8cd13b1..389a0af8562bf7de6b8e52015286da06aef2f428 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -480,7 +480,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0456-Remove-some-streams-from-structures.patch b/patches/server/0457-Remove-some-streams-from-structures.patch
index 3feaf02aef..3feaf02aef 100644
--- a/patches/server/0456-Remove-some-streams-from-structures.patch
+++ b/patches/server/0457-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0457-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0458-Remove-streams-from-classes-related-villager-gossip.patch
index 30a2074946..30a2074946 100644
--- a/patches/server/0457-Remove-streams-from-classes-related-villager-gossip.patch
+++ b/patches/server/0458-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0458-Support-components-in-ItemMeta.patch b/patches/server/0459-Support-components-in-ItemMeta.patch
index 4fba0081f9..4fba0081f9 100644
--- a/patches/server/0458-Support-components-in-ItemMeta.patch
+++ b/patches/server/0459-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0459-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0460-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
index 9a07cce833..9a07cce833 100644
--- a/patches/server/0459-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
+++ b/patches/server/0460-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0460-Add-entity-liquid-API.patch b/patches/server/0461-Add-entity-liquid-API.patch
index 4a28ddb065..c209cd6e4e 100644
--- a/patches/server/0460-Add-entity-liquid-API.patch
+++ b/patches/server/0461-Add-entity-liquid-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 57ec20f963c440051b318bf29b59db965d9d744e..3883c5d97f80a44cb371b69c3b07caa362416666 100644
+index 5d51296954dc9e1c3c9576d7afb5287c76ab3afe..ba0f9d729a4d4bd35050ab41d6d70ee3ea46beeb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1372,7 +1372,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0461-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0462-Update-itemstack-legacy-name-and-lore.patch
index 159011097e..159011097e 100644
--- a/patches/server/0461-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/server/0462-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0462-Spawn-player-in-correct-world-on-login.patch b/patches/server/0463-Spawn-player-in-correct-world-on-login.patch
index a12daa7fac..fa39d6e866 100644
--- a/patches/server/0462-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/server/0463-Spawn-player-in-correct-world-on-login.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f19c9489d0b982a28e2ee8fac6940ecc11fac6af..aa9d32a4c86aade43f91c78ae1179119d12e9a88 100644
+index 7edadb4795618b38d2fa321faa085cc69f9529bf..9d9570b281041a08879f0bc3eedeef764ce5a47c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -196,7 +196,18 @@ public abstract class PlayerList {
diff --git a/patches/server/0463-Add-PrepareResultEvent.patch b/patches/server/0464-Add-PrepareResultEvent.patch
index bdeb15cb74..bdeb15cb74 100644
--- a/patches/server/0463-Add-PrepareResultEvent.patch
+++ b/patches/server/0464-Add-PrepareResultEvent.patch
diff --git a/patches/server/0464-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0465-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 8adbe38157..493db7713f 100644
--- a/patches/server/0464-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0465-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 479a10b24d5c8d825d3c11d1800c89d769e0f441..aebf02fbd3823eb05a0823a843e35d94c05a8afe 100644
+index 2b63a1cac397d80103b172477a0f3933e030e9a3..795b24ff5357a52624abc994bcfcc772ca7f5e7b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3378,7 +3378,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0465-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0466-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index 0ae6020b80..0ae6020b80 100644
--- a/patches/server/0465-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/patches/server/0466-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/server/0466-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0467-Optimize-NetworkManager-Exception-Handling.patch
index 013df0fbfa..013df0fbfa 100644
--- a/patches/server/0466-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0467-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0467-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0468-Optimize-the-advancement-data-player-iteration-to-be.patch
index bcabd99f92..bcabd99f92 100644
--- a/patches/server/0467-Optimize-the-advancement-data-player-iteration-to-be.patch
+++ b/patches/server/0468-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0468-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0469-Fix-arrows-never-despawning-MC-125757.patch
index 85c6131304..85c6131304 100644
--- a/patches/server/0468-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0469-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0469-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0470-Thread-Safe-Vanilla-Command-permission-checking.patch
index 7145af352d..ee6f591ce6 100644
--- a/patches/server/0469-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0470-Thread-Safe-Vanilla-Command-permission-checking.patch
@@ -9,7 +9,7 @@ to race conditions.
 Plus, .canUse we want to be safe for async anyways.
 
 diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
-index 2b87c6eb28d4db634dd6d8ee42ff3aa78ed7cb68..f64aa22ed6fcb4af67317b99f459ee5296392548 100644
+index a4f97c1df86c574af9b9824a38034a3d76d6e357..d65defd5fc54086a969c568b93dfb05f40dd5a44 100644
 --- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
 +++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
 @@ -74,10 +74,10 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
diff --git a/patches/server/0470-Move-range-check-for-block-placing-up.patch b/patches/server/0471-Move-range-check-for-block-placing-up.patch
index 667ef79ec9..c6c03f240a 100644
--- a/patches/server/0470-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0471-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 33c0db5e7dc0d824e10577fc73406134d54d62bc..48e4ed91def1cfda0d7f10d00e13c415f74dbca2 100644
+index 3b18f7fafce62cb107a3a7c1558ea544ab10454c..ee9264d090db36668d2fe745734dd27b3f1556db 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1686,6 +1686,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0471-Fix-SPIGOT-5989.patch b/patches/server/0472-Fix-SPIGOT-5989.patch
index 7b8d5b1276..edf34ca045 100644
--- a/patches/server/0471-Fix-SPIGOT-5989.patch
+++ b/patches/server/0472-Fix-SPIGOT-5989.patch
@@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d5e5e0a80c1a3dd5823e9975062856b6d0ef3ae1..d5768986b1666691bbcefac158cea120eaf9cac5 100644
+index 738967c8f6b57a52ab7a2b1302c9a9e6f4698d2c..019bbc77fe0a85de6d8eef53496981d1d7d0c320 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -79,6 +79,7 @@ import net.minecraft.world.level.GameRules;
diff --git a/patches/server/0472-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0473-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index c434ad9703..c434ad9703 100644
--- a/patches/server/0472-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0473-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0473-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0474-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index 1525de48e4..1525de48e4 100644
--- a/patches/server/0473-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0474-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0474-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0475-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 935dc6919a..935dc6919a 100644
--- a/patches/server/0474-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0475-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0475-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0476-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
index b62f062554..b62f062554 100644
--- a/patches/server/0475-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
+++ b/patches/server/0476-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0476-Fix-some-rails-connecting-improperly.patch b/patches/server/0477-Fix-some-rails-connecting-improperly.patch
index 8de7ddf603..b0440d3c2f 100644
--- a/patches/server/0476-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0477-Fix-some-rails-connecting-improperly.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix some rails connecting improperly
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java b/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java
-index 67ffd7f67f72a5293411688e0be1a49f204a74d4..4ed0b305015ffa0366c93306dae4a245fa8ad812 100644
+index b0e20bb18179265f59befde2b4c685b8ee2c119e..3c5c9279389d4ffda07cbc10949c616071e6e288 100644
 --- a/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java
 @@ -65,6 +65,7 @@ public abstract class BaseRailBlock extends Block implements SimpleWaterloggedBl
@@ -29,7 +29,7 @@ index 8284df37b6b9a937c43c14b2a0f1274e087aa3ad..b68e3ced407a9e6b386cbd379e58c86f
              boolean flag1 = false;
              List<AbstractMinecart> list = this.getInteractingMinecartOfType(world, pos, AbstractMinecart.class, (entity) -> {
 diff --git a/src/main/java/net/minecraft/world/level/block/RailState.java b/src/main/java/net/minecraft/world/level/block/RailState.java
-index a205e04bce8706302e4a077646749d05dee98251..2a642275522c1d718dd6052f5ac942579cc31e9e 100644
+index 0cbfad97371b59de95963a09aa16f3dad7a37222..d873625c1b8439a727d39ce207b5e84a1d86e5eb 100644
 --- a/src/main/java/net/minecraft/world/level/block/RailState.java
 +++ b/src/main/java/net/minecraft/world/level/block/RailState.java
 @@ -17,6 +17,12 @@ public class RailState {
diff --git a/patches/server/0477-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0478-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index be48fd5ae2..be48fd5ae2 100644
--- a/patches/server/0477-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0478-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0478-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0479-Do-not-let-the-server-load-chunks-from-newer-version.patch
index a26acb8e18..a26acb8e18 100644
--- a/patches/server/0478-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0479-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0479-Brand-support.patch b/patches/server/0480-Brand-support.patch
index 930d392797..930d392797 100644
--- a/patches/server/0479-Brand-support.patch
+++ b/patches/server/0480-Brand-support.patch
diff --git a/patches/server/0480-Add-setMaxPlayers-API.patch b/patches/server/0481-Add-setMaxPlayers-API.patch
index a676e0f067..2afb00b44c 100644
--- a/patches/server/0480-Add-setMaxPlayers-API.patch
+++ b/patches/server/0481-Add-setMaxPlayers-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d5768986b1666691bbcefac158cea120eaf9cac5..e5dc73d7cfd2ec868b18c5d34010d79d273465e1 100644
+index 019bbc77fe0a85de6d8eef53496981d1d7d0c320..f9ef6e64b95f90d69a897dd996a587749776350d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -144,7 +144,7 @@ public abstract class PlayerList {
@@ -18,7 +18,7 @@ index d5768986b1666691bbcefac158cea120eaf9cac5..e5dc73d7cfd2ec868b18c5d34010d79d
      private int simulationDistance;
      private boolean allowCheatsForAllPlayers;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8699b1c7d9085a07919cdb51391a189cf59e6623..f4eb6a4c4d79b074f9d96f5cb84fc99ff60556a6 100644
+index 017e351e14a6a3a4c711df84f81936c296da13e1..98826babf8be2782b645c2417ed5a7595ed9a336 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -668,6 +668,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0481-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0482-Add-playPickupItemAnimation-to-LivingEntity.patch
index 9efead6d4e..9efead6d4e 100644
--- a/patches/server/0481-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0482-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0482-Don-t-require-FACING-data.patch b/patches/server/0483-Don-t-require-FACING-data.patch
index 76a2f0f0e3..76a2f0f0e3 100644
--- a/patches/server/0482-Don-t-require-FACING-data.patch
+++ b/patches/server/0483-Don-t-require-FACING-data.patch
diff --git a/patches/server/0483-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0484-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 34bb93c244..616c20da8c 100644
--- a/patches/server/0483-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0484-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -17,7 +17,7 @@ index 38af4d10e2e09c0917ae8ff265e5a6c610fa4404..2cb1bad01d48efe0e7474ca8308d0d7e
              // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
              this.removeTicketsForSpawn(this.paperConfig.keepLoadedRange, prevSpawn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e9353aa51d24e06c3bd67417215cdfb0c97a6d60..3fb6aabf79cdc9db86ecff56541ae7aa8a90e81d 100644
+index 198ddc0747470313e4cbab132a8e523155cfe0c1..f7d5c6aa18ee44e0a6651ed73c922a973bb809b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -258,11 +258,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0484-Add-moon-phase-API.patch b/patches/server/0485-Add-moon-phase-API.patch
index 15ae8e145d..82a9683167 100644
--- a/patches/server/0484-Add-moon-phase-API.patch
+++ b/patches/server/0485-Add-moon-phase-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add moon phase API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 797dfc6b10aab7a84a19cd49854b23bd04341d6b..2a388f8bbbdfb4dc469bcfce6a6241066a7fe597 100644
+index f7d5c6aa18ee44e0a6651ed73c922a973bb809b3..c39d5dd9602fe35b4936f01089a3b2048ef0c9bf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -195,6 +195,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0485-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0486-Improve-Chunk-Status-Transition-Speed.patch
index b9f918ff05..b9f918ff05 100644
--- a/patches/server/0485-Improve-Chunk-Status-Transition-Speed.patch
+++ b/patches/server/0486-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/patches/server/0486-Prevent-headless-pistons-from-being-created.patch b/patches/server/0487-Prevent-headless-pistons-from-being-created.patch
index 0d5eba8f24..687dd4d0be 100644
--- a/patches/server/0486-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0487-Prevent-headless-pistons-from-being-created.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d404105573f3cda57e8eb6cad70d248d4e5e1bdf..ff855232e9b94d1b05d7abb8fd5ce243cc0cd324 100644
+index 5e531f9fc67bd3092b39f1d3b46b9490319dd79a..ad67d41484052e38f3b955aafa1f74cf6e2b3701 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -469,4 +469,10 @@ public class PaperConfig {
diff --git a/patches/server/0487-Add-BellRingEvent.patch b/patches/server/0488-Add-BellRingEvent.patch
index e101aa373c..91ad6c6972 100644
--- a/patches/server/0487-Add-BellRingEvent.patch
+++ b/patches/server/0488-Add-BellRingEvent.patch
@@ -7,7 +7,7 @@ Add a new event, BellRingEvent, to trigger whenever a player rings a
 village bell. Passes along the bell block and the player who rang it.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BellBlock.java b/src/main/java/net/minecraft/world/level/block/BellBlock.java
-index 3392d9b45d4bfba7ad3e3a84cdd4f2a29b58e4ff..1864984197a6b28cccb3a57b6856f61766d6a467 100644
+index 07276602799b3890ea62946cdf8a75ac48082d1f..135632360fd8b20f1cd3672c260dd2f92e993371 100644
 --- a/src/main/java/net/minecraft/world/level/block/BellBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BellBlock.java
 @@ -3,6 +3,7 @@ package net.minecraft.world.level.block;
diff --git a/patches/server/0488-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0489-Add-zombie-targets-turtle-egg-config.patch
index b9b63d40d1..b9b63d40d1 100644
--- a/patches/server/0488-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0489-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0489-Buffer-joins-to-world.patch b/patches/server/0490-Buffer-joins-to-world.patch
index 61a120253f..242c0597af 100644
--- a/patches/server/0489-Buffer-joins-to-world.patch
+++ b/patches/server/0490-Buffer-joins-to-world.patch
@@ -8,7 +8,7 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ff855232e9b94d1b05d7abb8fd5ce243cc0cd324..503d0a15a39d70c26140987f076047e3835ce9fa 100644
+index ad67d41484052e38f3b955aafa1f74cf6e2b3701..658569f9cefdbbfc30eef3b63e8bf552557a498a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -91,6 +91,11 @@ public class PaperConfig {
diff --git a/patches/server/0490-Eigencraft-redstone-implementation.patch b/patches/server/0491-Eigencraft-redstone-implementation.patch
index f1c2902551..f1c2902551 100644
--- a/patches/server/0490-Eigencraft-redstone-implementation.patch
+++ b/patches/server/0491-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0491-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0492-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 5370f96d97..5370f96d97 100644
--- a/patches/server/0491-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0492-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0492-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0493-PortalCreateEvent-needs-to-know-its-entity.patch
index dc90dbfec8..dc90dbfec8 100644
--- a/patches/server/0492-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0493-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0493-Fix-CraftTeam-null-check.patch b/patches/server/0494-Fix-CraftTeam-null-check.patch
index 2772e3f4bc..fc8ca37076 100644
--- a/patches/server/0493-Fix-CraftTeam-null-check.patch
+++ b/patches/server/0494-Fix-CraftTeam-null-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CraftTeam null check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index 8aa74d3d04efc88f48b79b677d63d464e1fef89e..0e1fbecfc3062ceac425607507caa54b0d007130 100644
+index 18d5a26c34c848241c306241b3ad9825b5a0b9a9..60b1cffdccde4715832546d6edbf206fbab4e82f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 @@ -261,7 +261,7 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
diff --git a/patches/server/0494-Add-more-Evoker-API.patch b/patches/server/0495-Add-more-Evoker-API.patch
index 367e900e25..367e900e25 100644
--- a/patches/server/0494-Add-more-Evoker-API.patch
+++ b/patches/server/0495-Add-more-Evoker-API.patch
diff --git a/patches/server/0495-Add-methods-to-get-translation-keys.patch b/patches/server/0496-Add-methods-to-get-translation-keys.patch
index d383e8c2bd..d383e8c2bd 100644
--- a/patches/server/0495-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0496-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0496-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0497-Create-HoverEvent-from-ItemStack-Entity.patch
index 8f6d9af194..8f6d9af194 100644
--- a/patches/server/0496-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0497-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0497-Cache-block-data-strings.patch b/patches/server/0498-Cache-block-data-strings.patch
index 4d0cb9354d..52837742c0 100644
--- a/patches/server/0497-Cache-block-data-strings.patch
+++ b/patches/server/0498-Cache-block-data-strings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 851d63ba918f1fb2ffb975b0b46c8797e2b3b903..7e4c9fb177211afc1fbbede3393cc7de8d9014a9 100644
+index 5edb1f4be4d0306a22827d1330a08251e5cb1fbe..e22ef9d02a64852f09a8d528a366817aceaf55dc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2031,6 +2031,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0498-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0499-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 412cfdb3ec..7f4c3255d3 100644
--- a/patches/server/0498-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0499-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 82ef4b4f99216eee00c867565d55e133bf7d8bcb..9d073564faa0f8dbd46ea6f9590a8260368fcbb0 100644
+index c0556da4b8a48523468456bd130726a56387ec0c..33e178801b8b3eb4b8fbeb8bbc2f6db75378bb09 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -689,7 +689,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -31,7 +31,7 @@ index 82ef4b4f99216eee00c867565d55e133bf7d8bcb..9d073564faa0f8dbd46ea6f9590a8260
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 731cd8167eed50ac066734e97d3670df363a67d7..1412f0dc93a417b41e8f8c615c44a8eeb70dc133 100644
+index 3c3960abd63297bf6c247bc48de3b77a90cee06d..a992153f951d888874971c9bca84963643925c56 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -154,6 +154,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0499-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0500-Add-additional-open-container-api-to-HumanEntity.patch
index 188d4ee3d8..41342fc93f 100644
--- a/patches/server/0499-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0500-Add-additional-open-container-api-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add additional open container api to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index f1c3afb478f2ffabb883ab86e132ff43c7c2d821..cdd2e391d18179d85a8658d09a02de6637a86a5c 100644
+index 0bad3e55ede8346531dd0eb1c139c14a13e4b72e..61665989cf24484509766619db95247ef40b3e1e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -458,6 +458,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0500-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0501-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 9787a24022..9787a24022 100644
--- a/patches/server/0500-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0501-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0501-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0502-Extend-block-drop-capture-to-capture-all-items-added.patch
index 04dc0dd436..2ff16ea4d5 100644
--- a/patches/server/0501-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0502-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b42637a2e9594cc2a30f910ef08399c11607e094..83c48cb9640ad1a300538bf176e1584c8a0dc539 100644
+index 2cb1bad01d48efe0e7474ca8308d0d7e84d691d6..053ca558c7db0b0a7c2b768e3827e0b90094fc5b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1266,6 +1266,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0502-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0503-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
index 57d50efae0..57d50efae0 100644
--- a/patches/server/0502-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
+++ b/patches/server/0503-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0503-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0504-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 8b9f214a80..f9ac5804df 100644
--- a/patches/server/0503-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0504-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -21,7 +21,7 @@ index a992153f951d888874971c9bca84963643925c56..e14ee2d556ca7cc28f8ca80b3e097a81
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 008c15164a7affb785964f604f8fea93d28344ac..26936cb655aec0453c094e0993d43d65393a5579 100644
+index 048163598018ee58a9aa2ca811ed44ac194ac880..b2ead915b12830c68a21ae994f0c8b728431013f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -502,6 +502,10 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0504-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0505-Lazily-track-plugin-scoreboards-by-default.patch
index cafd24af42..e32e47bead 100644
--- a/patches/server/0504-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0505-Lazily-track-plugin-scoreboards-by-default.patch
@@ -14,7 +14,7 @@ this breaks your workflow you can always force all scoreboards to be tracked wit
 settings.track-plugin-scoreboards in paper.yml.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 503d0a15a39d70c26140987f076047e3835ce9fa..d58429ef5c7e866ce36a00fd55462cb024043a71 100644
+index 658569f9cefdbbfc30eef3b63e8bf552557a498a..4bd335699f5f53b8303a86758a9dedae75bf8464 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -96,6 +96,11 @@ public class PaperConfig {
@@ -30,7 +30,7 @@ index 503d0a15a39d70c26140987f076047e3835ce9fa..d58429ef5c7e866ce36a00fd55462cb0
          for (Map.Entry<String, Command> entry : commands.entrySet()) {
              MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Paper", entry.getValue());
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
-index 5f2af880619e01a03e05258ae1f9fa58110f7f2a..944080939ceaf2db8bcd7d3c01f4b97440e35cc1 100644
+index 9130c478b80fc50ef1fc4e27b1afa51e3f97d618..167376bcd547f55983ccbb0d46e571c45c7d1ed9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
 @@ -18,6 +18,7 @@ import org.bukkit.scoreboard.Team;
diff --git a/patches/server/0505-Entity-isTicking.patch b/patches/server/0506-Entity-isTicking.patch
index fef3249c44..fef3249c44 100644
--- a/patches/server/0505-Entity-isTicking.patch
+++ b/patches/server/0506-Entity-isTicking.patch
diff --git a/patches/server/0506-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0507-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 9879dd70b5..1af8d0de45 100644
--- a/patches/server/0506-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0507-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7e4c9fb177211afc1fbbede3393cc7de8d9014a9..98d896db95953a91d31830a23b23265fa9f2c795 100644
+index e22ef9d02a64852f09a8d528a366817aceaf55dc..8ebd25e66301c62ae30d53f2104f732a32939029 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2097,13 +2097,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0507-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0508-Fix-Concurrency-issue-in-WeightedList.patch
index 4f6d7689d1..d151ba9079 100644
--- a/patches/server/0507-Fix-Concurrency-issue-in-WeightedList.patch
+++ b/patches/server/0508-Fix-Concurrency-issue-in-WeightedList.patch
@@ -20,7 +20,7 @@ index c1f22c5e17418f91736237af1495a8a9910a61d5..e644bdd3a6f7c09a44149da03587b796
      public GateBehavior(Map<MemoryModuleType<?>, MemoryStatus> requiredMemoryState, Set<MemoryModuleType<?>> memoriesToForgetWhenStopped, GateBehavior.OrderPolicy order, GateBehavior.RunningPolicy runMode, List<Pair<Behavior<? super E>, Integer>> tasks) {
          super(requiredMemoryState);
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java
-index ca4c067ae99f4a1f2e62f8d92928d65ab29bc517..1bc34453933bc7590af45a5559a4fc75eb3e0c5c 100644
+index 63b66966e243cfc32802e0a42f36a40d6400f0e4..4f42344fec13b8d7fe0c1dd412525853c35bacca 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java
 @@ -14,12 +14,25 @@ import java.util.stream.Stream;
diff --git a/patches/server/0508-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0509-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index 380db649b6..380db649b6 100644
--- a/patches/server/0508-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0509-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0509-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0510-Fix-for-large-move-vectors-crashing-server.patch
index dbf8c86a7a..59fa6d096c 100644
--- a/patches/server/0509-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0510-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9d073564faa0f8dbd46ea6f9590a8260368fcbb0..cdc210f1a2a1c34044ee27e377b234ffafb30b81 100644
+index 33e178801b8b3eb4b8fbeb8bbc2f6db75378bb09..1d266c92fb83086b61bb67b4692e117beab1f3aa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -509,9 +509,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0510-Optimise-getType-calls.patch b/patches/server/0511-Optimise-getType-calls.patch
index 6653f476f0..625edaa3a3 100644
--- a/patches/server/0510-Optimise-getType-calls.patch
+++ b/patches/server/0511-Optimise-getType-calls.patch
@@ -41,7 +41,7 @@ index 8001245c4ba619cd357a194d60fdc2efe186efb3..07fa4e4ae5f2cfb4447a608dc645c0b7
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index e116ccfa4878636073cc4cdcf680683cda88d314..4bbaf22f449af42eba1307604e3860ea8b60a38c 100644
+index 396fb96abed1e77893d8ee8a15cff18cad804475..2c1efaecf220588d8b74946194bf340871e57004 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -224,7 +224,7 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0511-Villager-resetOffers.patch b/patches/server/0512-Villager-resetOffers.patch
index da091e898a..da091e898a 100644
--- a/patches/server/0511-Villager-resetOffers.patch
+++ b/patches/server/0512-Villager-resetOffers.patch
diff --git a/patches/server/0512-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0513-Improve-inlinig-for-some-hot-IBlockData-methods.patch
index 75788a359a..75788a359a 100644
--- a/patches/server/0512-Improve-inlinig-for-some-hot-IBlockData-methods.patch
+++ b/patches/server/0513-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0513-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0514-Retain-block-place-order-when-capturing-blockstates.patch
index f32ff304e3..f32ff304e3 100644
--- a/patches/server/0513-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0514-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0514-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0515-Reduce-blockpos-allocation-from-pathfinding.patch
index 08bd69837c..08bd69837c 100644
--- a/patches/server/0514-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/server/0515-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0515-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0516-Fix-item-locations-dropped-from-campfires.patch
index 14795b0485..14795b0485 100644
--- a/patches/server/0515-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0516-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0516-Player-elytra-boost-API.patch b/patches/server/0517-Player-elytra-boost-API.patch
index 5a079df28d..5a079df28d 100644
--- a/patches/server/0516-Player-elytra-boost-API.patch
+++ b/patches/server/0517-Player-elytra-boost-API.patch
diff --git a/patches/server/0517-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0518-Fixed-TileEntityBell-memory-leak.patch
index 09d0b77f4a..09d0b77f4a 100644
--- a/patches/server/0517-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/server/0518-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0518-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0519-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index ced98f733e..ced98f733e 100644
--- a/patches/server/0518-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0519-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0519-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0520-Add-getOfflinePlayerIfCached-String.patch
index 0c27ba944e..afbe50edae 100644
--- a/patches/server/0519-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0520-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f4eb6a4c4d79b074f9d96f5cb84fc99ff60556a6..67579748521194f49d371be6dacc2005d7f752ed 100644
+index 98826babf8be2782b645c2417ed5a7595ed9a336..ce93a00aba502b6d3e962c9396a82ae2587a6b52 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1800,6 +1800,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0520-Add-ignore-discounts-API.patch b/patches/server/0521-Add-ignore-discounts-API.patch
index 2c2b5e411f..2c2b5e411f 100644
--- a/patches/server/0520-Add-ignore-discounts-API.patch
+++ b/patches/server/0521-Add-ignore-discounts-API.patch
diff --git a/patches/server/0521-Toggle-for-removing-existing-dragon.patch b/patches/server/0522-Toggle-for-removing-existing-dragon.patch
index 5befa19db0..5befa19db0 100644
--- a/patches/server/0521-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0522-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0522-Fix-client-lag-on-advancement-loading.patch b/patches/server/0523-Fix-client-lag-on-advancement-loading.patch
index 1b9a74f3f0..3a20929a77 100644
--- a/patches/server/0522-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0523-Fix-client-lag-on-advancement-loading.patch
@@ -15,7 +15,7 @@ manually reload the advancement data for all players, which
 normally takes place as a part of the datapack reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 26936cb655aec0453c094e0993d43d65393a5579..7a4ae640aaaf2017ad4f95ca1393b554b0b30302 100644
+index b2ead915b12830c68a21ae994f0c8b728431013f..5540c5a881a9d34a8c50d6b6f0694303c76aa610 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -340,7 +340,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0523-Item-no-age-no-player-pickup.patch b/patches/server/0524-Item-no-age-no-player-pickup.patch
index 13b456555a..13b456555a 100644
--- a/patches/server/0523-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0524-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0524-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0525-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index a7916d16e0..a7916d16e0 100644
--- a/patches/server/0524-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/0525-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0525-Beacon-API-custom-effect-ranges.patch b/patches/server/0526-Beacon-API-custom-effect-ranges.patch
index 6c611b18c1..6c611b18c1 100644
--- a/patches/server/0525-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0526-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0526-Add-API-for-quit-reason.patch b/patches/server/0527-Add-API-for-quit-reason.patch
index 05b63f051d..fa9571a921 100644
--- a/patches/server/0526-Add-API-for-quit-reason.patch
+++ b/patches/server/0527-Add-API-for-quit-reason.patch
@@ -25,7 +25,7 @@ index 1c63947958d202d00593e2b76d113c8b327706d7..932b494ea2a5e849b233c73bd2472d5c
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          ConnectionProtocol enumprotocol = this.getCurrentProtocol();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1ab42e2b35014ad941d97ffef5706e380418bc8f..1168641b7f939a98c61d03ac86dbc796f70dc31f 100644
+index c363b5f48253cd77c6b986b85f068a38df5319b8..8003ede966f760d660575c56d6f949dda900cf21 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -257,6 +257,7 @@ public class ServerPlayer extends Player {
@@ -37,7 +37,7 @@ index 1ab42e2b35014ad941d97ffef5706e380418bc8f..1168641b7f939a98c61d03ac86dbc796
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cdc210f1a2a1c34044ee27e377b234ffafb30b81..869e74ae1eaf7ad9c923ac1c102e2801402d77b3 100644
+index 1d266c92fb83086b61bb67b4692e117beab1f3aa..ad4e5c8c68712a9917352024427020f4793c762a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -442,6 +442,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -49,7 +49,7 @@ index cdc210f1a2a1c34044ee27e377b234ffafb30b81..869e74ae1eaf7ad9c923ac1c102e2801
              this.connection.disconnect(ichatbasecomponent);
          });
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e5dc73d7cfd2ec868b18c5d34010d79d273465e1..0b4d5ab836e861ea87bb72185a513bdf341d5921 100644
+index f9ef6e64b95f90d69a897dd996a587749776350d..8443938a2aa6e6fdbba1f9bcf4e5c5afd883140e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -600,7 +600,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0527-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0528-Add-Wandering-Trader-spawn-rate-config-options.patch
index e748261ec7..e748261ec7 100644
--- a/patches/server/0527-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0528-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0528-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch
index bbe9da5258..bbe9da5258 100644
--- a/patches/server/0528-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0529-Expose-world-spawn-angle.patch b/patches/server/0530-Expose-world-spawn-angle.patch
index b391503776..3d3760159e 100644
--- a/patches/server/0529-Expose-world-spawn-angle.patch
+++ b/patches/server/0530-Expose-world-spawn-angle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0b4d5ab836e861ea87bb72185a513bdf341d5921..30f0b20924d6b778e49761a72b50263c96311bee 100644
+index 8443938a2aa6e6fdbba1f9bcf4e5c5afd883140e..8d5154cad319d7762db696cd9cd2bf8ab69f632e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -878,7 +878,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0530-Add-Destroy-Speed-API.patch b/patches/server/0531-Add-Destroy-Speed-API.patch
index a2b7640fee..a2b7640fee 100644
--- a/patches/server/0530-Add-Destroy-Speed-API.patch
+++ b/patches/server/0531-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0531-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0532-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index a9ad0ef483..a9ad0ef483 100644
--- a/patches/server/0531-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0532-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0532-Add-LivingEntity-clearActiveItem.patch b/patches/server/0533-Add-LivingEntity-clearActiveItem.patch
index 6b43687673..6b43687673 100644
--- a/patches/server/0532-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0533-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0533-Add-PlayerItemCooldownEvent.patch b/patches/server/0534-Add-PlayerItemCooldownEvent.patch
index 584621c1af..584621c1af 100644
--- a/patches/server/0533-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0534-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0534-More-lightning-API.patch b/patches/server/0535-More-lightning-API.patch
index 5b18a81437..5b18a81437 100644
--- a/patches/server/0534-More-lightning-API.patch
+++ b/patches/server/0535-More-lightning-API.patch
diff --git a/patches/server/0535-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0536-Climbing-should-not-bypass-cramming-gamerule.patch
index 91df7bda8b..53618b2d13 100644
--- a/patches/server/0535-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0536-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -21,7 +21,7 @@ index 789a92e4e2d586e6cd4c71e8ce72429b16141f08..7a61a46fdfbd597ed6d76f8142c8159e
      private void keepLoadedRange() {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1de52b5e6a7fde4acaf6942edad163ed94d9e0a7..b3719b657ea75c4b80cf21e115b3ba48f775a3c4 100644
+index f8876446fe73681d0a4ed72759ae4080f85c572a..78dbc89bb247b2765bd2d7d81013d18dfe35539f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1748,6 +1748,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -61,7 +61,7 @@ index 22f36cd3df49160f1b6668befdd05c2268edaa49..e39965c2e50bc8ee424ea07819346e06
              } else if (entity.level.isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) {
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index aebf02fbd3823eb05a0823a843e35d94c05a8afe..1dc2af88b8db9f93a92c348e3a73bfe774699dc8 100644
+index 795b24ff5357a52624abc994bcfcc772ca7f5e7b..f47b278ab6c4d88fabb9b6ff6f2a42c1e45f70a8 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3300,7 +3300,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0536-Added-missing-default-perms-for-commands.patch b/patches/server/0537-Added-missing-default-perms-for-commands.patch
index 50b46662b0..50b46662b0 100644
--- a/patches/server/0536-Added-missing-default-perms-for-commands.patch
+++ b/patches/server/0537-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0537-Add-PlayerShearBlockEvent.patch b/patches/server/0538-Add-PlayerShearBlockEvent.patch
index 80f40f1eba..80f40f1eba 100644
--- a/patches/server/0537-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0538-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0538-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0539-Fix-curing-zombie-villager-discount-exploit.patch
index 25c21ce641..25c21ce641 100644
--- a/patches/server/0538-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/server/0539-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0539-Limit-recipe-packets.patch b/patches/server/0540-Limit-recipe-packets.patch
index cba2df5881..a831594e4b 100644
--- a/patches/server/0539-Limit-recipe-packets.patch
+++ b/patches/server/0540-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d58429ef5c7e866ce36a00fd55462cb024043a71..7413cbbcf0ab572483adc0ab915978593b8ea658 100644
+index 4bd335699f5f53b8303a86758a9dedae75bf8464..ccc60a5465efa2b71fc2593d75af62c0b64fe66c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -366,6 +366,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index d58429ef5c7e866ce36a00fd55462cb024043a71..7413cbbcf0ab572483adc0ab91597859
      public static boolean velocityOnlineMode;
      public static byte[] velocitySecretKey;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 869e74ae1eaf7ad9c923ac1c102e2801402d77b3..ae2ceff37d4dbadc18078672dcb428dc75c45a8f 100644
+index ad4e5c8c68712a9917352024427020f4793c762a..0a853329f7d3c0fe88dc033cd7d197a61ed590fc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -230,6 +230,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0540-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0541-Fix-CraftSound-backwards-compatibility.patch
index 60e8ef1e6b..60e8ef1e6b 100644
--- a/patches/server/0540-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0541-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0541-MC-4-Fix-item-position-desync.patch b/patches/server/0542-MC-4-Fix-item-position-desync.patch
index ac6235462f..ac6235462f 100644
--- a/patches/server/0541-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0542-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0542-Player-Chunk-Load-Unload-Events.patch b/patches/server/0543-Player-Chunk-Load-Unload-Events.patch
index 3e60e4b85b..05674fb46b 100644
--- a/patches/server/0542-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0543-Player-Chunk-Load-Unload-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1168641b7f939a98c61d03ac86dbc796f70dc31f..695c6aac6d95aee895f9ef4b5b538e1747931167 100644
+index 8003ede966f760d660575c56d6f949dda900cf21..8d9cfbc171c51830f5005c6604333c7ff54298d7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2113,11 +2113,21 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0543-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0544-Optimize-Dynamic-get-Missing-Keys.patch
index 5a4efe035c..5a4efe035c 100644
--- a/patches/server/0543-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0544-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0544-Expose-LivingEntity-hurt-direction.patch b/patches/server/0545-Expose-LivingEntity-hurt-direction.patch
index 2f461711f6..2f461711f6 100644
--- a/patches/server/0544-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0545-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0545-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0546-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 243fab4a51..c9021d6c43 100644
--- a/patches/server/0545-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0546-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d031eb1976cc50c0733cfef98404bc5b3fd152cb..797e27f12a7d446442b35e0814254c4cc74b5907 100644
+index 9a2f0c109181fc45c7388a2a622c4e6cf63cc771..c5fd069085efa57f99698930640198c6fcaa4bfb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -263,6 +263,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0546-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0547-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index e870bb8917..e870bb8917 100644
--- a/patches/server/0546-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/server/0547-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0547-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0548-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index c7309cc0c3..982de7e5ab 100644
--- a/patches/server/0547-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0548-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
@@ -37,7 +37,7 @@ index 742ffe531bb8f3a9ca34dea99b044123d90cfff9..bd283f71cb05ffbe1fed39afb41ae54d
              CriteriaTriggers.TRADE.trigger((ServerPlayer) this.tradingPlayer, this, offer.getResult());
          }
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 52f890fb91041757e6b8cba8831c890cbe9e111d..cd4070d30e18d14701385328f03734e731c3c2d3 100644
+index eecb852e4946c774ad295c53dbd904571262055a..3dc87e86dcd4c87e8e87e1dcd2765acb3b258bdf 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -753,6 +753,14 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0548-Implement-TargetHitEvent.patch b/patches/server/0549-Implement-TargetHitEvent.patch
index 1f9af079c2..1f9af079c2 100644
--- a/patches/server/0548-Implement-TargetHitEvent.patch
+++ b/patches/server/0549-Implement-TargetHitEvent.patch
diff --git a/patches/server/0549-Additional-Block-Material-API-s.patch b/patches/server/0550-Additional-Block-Material-API-s.patch
index c37be6c6ce..e93239aae5 100644
--- a/patches/server/0549-Additional-Block-Material-API-s.patch
+++ b/patches/server/0550-Additional-Block-Material-API-s.patch
@@ -9,7 +9,7 @@ process to do this in the Bukkit API
 Adds API for buildable, replaceable, burnable too.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 25794fca0c10b262a696ecec9c736a991e8f357d..3430bf2c05f9dc47a7483327bee4c04e4d87349e 100644
+index 653dcec33f83ab490af424faa6ede7df07d41742..817d7143fb60916a6747ee4b9f7c77becd9071c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -463,6 +463,25 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0550-Fix-harming-potion-dupe.patch b/patches/server/0551-Fix-harming-potion-dupe.patch
index 40de75b0d2..40de75b0d2 100644
--- a/patches/server/0550-Fix-harming-potion-dupe.patch
+++ b/patches/server/0551-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0551-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0552-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index 69d3ef793f..69d3ef793f 100644
--- a/patches/server/0551-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/server/0552-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0552-Cache-burn-durations.patch b/patches/server/0553-Cache-burn-durations.patch
index 9ef84f0bb9..9ef84f0bb9 100644
--- a/patches/server/0552-Cache-burn-durations.patch
+++ b/patches/server/0553-Cache-burn-durations.patch
diff --git a/patches/server/0553-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0554-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index cc44ea02f0..cc44ea02f0 100644
--- a/patches/server/0553-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0554-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0554-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0555-Fix-Not-a-string-Map-Conversion-spam.patch
index 8967f3f735..8967f3f735 100644
--- a/patches/server/0554-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0555-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0555-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0556-Implement-PlayerFlowerPotManipulateEvent.patch
index 8f512f54d6..8f512f54d6 100644
--- a/patches/server/0555-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0556-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0556-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0557-Fix-interact-event-not-being-called-in-adventure.patch
index e353ba8f62..a2e34830c9 100644
--- a/patches/server/0556-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/0557-Fix-interact-event-not-being-called-in-adventure.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix interact event not being called in adventure
 Call PlayerInteractEvent when left-clicking on a block in adventure mode
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ae2ceff37d4dbadc18078672dcb428dc75c45a8f..c58a01989e1aa9999534fbf4b718244778dd9497 100644
+index 0a853329f7d3c0fe88dc033cd7d197a61ed590fc..4dc7697f5a6e14663211ebb1cbf1cd16a7436a7e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1764,7 +1764,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0557-Zombie-API-breaking-doors.patch b/patches/server/0558-Zombie-API-breaking-doors.patch
index 2b1fa20025..2b1fa20025 100644
--- a/patches/server/0557-Zombie-API-breaking-doors.patch
+++ b/patches/server/0558-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0558-Fix-nerfed-slime-when-splitting.patch b/patches/server/0559-Fix-nerfed-slime-when-splitting.patch
index 31fe051bdb..31fe051bdb 100644
--- a/patches/server/0558-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0559-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0559-Add-EntityLoadCrossbowEvent.patch b/patches/server/0560-Add-EntityLoadCrossbowEvent.patch
index 73aa3dc3bc..73aa3dc3bc 100644
--- a/patches/server/0559-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0560-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0560-Guardian-beam-workaround.patch b/patches/server/0561-Guardian-beam-workaround.patch
index fa66573d2b..fa66573d2b 100644
--- a/patches/server/0560-Guardian-beam-workaround.patch
+++ b/patches/server/0561-Guardian-beam-workaround.patch
diff --git a/patches/server/0561-Added-WorldGameRuleChangeEvent.patch b/patches/server/0562-Added-WorldGameRuleChangeEvent.patch
index 3cafbb1d1c..3cafbb1d1c 100644
--- a/patches/server/0561-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0562-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0562-Added-ServerResourcesReloadedEvent.patch b/patches/server/0563-Added-ServerResourcesReloadedEvent.patch
index 32592e509b..5227578947 100644
--- a/patches/server/0562-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0563-Added-ServerResourcesReloadedEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 98d896db95953a91d31830a23b23265fa9f2c795..9abe6de575509d930c3f055e8dc5a14de5f1f49d 100644
+index 8ebd25e66301c62ae30d53f2104f732a32939029..3eda7f5469803af5fae138b81976ecae2b7c6c2e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2000,7 +2000,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0563-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0564-Added-world-settings-for-mobs-picking-up-loot.patch
index 0253bf3f8b..0253bf3f8b 100644
--- a/patches/server/0563-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0564-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0564-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0565-Implemented-BlockFailedDispenseEvent.patch
index c398da296c..c398da296c 100644
--- a/patches/server/0564-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0565-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0565-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0566-Added-PlayerLecternPageChangeEvent.patch
index cd550d08ad..cd550d08ad 100644
--- a/patches/server/0565-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0566-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0566-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0567-Added-PlayerLoomPatternSelectEvent.patch
index 336ac8dfc8..336ac8dfc8 100644
--- a/patches/server/0566-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0567-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0567-Configurable-door-breaking-difficulty.patch b/patches/server/0568-Configurable-door-breaking-difficulty.patch
index 45702113a6..45702113a6 100644
--- a/patches/server/0567-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0568-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0568-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0569-Empty-commands-shall-not-be-dispatched.patch
index 39f7cea127..39f7cea127 100644
--- a/patches/server/0568-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0569-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0569-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0570-Implement-API-to-expose-exact-interaction-point.patch
index 32548f350b..ed42a192f2 100644
--- a/patches/server/0569-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/server/0570-Implement-API-to-expose-exact-interaction-point.patch
@@ -18,7 +18,7 @@ index d006964cb6c4c3cd843064ab685700c67df8c238..f97d97426144527cff9ebb91b26fe854
          this.interactResult = event.useItemInHand() == Event.Result.DENY;
          this.interactPosition = blockposition.immutable();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 74aa6f2a1a55b9049f912f3e87b9032565bbc4d3..6d5d42a40a42b0d1e8e80d802cd629dd2854ae9b 100644
+index ed5c598a803748bc001f8ee5ca40b8aa6fe72a3a..dbc777a7d872116da0f60953fc6a650df17d9f5c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -56,7 +56,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
diff --git a/patches/server/0570-Remove-stale-POIs.patch b/patches/server/0571-Remove-stale-POIs.patch
index 6ea7a5b8fe..8946f8c015 100644
--- a/patches/server/0570-Remove-stale-POIs.patch
+++ b/patches/server/0571-Remove-stale-POIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove stale POIs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 83c48cb9640ad1a300538bf176e1584c8a0dc539..f408d59f2b829765e915dfdb09733407012c8524 100644
+index 053ca558c7db0b0a7c2b768e3827e0b90094fc5b..5f9376afffa369ea2480fafdda5e9fadf46f236e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1834,6 +1834,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0571-Fix-villager-boat-exploit.patch b/patches/server/0572-Fix-villager-boat-exploit.patch
index 832ad8704c..2197e38237 100644
--- a/patches/server/0571-Fix-villager-boat-exploit.patch
+++ b/patches/server/0572-Fix-villager-boat-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 30f0b20924d6b778e49761a72b50263c96311bee..f0e2f637d443db71bd9df26cebb0f02c3e1ae85f 100644
+index 8d5154cad319d7762db696cd9cd2bf8ab69f632e..65335a8dc42366c5318d583097b24443dc3c9616 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -625,6 +625,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0572-Add-sendOpLevel-API.patch b/patches/server/0573-Add-sendOpLevel-API.patch
index ef1d799def..ef1d799def 100644
--- a/patches/server/0572-Add-sendOpLevel-API.patch
+++ b/patches/server/0573-Add-sendOpLevel-API.patch
diff --git a/patches/server/0573-Add-PaperRegistry.patch b/patches/server/0574-Add-PaperRegistry.patch
index 57709833c9..f3485f9279 100644
--- a/patches/server/0573-Add-PaperRegistry.patch
+++ b/patches/server/0574-Add-PaperRegistry.patch
@@ -173,7 +173,7 @@ index 0000000000000000000000000000000000000000..6f39e343147803e15e7681c993b8797a
 +public record RegistryKey<API extends Keyed, MINECRAFT>(Class<API> apiClass, ResourceKey<? extends Registry<MINECRAFT>> resourceKey) {
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9abe6de575509d930c3f055e8dc5a14de5f1f49d..696d382283f94335f6e23eb12c6fa209c51cff8c 100644
+index 3eda7f5469803af5fae138b81976ecae2b7c6c2e..9941456a019a34384f892c44df3c73f9416bd560 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2032,6 +2032,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -185,7 +185,7 @@ index 9abe6de575509d930c3f055e8dc5a14de5f1f49d..696d382283f94335f6e23eb12c6fa209
              if (Thread.currentThread() != this.serverThread) return; // Paper
              //this.getPlayerList().saveAll(); // Paper - we don't need to do this
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 7a4ae640aaaf2017ad4f95ca1393b554b0b30302..9374dd74d42e005b7573800d3e9a356e1c57ea86 100644
+index 5540c5a881a9d34a8c50d6b6f0694303c76aa610..9af0bd83c03a7e9fba04f7b9f0c66029a7f4b65a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -512,6 +512,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0574-Add-StructuresLocateEvent.patch b/patches/server/0575-Add-StructuresLocateEvent.patch
index 7a03d1b7a0..d381dee3d6 100644
--- a/patches/server/0574-Add-StructuresLocateEvent.patch
+++ b/patches/server/0575-Add-StructuresLocateEvent.patch
@@ -72,7 +72,7 @@ index 0000000000000000000000000000000000000000..41f6c2e1e60fc32e6393097711412ca2
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 696d382283f94335f6e23eb12c6fa209c51cff8c..e74885c51c2970af13d847ec34a415e5aa18b01c 100644
+index 9941456a019a34384f892c44df3c73f9416bd560..d109ef77109fbeb710eafb55a38c803b9bb37d73 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2032,7 +2032,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0575-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0576-Collision-option-for-requiring-a-player-participant.patch
index aaa9f2dbe2..eee9af4b50 100644
--- a/patches/server/0575-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0576-Collision-option-for-requiring-a-player-participant.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 082a7d3c7ebaa66e89dbab3ebf7c9b5451e7180b..b7ca3eb12ee9dcc2e66b1090addb0934bca01dde 100644
+index 13fc7c21283f09fd135a12649776bb1355da4154..0bd01fb0582c27890fa94ed779103fa75472b482 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -110,6 +110,18 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index 082a7d3c7ebaa66e89dbab3ebf7c9b5451e7180b..b7ca3eb12ee9dcc2e66b1090addb0934
      public int wanderingTraderSpawnDayTicks = 24000;
      public int wanderingTraderSpawnChanceFailureIncrement = 25;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index dbfe16f904382f3fa3790fc8da0f5c7b5b83a501..162542958a331fd0ff0623266c9c62211152b1a6 100644
+index e53d8fe713a4c9920f40bf91d6453d36520b45f7..c14cbbf7d88d99bf5f24aad5c45fcb1504187a16 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1631,6 +1631,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0576-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0577-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index b74ce3c39c..b74ce3c39c 100644
--- a/patches/server/0576-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0577-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0577-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0578-Return-chat-component-with-empty-text-instead-of-thr.patch
index a9e7d4baac..174b504adb 100644
--- a/patches/server/0577-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0578-Return-chat-component-with-empty-text-instead-of-thr.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Return chat component with empty text instead of throwing
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index cd4070d30e18d14701385328f03734e731c3c2d3..a0e5e2daff21564a85c46ad469b79139cc26c1fd 100644
+index 3dc87e86dcd4c87e8e87e1dcd2765acb3b258bdf..bc0a49d41bdbc5544f789150ac239617d03b5837 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -22,6 +22,7 @@ import net.minecraft.ReportedException;
diff --git a/patches/server/0578-Make-schedule-command-per-world.patch b/patches/server/0579-Make-schedule-command-per-world.patch
index 4859bb69f5..4859bb69f5 100644
--- a/patches/server/0578-Make-schedule-command-per-world.patch
+++ b/patches/server/0579-Make-schedule-command-per-world.patch
diff --git a/patches/server/0579-Configurable-max-leash-distance.patch b/patches/server/0580-Configurable-max-leash-distance.patch
index 3570d9abae..e6e06649da 100644
--- a/patches/server/0579-Configurable-max-leash-distance.patch
+++ b/patches/server/0580-Configurable-max-leash-distance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable max leash distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b7ca3eb12ee9dcc2e66b1090addb0934bca01dde..08a08fed65f3c967384244c4a016692029a4725e 100644
+index 0bd01fb0582c27890fa94ed779103fa75472b482..ede5c95818c6021d2317a9c7b181d0b6f1b4b7b7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -332,6 +332,12 @@ public class PaperWorldConfig {
diff --git a/patches/server/0580-Implement-BlockPreDispenseEvent.patch b/patches/server/0581-Implement-BlockPreDispenseEvent.patch
index 40df4715e0..40df4715e0 100644
--- a/patches/server/0580-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0581-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0581-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0582-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 0c470fc8f2..0c470fc8f2 100644
--- a/patches/server/0581-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0582-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0582-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0583-Add-toggle-for-always-placing-the-dragon-egg.patch
index 70724f223a..3011f9dacd 100644
--- a/patches/server/0582-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0583-Add-toggle-for-always-placing-the-dragon-egg.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for always placing the dragon egg
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 08a08fed65f3c967384244c4a016692029a4725e..db93028c0acb771976cb38a3e4183441a65dbeb9 100644
+index ede5c95818c6021d2317a9c7b181d0b6f1b4b7b7..247d2d2c938394b4aa0d02c89ee2f7e68876ce3f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -798,6 +798,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0583-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0584-Added-PlayerStonecutterRecipeSelectEvent.patch
index c8cefc8ca5..c8cefc8ca5 100644
--- a/patches/server/0583-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0584-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0584-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0585-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 6edeadfc88..6edeadfc88 100644
--- a/patches/server/0584-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0585-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0585-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0586-Reset-shield-blocking-on-dimension-change.patch
index 642fb71a89..559f9e7aba 100644
--- a/patches/server/0585-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0586-Reset-shield-blocking-on-dimension-change.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 695c6aac6d95aee895f9ef4b5b538e1747931167..b51eaeaf9a61902fdf26dcc62f0725225b20ad1d 100644
+index 8d9cfbc171c51830f5005c6604333c7ff54298d7..d5df57d0692f26420fba8ca25c302dfcd9078e20 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1173,6 +1173,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0586-add-DragonEggFormEvent.patch b/patches/server/0587-add-DragonEggFormEvent.patch
index ab3f7fd05b..ab3f7fd05b 100644
--- a/patches/server/0586-add-DragonEggFormEvent.patch
+++ b/patches/server/0587-add-DragonEggFormEvent.patch
diff --git a/patches/server/0587-EntityMoveEvent.patch b/patches/server/0588-EntityMoveEvent.patch
index 89f20bd099..5c74db097f 100644
--- a/patches/server/0587-EntityMoveEvent.patch
+++ b/patches/server/0588-EntityMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e74885c51c2970af13d847ec34a415e5aa18b01c..445efad6a35b819dcb845524a28055a90da6e7f6 100644
+index d109ef77109fbeb710eafb55a38c803b9bb37d73..3a73d834c3c8481ff3af3eee7634309f7abe60ab 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1535,6 +1535,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -17,7 +17,7 @@ index e74885c51c2970af13d847ec34a415e5aa18b01c..445efad6a35b819dcb845524a28055a9
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f408d59f2b829765e915dfdb09733407012c8524..349f92a10e80f091abca6d86b869800d8c5ea787 100644
+index 5f9376afffa369ea2480fafdda5e9fadf46f236e..af99e51d26d3c80ec14d78646f8c672e20f57f5f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -209,6 +209,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -29,7 +29,7 @@ index f408d59f2b829765e915dfdb09733407012c8524..349f92a10e80f091abca6d86b869800d
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1dc2af88b8db9f93a92c348e3a73bfe774699dc8..9a85187a111116f6dabf9b40867a4f3cdcf64c6a 100644
+index f47b278ab6c4d88fabb9b6ff6f2a42c1e45f70a8..30d79e006f22a6cc7652b111b9307f9f1634ba60 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3246,6 +3246,20 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0588-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0589-added-option-to-disable-pathfinding-updates-on-block.patch
index d4685726b4..2835481a62 100644
--- a/patches/server/0588-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0589-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index db93028c0acb771976cb38a3e4183441a65dbeb9..0e11202faccbb4b0347767dcf60a1461067d1b7c 100644
+index 247d2d2c938394b4aa0d02c89ee2f7e68876ce3f..09e8305cee635c1fb0b490de531eee79d9b15137 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -803,6 +803,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0589-Inline-shift-direction-fields.patch b/patches/server/0590-Inline-shift-direction-fields.patch
index aea372f6f4..cecff20ec5 100644
--- a/patches/server/0589-Inline-shift-direction-fields.patch
+++ b/patches/server/0590-Inline-shift-direction-fields.patch
@@ -7,7 +7,7 @@ Removes a layer of indirection for EnumDirection.getAdjacent(X|Y|Z)(), which is
 critical section for much of the server, including the lighting engine.
 
 diff --git a/src/main/java/net/minecraft/core/Direction.java b/src/main/java/net/minecraft/core/Direction.java
-index b92377f109c6bc0d497a20b1f92185cb29b57443..6d883db5c04cbcf454952c0f361029ecbfe4f037 100644
+index 4eddfa6a07f9d42b5ecf9eb92cd609559b9b6b56..6b71d9433846eb4464177f09d7bfdea82200b189 100644
 --- a/src/main/java/net/minecraft/core/Direction.java
 +++ b/src/main/java/net/minecraft/core/Direction.java
 @@ -64,6 +64,11 @@ public enum Direction implements StringRepresentable {
diff --git a/patches/server/0590-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0591-Allow-adding-items-to-BlockDropItemEvent.patch
index fdd2359e10..43455ca0d7 100644
--- a/patches/server/0590-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0591-Allow-adding-items-to-BlockDropItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 66415d1e9690f1d644b73115b9873c52ef45e212..5c2beec59b0382d80bf97317cbbeab43df24ad55 100644
+index dbe2d218aa2561b404519245d3ef09b9a1e234e3..b7e0d588d0fa1253e5f3dbd580de190c53a455ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -396,13 +396,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0591-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0592-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 8cfe3357dc..8cfe3357dc 100644
--- a/patches/server/0591-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0592-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0592-living-entity-allow-attribute-registration.patch b/patches/server/0593-living-entity-allow-attribute-registration.patch
index 88cf7f15c6..88cf7f15c6 100644
--- a/patches/server/0592-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0593-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0593-fix-dead-slime-setSize-invincibility.patch b/patches/server/0594-fix-dead-slime-setSize-invincibility.patch
index 33ce1b72f2..33ce1b72f2 100644
--- a/patches/server/0593-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0594-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0594-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0595-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0594-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0595-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0595-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0596-Add-support-for-hex-color-codes-in-console.patch
index 5a7a286607..5a7a286607 100644
--- a/patches/server/0595-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/server/0596-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0596-Expose-Tracked-Players.patch b/patches/server/0597-Expose-Tracked-Players.patch
index ec9396cdd0..ec9396cdd0 100644
--- a/patches/server/0596-Expose-Tracked-Players.patch
+++ b/patches/server/0597-Expose-Tracked-Players.patch
diff --git a/patches/server/0597-Remove-streams-from-SensorNearest.patch b/patches/server/0598-Remove-streams-from-SensorNearest.patch
index 91ae33c411..91ae33c411 100644
--- a/patches/server/0597-Remove-streams-from-SensorNearest.patch
+++ b/patches/server/0598-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0598-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0599-Throw-proper-exception-on-empty-JsonList-file.patch
index e013e32526..e013e32526 100644
--- a/patches/server/0598-Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/server/0599-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0599-Improve-ServerGUI.patch b/patches/server/0600-Improve-ServerGUI.patch
index e573bd2f58..e573bd2f58 100644
--- a/patches/server/0599-Improve-ServerGUI.patch
+++ b/patches/server/0600-Improve-ServerGUI.patch
diff --git a/patches/server/0600-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0601-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
index 1099f41d55..1099f41d55 100644
--- a/patches/server/0600-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
+++ b/patches/server/0601-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0601-fix-converting-txt-to-json-file.patch b/patches/server/0602-fix-converting-txt-to-json-file.patch
index eb9cd86dd7..fd7202db0b 100644
--- a/patches/server/0601-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0602-fix-converting-txt-to-json-file.patch
@@ -48,7 +48,7 @@ index 8eca8825008713467a20f84d71ed0f32d5a40e47..e842e96fe566e89b37e38429c718318a
          if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
              return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 64b8d76642e8bbcdc685ea30d95a83adffca1bbc..7157bd4e36b0e367af37749b80968caf2bac0437 100644
+index 71b6f3990ace47ac752ec825c78d7fa964011898..8e70aa9ead2ba54c7b10d134b38734f0283ddb2a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -174,6 +174,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0602-Add-worldborder-events.patch b/patches/server/0603-Add-worldborder-events.patch
index af0cf2d370..af0cf2d370 100644
--- a/patches/server/0602-Add-worldborder-events.patch
+++ b/patches/server/0603-Add-worldborder-events.patch
diff --git a/patches/server/0603-added-PlayerNameEntityEvent.patch b/patches/server/0604-added-PlayerNameEntityEvent.patch
index c1df33b717..c1df33b717 100644
--- a/patches/server/0603-added-PlayerNameEntityEvent.patch
+++ b/patches/server/0604-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0604-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0605-Prevent-grindstones-from-overstacking-items.patch
index 3719f82383..3719f82383 100644
--- a/patches/server/0604-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0605-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0605-Add-recipe-to-cook-events.patch b/patches/server/0606-Add-recipe-to-cook-events.patch
index 183bc80987..183bc80987 100644
--- a/patches/server/0605-Add-recipe-to-cook-events.patch
+++ b/patches/server/0606-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0606-Add-Block-isValidTool.patch b/patches/server/0607-Add-Block-isValidTool.patch
index 099af5f6fb..95bf6c3432 100644
--- a/patches/server/0606-Add-Block-isValidTool.patch
+++ b/patches/server/0607-Add-Block-isValidTool.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Block#isValidTool
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 3430bf2c05f9dc47a7483327bee4c04e4d87349e..56fd99224edf9041104a540fd14ba3468af4805e 100644
+index 817d7143fb60916a6747ee4b9f7c77becd9071c1..1bd1f5993fc296b7d8255cabaf28382c2e258099 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -718,5 +718,9 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0607-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0608-Allow-using-signs-inside-spawn-protection.patch
index bd26a70853..a5624a6007 100644
--- a/patches/server/0607-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0608-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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0e11202faccbb4b0347767dcf60a1461067d1b7c..6675166be886365f2ef12dfdb4b58a96883e0d7a 100644
+index 09e8305cee635c1fb0b490de531eee79d9b15137..cea095aae3f9ba4ed8be88282d48925ad667f0d9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -837,4 +837,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 0e11202faccbb4b0347767dcf60a1461067d1b7c..6675166be886365f2ef12dfdb4b58a96
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 345d25950406d4c0567a3ac41cd00586f4241a0f..bcc83f35ef838cb043ec4fb98c6a4af86fba3f85 100644
+index 4dc7697f5a6e14663211ebb1cbf1cd16a7436a7e..400c1bd9964a640a35146c7a80fae08de08be963 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1756,7 +1756,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0608-Add-methods-to-get-world-by-key.patch b/patches/server/0609-Add-methods-to-get-world-by-key.patch
index 8f000fac00..8f000fac00 100644
--- a/patches/server/0608-Add-methods-to-get-world-by-key.patch
+++ b/patches/server/0609-Add-methods-to-get-world-by-key.patch
diff --git a/patches/server/0609-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0610-Add-fast-alternative-constructor-for-Rotations.patch
index d2a627b5b6..bbdcc665bb 100644
--- a/patches/server/0609-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0610-Add-fast-alternative-constructor-for-Rotations.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add fast alternative constructor for Rotations
 Signed-off-by: Irmo van den Berge <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/core/Rotations.java b/src/main/java/net/minecraft/core/Rotations.java
-index d6b192ffa208f2bfc16238933ab2af9c61607796..dd0f0a4567a7d1749e5265649e0fa816aadd6826 100644
+index e4b4e78de933b93be87805501d9cbfec429cf68c..152b1a2cb88c6456282b537611c18975d6da5f57 100644
 --- a/src/main/java/net/minecraft/core/Rotations.java
 +++ b/src/main/java/net/minecraft/core/Rotations.java
 @@ -19,6 +19,18 @@ public class Rotations {
diff --git a/patches/server/0610-Item-Rarity-API.patch b/patches/server/0611-Item-Rarity-API.patch
index 6ca8aa7912..6ca8aa7912 100644
--- a/patches/server/0610-Item-Rarity-API.patch
+++ b/patches/server/0611-Item-Rarity-API.patch
diff --git a/patches/server/0611-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0612-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index ff46048dcd..ff46048dcd 100644
--- a/patches/server/0611-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0612-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0612-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0613-copy-TESign-isEditable-from-snapshots.patch
index 0cfc8f03a3..235a37f38b 100644
--- a/patches/server/0612-copy-TESign-isEditable-from-snapshots.patch
+++ b/patches/server/0613-copy-TESign-isEditable-from-snapshots.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] copy TESign#isEditable from snapshots
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index bfa2345642142ea45460552fce97d5b411a5e48e..59f03dce529f54d9c447ed2bda40da4b8ec8c4a8 100644
+index 09ea221665bd17bc853274d0146987ebadefe46f..e0bb5146059ad767feca38f3816f29069239ffda 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -116,6 +116,7 @@ public class CraftSign extends CraftBlockEntityState<SignBlockEntity> implements
diff --git a/patches/server/0613-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0614-Drop-carried-item-when-player-has-disconnected.patch
index 26cffa4d21..230a0a305c 100644
--- a/patches/server/0613-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0614-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7157bd4e36b0e367af37749b80968caf2bac0437..2c011416ee3b1c57a1ee95ba0a120c784b8f87b2 100644
+index 8e70aa9ead2ba54c7b10d134b38734f0283ddb2a..7eafebf167e4060c73ba77636eb11e7f346f040a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -618,6 +618,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0614-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0615-forced-whitelist-use-configurable-kick-message.patch
index 17ef0bf65d..17ef0bf65d 100644
--- a/patches/server/0614-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0615-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0615-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0616-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 027f03036d..93858cb0ad 100644
--- a/patches/server/0615-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0616-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 efee98799e5196c9f1adf73a0f4ff0590ed96b5f..424b7df06f98bb5157b91026854e03cd8c4e3deb 100644
+index 400c1bd9964a640a35146c7a80fae08de08be963..36df32ae2edef09e6c544c4e93ef3e262aee5566 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1191,7 +1191,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0616-Entity-load-save-limit-per-chunk.patch b/patches/server/0617-Entity-load-save-limit-per-chunk.patch
index 05ac4da03a..c134100933 100644
--- a/patches/server/0616-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0617-Entity-load-save-limit-per-chunk.patch
@@ -9,7 +9,7 @@ defaults are only included for certain entites, this allows setting
 limits for any entity type.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6675166be886365f2ef12dfdb4b58a96883e0d7a..8de319b60de9b5c0cfcaef6b3d4f17c73ab8e4e6 100644
+index cea095aae3f9ba4ed8be88282d48925ad667f0d9..80840cd2d2c74e6778df2cd2082b5318e273ad3a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -8,6 +8,8 @@ import it.unimi.dsi.fastutil.objects.Reference2IntMap;
diff --git a/patches/server/0617-Expose-protocol-version.patch b/patches/server/0618-Expose-protocol-version.patch
index a274f4fe6c..a274f4fe6c 100644
--- a/patches/server/0617-Expose-protocol-version.patch
+++ b/patches/server/0618-Expose-protocol-version.patch
diff --git a/patches/server/0618-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0619-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index 2ab758e5e5..9b042cdd17 100644
--- a/patches/server/0618-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/server/0619-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow for Component suggestion tooltips in
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 424b7df06f98bb5157b91026854e03cd8c4e3deb..171fb8361c688080c2cf29788433c3d87bf3864e 100644
+index 36df32ae2edef09e6c544c4e93ef3e262aee5566..7f73b6b63edefcf7fd4f5c7f15558af8b926f24e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -771,12 +771,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0619-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0620-Enhance-console-tab-completions-for-brigadier-comman.patch
index 4fa634b202..51de31f69b 100644
--- a/patches/server/0619-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0620-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Enhance console tab completions for brigadier commands
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 23d849872109e43d6e22a953d3a4298565d4621d..fae61ada619d86b6721c7a57fecd485188919a25 100644
+index c07257314e070d4423c4f53f58cb0962e3ead131..affede1bcd604ce2bb1f95b037e7d7acfe21cf91 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -106,6 +106,13 @@ public class PaperConfig {
diff --git a/patches/server/0620-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0621-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 7141d18a53..71bdd41804 100644
--- a/patches/server/0620-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0621-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,7 +9,7 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9a85187a111116f6dabf9b40867a4f3cdcf64c6a..fd2d5e274a3bf889b954bed17d286d1157cd208e 100644
+index 30d79e006f22a6cc7652b111b9307f9f1634ba60..b079f9cd9dd3c818b859010df74172a84eee544d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3719,6 +3719,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0621-Add-bypass-host-check.patch b/patches/server/0622-Add-bypass-host-check.patch
index 5e9b983ad1..5e9b983ad1 100644
--- a/patches/server/0621-Add-bypass-host-check.patch
+++ b/patches/server/0622-Add-bypass-host-check.patch
diff --git a/patches/server/0622-Set-area-affect-cloud-rotation.patch b/patches/server/0623-Set-area-affect-cloud-rotation.patch
index b0f478a353..b0f478a353 100644
--- a/patches/server/0622-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0623-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0623-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0624-add-isDeeplySleeping-to-HumanEntity.patch
index 8c7bfe4fbb..45aa29e9a0 100644
--- a/patches/server/0623-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0624-add-isDeeplySleeping-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add isDeeplySleeping to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index cdd2e391d18179d85a8658d09a02de6637a86a5c..e7108dd70f1eb91f38e04ad71e595bc679560f75 100644
+index 61665989cf24484509766619db95247ef40b3e1e..83c5314ed3a3f09162bca47902c4e749fab940a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -121,6 +121,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0624-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0625-add-consumeFuel-to-FurnaceBurnEvent.patch
index ffb9062039..ffb9062039 100644
--- a/patches/server/0624-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0625-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0625-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0626-add-get-set-drop-chance-to-EntityEquipment.patch
index 9720fcdaf4..9720fcdaf4 100644
--- a/patches/server/0625-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0626-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0626-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0627-fix-PigZombieAngerEvent-cancellation.patch
index 9b69dc24f2..9b69dc24f2 100644
--- a/patches/server/0626-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0627-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0627-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0628-Fix-checkReach-check-for-Shulker-boxes.patch
index e63651a68f..e63651a68f 100644
--- a/patches/server/0627-Fix-checkReach-check-for-Shulker-boxes.patch
+++ b/patches/server/0628-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0628-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0629-fix-PlayerItemHeldEvent-firing-twice.patch
index d13ea0640b..2f2cac0cbd 100644
--- a/patches/server/0628-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0629-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 171fb8361c688080c2cf29788433c3d87bf3864e..b1e62c8c7f53ea30f190f689ebeac14212534181 100644
+index 7f73b6b63edefcf7fd4f5c7f15558af8b926f24e..ad7bf4468956a840c39b3a52a115501b5479d192 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1964,6 +1964,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0629-Added-PlayerDeepSleepEvent.patch b/patches/server/0630-Added-PlayerDeepSleepEvent.patch
index 77e3bcfdaa..77e3bcfdaa 100644
--- a/patches/server/0629-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0630-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0630-More-World-API.patch b/patches/server/0631-More-World-API.patch
index 89c9bfad2f..89c9bfad2f 100644
--- a/patches/server/0630-More-World-API.patch
+++ b/patches/server/0631-More-World-API.patch
diff --git a/patches/server/0631-Added-PlayerBedFailEnterEvent.patch b/patches/server/0632-Added-PlayerBedFailEnterEvent.patch
index 95b8821728..95b8821728 100644
--- a/patches/server/0631-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0632-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0632-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0633-Implement-methods-to-convert-between-Component-and-B.patch
index ad3e98c8b5..ad3e98c8b5 100644
--- a/patches/server/0632-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0633-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0633-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0634-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 576aa63f5a..c751eba424 100644
--- a/patches/server/0633-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0634-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2c011416ee3b1c57a1ee95ba0a120c784b8f87b2..1f1d5a1fe4fc567a383e60bd9b0dc69d8da673cb 100644
+index 7eafebf167e4060c73ba77636eb11e7f346f040a..3e6f38e9b42f086c3f8b020628683f06ba1d28cb 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -851,6 +851,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0634-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0635-Introduce-beacon-activation-deactivation-events.patch
index 4858e0f40b..4858e0f40b 100644
--- a/patches/server/0634-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0635-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0635-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0636-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 334910b84e..6e5395acef 100644
--- a/patches/server/0635-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0636-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 b1e62c8c7f53ea30f190f689ebeac14212534181..f50c2d827504ce7ef724574dbd2126d5f8c960b3 100644
+index ad7bf4468956a840c39b3a52a115501b5479d192..13a4db38552125f229f9fa09a893c88e895288c6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2502,7 +2502,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -18,7 +18,7 @@ index b1e62c8c7f53ea30f190f689ebeac14212534181..f50c2d827504ce7ef724574dbd2126d5
                  } else {
                      if (this.player.getHealth() > 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1f1d5a1fe4fc567a383e60bd9b0dc69d8da673cb..5d7d1372e012ce609073eecea83232b085c6c404 100644
+index 3e6f38e9b42f086c3f8b020628683f06ba1d28cb..6dfca5731966084efce3997898a6ebe9c0c6ea0d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -810,6 +810,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0636-Add-Channel-initialization-listeners.patch b/patches/server/0637-Add-Channel-initialization-listeners.patch
index 1f7fe2772b..1f7fe2772b 100644
--- a/patches/server/0636-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0637-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0637-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0638-Send-empty-commands-if-tab-completion-is-disabled.patch
index 2b52bb5343..2b52bb5343 100644
--- a/patches/server/0637-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0638-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0638-Add-more-WanderingTrader-API.patch b/patches/server/0639-Add-more-WanderingTrader-API.patch
index 65d351d6df..65d351d6df 100644
--- a/patches/server/0638-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0639-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0639-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0640-Add-EntityBlockStorage-clearEntities.patch
index 4742b14dac..4742b14dac 100644
--- a/patches/server/0639-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0640-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0640-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0641-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index b53cff9d00..b53cff9d00 100644
--- a/patches/server/0640-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0641-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0641-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0642-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 0b88624654..0b88624654 100644
--- a/patches/server/0641-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0642-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0642-Inventory-close.patch b/patches/server/0643-Inventory-close.patch
index e7f478324a..e7f478324a 100644
--- a/patches/server/0642-Inventory-close.patch
+++ b/patches/server/0643-Inventory-close.patch
diff --git a/patches/server/0643-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0644-call-PortalCreateEvent-players-and-end-platform.patch
index 35c8773feb..4f34eed09b 100644
--- a/patches/server/0643-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/server/0644-call-PortalCreateEvent-players-and-end-platform.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] call PortalCreateEvent players and end platform
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b51eaeaf9a61902fdf26dcc62f0725225b20ad1d..03cbe2436caf1546ef94102b96a848b1b1b701ed 100644
+index d5df57d0692f26420fba8ca25c302dfcd9078e20..c9d70d5d1b53fe92ca7d895f1ed0d82fe4b06dab 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1200,15 +1200,21 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0644-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0645-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 9fc439f344..9fc439f344 100644
--- a/patches/server/0644-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0645-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0645-Fix-CraftPotionBrewer-cache.patch b/patches/server/0646-Fix-CraftPotionBrewer-cache.patch
index 2d8295382f..2d8295382f 100644
--- a/patches/server/0645-Fix-CraftPotionBrewer-cache.patch
+++ b/patches/server/0646-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0646-Add-basic-Datapack-API.patch b/patches/server/0647-Add-basic-Datapack-API.patch
index aacc02ce0e..994264637b 100644
--- a/patches/server/0646-Add-basic-Datapack-API.patch
+++ b/patches/server/0647-Add-basic-Datapack-API.patch
@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6f30668471c2076e2bbd8af79791bbe362f4d08e..3cb0b4797015eff95632355e4b78b955a8280a02 100644
+index b651a9d86a5b0e7ec2b10d2e756bbac4624f7f9c..52aaa4837423585e7f66790ca95ad7c0bdb30e4b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -281,6 +281,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0647-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0648-Add-environment-variable-to-disable-server-gui.patch
index a8785b7a29..a8785b7a29 100644
--- a/patches/server/0647-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0648-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0648-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0649-additions-to-PlayerGameModeChangeEvent.patch
index 7313a09aa0..e91ca1aa0a 100644
--- a/patches/server/0648-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0649-additions-to-PlayerGameModeChangeEvent.patch
@@ -126,7 +126,7 @@ index f97d97426144527cff9ebb91b26fe8541a9c6d9b..b6eef41079120fffd63f06f681378b1b
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f50c2d827504ce7ef724574dbd2126d5f8c960b3..6ba3c1dcf797440e0677675a4869de25b567b945 100644
+index 13a4db38552125f229f9fa09a893c88e895288c6..bb9881c7e45bfa13f04f9779ec134fa349bd9133 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2511,7 +2511,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0649-ItemStack-repair-check-API.patch b/patches/server/0650-ItemStack-repair-check-API.patch
index debbecf4bc..debbecf4bc 100644
--- a/patches/server/0649-ItemStack-repair-check-API.patch
+++ b/patches/server/0650-ItemStack-repair-check-API.patch
diff --git a/patches/server/0650-More-Enchantment-API.patch b/patches/server/0651-More-Enchantment-API.patch
index be8a7f96c7..be8a7f96c7 100644
--- a/patches/server/0650-More-Enchantment-API.patch
+++ b/patches/server/0651-More-Enchantment-API.patch
diff --git a/patches/server/0651-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0652-Fix-and-optimise-world-force-upgrading.patch
index 6e38710566..571a37771d 100644
--- a/patches/server/0651-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0652-Fix-and-optimise-world-force-upgrading.patch
@@ -357,7 +357,7 @@ index 4bc33c31d497aa7d69226ab870fd78902bedfd5b..089e8414c7bdc102ba0d914af576df1a
          return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3cb0b4797015eff95632355e4b78b955a8280a02..d4be39b4cb6a6c7f8b27ddd6dfb60541e9ac8834 100644
+index 52aaa4837423585e7f66790ca95ad7c0bdb30e4b..e4ba6c09f7d022c10cf8dba54ed122a797148473 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1199,12 +1199,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0652-Add-Mob-lookAt-API.patch b/patches/server/0653-Add-Mob-lookAt-API.patch
index 14378270ee..14378270ee 100644
--- a/patches/server/0652-Add-Mob-lookAt-API.patch
+++ b/patches/server/0653-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0653-Add-Unix-domain-socket-support.patch b/patches/server/0654-Add-Unix-domain-socket-support.patch
index 85d133844f..85d133844f 100644
--- a/patches/server/0653-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0654-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0654-Add-EntityInsideBlockEvent.patch b/patches/server/0655-Add-EntityInsideBlockEvent.patch
index 2c221ccdeb..b1f766631e 100644
--- a/patches/server/0654-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0655-Add-EntityInsideBlockEvent.patch
@@ -137,7 +137,7 @@ index 0549256cbd7028c82bf82ccc4ff64219df7e0906..683f24251baf8ef3bef8f32ba83dc7f0
              this.maybeDoSlideAchievement(entity, pos);
              this.doSlideMovement(entity);
 diff --git a/src/main/java/net/minecraft/world/level/block/HopperBlock.java b/src/main/java/net/minecraft/world/level/block/HopperBlock.java
-index 9a58f017bbaa742cbb892c804011cc9396b8607c..386c3e458babc31ad3bf2b51c20d1cfde08647ac 100644
+index ec2fde5d5e62925e6668699675935c8e2ba04389..3278c40979af3b0fb6097ad34936c6aa43d36060 100644
 --- a/src/main/java/net/minecraft/world/level/block/HopperBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/HopperBlock.java
 @@ -200,6 +200,7 @@ public class HopperBlock extends BaseEntityBlock {
diff --git a/patches/server/0655-Attributes-API-for-item-defaults.patch b/patches/server/0656-Attributes-API-for-item-defaults.patch
index 59fb29e46e..59fb29e46e 100644
--- a/patches/server/0655-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0656-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0656-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0657-Add-cause-to-Weather-ThunderChangeEvents.patch
index 3ddba77daa..3ddba77daa 100644
--- a/patches/server/0656-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0657-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0657-More-Lidded-Block-API.patch b/patches/server/0658-More-Lidded-Block-API.patch
index 5b7c8a3b64..5b7c8a3b64 100644
--- a/patches/server/0657-More-Lidded-Block-API.patch
+++ b/patches/server/0658-More-Lidded-Block-API.patch
diff --git a/patches/server/0658-Limit-item-frame-cursors-on-maps.patch b/patches/server/0659-Limit-item-frame-cursors-on-maps.patch
index 58e1de7429..7162a979c3 100644
--- a/patches/server/0658-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0659-Limit-item-frame-cursors-on-maps.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit item frame cursors on maps
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8de319b60de9b5c0cfcaef6b3d4f17c73ab8e4e6..4271920c69e44a522d8360a786651d4e85ce62ff 100644
+index 80840cd2d2c74e6778df2cd2082b5318e273ad3a..a39819cef95fc70c5703b392afd5530ce6e3a622 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -876,4 +876,9 @@ public class PaperWorldConfig {
diff --git a/patches/server/0659-Add-PlayerKickEvent-causes.patch b/patches/server/0660-Add-PlayerKickEvent-causes.patch
index 1eb96b6b01..b34e2fab4f 100644
--- a/patches/server/0659-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0660-Add-PlayerKickEvent-causes.patch
@@ -57,7 +57,7 @@ index 708ac03d5a849bf09c49547306e4a8c5a5ef8d91..5a8df368a4a25839cd4ac9be6972da2e
          }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index eab35ca61dd44d03ad0b9851d0e878480aba104a..b1a5df7e62bc2505bc95933cbdbf6e8be3c281d5 100644
+index bb9881c7e45bfa13f04f9779ec134fa349bd9133..62a006c1869118ed2fe5bc573c83f6398ff64167 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -318,7 +318,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0660-Add-PufferFishStateChangeEvent.patch b/patches/server/0661-Add-PufferFishStateChangeEvent.patch
index e15126884a..e15126884a 100644
--- a/patches/server/0660-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0661-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0661-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0662-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 2d2d6ea63a..2d2d6ea63a 100644
--- a/patches/server/0661-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0662-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0662-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0663-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 8e8c207a92..687af12ba7 100644
--- a/patches/server/0662-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0663-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
@@ -14,7 +14,7 @@ contention situations.
 And this is extremely a low contention situation.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index 45a969f97b26e328e34f3d576557999c32b954a2..277b75940d0424051919889b2d0045f313027234 100644
+index ea7b92b9ecb99bc995ab9a6ee5a974a0810778db..d886320211c7fa80960042c9b9ef4951eb34aaf1 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 @@ -32,14 +32,14 @@ public class PalettedContainer<T> implements PaletteResize<T> {
diff --git a/patches/server/0663-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0664-Add-option-to-fix-items-merging-through-walls.patch
index 5bcc2fbd51..db51ec7fd8 100644
--- a/patches/server/0663-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0664-Add-option-to-fix-items-merging-through-walls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to fix items merging through walls
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4271920c69e44a522d8360a786651d4e85ce62ff..6d881cf705cf23bed1896a044548d4ae0a752f57 100644
+index a39819cef95fc70c5703b392afd5530ce6e3a622..306013994f397ba855acbd4e1aba791850b8d78b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -881,4 +881,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 4271920c69e44a522d8360a786651d4e85ce62ff..6d881cf705cf23bed1896a044548d4ae
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 3938bb6aa82bd02359dede6f6b17b7ba6685579b..9ca37cbf829ff4240ae79fc283bcf9e7f2c728d2 100644
+index b56d1229333bb86433d6691f1116f2d195c4b16b..336d753bbd836e2a08207c5e3d41acbe2b72543f 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -241,6 +241,14 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0664-Add-BellRevealRaiderEvent.patch b/patches/server/0665-Add-BellRevealRaiderEvent.patch
index 587e0f0400..587e0f0400 100644
--- a/patches/server/0664-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0665-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0665-Fix-invulnerable-end-crystals.patch b/patches/server/0666-Fix-invulnerable-end-crystals.patch
index 64406dee0a..b49351fef9 100644
--- a/patches/server/0665-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0666-Fix-invulnerable-end-crystals.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix invulnerable end crystals
 MC-108513
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6d881cf705cf23bed1896a044548d4ae0a752f57..bfd1b59b1bf071c3beedcd6d8db364ed41946033 100644
+index 306013994f397ba855acbd4e1aba791850b8d78b..ccbd0bd60cbc1212d9683667ce4744350eda90bb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -886,4 +886,9 @@ public class PaperWorldConfig {
diff --git a/patches/server/0666-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0667-Add-ElderGuardianAppearanceEvent.patch
index 540926f9ef..540926f9ef 100644
--- a/patches/server/0666-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0667-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0667-Fix-dangerous-end-portal-logic.patch b/patches/server/0668-Fix-dangerous-end-portal-logic.patch
index 50f2093639..50f2093639 100644
--- a/patches/server/0667-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0668-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0668-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0669-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index c46f8fbb65..c46f8fbb65 100644
--- a/patches/server/0668-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0669-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0669-Make-item-validations-configurable.patch b/patches/server/0670-Make-item-validations-configurable.patch
index 82a6f23712..8f10f9d7d3 100644
--- a/patches/server/0669-Make-item-validations-configurable.patch
+++ b/patches/server/0670-Make-item-validations-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make item validations configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index fae61ada619d86b6721c7a57fecd485188919a25..3d1319af2dbade4234025793303333cb95d9c019 100644
+index affede1bcd604ce2bb1f95b037e7d7acfe21cf91..5c1062f1f9578f2c728b0674eb3a1785b9c345b5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -506,4 +506,19 @@ public class PaperConfig {
@@ -29,7 +29,7 @@ index fae61ada619d86b6721c7a57fecd485188919a25..3d1319af2dbade4234025793303333cb
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 0f753f4868141ecc383877ea3a666a383f2e3339..ebb643fc0477409d1efb4e9af59675045fa6b8bb 100644
+index fefa4d83c5699be0b55794cd28d13d27b66ef108..182cd92b4322127a81d5f14e5d4fd156057979c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -92,11 +92,11 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -56,7 +56,7 @@ index 0f753f4868141ecc383877ea3a666a383f2e3339..ebb643fc0477409d1efb4e9af5967504
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 671ac759424eaf9b2573545c6fcbec1f3a0ef731..3b0341fecee0d122d2ddf358bc615daae1c58f8b 100644
+index 24588933984cea75e983752ebd0c5643ff1e7846..1fe46049cc33c24db04fbfcde36ab275c03177bf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -357,18 +357,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0670-Line-Of-Sight-Changes.patch b/patches/server/0671-Line-Of-Sight-Changes.patch
index 4669d16360..7d24dbd2b2 100644
--- a/patches/server/0670-Line-Of-Sight-Changes.patch
+++ b/patches/server/0671-Line-Of-Sight-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fd2d5e274a3bf889b954bed17d286d1157cd208e..709ca3f249a5c4d3a405e94ca353864df349ffcd 100644
+index b079f9cd9dd3c818b859010df74172a84eee544d..2e304d845878ff58a574c11dfa4424ba68991f64 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3449,7 +3449,8 @@ public abstract class LivingEntity extends Entity {
@@ -19,7 +19,7 @@ index fd2d5e274a3bf889b954bed17d286d1157cd208e..709ca3f249a5c4d3a405e94ca353864d
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5e09816bf1aa9444df4d5480e37516623f8ce26c..8d91f0b8aee459c331ab3777e5e27c9584ff90bd 100644
+index 19e4abd0175a19e75521b5adc9ea47bb00abf3c9..f7a7f68edebd304f7ca996cba58979d3fb854217 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -200,6 +200,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0671-add-per-world-spawn-limits.patch b/patches/server/0672-add-per-world-spawn-limits.patch
index 67c5b980b2..cee4ef4f22 100644
--- a/patches/server/0671-add-per-world-spawn-limits.patch
+++ b/patches/server/0672-add-per-world-spawn-limits.patch
@@ -44,7 +44,7 @@ index ccbd0bd60cbc1212d9683667ce4744350eda90bb..1f74b1b2fc9ecfbb83710665ef017188
      private void lightQueueSize() {
          lightQueueSize = getInt("light-queue-size", lightQueueSize);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8d91f0b8aee459c331ab3777e5e27c9584ff90bd..abd119d2b018c5df0db6a85dbf4a36de897956e2 100644
+index f7a7f68edebd304f7ca996cba58979d3fb854217..cff763bd0ac8dff62c8d6e7ad94fc0e453df7abe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -222,6 +222,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0672-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0673-Fix-PotionSplashEvent-for-water-splash-potions.patch
index 56f02dad6e..56f02dad6e 100644
--- a/patches/server/0672-Fix-PotionSplashEvent-for-water-splash-potions.patch
+++ b/patches/server/0673-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0673-Add-more-LimitedRegion-API.patch b/patches/server/0674-Add-more-LimitedRegion-API.patch
index e9e7611f99..e9e7611f99 100644
--- a/patches/server/0673-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0674-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0674-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0675-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 4f89c53f09..f3288e60b8 100644
--- a/patches/server/0674-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0675-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1ba0b24ca73a505239838a771a1cb851b2a40753..7ae525803609f173c0a38b17d2ef86c1facbd5dc 100644
+index 045729440899e59bd023b3e84ef11f4d6682d10b..b88728889c2ebfc44bfa5032b1629817b4e7b45d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2180,7 +2180,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0675-Missing-Entity-Behavior-API.patch b/patches/server/0676-Missing-Entity-Behavior-API.patch
index 981ba24354..981ba24354 100644
--- a/patches/server/0675-Missing-Entity-Behavior-API.patch
+++ b/patches/server/0676-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0676-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0677-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index c7168f2c59..8ee5e17d79 100644
--- a/patches/server/0676-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0677-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 9be0dbdd7d06568e9604fe18e5d4dd9f5d4a14be..d6279614b94afa8419a163305f5b23b1f36c10b2 100644
+index 62a006c1869118ed2fe5bc573c83f6398ff64167..b9c330f3c40ff8ee204e29d62e4a452dbe618f77 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1114,7 +1114,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0677-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0678-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 7b6806a054..863796fe03 100644
--- a/patches/server/0677-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0678-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix return value of Block#applyBoneMeal always being false
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 56fd99224edf9041104a540fd14ba3468af4805e..6c29efdb641c5d768a8bbf410da2a059e7d3e90a 100644
+index 1bd1f5993fc296b7d8255cabaf28382c2e258099..b2628b1698ef2a235e7b465f09747cafbb133b7a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -558,7 +558,7 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0678-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0679-Use-getChunkIfLoadedImmediately-in-places.patch
index 254153e83b..f4de3f7289 100644
--- a/patches/server/0678-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0679-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c37934d1319dcd5e9cbba8d4f08550656354cf30..8fbf0b2f6bd0bdc9eef8e9b950a81e258e1cc552 100644
+index 958949d972fd7b8ae61041bfe15c21d4d19d9573..384222f321f1678803d62187b76bf3dee1970c0c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -215,7 +215,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0679-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0680-Fix-commands-from-signs-not-firing-command-events.patch
index dcfc44a38e..b49388d4aa 100644
--- a/patches/server/0679-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0680-Fix-commands-from-signs-not-firing-command-events.patch
@@ -10,7 +10,7 @@ This patch changes sign command logic so that `run_command` click events:
   - sends failure messages to the player who clicked the sign
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 691e5db143801920a34bc623912c24c9024b97b0..c8173f49326a9da0a76c98cd82fda2ba6b7be50e 100644
+index 1f74b1b2fc9ecfbb83710665ef0171886eab0097..c651c8750f357883c6e92b6a19e087090c4b324a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -911,4 +911,9 @@ public class PaperWorldConfig {
diff --git a/patches/server/0680-Adds-PlayerArmSwingEvent.patch b/patches/server/0681-Adds-PlayerArmSwingEvent.patch
index 635b5f50c8..b6f0d0c7f7 100644
--- a/patches/server/0680-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0681-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 d6279614b94afa8419a163305f5b23b1f36c10b2..f14f8c4db697f0101158f0024c9c91814f4c942e 100644
+index b9c330f3c40ff8ee204e29d62e4a452dbe618f77..49f5596ba647ce4ec310880f0091e78735099980 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2262,7 +2262,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0681-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0682-Fixes-kick-event-leave-message-not-being-sent.patch
index c2504bda8f..f840eab7dd 100644
--- a/patches/server/0681-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0682-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 7ae525803609f173c0a38b17d2ef86c1facbd5dc..3a44756d9e71a56293f41ec9aab141ba81ba9f7c 100644
+index b88728889c2ebfc44bfa5032b1629817b4e7b45d..b49dd352f6d8d27ab97fd0d69cf4001039ae577e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -251,7 +251,6 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 7ae525803609f173c0a38b17d2ef86c1facbd5dc..3a44756d9e71a56293f41ec9aab141ba
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f14f8c4db697f0101158f0024c9c91814f4c942e..88416fe604ccc136230f8743ea7a789b15d6c46d 100644
+index 49f5596ba647ce4ec310880f0091e78735099980..62e24f0314689c14dad5fb216f110b48addb5da2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -447,7 +447,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -59,7 +59,7 @@ index f14f8c4db697f0101158f0024c9c91814f4c942e..88416fe604ccc136230f8743ea7a789b
              this.server.getPlayerList().broadcastMessage(PaperAdventure.asVanilla(quitMessage), ChatType.SYSTEM, Util.NIL_UUID);
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ee139c746328fcff67b1ee75629dbee0dd547fed..88820ba073e89638304b26e52a39a426f76fb2e9 100644
+index 3198291eaf12f8da4c138a1963db09f60381b4b6..c6f2ef6b12c699651aaefff0d0dbc20877ea5584 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -591,6 +591,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0682-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0683-Add-config-for-mobs-immune-to-default-effects.patch
index 15586f9036..b4154797bd 100644
--- a/patches/server/0682-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0683-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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c8173f49326a9da0a76c98cd82fda2ba6b7be50e..38f1ce3ef637a6b1915409ecab529a84317c5a5e 100644
+index c651c8750f357883c6e92b6a19e087090c4b324a..f7ce18d165733329e7c656885cf5ed1b06d35a47 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -709,6 +709,21 @@ public class PaperWorldConfig {
@@ -31,7 +31,7 @@ index c8173f49326a9da0a76c98cd82fda2ba6b7be50e..38f1ce3ef637a6b1915409ecab529a84
      private void nerfNetherPortalPigmen() {
          nerfNetherPortalPigmen = getBoolean("game-mechanics.nerf-pigmen-from-nether-portals", nerfNetherPortalPigmen);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 709ca3f249a5c4d3a405e94ca353864df349ffcd..1f35368f9f44c578be76d66a85da937f497df655 100644
+index 2e304d845878ff58a574c11dfa4424ba68991f64..b2a561ec99af75188eb0141abb36bb42f37f7185 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1130,7 +1130,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0683-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0684-Fix-incorrect-message-for-outdated-client.patch
index 1b0f3a3869..1b0f3a3869 100644
--- a/patches/server/0683-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0684-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0684-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0685-Don-t-apply-cramming-damage-to-players.patch
index be4fa5a039..1e26ccf09a 100644
--- a/patches/server/0684-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0685-Don-t-apply-cramming-damage-to-players.patch
@@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 38f1ce3ef637a6b1915409ecab529a84317c5a5e..a8afdd402a0fe90ba73ae7fc60fa335f80cf267b 100644
+index f7ce18d165733329e7c656885cf5ed1b06d35a47..40b3c6ef824e96747d3c01129e4dbaaaa3d3613a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -931,4 +931,9 @@ public class PaperWorldConfig {
@@ -25,7 +25,7 @@ index 38f1ce3ef637a6b1915409ecab529a84317c5a5e..a8afdd402a0fe90ba73ae7fc60fa335f
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3a44756d9e71a56293f41ec9aab141ba81ba9f7c..3b1a7cfadd669afafe7e34a3c7c31fd913e3bbd6 100644
+index b49dd352f6d8d27ab97fd0d69cf4001039ae577e..9e774df7b0846a8d4b22914eb5e4b09d621a9a2c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1438,7 +1438,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0686-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 75bec689ce..75bec689ce 100644
--- a/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0686-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0686-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0687-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 46872564c2..c7c3cd9526 100644
--- a/patches/server/0686-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0687-Add-a-bunch-of-missing-forceDrop-toggles.patch
@@ -33,7 +33,7 @@ index 306aa8c36be92d66ebcc6b7e0dbb9dee6ec41a9b..8db4fc59b99694d2b15af188fc1c39cc
  
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index d202682d0bc0fb22065cda27b23537f526935a5d..84c129fd931596a4cd3aa5b9caa7da1c309b71a7 100644
+index 0caf8e2cf42b83f1c62fa8c08f8cf86951be2827..63cfda124b5bad20af3050a0b62d73883b6abf7d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -305,7 +305,9 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
diff --git a/patches/server/0687-Stinger-API.patch b/patches/server/0688-Stinger-API.patch
index 33f8959315..33f8959315 100644
--- a/patches/server/0687-Stinger-API.patch
+++ b/patches/server/0688-Stinger-API.patch
diff --git a/patches/server/0688-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0689-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index 8d4fe001d2..8d4fe001d2 100644
--- a/patches/server/0688-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0689-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0689-Add-System.out-err-catcher.patch b/patches/server/0690-Add-System.out-err-catcher.patch
index 28ea5f65b7..ead4fa2a9f 100644
--- a/patches/server/0689-Add-System.out-err-catcher.patch
+++ b/patches/server/0690-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..76d0d00cd6742991e3f3ec827a75ee87
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ecffb6e2c779d520e25c79d04f10d408a7c778c6..75c153b739e1c22877102791adb90e955906a31c 100644
+index e4ba6c09f7d022c10cf8dba54ed122a797148473..674154ae0ceb8da37e41be69179b546ab2872be5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -283,6 +283,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0690-Fix-test-not-bootstrapping.patch b/patches/server/0691-Fix-test-not-bootstrapping.patch
index 5d0466c3b3..5d0466c3b3 100644
--- a/patches/server/0690-Fix-test-not-bootstrapping.patch
+++ b/patches/server/0691-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0691-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0692-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 10cd90749d..10cd90749d 100644
--- a/patches/server/0691-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0692-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0692-Improve-boat-collision-performance.patch b/patches/server/0693-Improve-boat-collision-performance.patch
index 18713a6ffd..2ff3c579db 100644
--- a/patches/server/0692-Improve-boat-collision-performance.patch
+++ b/patches/server/0693-Improve-boat-collision-performance.patch
@@ -17,7 +17,7 @@ index 47fcfb1e5b65ce2ae3fcdfc5eecf3a1cf4a8d67f..c506b837d0f8b49fa65efe7ff80dd64c
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1f35368f9f44c578be76d66a85da937f497df655..d64e946a3228b871fb8a9703a8631008078e4bec 100644
+index b2a561ec99af75188eb0141abb36bb42f37f7185..d49d9d60a839d5ac5d67a677fcbae2897e54dada 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1318,7 +1318,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0693-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0694-Prevent-AFK-kick-while-watching-end-credits.patch
index b293b73865..8fb3104810 100644
--- a/patches/server/0693-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0694-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 d9eec6be067b858001c31f25788a63f2d50051ce..cfb827f64eaacf9835f950b963b850609347a708 100644
+index 62e24f0314689c14dad5fb216f110b48addb5da2..4688a91fe7cee4e7c3c1d27a5f5db592bbfe1a30 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -387,7 +387,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0694-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0695-Allow-skipping-writing-of-comments-to-server.propert.patch
index 6395f3f4a8..6395f3f4a8 100644
--- a/patches/server/0694-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0695-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0695-Add-PlayerSetSpawnEvent.patch b/patches/server/0696-Add-PlayerSetSpawnEvent.patch
index 606e2777da..606e2777da 100644
--- a/patches/server/0695-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0696-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0696-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0697-Make-hoppers-respect-inventory-max-stack-size.patch
index ea86736121..ea86736121 100644
--- a/patches/server/0696-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0697-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0697-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0698-Optimize-entity-tracker-passenger-checks.patch
index cf8b4494f3..cf8b4494f3 100644
--- a/patches/server/0697-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0698-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0698-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0699-Config-option-for-Piglins-guarding-chests.patch
index d66cfe26cc..0c0fdb47fc 100644
--- a/patches/server/0698-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0699-Config-option-for-Piglins-guarding-chests.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config option for Piglins guarding chests
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 96895f4e14924ff23ab1b17d298dd8abf7f2493e..48ed38be1eec19a64a03e0d04da22a546672a1ca 100644
+index 3dc62c72e9d3db93d3e118814cfada6c275b8e3f..68982f44fac2a3da621503cffb7921498a6f8666 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -77,6 +77,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0699-Added-EntityDamageItemEvent.patch b/patches/server/0700-Added-EntityDamageItemEvent.patch
index 0f5056e7ce..0f5056e7ce 100644
--- a/patches/server/0699-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0700-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0700-Optimize-indirect-passenger-iteration.patch b/patches/server/0701-Optimize-indirect-passenger-iteration.patch
index a01d49bc27..a01d49bc27 100644
--- a/patches/server/0700-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0701-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0701-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0702-Fix-block-drops-position-losing-precision-millions-o.patch
index a32af5a891..a32af5a891 100644
--- a/patches/server/0701-Fix-block-drops-position-losing-precision-millions-o.patch
+++ b/patches/server/0702-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0702-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0703-Configurable-item-frame-map-cursor-update-interval.patch
index 5efe0d11c6..c9087f6072 100644
--- a/patches/server/0702-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0703-Configurable-item-frame-map-cursor-update-interval.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable item frame map cursor update interval
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 48ed38be1eec19a64a03e0d04da22a546672a1ca..430cb89460c7f13a95a1019b640047e88cd79cfe 100644
+index 68982f44fac2a3da621503cffb7921498a6f8666..4b84f633e647db439ad9390b963de6af543c8d83 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -924,6 +924,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0703-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0704-Make-EntityUnleashEvent-cancellable.patch
index 29ff062c87..29ff062c87 100644
--- a/patches/server/0703-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0704-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0704-Clear-bucket-NBT-after-dispense.patch b/patches/server/0705-Clear-bucket-NBT-after-dispense.patch
index 50f3155d75..50f3155d75 100644
--- a/patches/server/0704-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0705-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0705-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0706-Change-EnderEye-target-without-changing-other-things.patch
index e4af6267df..e4af6267df 100644
--- a/patches/server/0705-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0706-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0706-Add-BlockBreakBlockEvent.patch b/patches/server/0707-Add-BlockBreakBlockEvent.patch
index b7f264d94f..b7f264d94f 100644
--- a/patches/server/0706-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0707-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0707-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0708-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 14e666a79e..14e666a79e 100644
--- a/patches/server/0707-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0708-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0708-More-CommandBlock-API.patch b/patches/server/0709-More-CommandBlock-API.patch
index daf682f8a0..daf682f8a0 100644
--- a/patches/server/0708-More-CommandBlock-API.patch
+++ b/patches/server/0709-More-CommandBlock-API.patch
diff --git a/patches/server/0709-Add-missing-team-sidebar-display-slots.patch b/patches/server/0710-Add-missing-team-sidebar-display-slots.patch
index 5581728a48..5581728a48 100644
--- a/patches/server/0709-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0710-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0710-Add-back-EntityPortalExitEvent.patch b/patches/server/0711-Add-back-EntityPortalExitEvent.patch
index 50881bbc38..50881bbc38 100644
--- a/patches/server/0710-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0711-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0711-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0712-Add-methods-to-find-targets-for-lightning-strikes.patch
index 6760c330c1..6760c330c1 100644
--- a/patches/server/0711-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0712-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0712-Get-entity-default-attributes.patch b/patches/server/0713-Get-entity-default-attributes.patch
index 2f754ee5f6..2f754ee5f6 100644
--- a/patches/server/0712-Get-entity-default-attributes.patch
+++ b/patches/server/0713-Get-entity-default-attributes.patch
diff --git a/patches/server/0713-Left-handed-API.patch b/patches/server/0714-Left-handed-API.patch
index 8a6c26a272..8a6c26a272 100644
--- a/patches/server/0713-Left-handed-API.patch
+++ b/patches/server/0714-Left-handed-API.patch
diff --git a/patches/server/0714-Add-advancement-display-API.patch b/patches/server/0715-Add-advancement-display-API.patch
index c2bd6b94c0..c2bd6b94c0 100644
--- a/patches/server/0714-Add-advancement-display-API.patch
+++ b/patches/server/0715-Add-advancement-display-API.patch
diff --git a/patches/server/0715-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0716-Add-ItemFactory-getMonsterEgg-API.patch
index a39b8f22f5..a39b8f22f5 100644
--- a/patches/server/0715-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/server/0716-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0716-Add-critical-damage-API.patch b/patches/server/0717-Add-critical-damage-API.patch
index ce876ca4da..ce876ca4da 100644
--- a/patches/server/0716-Add-critical-damage-API.patch
+++ b/patches/server/0717-Add-critical-damage-API.patch
diff --git a/patches/server/0717-Fix-issues-with-mob-conversion.patch b/patches/server/0718-Fix-issues-with-mob-conversion.patch
index 69feb4b3a4..69feb4b3a4 100644
--- a/patches/server/0717-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0718-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0718-Add-isCollidable-methods-to-various-places.patch b/patches/server/0719-Add-isCollidable-methods-to-various-places.patch
index 974af6bc3b..974af6bc3b 100644
--- a/patches/server/0718-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0719-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0719-Goat-ram-API.patch b/patches/server/0720-Goat-ram-API.patch
index f1fcff3a29..f1fcff3a29 100644
--- a/patches/server/0719-Goat-ram-API.patch
+++ b/patches/server/0720-Goat-ram-API.patch
diff --git a/patches/server/0720-Add-API-for-resetting-a-single-score.patch b/patches/server/0721-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9..c2e1fd93b9 100644
--- a/patches/server/0720-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0721-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0721-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0722-Add-Raw-Byte-Entity-Serialization.patch
index 386d4af369..b43c7fef83 100644
--- a/patches/server/0721-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0722-Add-Raw-Byte-Entity-Serialization.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 434142b0a1079d924ab0f0d1193482afbb9fda67..dbfd97c2ba09ffd6b83c5b2f787e7463ab61e4a6 100644
+index c2f12edf1045667641579788d8a38706dc1285ab..9c33b2259bf741c5f891691836ad19f9200c4308 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1837,6 +1837,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -45,7 +45,7 @@ index 23f3acdc37968ec76ffb57e022755c97ff02ff67..9e5f338d0bb64ac47a99cd08a2ab083d
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 17e67d32522ddeb9a8db06089fb7b7f3ed894d4d..bda04a3a7865cfaf6eff7a40b3f12fa3145771e9 100644
+index 2ab43400661fcc98d989e375dbeffa12e187c5e9..5b05ef93a02e8a8525cf1558273d0f8963407862 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -457,6 +457,30 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0722-Vanilla-command-permission-fixes.patch b/patches/server/0723-Vanilla-command-permission-fixes.patch
index d9b53520f4..d9b53520f4 100644
--- a/patches/server/0722-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0723-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0723-Make-CallbackExecutor-strict-again.patch b/patches/server/0724-Make-CallbackExecutor-strict-again.patch
index 9360912a3d..9360912a3d 100644
--- a/patches/server/0723-Make-CallbackExecutor-strict-again.patch
+++ b/patches/server/0724-Make-CallbackExecutor-strict-again.patch
diff --git a/patches/server/0724-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0725-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
index a5d388d197..a5d388d197 100644
--- a/patches/server/0724-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
+++ b/patches/server/0725-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0725-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0726-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 00366a827d..38b768fb4b 100644
--- a/patches/server/0725-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0726-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -28,7 +28,7 @@ index b10c0099ba0691cb167e78b8decafe39146caaf2..a7ad8fcbd99b94440803290b7fe7465c
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 58ece1e30d316a81e347f196d288292154d71bfe..0b567dfbf7c3971858707bcde6909323a7a2634f 100644
+index c8be2fa8c0b39e7b02d5214551e13b49af0c4730..6f55fa61f4c3291413aab076a46cec2cc103dac5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1580,6 +1580,18 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0726-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0727-Correctly-handle-recursion-for-chunkholder-updates.patch
index 3d7be82a0c..3d7be82a0c 100644
--- a/patches/server/0726-Correctly-handle-recursion-for-chunkholder-updates.patch
+++ b/patches/server/0727-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0727-Fix-GameProfileCache-concurrency.patch b/patches/server/0728-Fix-GameProfileCache-concurrency.patch
index 6d3dd691b3..6d3dd691b3 100644
--- a/patches/server/0727-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0728-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0728-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0729-Fix-chunks-refusing-to-unload-at-low-TPS.patch
index 9faff94627..9faff94627 100644
--- a/patches/server/0728-Fix-chunks-refusing-to-unload-at-low-TPS.patch
+++ b/patches/server/0729-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0729-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0730-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
index 3dc1dc9d4d..3dc1dc9d4d 100644
--- a/patches/server/0729-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
+++ b/patches/server/0730-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
diff --git a/patches/server/0730-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0731-Do-not-allow-ticket-level-changes-when-updating-chun.patch
index ab433784a5..ab433784a5 100644
--- a/patches/server/0730-Do-not-allow-ticket-level-changes-when-updating-chun.patch
+++ b/patches/server/0731-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0731-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0732-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index 3db60a23b1..3db60a23b1 100644
--- a/patches/server/0731-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/server/0732-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0732-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0733-Log-when-the-async-catcher-is-tripped.patch
index bede76faf6..bede76faf6 100644
--- a/patches/server/0732-Log-when-the-async-catcher-is-tripped.patch
+++ b/patches/server/0733-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0733-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0734-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 7f1b042741..cbc9aa584c 100644
--- a/patches/server/0733-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0734-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -10,7 +10,7 @@ Also has a hover text on each mob category listing what entity types are
 in said category
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 5a30840a2c35d8b721e27e91b4e6816e9b7c1e5a..ddabe0c59a04e6017368c5ba57767b8953cc09f0 100644
+index fa0b824747c5b15cfb29e22b2d30b9c6932c1320..ca401a3203176578f9cd399aa740f07147e45de9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -3,6 +3,7 @@ package com.destroystokyo.paper;
@@ -48,13 +48,16 @@ index 5a30840a2c35d8b721e27e91b4e6816e9b7c1e5a..ddabe0c59a04e6017368c5ba57767b89
  import org.apache.commons.lang3.tuple.MutablePair;
  import org.apache.commons.lang3.tuple.Pair;
  import org.bukkit.Bukkit;
-@@ -55,11 +65,12 @@ import java.util.List;
+@@ -54,6 +64,7 @@ import java.util.List;
  import java.util.Locale;
  import java.util.Map;
  import java.util.Set;
 +import java.util.function.ToIntFunction;
  import java.util.stream.Collectors;
  
+ import static net.kyori.adventure.text.Component.text;
+@@ -66,7 +77,7 @@ import static net.kyori.adventure.text.format.NamedTextColor.YELLOW;
+ 
  public class PaperCommand extends Command {
      private static final String BASE_PERM = "bukkit.command.paper.";
 -    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version", "debug", "chunkinfo", "fixlight", "syncloadinfo", "dumpitem").build();
@@ -62,7 +65,7 @@ index 5a30840a2c35d8b721e27e91b4e6816e9b7c1e5a..ddabe0c59a04e6017368c5ba57767b89
  
      public PaperCommand(String name) {
          super(name);
-@@ -92,6 +103,10 @@ public class PaperCommand extends Command {
+@@ -99,6 +110,10 @@ public class PaperCommand extends Command {
                      return getListMatchingLast(sender, args, "help", "chunks");
                  }
                  break;
@@ -73,7 +76,7 @@ index 5a30840a2c35d8b721e27e91b4e6816e9b7c1e5a..ddabe0c59a04e6017368c5ba57767b89
              case "chunkinfo":
                  List<String> worldNames = new ArrayList<>();
                  worldNames.add("*");
-@@ -188,6 +203,12 @@ public class PaperCommand extends Command {
+@@ -195,6 +210,12 @@ public class PaperCommand extends Command {
              case "syncloadinfo":
                  this.doSyncLoadInfo(sender, args);
                  break;
@@ -86,7 +89,7 @@ index 5a30840a2c35d8b721e27e91b4e6816e9b7c1e5a..ddabe0c59a04e6017368c5ba57767b89
              case "ver":
                  if (!testPermission(sender, "version")) break; // "ver" needs a special check because it's an alias. All other commands are checked up before the switch statement (because they are present in the SUBCOMMANDS set)
              case "version":
-@@ -246,6 +267,184 @@ public class PaperCommand extends Command {
+@@ -253,6 +274,184 @@ public class PaperCommand extends Command {
          }
      }
  
diff --git a/patches/server/0734-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0735-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
index 000406a8b8..000406a8b8 100644
--- a/patches/server/0734-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
+++ b/patches/server/0735-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/0735-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0736-Sanitize-ResourceLocation-error-logging.patch
index ff7e0b7826..ff7e0b7826 100644
--- a/patches/server/0735-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0736-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0736-Optimise-general-POI-access.patch b/patches/server/0737-Optimise-general-POI-access.patch
index 65b633f62c..65b633f62c 100644
--- a/patches/server/0736-Optimise-general-POI-access.patch
+++ b/patches/server/0737-Optimise-general-POI-access.patch
diff --git a/patches/server/0737-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0738-Allow-controlled-flushing-for-network-manager.patch
index 9b061bed55..9b061bed55 100644
--- a/patches/server/0737-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/server/0738-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0738-Add-more-async-catchers.patch b/patches/server/0739-Add-more-async-catchers.patch
index 75531f83ac..75531f83ac 100644
--- a/patches/server/0738-Add-more-async-catchers.patch
+++ b/patches/server/0739-Add-more-async-catchers.patch
diff --git a/patches/server/0739-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0740-Rewrite-entity-bounding-box-lookup-calls.patch
index f53c3bc693..f53c3bc693 100644
--- a/patches/server/0739-Rewrite-entity-bounding-box-lookup-calls.patch
+++ b/patches/server/0740-Rewrite-entity-bounding-box-lookup-calls.patch
diff --git a/patches/server/0740-Optimise-chunk-tick-iteration.patch b/patches/server/0741-Optimise-chunk-tick-iteration.patch
index 136af3f2a8..136af3f2a8 100644
--- a/patches/server/0740-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0741-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0741-Execute-chunk-tasks-mid-tick.patch b/patches/server/0742-Execute-chunk-tasks-mid-tick.patch
index 8f00440e97..8f00440e97 100644
--- a/patches/server/0741-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0742-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0742-Do-not-copy-visible-chunks.patch b/patches/server/0743-Do-not-copy-visible-chunks.patch
index ba0a6e065e..310d49fad4 100644
--- a/patches/server/0742-Do-not-copy-visible-chunks.patch
+++ b/patches/server/0743-Do-not-copy-visible-chunks.patch
@@ -9,10 +9,10 @@ the function. I saw approximately 1/3rd of the function
 on the copy.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index ddabe0c59a04e6017368c5ba57767b8953cc09f0..f57ec991111b45dbc33a81d3162ef58872ee3590 100644
+index ca401a3203176578f9cd399aa740f07147e45de9..dcda01dd8668c7ef7c63709179135deafb83eee5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-@@ -476,7 +476,7 @@ public class PaperCommand extends Command {
+@@ -483,7 +483,7 @@ public class PaperCommand extends Command {
              int ticking = 0;
              int entityTicking = 0;
  
@@ -186,7 +186,7 @@ index ef28e0f57ba593265a3eca4d3f21d0b1b51e8740..f4c1316ae1cadc1a7a7fed16e0e99704
          while (objectbidirectionaliterator.hasNext()) {
              Entry<ChunkHolder> entry = (Entry) objectbidirectionaliterator.next();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 05352f89399d7c90ff029984889bddd73c31a7d1..0ebacc6f35591b3f1fc740d484f30c7c2337392a 100644
+index f316bd615b2801365c0c2d23521ba471ed320968..d7624db77ffde9ce7fa4ece8318c7e75e065feed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -161,7 +161,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0743-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0744-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 5459269b64..5459269b64 100644
--- a/patches/server/0743-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0744-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0744-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0745-Custom-table-implementation-for-blockstate-state-loo.patch
index 0feb55739c..0feb55739c 100644
--- a/patches/server/0744-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0745-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0745-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0746-Detail-more-information-in-watchdog-dumps.patch
index 5daad07155..5daad07155 100644
--- a/patches/server/0745-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0746-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0746-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0747-Manually-inline-methods-in-BlockPosition.patch
index 6668339cba..f073f5b5a6 100644
--- a/patches/server/0746-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0747-Manually-inline-methods-in-BlockPosition.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Manually inline methods in BlockPosition
 
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 028edb36f995316a9348133db1ed1d4cdda21aed..8c79f66abd42e9c9875e8877c6dd82b5e3cfa184 100644
+index 11745a71e5b2f00417b4e7f9cbc516071bd45ed9..2808acafaa0e3b448e75c40c04ba932ef9723da9 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
 @@ -484,9 +484,9 @@ public class BlockPos extends Vec3i {
diff --git a/patches/server/0747-Distance-manager-tick-timings.patch b/patches/server/0748-Distance-manager-tick-timings.patch
index 2ea652c2aa..2ea652c2aa 100644
--- a/patches/server/0747-Distance-manager-tick-timings.patch
+++ b/patches/server/0748-Distance-manager-tick-timings.patch
diff --git a/patches/server/0748-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0749-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 7d081ee195..7d081ee195 100644
--- a/patches/server/0748-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0749-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0749-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0750-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index c3f6182749..c3f6182749 100644
--- a/patches/server/0749-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0750-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0750-Add-packet-limiter-config.patch b/patches/server/0751-Add-packet-limiter-config.patch
index feb1bfd26f..12ce1bf117 100644
--- a/patches/server/0750-Add-packet-limiter-config.patch
+++ b/patches/server/0751-Add-packet-limiter-config.patch
@@ -24,7 +24,7 @@ and an action can be defined: DROP or KICK
 If interval or rate are less-than 0, the limit is ignored
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index bc91acb8b7e407092102e39037fc6f3fd380a073..da3eca94623a81d178166cc4689bb95a829837cc 100644
+index 5c1062f1f9578f2c728b0674eb3a1785b9c345b5..919ce4ee6aafe925e520424dc0529999b536ecc7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -521,4 +521,102 @@ public class PaperConfig {
diff --git a/patches/server/0751-Lag-compensate-block-breaking.patch b/patches/server/0752-Lag-compensate-block-breaking.patch
index 8efc05d082..e185b2f209 100644
--- a/patches/server/0751-Lag-compensate-block-breaking.patch
+++ b/patches/server/0752-Lag-compensate-block-breaking.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Lag compensate block breaking
 Use time instead of ticks if ticks fall behind
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index da3eca94623a81d178166cc4689bb95a829837cc..d673f1d051f943c65bceccc2c8d8172e3259abb4 100644
+index 919ce4ee6aafe925e520424dc0529999b536ecc7..92413fd4132b1e5b63d4be0e9cf341d2a7200df4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -619,4 +619,10 @@ public class PaperConfig {
diff --git a/patches/server/0752-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0753-Use-correct-LevelStem-registry-when-loading-default-.patch
index 2ebf02008b..2ebf02008b 100644
--- a/patches/server/0752-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/server/0753-Use-correct-LevelStem-registry-when-loading-default-.patch
diff --git a/patches/server/0753-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0754-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index c5bd6526f7..c5bd6526f7 100644
--- a/patches/server/0753-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0754-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0754-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0755-Consolidate-flush-calls-for-entity-tracker-packets.patch
index 73b6417870..73b6417870 100644
--- a/patches/server/0754-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/server/0755-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0755-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0756-Don-t-lookup-fluid-state-when-raytracing.patch
index eef7de0e32..eef7de0e32 100644
--- a/patches/server/0755-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0756-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0756-Time-scoreboard-search.patch b/patches/server/0757-Time-scoreboard-search.patch
index 48469b83af..48469b83af 100644
--- a/patches/server/0756-Time-scoreboard-search.patch
+++ b/patches/server/0757-Time-scoreboard-search.patch
diff --git a/patches/server/0757-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0758-Send-full-pos-packets-for-hard-colliding-entities.patch
index af16624ff3..89f7f28d4c 100644
--- a/patches/server/0757-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0758-Send-full-pos-packets-for-hard-colliding-entities.patch
@@ -9,7 +9,7 @@ Configurable under
 `send-full-pos-for-hard-colliding-entities`
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d673f1d051f943c65bceccc2c8d8172e3259abb4..2e02446ea3d0b3aa4673e9686ed62c14527fabcc 100644
+index 92413fd4132b1e5b63d4be0e9cf341d2a7200df4..5203a43d707010f6ba43be2d6627d48560b77731 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -625,4 +625,10 @@ public class PaperConfig {
diff --git a/patches/server/0758-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0759-Do-not-run-raytrace-logic-for-AIR.patch
index baedf55a9d..baedf55a9d 100644
--- a/patches/server/0758-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0759-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0759-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0760-Oprimise-map-impl-for-tracked-players.patch
index 91de4460ec..91de4460ec 100644
--- a/patches/server/0759-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0760-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0760-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0761-Optimise-BlockSoil-nearby-water-lookup.patch
index f3fe0f0f17..f3fe0f0f17 100644
--- a/patches/server/0760-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0761-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0761-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0762-Allow-removal-addition-of-entities-to-entity-ticklis.patch
index bf79d6270e..bf79d6270e 100644
--- a/patches/server/0761-Allow-removal-addition-of-entities-to-entity-ticklis.patch
+++ b/patches/server/0762-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0762-Optimise-random-block-ticking.patch b/patches/server/0763-Optimise-random-block-ticking.patch
index 871b901f2e..96da0b87e8 100644
--- a/patches/server/0762-Optimise-random-block-ticking.patch
+++ b/patches/server/0763-Optimise-random-block-ticking.patch
@@ -410,7 +410,7 @@ index cdd17e501c678a4f4bebbaaccdaec1682351e2f2..6afad987f6dd1fd7243dfa6c50549c2a
  
      public PalettedContainer<BlockState> getStates() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index d6e56bd606aca4aef7442c759d5567924032b775..ac0ccaf11eb414d0c2b843f458753fb37aac3f67 100644
+index d886320211c7fa80960042c9b9ef4951eb34aaf1..73d0a52e0b9bcd81caf5c8a91c3d8052ad6d1da8 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 @@ -354,6 +354,14 @@ public class PalettedContainer<T> implements PaletteResize<T> {
diff --git a/patches/server/0763-Optimise-non-flush-packet-sending.patch b/patches/server/0764-Optimise-non-flush-packet-sending.patch
index f4d6e1b6b4..f4d6e1b6b4 100644
--- a/patches/server/0763-Optimise-non-flush-packet-sending.patch
+++ b/patches/server/0764-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0764-Optimise-nearby-player-lookups.patch b/patches/server/0765-Optimise-nearby-player-lookups.patch
index 7bbed99156..7b5630ed08 100644
--- a/patches/server/0764-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0765-Optimise-nearby-player-lookups.patch
@@ -322,7 +322,7 @@ index 87d1f5b2717fc82203b5674ac0bf2704117f8f63..d87900e2a9559a34ee66e3cffab851a5
  
      private static Boolean isValidSpawnPostitionForType(ServerLevel world, MobCategory group, StructureFeatureManager structureAccessor, ChunkGenerator chunkGenerator, MobSpawnSettings.SpawnerData spawnEntry, BlockPos.MutableBlockPos pos, double squaredDistance) { // Paper
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 06577d9cd276e65f2fdf5082b9ee4dc2d5211611..4c5e3e6aa6c6ec88ce472e8dff10bc591245c4f7 100644
+index 0388b89a5f67ebaf344de53464922daddd234199..14f956ad7c305a4d22370d705a70f77e65861007 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -235,6 +235,98 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0765-Optimise-WorldServer-notify.patch b/patches/server/0766-Optimise-WorldServer-notify.patch
index c6a1399cae..c6a1399cae 100644
--- a/patches/server/0765-Optimise-WorldServer-notify.patch
+++ b/patches/server/0766-Optimise-WorldServer-notify.patch
diff --git a/patches/server/0766-Remove-streams-for-villager-AI.patch b/patches/server/0767-Remove-streams-for-villager-AI.patch
index 8257c2de40..15b31d1420 100644
--- a/patches/server/0766-Remove-streams-for-villager-AI.patch
+++ b/patches/server/0767-Remove-streams-for-villager-AI.patch
@@ -128,7 +128,7 @@ index e644bdd3a6f7c09a44149da03587b796674fa568..c67c448e0d8bdd788b94189651304110
      }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java
-index 1bc34453933bc7590af45a5559a4fc75eb3e0c5c..204ca4fbd89bdadd902529f1f191df46fce3cace 100644
+index 4f42344fec13b8d7fe0c1dd412525853c35bacca..b35abac7029708042b25d98ab11005c2ea8ae6ea 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java
 @@ -12,7 +12,7 @@ import java.util.Random;
diff --git a/patches/server/0767-Rewrite-dataconverter-system.patch b/patches/server/0768-Rewrite-dataconverter-system.patch
index dc851e7b7d..dc851e7b7d 100644
--- a/patches/server/0767-Rewrite-dataconverter-system.patch
+++ b/patches/server/0768-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0768-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0769-Use-Velocity-compression-and-cipher-natives.patch
index d3ae968812..6d5ea4a511 100644
--- a/patches/server/0768-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0769-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 93bfdaeaae9710e271b23f44076e21a5eff6b8ff..bc90bb64877d423e67d917609521e6b33405c4e4 100644
+index 6b46f9c94dc051579ca5b51755caad19505e874a..4715d1386afd939628c392a7d8062e5887d7a507 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -35,6 +35,11 @@ dependencies {
diff --git a/patches/server/0769-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0770-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 5b7dedcdeb..5b7dedcdeb 100644
--- a/patches/server/0769-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0770-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0770-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0771-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
index 5c0a433617..5c0a433617 100644
--- a/patches/server/0770-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
+++ b/patches/server/0771-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
diff --git a/patches/server/0771-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0772-Async-catch-modifications-to-critical-entity-state.patch
index 305329fc53..305329fc53 100644
--- a/patches/server/0771-Async-catch-modifications-to-critical-entity-state.patch
+++ b/patches/server/0772-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0772-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0773-Fix-Bukkit-NamespacedKey-shenanigans.patch
index 8f152dd0e7..8f152dd0e7 100644
--- a/patches/server/0772-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0773-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0773-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0774-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 68a4c86bc0..68a4c86bc0 100644
--- a/patches/server/0773-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0774-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0774-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0775-Check-requirement-before-suggesting-root-nodes.patch
index d824c5f2af..d824c5f2af 100644
--- a/patches/server/0774-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0775-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0775-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0776-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 2bf87847d2..181bb7eeae 100644
--- a/patches/server/0775-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0776-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 c7ed9e00ed131f4f438244178ec24f14299c46b8..7be8b98a61c3d92ef7c473983fe620047a137630 100644
+index 4688a91fe7cee4e7c3c1d27a5f5db592bbfe1a30..f15e4b72264c4ee3d7dc758307963a528fa84ef6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -770,6 +770,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0776-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0777-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 81bcca30af..81bcca30af 100644
--- a/patches/server/0776-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0777-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0777-Ensure-valid-vehicle-status.patch b/patches/server/0778-Ensure-valid-vehicle-status.patch
index 8f0a2f2c48..b350b5122a 100644
--- a/patches/server/0777-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0778-Ensure-valid-vehicle-status.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0b567dfbf7c3971858707bcde6909323a7a2634f..ca978f337a7cf443e6918bea2e6cae0ceef30145 100644
+index 6f55fa61f4c3291413aab076a46cec2cc103dac5..6b9622c41966843411184493f42b3d4005be533e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -504,7 +504,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0778-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0779-Prevent-softlocked-end-exit-portal-generation.patch
index 855c2ec833..855c2ec833 100644
--- a/patches/server/0778-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0779-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0779-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0780-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 2ce994e362..2ce994e362 100644
--- a/patches/server/0779-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0780-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0780-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0781-Don-t-log-debug-logging-being-disabled.patch
index 5bec880eb8..5bec880eb8 100644
--- a/patches/server/0780-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0781-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0781-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0782-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0781-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0782-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0782-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0783-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
index 6e988a6c7e..6e988a6c7e 100644
--- a/patches/server/0782-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
+++ b/patches/server/0783-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
diff --git a/patches/server/0783-Preserve-overstacked-loot.patch b/patches/server/0784-Preserve-overstacked-loot.patch
index cb7a8a7e88..cb7a8a7e88 100644
--- a/patches/server/0783-Preserve-overstacked-loot.patch
+++ b/patches/server/0784-Preserve-overstacked-loot.patch
diff --git a/patches/server/0784-Update-head-rotation-in-missing-places.patch b/patches/server/0785-Update-head-rotation-in-missing-places.patch
index af1ce3e6a7..af1ce3e6a7 100644
--- a/patches/server/0784-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0785-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0785-prevent-unintended-light-block-manipulation.patch b/patches/server/0786-prevent-unintended-light-block-manipulation.patch
index 08bd6164f5..08bd6164f5 100644
--- a/patches/server/0785-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0786-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0786-Fix-CraftCriteria-defaults-map.patch b/patches/server/0787-Fix-CraftCriteria-defaults-map.patch
index 11fce3ca24..11fce3ca24 100644
--- a/patches/server/0786-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0787-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0787-Fix-upstreams-block-state-factories.patch b/patches/server/0788-Fix-upstreams-block-state-factories.patch
index b5a4b68ac1..b5a4b68ac1 100644
--- a/patches/server/0787-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0788-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0788-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0789-Add-config-option-for-logging-player-ip-addresses.patch
index 90be92e48d..37d2285462 100644
--- a/patches/server/0788-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0789-Add-config-option-for-logging-player-ip-addresses.patch
@@ -81,7 +81,7 @@ index 4cd92875d60c2f1dcce67ac99e9ba257a10f87b1..f5c1dff1d571e89f960f11400edbcbbe
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1fad95b709bbc755e5906a93c8d2ed09b52154ce..7fd530a901aecc49fa7fbbf3e876b0f56b665212 100644
+index 6b3ab58a4446e9ce6f91f870ef8b2511522e0da0..2aa31d8ad15100b3a25dd7da41bf17b126ba937e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -238,7 +238,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0789-Configurable-feature-seeds.patch b/patches/server/0790-Configurable-feature-seeds.patch
index 7570560d05..1f31c0c65d 100644
--- a/patches/server/0789-Configurable-feature-seeds.patch
+++ b/patches/server/0790-Configurable-feature-seeds.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable feature seeds
 Co-authored-by: Thonk <[email protected]>
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index ee72086b2dee2bd6415803e77825b2b1cb83cd3d..309dbf5fce3ce940d5e1b57d267b9d6b2c5ff5b6 100644
+index 4092a227a540a1c5cfb95efcc2a36e049b9a979c..e2f60115370f19e935eb3b14d5de99aa4126c6b0 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -280,7 +280,7 @@ public class TimingsExport extends Thread {
+@@ -282,7 +282,7 @@ public class TimingsExport extends Thread {
          JSONObject object = new JSONObject();
          for (String key : config.getKeys(false)) {
              String fullKey = (parentKey != null ? parentKey + "." + key : key);
diff --git a/patches/server/0790-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0791-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
index 6e33709dbe..6e33709dbe 100644
--- a/patches/server/0790-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ b/patches/server/0791-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0791-Add-root-admin-user-detection.patch b/patches/server/0792-Add-root-admin-user-detection.patch
index 86c355de50..86c355de50 100644
--- a/patches/server/0791-Add-root-admin-user-detection.patch
+++ b/patches/server/0792-Add-root-admin-user-detection.patch
diff --git a/patches/server/0792-Always-allow-item-changing-in-Fireball.patch b/patches/server/0793-Always-allow-item-changing-in-Fireball.patch
index fe4cbf2ef1..fe4cbf2ef1 100644
--- a/patches/server/0792-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0793-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0793-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0794-don-t-attempt-to-teleport-dead-entities.patch
index 33a676d580..33a676d580 100644
--- a/patches/server/0793-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0794-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0794-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0795-Prevent-excessive-velocity-through-repeated-crits.patch
index 4304993831..3be98b5047 100644
--- a/patches/server/0794-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0795-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d64e946a3228b871fb8a9703a8631008078e4bec..4240d5bcb550c591706d978ddabffd79104faa37 100644
+index d49d9d60a839d5ac5d67a677fcbae2897e54dada..18dfc235f17510ae9eda3ffd7c04b7aa8c4aac89 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2594,14 +2594,27 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0795-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0796-Remove-client-side-code-using-deprecated-for-removal.patch
index da2436d274..da2436d274 100644
--- a/patches/server/0795-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0796-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0796-Rewrite-the-light-engine.patch b/patches/server/0797-Rewrite-the-light-engine.patch
index c82dfc25c2..e7830ea3aa 100644
--- a/patches/server/0796-Rewrite-the-light-engine.patch
+++ b/patches/server/0797-Rewrite-the-light-engine.patch
@@ -4345,10 +4345,10 @@ index 0000000000000000000000000000000000000000..dd995e25ae620ae36cd5eecb2fe10ad0
 +
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index f57ec991111b45dbc33a81d3162ef58872ee3590..d0c55497040158d959693ef2ddf3ff03bd6df05f 100644
+index dcda01dd8668c7ef7c63709179135deafb83eee5..5f079cf06b0d1505bfb3fda5c326b2d7fd4f0e48 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-@@ -700,6 +700,46 @@ public class PaperCommand extends Command {
+@@ -715,6 +715,46 @@ public class PaperCommand extends Command {
          }
      }
  
@@ -4375,27 +4375,27 @@ index f57ec991111b45dbc33a81d3162ef58872ee3590..d0c55497040158d959693ef2ddf3ff03
 +        lightengine.relight(chunks,
 +                (ChunkPos chunkPos) -> {
 +                    ++relitChunks[0];
-+                    sender.getBukkitEntity().sendMessage(
-+                            ChatColor.BLUE + "Relit chunk " + ChatColor.DARK_AQUA + chunkPos + ChatColor.BLUE +
-+                                    ", progress: " + ChatColor.DARK_AQUA + (int)(Math.round(100.0 * (double)(relitChunks[0])/(double)pending[0])) + "%"
-+                    );
++                    sender.getBukkitEntity().sendMessage(text().color(DARK_AQUA).append(
++                        text("Relit chunk ", BLUE), text(chunkPos.toString()),
++                        text(", progress: ", BLUE), text((int)(Math.round(100.0 * (double)(relitChunks[0])/(double)pending[0])) + "%")
++                    ));
 +                },
 +                (int totalRelit) -> {
 +                    final long end = System.nanoTime();
 +                    final long diff = Math.round(1.0e-6*(end - start));
-+                    sender.getBukkitEntity().sendMessage(
-+                            ChatColor.BLUE + "Relit " + ChatColor.DARK_AQUA + totalRelit + ChatColor.BLUE + " chunks. Took " +
-+                                    ChatColor.DARK_AQUA + diff + "ms"
-+                    );
++                    sender.getBukkitEntity().sendMessage(text().color(DARK_AQUA).append(
++                        text("Relit ", BLUE), text(totalRelit),
++                        text(" chunks. Took ", BLUE), text(diff + "ms")
++                    ));
 +                });
-+        sender.getBukkitEntity().sendMessage(ChatColor.BLUE + "Relighting " + ChatColor.DARK_AQUA + pending[0] + ChatColor.BLUE + " chunks");
++        sender.getBukkitEntity().sendMessage(text().color(BLUE).append(text("Relighting "), text(pending[0], DARK_AQUA), text(" chunks")));
 +    }
 +    // Paper end - rewrite light engine
 +
      private void doFixLight(CommandSender sender, String[] args) {
          if (!(sender instanceof Player)) {
              sender.sendMessage("Only players can use this command");
-@@ -708,7 +748,7 @@ public class PaperCommand extends Command {
+@@ -723,7 +763,7 @@ public class PaperCommand extends Command {
          int radius = 2;
          if (args.length > 1) {
              try {
@@ -4404,7 +4404,7 @@ index f57ec991111b45dbc33a81d3162ef58872ee3590..d0c55497040158d959693ef2ddf3ff03
              } catch (Exception e) {
                  sender.sendMessage("Not a number");
                  return;
-@@ -721,6 +761,13 @@ public class PaperCommand extends Command {
+@@ -736,6 +776,13 @@ public class PaperCommand extends Command {
          ServerLevel world = (ServerLevel) handle.level;
          ThreadedLevelLightEngine lightengine = world.getChunkSource().getLightEngine();
  
@@ -4974,7 +4974,7 @@ index 37e7f766e0de7b47c7240c9365bb134fda26a756..cac036ac3c7abb520fbd97b9cea4fb1c
          super(wrapped.getPos(), UpgradeData.EMPTY, wrapped.levelHeightAccessor, wrapped.getLevel().registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), wrapped.getBlendingData());
          this.wrapped = wrapped;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 4c5e3e6aa6c6ec88ce472e8dff10bc591245c4f7..b46648301396930478391967b371bf8d201901e1 100644
+index 14f956ad7c305a4d22370d705a70f77e65861007..72b5d63127fbcd2913309f2c3c438b88728b4673 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -100,6 +100,10 @@ public class LevelChunk extends ChunkAccess {
@@ -5002,7 +5002,7 @@ index 4c5e3e6aa6c6ec88ce472e8dff10bc591245c4f7..b46648301396930478391967b371bf8d
  
          while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index ac0ccaf11eb414d0c2b843f458753fb37aac3f67..bba327d0f235aa35f24098214626763ca2c53b86 100644
+index 73d0a52e0b9bcd81caf5c8a91c3d8052ad6d1da8..a34a52c827a631336ec08d037fd662ed1a026742 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 @@ -186,7 +186,7 @@ public class PalettedContainer<T> implements PaletteResize<T> {
diff --git a/patches/server/0797-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0798-Always-parse-protochunk-light-sources-unless-it-is-m.patch
index a1b655d7c1..a1b655d7c1 100644
--- a/patches/server/0797-Always-parse-protochunk-light-sources-unless-it-is-m.patch
+++ b/patches/server/0798-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0798-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0799-Fix-removing-recipes-from-RecipeIterator.patch
index 5784fd4dc3..5784fd4dc3 100644
--- a/patches/server/0798-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0799-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0799-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0800-Prevent-sending-oversized-item-data-in-equipment-and.patch
index e35fbc79b1..79e196e966 100644
--- a/patches/server/0799-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0800-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -34,7 +34,7 @@ index 9760ff4b6ca0e555f01151968cbfe0cdb8960e35..7464336f0c7ee59e59552afbad7bed0a
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4240d5bcb550c591706d978ddabffd79104faa37..626e53564d4130b98440982e174fd7c23b7df863 100644
+index 18dfc235f17510ae9eda3ffd7c04b7aa8c4aac89..1f8ba8dbb69bf9be998ed99095ecdeacba5ab03d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3077,7 +3077,10 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0800-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0801-Hide-unnecessary-itemmeta-from-clients.patch
index 774eeac76f..d848f175e1 100644
--- a/patches/server/0800-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0801-Hide-unnecessary-itemmeta-from-clients.patch
@@ -36,7 +36,7 @@ index 7464336f0c7ee59e59552afbad7bed0afcecef87..fe29bf349b987d633b185b9d44d22105
                  }
              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 626e53564d4130b98440982e174fd7c23b7df863..f21f69977ff92ac967aac2e72b679f17e2c42501 100644
+index 1f8ba8dbb69bf9be998ed99095ecdeacba5ab03d..5ef73cf97df2949d308d4cc9213bfb173c15b4a5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3079,7 +3079,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0801-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0802-Fix-kelp-modifier-changing-growth-for-other-crops.patch
index da0f208d4e..da0f208d4e 100644
--- a/patches/server/0801-Fix-kelp-modifier-changing-growth-for-other-crops.patch
+++ b/patches/server/0802-Fix-kelp-modifier-changing-growth-for-other-crops.patch
diff --git a/patches/server/0802-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0803-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 0e41fd2743..0e41fd2743 100644
--- a/patches/server/0802-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0803-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0803-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0804-Add-PlayerItemFrameChangeEvent.patch
index 02aa6ad973..02aa6ad973 100644
--- a/patches/server/0803-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0804-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0804-Add-player-health-update-API.patch b/patches/server/0805-Add-player-health-update-API.patch
index b934c52eb4..b934c52eb4 100644
--- a/patches/server/0804-Add-player-health-update-API.patch
+++ b/patches/server/0805-Add-player-health-update-API.patch
diff --git a/patches/server/0805-Optimize-HashMapPalette.patch b/patches/server/0806-Optimize-HashMapPalette.patch
index ef1880895f..ef1880895f 100644
--- a/patches/server/0805-Optimize-HashMapPalette.patch
+++ b/patches/server/0806-Optimize-HashMapPalette.patch
diff --git a/patches/server/0806-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0807-Allow-delegation-to-vanilla-chunk-gen.patch
index 2c7b20a0c3..ab4dd3ccd0 100644
--- a/patches/server/0806-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0807-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c99a522c7839b2a9cf131913172baabfc0658eeb..2747a420f2c1ba4cf103f6340c5db671af3ade81 100644
+index c0427bfe4f93b501aaacb66c131d2736dce6b5e0..825a3b688099a3021ff422dd123038b6cca3e14f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2317,6 +2317,90 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0807-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0808-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 8e51d2bd17..8e51d2bd17 100644
--- a/patches/server/0807-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0808-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0808-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0809-Optimise-collision-checking-in-player-move-packet-ha.patch
index 3b1fc4b2f2..6bb3a43baa 100644
--- a/patches/server/0808-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0809-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling
 Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cc0adbd20bc069e61fc333e57c2e3ccbf8d5c888..fb15e7ec56b91541a4bff810d45edec57adfaeab 100644
+index f15e4b72264c4ee3d7dc758307963a528fa84ef6..a0766375eb8dde3b04a01dbca535a4b08a5d6abc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -587,7 +587,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0809-Actually-unload-POI-data.patch b/patches/server/0810-Actually-unload-POI-data.patch
index 8a61aa29f6..8a61aa29f6 100644
--- a/patches/server/0809-Actually-unload-POI-data.patch
+++ b/patches/server/0810-Actually-unload-POI-data.patch
diff --git a/patches/server/0810-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0811-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index c03eefb28c..c03eefb28c 100644
--- a/patches/server/0810-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0811-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0811-Update-Log4j.patch b/patches/server/0812-Update-Log4j.patch
index 61dbac5ec5..4ad573bc33 100644
--- a/patches/server/0811-Update-Log4j.patch
+++ b/patches/server/0812-Update-Log4j.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update Log4j
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index bc90bb64877d423e67d917609521e6b33405c4e4..dd8f449dddbe0838835ae8f8d5033aa422db403d 100644
+index 4715d1386afd939628c392a7d8062e5887d7a507..0282e3b75470e1a68ea1fc228082483514ba432e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -20,10 +20,11 @@ dependencies {
diff --git a/patches/server/0812-Add-more-Campfire-API.patch b/patches/server/0813-Add-more-Campfire-API.patch
index 75cef9d65b..75cef9d65b 100644
--- a/patches/server/0812-Add-more-Campfire-API.patch
+++ b/patches/server/0813-Add-more-Campfire-API.patch
diff --git a/patches/server/0813-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0814-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 324e828c7c..324e828c7c 100644
--- a/patches/server/0813-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0814-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0814-Fix-tripwire-state-inconsistency.patch b/patches/server/0815-Fix-tripwire-state-inconsistency.patch
index ef3e8540d4..ef3e8540d4 100644
--- a/patches/server/0814-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0815-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0815-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0816-Fix-fluid-logging-on-Block-breakNaturally.patch
index 1f9012a293..1f9012a293 100644
--- a/patches/server/0815-Fix-fluid-logging-on-Block-breakNaturally.patch
+++ b/patches/server/0816-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0816-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0817-Forward-CraftEntity-in-teleport-command.patch
index 5d793144d9..5d793144d9 100644
--- a/patches/server/0816-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0817-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0817-Improve-scoreboard-entries.patch b/patches/server/0818-Improve-scoreboard-entries.patch
index 82f0da6dde..313567a730 100644
--- a/patches/server/0817-Improve-scoreboard-entries.patch
+++ b/patches/server/0818-Improve-scoreboard-entries.patch
@@ -24,7 +24,7 @@ index 6752cd9b3bc246fc2a7764df0d2b40d3e638fa62..c5cf800ab8cbb5ebcf1b06ad591f08be
      public void unregister() throws IllegalStateException {
          CraftScoreboard scoreboard = this.checkState();
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
-index 944080939ceaf2db8bcd7d3c01f4b97440e35cc1..0102c475b6e49777c1e24c32e5eff2992e51c89f 100644
+index 167376bcd547f55983ccbb0d46e571c45c7d1ed9..912d302af733d8ee2517cf5f243301e6452493f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
 @@ -234,4 +234,23 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
@@ -52,7 +52,7 @@ index 944080939ceaf2db8bcd7d3c01f4b97440e35cc1..0102c475b6e49777c1e24c32e5eff299
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index 0e1fbecfc3062ceac425607507caa54b0d007130..32a160ca2e53cc76a31cb401d1509c5e643041dd 100644
+index 60b1cffdccde4715832546d6edbf206fbab4e82f..4b64d6c5c987e127d1ed5edad0a78f7172370b9f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 @@ -310,6 +310,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
diff --git a/patches/server/0818-Entity-powdered-snow-API.patch b/patches/server/0819-Entity-powdered-snow-API.patch
index 7df19b80b9..7df19b80b9 100644
--- a/patches/server/0818-Entity-powdered-snow-API.patch
+++ b/patches/server/0819-Entity-powdered-snow-API.patch
diff --git a/patches/server/0819-Add-API-for-item-entity-health.patch b/patches/server/0820-Add-API-for-item-entity-health.patch
index d923270a18..d923270a18 100644
--- a/patches/server/0819-Add-API-for-item-entity-health.patch
+++ b/patches/server/0820-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0820-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0821-Fix-entity-type-tags-suggestions-in-selectors.patch
index 2694c62fc6..2694c62fc6 100644
--- a/patches/server/0820-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0821-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0821-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0822-Configurable-max-block-light-for-monster-spawning.patch
index f1d8d41d0d..f1d8d41d0d 100644
--- a/patches/server/0821-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0822-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0822-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0823-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 8ed1ba062d..8ed1ba062d 100644
--- a/patches/server/0822-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0823-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0823-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0824-Load-effect-amplifiers-greater-than-127-correctly.patch
index 83f5b4740d..83f5b4740d 100644
--- a/patches/server/0823-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0824-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0824-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0825-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 9f3ee548ee..9f3ee548ee 100644
--- a/patches/server/0824-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0825-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0825-Fix-bees-aging-inside-hives.patch b/patches/server/0826-Fix-bees-aging-inside-hives.patch
index c9303da67b..c9303da67b 100644
--- a/patches/server/0825-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0826-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0826-Bucketable-API.patch b/patches/server/0827-Bucketable-API.patch
index ff1194970a..ff1194970a 100644
--- a/patches/server/0826-Bucketable-API.patch
+++ b/patches/server/0827-Bucketable-API.patch
diff --git a/patches/server/0827-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0828-Check-player-world-in-endPortalSoundRadius.patch
index a632d3d594..a632d3d594 100644
--- a/patches/server/0827-Check-player-world-in-endPortalSoundRadius.patch
+++ b/patches/server/0828-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0828-Validate-usernames.patch b/patches/server/0829-Validate-usernames.patch
index 204bdfe8f4..dae1fab5a3 100644
--- a/patches/server/0828-Validate-usernames.patch
+++ b/patches/server/0829-Validate-usernames.patch
@@ -74,7 +74,7 @@ index f5c1dff1d571e89f960f11400edbcbbea0620575..7065aa4522431d08018fec8e591ba7c2
              this.state = ServerLoginPacketListenerImpl.State.KEY;
              this.connection.send(new ClientboundHelloPacket("", this.server.getKeyPair().getPublic().getEncoded(), this.nonce));
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ca5026270a44fef244eb566695702bb3f4729367..c88f57256e6f784e39fe74c3b7fc7e3d8b3a618a 100644
+index bb4e844c77c76eb893c55844c5a814ccd337b7f4..32f710e52da781ed9a0df8249a9ca79f1804b24a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -707,7 +707,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0829-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0830-Fix-saving-configs-with-more-long-comments.patch
index 7d52b01085..7d52b01085 100644
--- a/patches/server/0829-Fix-saving-configs-with-more-long-comments.patch
+++ b/patches/server/0830-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0830-Make-water-animal-spawn-height-configurable.patch b/patches/server/0831-Make-water-animal-spawn-height-configurable.patch
index 21254b0954..21254b0954 100644
--- a/patches/server/0830-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0831-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0831-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0832-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index f897a69dd5..ea1ff31a35 100644
--- a/patches/server/0831-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0832-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -18,7 +18,7 @@ index df955666723a8cb1e612311f0b8e77fb577d6be5..01aefce226ae82d707b38b0d56d2580d
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2747a420f2c1ba4cf103f6340c5db671af3ade81..7dc79e7c552d7ebc2dea9248c2d5647b5a6895e0 100644
+index 825a3b688099a3021ff422dd123038b6cca3e14f..168893fe1790edac8fee884b1fae4e6b7a1bd5c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1217,7 +1217,7 @@ public final class CraftServer implements Server {
@@ -31,7 +31,7 @@ index 2747a420f2c1ba4cf103f6340c5db671af3ade81..7dc79e7c552d7ebc2dea9248c2d5647b
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0ebacc6f35591b3f1fc740d484f30c7c2337392a..bd24cf74dfc0974f5bc132994deac45b4ec7b344 100644
+index d7624db77ffde9ce7fa4ece8318c7e75e065feed..b9ba6937a6acdccfff89b63ef7821553012a5a97 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -212,6 +212,31 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0832-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0833-Add-config-option-for-worlds-affected-by-time-cmd.patch
index e0acf7e749..e0acf7e749 100644
--- a/patches/server/0832-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0833-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0833-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0834-Add-new-overload-to-PersistentDataContainer-has.patch
index d19f7179e1..d19f7179e1 100644
--- a/patches/server/0833-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/server/0834-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0834-Multiple-Entries-with-Scoreboards.patch b/patches/server/0835-Multiple-Entries-with-Scoreboards.patch
index 1aaf48cd04..7a237549c3 100644
--- a/patches/server/0834-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0835-Multiple-Entries-with-Scoreboards.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Multiple Entries with Scoreboards
 
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
-index 005a3058c51a41a39f050b1817e2079be93ad366..9c7c6751e81af9a013de4fe9e4d029b69a8534ca 100644
+index c5339618c195507c1d1482e4e77e262e8db240a5..fe01daf9f78dff51b97337af8cfd43f19bc4678e 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
 @@ -42,6 +42,12 @@ public class ClientboundSetPlayerTeamPacket implements Packet<ClientGamePacketLi
@@ -70,7 +70,7 @@ index 610d312b9c8f6c8d1f102e8ba2fe9fc2cc3e98c5..3a4a0727ad44322e3ba85512cd077808
      public void onObjectiveAdded(Objective objective) {
          super.onObjectiveAdded(objective);
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index 32a160ca2e53cc76a31cb401d1509c5e643041dd..29c49cf0e6e7f523e362730f0aa17fc4b18aceb9 100644
+index 4b64d6c5c987e127d1ed5edad0a78f7172370b9f..67efb0d38ae369ff5254f7b1ec85d32d4eee8291 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 @@ -234,6 +234,21 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
diff --git a/patches/server/0835-Reset-placed-block-on-exception.patch b/patches/server/0836-Reset-placed-block-on-exception.patch
index 7666ecdfe1..7666ecdfe1 100644
--- a/patches/server/0835-Reset-placed-block-on-exception.patch
+++ b/patches/server/0836-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0836-Add-configurable-height-for-slime-spawn.patch b/patches/server/0837-Add-configurable-height-for-slime-spawn.patch
index 0453fed5fd..0453fed5fd 100644
--- a/patches/server/0836-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0837-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0837-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0838-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index a834180d50..a834180d50 100644
--- a/patches/server/0837-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0838-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0838-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0839-Fix-xp-reward-for-baby-zombies.patch
index 8418f634d4..8418f634d4 100644
--- a/patches/server/0838-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0839-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0839-Kick-on-main-for-illegal-chars.patch b/patches/server/0840-Kick-on-main-for-illegal-chars.patch
index cfcd3fa5f9..a41c08fba8 100644
--- a/patches/server/0839-Kick-on-main-for-illegal-chars.patch
+++ b/patches/server/0840-Kick-on-main-for-illegal-chars.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Kick on main for illegal chars
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 09c86449f1e1fe06b75537251f91fc6063e7c7c4..4782ca794273c8a3fd53cf05732afd71ea376721 100644
+index a0766375eb8dde3b04a01dbca535a4b08a5d6abc..f587a2c208dee26b2146a2dbe343e6bf39ec11e5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2081,7 +2081,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0840-Multi-Block-Change-API-Implementation.patch b/patches/server/0841-Multi-Block-Change-API-Implementation.patch
index eb260881d2..eb260881d2 100644
--- a/patches/server/0840-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0841-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0841-Fix-NotePlayEvent.patch b/patches/server/0842-Fix-NotePlayEvent.patch
index 3d7aa4d732..3d7aa4d732 100644
--- a/patches/server/0841-Fix-NotePlayEvent.patch
+++ b/patches/server/0842-Fix-NotePlayEvent.patch
diff --git a/patches/server/0842-Freeze-Tick-Lock-API.patch b/patches/server/0843-Freeze-Tick-Lock-API.patch
index c991ca64a7..cde0c44088 100644
--- a/patches/server/0842-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0843-Freeze-Tick-Lock-API.patch
@@ -46,7 +46,7 @@ index 18294d7cdb4619bb128c626ef567622bae187c8d..ede2f5f00b59893cca354e5626938360
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f21f69977ff92ac967aac2e72b679f17e2c42501..1521f53ee1bd85ca44a68b2c9d969eaf63fa342e 100644
+index 5ef73cf97df2949d308d4cc9213bfb173c15b4a5..c17b8c77b1a4d65afaefd9c4b32219d898882410 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3319,7 +3319,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0843-Dolphin-API.patch b/patches/server/0844-Dolphin-API.patch
index 4bb12a6785..4bb12a6785 100644
--- a/patches/server/0843-Dolphin-API.patch
+++ b/patches/server/0844-Dolphin-API.patch
diff --git a/patches/server/0844-More-PotionEffectType-API.patch b/patches/server/0845-More-PotionEffectType-API.patch
index 14fb482187..14fb482187 100644
--- a/patches/server/0844-More-PotionEffectType-API.patch
+++ b/patches/server/0845-More-PotionEffectType-API.patch
diff --git a/patches/server/0845-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0846-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 3b79f9947c..3b79f9947c 100644
--- a/patches/server/0845-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0846-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0846-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0847-API-for-creating-command-sender-which-forwards-feedb.patch
index 0b8985beaf..0b8985beaf 100644
--- a/patches/server/0846-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0847-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0847-Add-config-for-stronghold-seed.patch b/patches/server/0848-Add-config-for-stronghold-seed.patch
index 020f8bb43a..020f8bb43a 100644
--- a/patches/server/0847-Add-config-for-stronghold-seed.patch
+++ b/patches/server/0848-Add-config-for-stronghold-seed.patch
diff --git a/patches/server/0848-Implement-regenerateChunk.patch b/patches/server/0849-Implement-regenerateChunk.patch
index 00039061dd..02220cea46 100644
--- a/patches/server/0848-Implement-regenerateChunk.patch
+++ b/patches/server/0849-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bd24cf74dfc0974f5bc132994deac45b4ec7b344..7b5e099f73dae3846a1190523e769530ffac2f28 100644
+index b9ba6937a6acdccfff89b63ef7821553012a5a97..bde90fa06a77e403ee97f2ed3b9fd1d6e5a4af81 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -133,6 +133,7 @@ import org.bukkit.util.Vector;
diff --git a/patches/server/0849-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0850-Log-exceptions-thrown-during-chat-processing.patch
index 76bdbcdd9c..76bdbcdd9c 100644
--- a/patches/server/0849-Log-exceptions-thrown-during-chat-processing.patch
+++ b/patches/server/0850-Log-exceptions-thrown-during-chat-processing.patch
diff --git a/patches/server/0850-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0851-Fix-cancelled-powdered-snow-bucket-placement.patch
index 9a95fdb1d3..9a95fdb1d3 100644
--- a/patches/server/0850-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0851-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0851-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0852-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 383630ec02..d1c68efe88 100644
--- a/patches/server/0851-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0852-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 66d931bf247cfc07c40ef4721ab24e163e6038ea..6b43fcb230cdc562585fbdc01a5db43b9cb6eca2 100644
+index 231a7935950d40683c8538bfcfc8adea236ad37a..6ce8e229eabcc021a01c1c29c39091858b598e39 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2157,6 +2157,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0852-Add-GameEvent-tags.patch b/patches/server/0853-Add-GameEvent-tags.patch
index 1176f0d9a2..485afd2e69 100644
--- a/patches/server/0852-Add-GameEvent-tags.patch
+++ b/patches/server/0853-Add-GameEvent-tags.patch
@@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..cb78a3d4e21376ea24347187478525d5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6b43fcb230cdc562585fbdc01a5db43b9cb6eca2..196640c203b3c33c1e967b2f1bf1fa360dc6952b 100644
+index 6ce8e229eabcc021a01c1c29c39091858b598e39..aea07b7b9cbee6198f69fabd32e901d5952687a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -97,6 +97,7 @@ import net.minecraft.world.level.biome.BiomeSource;
diff --git a/patches/server/0853-Replace-player-chunk-loader-system.patch b/patches/server/0854-Replace-player-chunk-loader-system.patch
index c6d2047f67..5816a2b520 100644
--- a/patches/server/0853-Replace-player-chunk-loader-system.patch
+++ b/patches/server/0854-Replace-player-chunk-loader-system.patch
@@ -67,10 +67,10 @@ determined by the number of players on the server multiplied by the
 whatever `global-max-concurrent-loads` is configured to.
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 309dbf5fce3ce940d5e1b57d267b9d6b2c5ff5b6..5ba64e1083b7cb1eec64d1925095c6ca5865ff07 100644
+index e2f60115370f19e935eb3b14d5de99aa4126c6b0..f3bf9df8c0bd56cad461210ce8551ade3a220b6b 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -159,7 +159,11 @@ public class TimingsExport extends Thread {
+@@ -161,7 +161,11 @@ public class TimingsExport extends Thread {
                  pair("gamerules", toObjectMapper(world.getWorld().getGameRules(), rule -> {
                      return pair(rule, world.getWorld().getGameRuleValue(rule));
                  })),
diff --git a/patches/server/0854-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0855-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index acba477db3..acba477db3 100644
--- a/patches/server/0854-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0855-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0855-Replace-ticket-level-propagator.patch b/patches/server/0856-Replace-ticket-level-propagator.patch
index 03d6ba0cb1..03d6ba0cb1 100644
--- a/patches/server/0855-Replace-ticket-level-propagator.patch
+++ b/patches/server/0856-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0856-Furnace-RecipesUsed-API.patch b/patches/server/0857-Furnace-RecipesUsed-API.patch
index 2e6cf1c2fe..2e6cf1c2fe 100644
--- a/patches/server/0856-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0857-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0857-Configurable-sculk-sensor-listener-range.patch b/patches/server/0858-Configurable-sculk-sensor-listener-range.patch
index 2e9adfa399..2e9adfa399 100644
--- a/patches/server/0857-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0858-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0858-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0859-Add-missing-block-data-mins-and-maxes.patch
index 6f3d051671..6f3d051671 100644
--- a/patches/server/0858-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0859-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0859-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0860-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 133d00d050..133d00d050 100644
--- a/patches/server/0859-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0860-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0860-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0861-Put-world-into-worldlist-before-initing-the-world.patch
index 33f21832a2..03d29b4b5a 100644
--- a/patches/server/0860-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0861-Put-world-into-worldlist-before-initing-the-world.patch
@@ -23,7 +23,7 @@ index 443fb9cdce8bf542ca6216aa65c3e48c66dde654..e4461fb3485391ec0a9d902d5b896bb9
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 196640c203b3c33c1e967b2f1bf1fa360dc6952b..c5b9770669f9ed51408ea4f10d03f2e737ba9eb9 100644
+index aea07b7b9cbee6198f69fabd32e901d5952687a0..19973165c7aa918c072db869c979d395895546d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1255,10 +1255,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0861-Fix-Entity-Position-Desync.patch b/patches/server/0862-Fix-Entity-Position-Desync.patch
index 8e9bd01077..8e9bd01077 100644
--- a/patches/server/0861-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0862-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0862-Custom-Potion-Mixes.patch b/patches/server/0863-Custom-Potion-Mixes.patch
index 48da9584e9..44548106e0 100644
--- a/patches/server/0862-Custom-Potion-Mixes.patch
+++ b/patches/server/0863-Custom-Potion-Mixes.patch
@@ -164,7 +164,7 @@ index 287205bce7f655f9a6b815f40d349c3db4c1e788..5c0f1488c8a8100cd39a03adeccded99
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c5b9770669f9ed51408ea4f10d03f2e737ba9eb9..dcc59692a5ab968cb8f2d53347fc300db67241da 100644
+index 19973165c7aa918c072db869c979d395895546d5..776b2b0ab9942282d9c8cb5ba8e86e257cee90b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -285,6 +285,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0863-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0864-Fix-Fluid-tags-isTagged-method.patch
index 95eeab8b2f..4bade43c39 100644
--- a/patches/server/0863-Fix-Fluid-tags-isTagged-method.patch
+++ b/patches/server/0864-Fix-Fluid-tags-isTagged-method.patch
@@ -18,7 +18,7 @@ index 89cb1ec575c0f58e9934d98b056621348dbbe27a..cdd474e9b0363641839a66d3e61fec46
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index bda04a3a7865cfaf6eff7a40b3f12fa3145771e9..41e7ca100073052b99c82fa6a82f8168e0135499 100644
+index 5b05ef93a02e8a8525cf1558273d0f8963407862..88abd2d3a9626501b1800ee754b98c6c29c75fb9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -201,7 +201,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0864-Fix-World-locateNearestStructure.patch b/patches/server/0865-Fix-World-locateNearestStructure.patch
index cf608d9ede..cf608d9ede 100644
--- a/patches/server/0864-Fix-World-locateNearestStructure.patch
+++ b/patches/server/0865-Fix-World-locateNearestStructure.patch
diff --git a/patches/server/0865-Force-close-world-loading-screen.patch b/patches/server/0866-Force-close-world-loading-screen.patch
index 6dd8526424..fe40682b45 100644
--- a/patches/server/0865-Force-close-world-loading-screen.patch
+++ b/patches/server/0866-Force-close-world-loading-screen.patch
@@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1f221b5451004093af6e46b65b9e60499a12b5ad..8d4b8025a158b71b87682a67fb67e7fcbf0bd6c2 100644
+index 3ffb0ae65ed530464462ec3b8cdb2db43c4d1b69..2a8c3082d07244f8f00d644e01e875b81264324d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -422,6 +422,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0866-Fix-falling-block-spawn-methods.patch b/patches/server/0867-Fix-falling-block-spawn-methods.patch
index 16b84ed9bc..16b84ed9bc 100644
--- a/patches/server/0866-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0867-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0867-Expose-furnace-minecart-push-values.patch b/patches/server/0868-Expose-furnace-minecart-push-values.patch
index 4086d94249..4086d94249 100644
--- a/patches/server/0867-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0868-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0868-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0869-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index b95d6ace5a..b95d6ace5a 100644
--- a/patches/server/0868-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0869-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0869-Fix-save-problems-on-shutdown.patch b/patches/server/0870-Fix-save-problems-on-shutdown.patch
index 319a477d4c..319a477d4c 100644
--- a/patches/server/0869-Fix-save-problems-on-shutdown.patch
+++ b/patches/server/0870-Fix-save-problems-on-shutdown.patch
diff --git a/patches/server/0870-More-Projectile-API.patch b/patches/server/0871-More-Projectile-API.patch
index 0b52fff0e5..0b52fff0e5 100644
--- a/patches/server/0870-More-Projectile-API.patch
+++ b/patches/server/0871-More-Projectile-API.patch
diff --git a/patches/server/0871-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0872-Fix-swamp-hut-cat-generation-deadlock.patch
index 07da981cf2..07da981cf2 100644
--- a/patches/server/0871-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0872-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0872-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0873-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index f833f532da..e3547442b3 100644
--- a/patches/server/0872-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0873-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 d18f8972d37dc56a8df786774a4f70b5c3b78ec4..1d30776997dda6998d793541bde9410030e25db1 100644
+index f587a2c208dee26b2146a2dbe343e6bf39ec11e5..255f1a4e702d8c31113fed91f5295201102bda98 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -517,6 +517,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0873-Implement-getComputedBiome-API.patch b/patches/server/0874-Implement-getComputedBiome-API.patch
index b3053d8904..b3053d8904 100644
--- a/patches/server/0873-Implement-getComputedBiome-API.patch
+++ b/patches/server/0874-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0874-Make-some-itemstacks-nonnull.patch b/patches/server/0875-Make-some-itemstacks-nonnull.patch
index e2cba95fe4..e2cba95fe4 100644
--- a/patches/server/0874-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0875-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0875-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0876-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
index 78f9466f9f..78f9466f9f 100644
--- a/patches/server/0875-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
+++ b/patches/server/0876-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0876-Implement-enchantWithLevels-API.patch b/patches/server/0877-Implement-enchantWithLevels-API.patch
index f70335da77..f70335da77 100644
--- a/patches/server/0876-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0877-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0877-Fix-saving-in-unloadWorld.patch b/patches/server/0878-Fix-saving-in-unloadWorld.patch
index 929f526273..f5525c7ec0 100644
--- a/patches/server/0877-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0878-Fix-saving-in-unloadWorld.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dcc59692a5ab968cb8f2d53347fc300db67241da..a7f8f4eafaaa89838fb9c0f10da83d62e6540ba7 100644
+index 776b2b0ab9942282d9c8cb5ba8e86e257cee90b9..32e13232c0c1c52486db469c1661e3473e6f0f5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1303,7 +1303,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0878-Buffer-OOB-setBlock-calls.patch b/patches/server/0879-Buffer-OOB-setBlock-calls.patch
index af5f320e73..af5f320e73 100644
--- a/patches/server/0878-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0879-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0879-Add-TameableDeathMessageEvent.patch b/patches/server/0880-Add-TameableDeathMessageEvent.patch
index 23302de760..23302de760 100644
--- a/patches/server/0879-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0880-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0880-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/server/0881-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
index 8a1fc34fd2..8a1fc34fd2 100644
--- a/patches/server/0880-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
+++ b/patches/server/0881-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
diff --git a/patches/server/0881-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0882-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 6ed1a773e9..76c68da927 100644
--- a/patches/server/0881-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0882-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 09a64a9b002f0da20cbe19731068837be27d3480..2f5e40437d1865a874c352999edd084226d4e47b 100644
+index 5e10a22c19ca1d5208dcfbe93436f5fdc3172c69..a6edf5117d4ae03d8294e7bb74dd2d77048895a5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -851,12 +851,14 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0882-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0883-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 3b43e3c29b..3b43e3c29b 100644
--- a/patches/server/0882-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0883-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0883-Guard-against-invalid-entity-positions.patch b/patches/server/0884-Guard-against-invalid-entity-positions.patch
index c05ceeb41e..c05ceeb41e 100644
--- a/patches/server/0883-Guard-against-invalid-entity-positions.patch
+++ b/patches/server/0884-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0884-cache-resource-keys.patch b/patches/server/0885-cache-resource-keys.patch
index 4234b8673f..4234b8673f 100644
--- a/patches/server/0884-cache-resource-keys.patch
+++ b/patches/server/0885-cache-resource-keys.patch
diff --git a/patches/server/0885-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0886-Allow-to-change-the-podium-for-the-EnderDragon.patch
index b1db71e97b..b1db71e97b 100644
--- a/patches/server/0885-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0886-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0886-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0887-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index c76221ca5a..c76221ca5a 100644
--- a/patches/server/0886-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0887-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0887-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0888-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index fead5e352a..fead5e352a 100644
--- a/patches/server/0887-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/server/0888-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0888-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0889-Prevent-tile-entity-copies-loading-chunks.patch
index 498549d220..75edbf32e1 100644
--- a/patches/server/0888-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0889-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 428fb4e57956b52eb139c0f2e76c85f1c893920f..1ab83b8ef05ef8dfdabb17f33cffa728d631dff2 100644
+index 255f1a4e702d8c31113fed91f5295201102bda98..c75a3b42272776ef2a2b516555c723c1913c8bf9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2995,7 +2995,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0889-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0890-Use-username-instead-of-display-name-in-PlayerList-g.patch
index b88c0f857c..5f4fcd5add 100644
--- a/patches/server/0889-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0890-Use-username-instead-of-display-name-in-PlayerList-g.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8d4b8025a158b71b87682a67fb67e7fcbf0bd6c2..95fe4240f3e1174ec36598f24d63f0073c13b376 100644
+index 2a8c3082d07244f8f00d644e01e875b81264324d..624946f48f0811c94d05174f28d0b1fc6d5e6a00 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1414,7 +1414,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0890-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0891-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index 0cb8d096f9..0cb8d096f9 100644
--- a/patches/server/0890-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/server/0891-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0891-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0892-Pass-ServerLevel-for-gamerule-callbacks.patch
index 24fad6d8fa..c13eadff74 100644
--- a/patches/server/0891-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0892-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -18,7 +18,7 @@ index e28e09aae1d95d9bed50a137e999e6d457e62478..257c94f7c1cb00c9a91ab82e311dfd8e
  
              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 12ed3dbbc95906e628acebeb3ad16e3018db1477..26be88d8826fc44ffd23e2853fbbd582c8c40425 100644
+index c75a3b42272776ef2a2b516555c723c1913c8bf9..0545c7fb227665dd23c7b5034a1520ed10f962b9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2604,7 +2604,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0892-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0893-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index eb5a640d95..eb5a640d95 100644
--- a/patches/server/0892-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0893-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0893-WorldCreator-keepSpawnLoaded.patch b/patches/server/0894-WorldCreator-keepSpawnLoaded.patch
index bc8f2d7d12..c615ee73a2 100644
--- a/patches/server/0893-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0894-WorldCreator-keepSpawnLoaded.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a7f8f4eafaaa89838fb9c0f10da83d62e6540ba7..512fb526cd4c3e5ce9db14b7ab9dc0107013f547 100644
+index 32e13232c0c1c52486db469c1661e3473e6f0f5e..ab843069ac0653d03cf3f925f49555016cad84fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1262,6 +1262,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0894-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0895-Fix-NPE-for-BlockDataMeta-getBlockData.patch
index 317d9c3403..317d9c3403 100644
--- a/patches/server/0894-Fix-NPE-for-BlockDataMeta-getBlockData.patch
+++ b/patches/server/0895-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0895-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0896-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 0c74e37d4f..0c74e37d4f 100644
--- a/patches/server/0895-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0896-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0896-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0897-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 21dd7187d3..21dd7187d3 100644
--- a/patches/server/0896-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0897-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0897-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0898-Fire-CauldronLevelChange-on-initial-fill.patch
index 14d9c24d20..14d9c24d20 100644
--- a/patches/server/0897-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0898-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0898-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0899-fix-powder-snow-cauldrons-not-turning-to-water.patch
index c8be521eba..c8be521eba 100644
--- a/patches/server/0898-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0899-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0899-Sign-cleanup-filtering.patch b/patches/server/0900-Sign-cleanup-filtering.patch
index d38a26aedb..d38a26aedb 100644
--- a/patches/server/0899-Sign-cleanup-filtering.patch
+++ b/patches/server/0900-Sign-cleanup-filtering.patch
diff --git a/patches/server/0900-Add-PlayerStopUsingItemEvent.patch b/patches/server/0901-Add-PlayerStopUsingItemEvent.patch
index b46828ff9f..c94af76d34 100644
--- a/patches/server/0900-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0901-Add-PlayerStopUsingItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1521f53ee1bd85ca44a68b2c9d969eaf63fa342e..bd5825c5b5c81e0694a3635b981588f0d2ba83cb 100644
+index c17b8c77b1a4d65afaefd9c4b32219d898882410..d6ef140bcc35b10f78f2ec2f10c8a153395fc9df 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3868,6 +3868,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0901-FallingBlock-auto-expire-setting.patch b/patches/server/0902-FallingBlock-auto-expire-setting.patch
index 4f899227c5..4f899227c5 100644
--- a/patches/server/0901-FallingBlock-auto-expire-setting.patch
+++ b/patches/server/0902-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0902-Don-t-tick-markers.patch b/patches/server/0903-Don-t-tick-markers.patch
index 99f2aecd24..f11e75fc18 100644
--- a/patches/server/0902-Don-t-tick-markers.patch
+++ b/patches/server/0903-Don-t-tick-markers.patch
@@ -9,10 +9,10 @@ list is only used in the tick and tickPassenger methods, so we can safely not ad
 markers to it.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index d0c55497040158d959693ef2ddf3ff03bd6df05f..45d1807b31f5acd5f08f729701cec4b464ad9398 100644
+index 0bb69361e42dc1e33907d3415b6c6d48f0b38742..920f25c9c25d24683040d259c6c4e6ed5b2689a5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-@@ -614,7 +614,7 @@ public class PaperCommand extends Command {
+@@ -629,7 +629,7 @@ public class PaperCommand extends Command {
                      ChunkPos chunk = e.chunkPosition();
                      info.left++;
                      info.right.put(chunk, info.right.getOrDefault(chunk, 0) + 1);
diff --git a/patches/server/0903-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0904-Add-Alternate-Current-redstone-implementation.patch
index 63e67cc7ed..63e67cc7ed 100644
--- a/patches/server/0903-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0904-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0904-Do-not-accept-invalid-client-settings.patch b/patches/server/0905-Do-not-accept-invalid-client-settings.patch
index a370d820c1..a370d820c1 100644
--- a/patches/server/0904-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0905-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0905-Add-support-for-Proxy-Protocol.patch b/patches/server/0906-Add-support-for-Proxy-Protocol.patch
index 7d940aadba..7d940aadba 100644
--- a/patches/server/0905-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0906-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0906-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0907-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 6832fde972..6832fde972 100644
--- a/patches/server/0906-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0907-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0907-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0908-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 59fabed7e4..59fabed7e4 100644
--- a/patches/server/0907-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0908-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0908-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0909-Sanitize-Sent-BlockEntity-NBT.patch
index f85e5b8beb..f85e5b8beb 100644
--- a/patches/server/0908-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/server/0909-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0909-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0910-Prevent-entity-loading-causing-async-lookups.patch
index edd92d33a0..edd92d33a0 100644
--- a/patches/server/0909-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0910-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0910-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0911-Disable-component-selector-resolving-in-books-by-def.patch
index 30b2816744..30b2816744 100644
--- a/patches/server/0910-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0911-Disable-component-selector-resolving-in-books-by-def.patch