Expose server build information (#10729)

* Expose server build information

* squash patches

* final tweaks

---------

Co-authored-by: Jake Potrebic <[email protected]>
Co-authored-by: masmc05 <[email protected]>

1360 files changed, 1817 insertions, 1446 deletions

diff --git a/patches/api/0015-Expose-server-build-information.patch b/patches/api/0015-Expose-server-build-information.patch
new file mode 100644
index 0000000000..23aa937bfd
--- /dev/null
+++ b/patches/api/0015-Expose-server-build-information.patch
@@ -0,0 +1,528 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <[email protected]>
+Date: Mon, 27 May 2019 01:10:06 -0500
+Subject: [PATCH] Expose server build information
+
+Co-authored-by: Professor Bloodstone <[email protected]>
+Co-authored-by: Mark Vainomaa <[email protected]>
+Co-authored-by: masmc05 <[email protected]>
+Co-authored-by: Riley Park <[email protected]>
+
+diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..a736d7bcdc5861a01b66ba36158db1c716339346
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
+@@ -0,0 +1,45 @@
++package com.destroystokyo.paper.util;
++
++import net.kyori.adventure.text.Component;
++import net.kyori.adventure.text.format.NamedTextColor;
++import org.bukkit.Bukkit;
++import org.jetbrains.annotations.NotNull;
++
++public interface VersionFetcher {
++    /**
++     * Amount of time to cache results for in milliseconds
++     * <p>
++     * Negative values will never cache.
++     *
++     * @return cache time
++     */
++    long getCacheTime();
++
++    /**
++     * Gets the version message to cache and show to command senders.
++     *
++     * <p>NOTE: This is run in a new thread separate from that of the command processing thread</p>
++     *
++     * @param serverVersion the current version of the server (will match {@link Bukkit#getVersion()})
++     * @return the message to show when requesting a version
++     */
++    @NotNull
++    Component getVersionMessage(@NotNull String serverVersion);
++
++    class DummyVersionFetcher implements VersionFetcher {
++
++        @Override
++        public long getCacheTime() {
++            return -1;
++        }
++
++        @NotNull
++        @Override
++        public Component getVersionMessage(@NotNull String serverVersion) {
++            Bukkit.getLogger().warning("Version provider has not been set, cannot check for updates!");
++            Bukkit.getLogger().info("Override the default implementation of org.bukkit.UnsafeValues#getVersionFetcher()");
++            new Throwable().printStackTrace();
++            return Component.text("Unable to check for updates. No version provider set.", NamedTextColor.RED);
++        }
++    }
++}
+diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..9df9d09aa477d4cd3c496ba0933c816df1ef0964
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
+@@ -0,0 +1,121 @@
++package io.papermc.paper;
++
++import java.time.Instant;
++import java.util.Optional;
++import java.util.OptionalInt;
++import net.kyori.adventure.key.Key;
++import net.kyori.adventure.util.Services;
++import org.jetbrains.annotations.ApiStatus;
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * Information about the current server build.
++ */
[email protected]
++public interface ServerBuildInfo {
++    /**
++     * The brand id for Paper.
++     */
++    Key BRAND_PAPER_ID = Key.key("papermc", "paper");
++
++    /**
++     * Gets the {@code ServerBuildInfo}.
++     *
++     * @return the {@code ServerBuildInfo}
++     */
++    static @NotNull ServerBuildInfo buildInfo() {
++        //<editor-fold defaultstate="collapsed" desc="Holder">
++        final class Holder {
++            static final Optional<ServerBuildInfo> INSTANCE = Services.service(ServerBuildInfo.class);
++        }
++        //</editor-fold>
++        return Holder.INSTANCE.orElseThrow();
++    }
++
++    /**
++     * Gets the brand id of the server.
++     *
++     * @return the brand id of the server (e.g. "papermc:paper")
++     */
++    @NotNull Key brandId();
++
++    /**
++     * Checks if the current server supports the specified brand.
++     *
++     * @param brandId the brand to check (e.g. "papermc:folia")
++     * @return {@code true} if the server supports the specified brand
++     */
++    @ApiStatus.Experimental
++    boolean isBrandCompatible(final @NotNull Key brandId);
++
++    /**
++     * Gets the brand name of the server.
++     *
++     * @return the brand name of the server (e.g. "Paper")
++     */
++    @NotNull String brandName();
++
++    /**
++     * Gets the Minecraft version id.
++     *
++     * @return the Minecraft version id (e.g. "1.20.4", "1.20.2-pre2", "23w31a")
++     */
++    @NotNull String minecraftVersionId();
++
++    /**
++     * Gets the Minecraft version name.
++     *
++     * @return the Minecraft version name (e.g. "1.20.4", "1.20.2 Pre-release 2", "23w31a")
++     */
++    @NotNull String minecraftVersionName();
++
++    /**
++     * Gets the build number.
++     *
++     * @return the build number
++     */
++    @NotNull OptionalInt buildNumber();
++
++    /**
++     * Gets the build time.
++     *
++     * @return the build time
++     */
++    @NotNull Instant buildTime();
++
++    /**
++     * Gets the git commit branch.
++     *
++     * @return the git commit branch
++     */
++    @NotNull Optional<String> gitBranch();
++
++    /**
++     * Gets the git commit hash.
++     *
++     * @return the git commit hash
++     */
++    @NotNull Optional<String> gitCommit();
++
++    /**
++     * Creates a string representation of the server build information.
++     *
++     * @param representation the type of representation
++     * @return a string
++     */
++    @NotNull String asString(final @NotNull StringRepresentation representation);
++
++    /**
++     * String representation types.
++     */
++    enum StringRepresentation {
++        /**
++         * A simple version string, in format {@code <minecraftVersionId>-<buildNumber>-<gitCommit>}.
++         */
++        VERSION_SIMPLE,
++        /**
++         * A simple version string, in format {@code <minecraftVersionId>-<buildNumber>-<gitBranch>@<gitCommit> (<buildTime>)}.
++         */
++        VERSION_FULL,
++    }
++}
+diff --git a/src/main/java/io/papermc/paper/util/JarManifests.java b/src/main/java/io/papermc/paper/util/JarManifests.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b306076343
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/util/JarManifests.java
+@@ -0,0 +1,37 @@
++package io.papermc.paper.util;
++
++import java.io.IOException;
++import java.io.InputStream;
++import java.net.URL;
++import java.util.Collections;
++import java.util.Map;
++import java.util.WeakHashMap;
++import java.util.jar.Manifest;
++import org.jetbrains.annotations.ApiStatus;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
[email protected]
++public final class JarManifests {
++    private JarManifests() {
++    }
++
++    private static final Map<ClassLoader, Manifest> MANIFESTS = Collections.synchronizedMap(new WeakHashMap<>());
++
++    public static @Nullable Manifest manifest(final @NotNull Class<?> clazz) {
++        return MANIFESTS.computeIfAbsent(clazz.getClassLoader(), classLoader -> {
++            final String classLocation = "/" + clazz.getName().replace(".", "/") + ".class";
++            final URL resource = clazz.getResource(classLocation);
++            if (resource == null) {
++                return null;
++            }
++            final String classFilePath = resource.toString().replace("\\", "/");
++            final String archivePath = classFilePath.substring(0, classFilePath.length() - classLocation.length());
++            try (final InputStream stream = new URL(archivePath + "/META-INF/MANIFEST.MF").openStream()) {
++                return new Manifest(stream);
++            } catch (final IOException ex) {
++                return null;
++            }
++        });
++    }
++}
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..f4bf442b065e93b49a7e17658f73d7569d644b25 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -109,13 +109,26 @@ public final class Bukkit {
+         }
+ 
+         Bukkit.server = server;
+-        server.getLogger().info("This server is running " + getName() + " version " + getVersion() + " (Implementing API version " + getBukkitVersion() + ")");
++        // Paper start - add git information
++        server.getLogger().info(getVersionMessage());
++    }
++    /**
++      * Gets message describing the version server is running.
++      *
++      * @return message describing the version server is running
++      */
++    @NotNull
++    public static String getVersionMessage() {
++        final io.papermc.paper.ServerBuildInfo version = io.papermc.paper.ServerBuildInfo.buildInfo();
++        return "This server is running " + getName() + " version " + version.asString(io.papermc.paper.ServerBuildInfo.StringRepresentation.VERSION_FULL) + " (Implementing API version " + getBukkitVersion() + ")";
++        // Paper end
+     }
+ 
+     /**
+      * Gets the name of this server implementation.
+      *
+      * @return name of this server implementation
++     * @see io.papermc.paper.ServerBuildInfo#brandName()
+      */
+     @NotNull
+     public static String getName() {
+@@ -126,6 +139,7 @@ public final class Bukkit {
+      * Gets the version string of this server implementation.
+      *
+      * @return version of this server implementation
++     * @see io.papermc.paper.ServerBuildInfo
+      */
+     @NotNull
+     public static String getVersion() {
+@@ -142,6 +156,20 @@ public final class Bukkit {
+         return server.getBukkitVersion();
+     }
+ 
++    // Paper start - expose game version
++    /**
++     * Gets the version of game this server implements
++     *
++     * @return version of game
++     * @see io.papermc.paper.ServerBuildInfo#minecraftVersionId()
++     * @see io.papermc.paper.ServerBuildInfo#minecraftVersionName()
++     */
++    @NotNull
++    public static String getMinecraftVersion() {
++        return server.getMinecraftVersion();
++    }
++    // Paper end
++
+     /**
+      * Gets a view of all currently logged in players. This {@linkplain
+      * Collections#unmodifiableCollection(Collection) view} is a reused
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index e37649ce4b3981f2cff96b64ed3bd4093c015346..7c646d1bb8b011c156b0688f9396bbcbba43d077 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -119,6 +119,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+     @NotNull
+     public String getBukkitVersion();
+ 
++    // Paper start - expose game version
++    /**
++     * Gets the version of game this server implements
++     *
++     * @return version of game
++     */
++    @NotNull
++    String getMinecraftVersion();
++    // Paper end
++
+     /**
+      * Gets a view of all currently logged in players. This {@linkplain
+      * Collections#unmodifiableCollection(Collection) view} is a reused
+diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
+index 9082e67324f810857db26bb89ecea7e9f866f80d..da997507b96908027c49dabc6daf7c787dcad95d 100644
+--- a/src/main/java/org/bukkit/UnsafeValues.java
++++ b/src/main/java/org/bukkit/UnsafeValues.java
+@@ -155,5 +155,12 @@ public interface UnsafeValues {
+      * @return name
+      */
+     String getTimingsServerName();
++
++    /**
++     * Called once by the version command on first use, then cached.
++     */
++    default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
++        return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
++    }
+     // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+index 04b4fb6859df0221f8f9f92c5a7ac2dda1073355..fd5d9881abfd930bb883120f018f76dc78b62b14 100644
+--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
++++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+@@ -24,8 +24,25 @@ import org.bukkit.plugin.Plugin;
+ import org.bukkit.plugin.PluginDescriptionFile;
+ import org.bukkit.util.StringUtil;
+ import org.jetbrains.annotations.NotNull;
++// Paper start - version command 2.0
++import com.destroystokyo.paper.util.VersionFetcher;
++import net.kyori.adventure.text.Component;
++import net.kyori.adventure.text.format.NamedTextColor;
++import net.kyori.adventure.text.event.ClickEvent;
++import net.kyori.adventure.text.format.TextDecoration;
++import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
++// Paper end - version command 2.0
+ 
+ public class VersionCommand extends BukkitCommand {
++    private VersionFetcher versionFetcher; // Paper - version command 2.0
++    private VersionFetcher getVersionFetcher() { // lazy load because unsafe isn't available at command registration
++        if (versionFetcher == null) {
++            versionFetcher = Bukkit.getUnsafe().getVersionFetcher();
++        }
++
++        return versionFetcher;
++    }
++
+     public VersionCommand(@NotNull String name) {
+         super(name);
+ 
+@@ -40,7 +57,7 @@ public class VersionCommand extends BukkitCommand {
+         if (!testPermission(sender)) return true;
+ 
+         if (args.length == 0) {
+-            sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")");
++            //sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")"); // Paper - moved to setVersionMessage
+             sendVersion(sender);
+         } else {
+             StringBuilder name = new StringBuilder();
+@@ -79,8 +96,17 @@ public class VersionCommand extends BukkitCommand {
+ 
+     private void describeToSender(@NotNull Plugin plugin, @NotNull CommandSender sender) {
+         PluginDescriptionFile desc = plugin.getDescription();
+-        sender.sendMessage(ChatColor.GREEN + desc.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + desc.getVersion());
+-
++        // Paper start - version command 2.0
++        sender.sendMessage(
++            Component.text()
++                .append(Component.text(desc.getName(), NamedTextColor.GREEN))
++                .append(Component.text(" version "))
++                .append(Component.text(desc.getVersion(), NamedTextColor.GREEN)
++                    .hoverEvent(Component.text("Click to copy to clipboard", NamedTextColor.WHITE))
++                    .clickEvent(ClickEvent.copyToClipboard(desc.getVersion()))
++                )
++        );
++        // Paper end - version command 2.0
+         if (desc.getDescription() != null) {
+             sender.sendMessage(desc.getDescription());
+         }
+@@ -146,14 +172,14 @@ public class VersionCommand extends BukkitCommand {
+ 
+     private final ReentrantLock versionLock = new ReentrantLock();
+     private boolean hasVersion = false;
+-    private String versionMessage = null;
++    private Component versionMessage = null; // Paper
+     private final Set<CommandSender> versionWaiters = new HashSet<CommandSender>();
+     private boolean versionTaskStarted = false;
+     private long lastCheck = 0;
+ 
+     private void sendVersion(@NotNull CommandSender sender) {
+         if (hasVersion) {
+-            if (System.currentTimeMillis() - lastCheck > 21600000) {
++            if (System.currentTimeMillis() - lastCheck > getVersionFetcher().getCacheTime()) { // Paper - use version supplier
+                 lastCheck = System.currentTimeMillis();
+                 hasVersion = false;
+             } else {
+@@ -168,7 +194,7 @@ public class VersionCommand extends BukkitCommand {
+                 return;
+             }
+             versionWaiters.add(sender);
+-            sender.sendMessage("Checking version, please wait...");
++            sender.sendMessage(Component.text("Checking version, please wait...", NamedTextColor.WHITE, TextDecoration.ITALIC)); // Paper
+             if (!versionTaskStarted) {
+                 versionTaskStarted = true;
+                 new Thread(new Runnable() {
+@@ -186,6 +212,13 @@ public class VersionCommand extends BukkitCommand {
+ 
+     private void obtainVersion() {
+         String version = Bukkit.getVersion();
++        // Paper start
++        if (version.startsWith("null")) { // running from ide?
++            setVersionMessage(Component.text("Unknown version, custom build?", NamedTextColor.YELLOW));
++            return;
++        }
++        setVersionMessage(getVersionFetcher().getVersionMessage(version));
++        /*
+         if (version == null) version = "Custom";
+         String[] parts = version.substring(0, version.indexOf(' ')).split("-");
+         if (parts.length == 4) {
+@@ -215,11 +248,24 @@ public class VersionCommand extends BukkitCommand {
+         } else {
+             setVersionMessage("Unknown version, custom build?");
+         }
++         */
++        // Paper end
+     }
+ 
+-    private void setVersionMessage(@NotNull String msg) {
++    // Paper start
++    private void setVersionMessage(final @NotNull Component msg) {
+         lastCheck = System.currentTimeMillis();
+-        versionMessage = msg;
++        final Component message = Component.textOfChildren(
++            Component.text(Bukkit.getVersionMessage(), NamedTextColor.WHITE),
++            Component.newline(),
++            msg
++        );
++        this.versionMessage = Component.text()
++            .append(message)
++            .hoverEvent(Component.text("Click to copy to clipboard", NamedTextColor.WHITE))
++            .clickEvent(ClickEvent.copyToClipboard(PlainTextComponentSerializer.plainText().serialize(message)))
++            .build();
++        // Paper end
+         versionLock.lock();
+         try {
+             hasVersion = true;
+diff --git a/src/test/java/io/papermc/paper/TestServerBuildInfo.java b/src/test/java/io/papermc/paper/TestServerBuildInfo.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..17be27a869c1047a7a9440fb8f3717260d4abbd0
+--- /dev/null
++++ b/src/test/java/io/papermc/paper/TestServerBuildInfo.java
+@@ -0,0 +1,59 @@
++package io.papermc.paper;
++
++import java.time.Instant;
++import java.util.Optional;
++import java.util.OptionalInt;
++import net.kyori.adventure.key.Key;
++import org.jetbrains.annotations.NotNull;
++
++public class TestServerBuildInfo implements ServerBuildInfo {
++    @Override
++    public @NotNull Key brandId() {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
++    public boolean isBrandCompatible(final @NotNull Key brandId) {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
++    public @NotNull String brandName() {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
++    public @NotNull String minecraftVersionId() {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
++    public @NotNull String minecraftVersionName() {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
++    public @NotNull OptionalInt buildNumber() {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
++    public @NotNull Instant buildTime() {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
++    public @NotNull Optional<String> gitBranch() {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
++    public @NotNull Optional<String> gitCommit() {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
++    public @NotNull String asString(final @NotNull StringRepresentation representation) {
++        return "";
++    }
++}
+diff --git a/src/test/resources/META-INF/services/io.papermc.paper.ServerBuildInfo b/src/test/resources/META-INF/services/io.papermc.paper.ServerBuildInfo
+new file mode 100644
+index 0000000000000000000000000000000000000000..64e2f8559b9c5a52e0a3229d3d12f65e9af145b3
+--- /dev/null
++++ b/src/test/resources/META-INF/services/io.papermc.paper.ServerBuildInfo
+@@ -0,0 +1 @@
++io.papermc.paper.TestServerBuildInfo
diff --git a/patches/api/0015-Version-Command-2.0.patch b/patches/api/0015-Version-Command-2.0.patch
deleted file mode 100644
index 500312dc32..0000000000
--- a/patches/api/0015-Version-Command-2.0.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <[email protected]>
-Date: Mon, 27 May 2019 01:10:06 -0500
-Subject: [PATCH] Version Command 2.0
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..a736d7bcdc5861a01b66ba36158db1c716339346
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
-@@ -0,0 +1,45 @@
-+package com.destroystokyo.paper.util;
-+
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import org.bukkit.Bukkit;
-+import org.jetbrains.annotations.NotNull;
-+
-+public interface VersionFetcher {
-+    /**
-+     * Amount of time to cache results for in milliseconds
-+     * <p>
-+     * Negative values will never cache.
-+     *
-+     * @return cache time
-+     */
-+    long getCacheTime();
-+
-+    /**
-+     * Gets the version message to cache and show to command senders.
-+     *
-+     * <p>NOTE: This is run in a new thread separate from that of the command processing thread</p>
-+     *
-+     * @param serverVersion the current version of the server (will match {@link Bukkit#getVersion()})
-+     * @return the message to show when requesting a version
-+     */
-+    @NotNull
-+    Component getVersionMessage(@NotNull String serverVersion);
-+
-+    class DummyVersionFetcher implements VersionFetcher {
-+
-+        @Override
-+        public long getCacheTime() {
-+            return -1;
-+        }
-+
-+        @NotNull
-+        @Override
-+        public Component getVersionMessage(@NotNull String serverVersion) {
-+            Bukkit.getLogger().warning("Version provider has not been set, cannot check for updates!");
-+            Bukkit.getLogger().info("Override the default implementation of org.bukkit.UnsafeValues#getVersionFetcher()");
-+            new Throwable().printStackTrace();
-+            return Component.text("Unable to check for updates. No version provider set.", NamedTextColor.RED);
-+        }
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 9082e67324f810857db26bb89ecea7e9f866f80d..da997507b96908027c49dabc6daf7c787dcad95d 100644
---- a/src/main/java/org/bukkit/UnsafeValues.java
-+++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -155,5 +155,12 @@ public interface UnsafeValues {
-      * @return name
-      */
-     String getTimingsServerName();
-+
-+    /**
-+     * Called once by the version command on first use, then cached.
-+     */
-+    default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
-+        return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
-+    }
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index 04b4fb6859df0221f8f9f92c5a7ac2dda1073355..b437cf212a63aa96a9492db8d01d5d37061aee23 100644
---- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -24,8 +24,25 @@ import org.bukkit.plugin.Plugin;
- import org.bukkit.plugin.PluginDescriptionFile;
- import org.bukkit.util.StringUtil;
- import org.jetbrains.annotations.NotNull;
-+// Paper start - version command 2.0
-+import com.destroystokyo.paper.util.VersionFetcher;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import net.kyori.adventure.text.event.ClickEvent;
-+import net.kyori.adventure.text.format.TextDecoration;
-+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-+// Paper end - version command 2.0
- 
- public class VersionCommand extends BukkitCommand {
-+    private VersionFetcher versionFetcher; // Paper - version command 2.0
-+    private VersionFetcher getVersionFetcher() { // lazy load because unsafe isn't available at command registration
-+        if (versionFetcher == null) {
-+            versionFetcher = Bukkit.getUnsafe().getVersionFetcher();
-+        }
-+
-+        return versionFetcher;
-+    }
-+
-     public VersionCommand(@NotNull String name) {
-         super(name);
- 
-@@ -40,7 +57,7 @@ public class VersionCommand extends BukkitCommand {
-         if (!testPermission(sender)) return true;
- 
-         if (args.length == 0) {
--            sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")");
-+            //sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")"); // Paper - moved to setVersionMessage
-             sendVersion(sender);
-         } else {
-             StringBuilder name = new StringBuilder();
-@@ -79,8 +96,17 @@ public class VersionCommand extends BukkitCommand {
- 
-     private void describeToSender(@NotNull Plugin plugin, @NotNull CommandSender sender) {
-         PluginDescriptionFile desc = plugin.getDescription();
--        sender.sendMessage(ChatColor.GREEN + desc.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + desc.getVersion());
--
-+        // Paper start - version command 2.0
-+        sender.sendMessage(
-+            Component.text()
-+                .append(Component.text(desc.getName(), NamedTextColor.GREEN))
-+                .append(Component.text(" version "))
-+                .append(Component.text(desc.getVersion(), NamedTextColor.GREEN)
-+                    .hoverEvent(Component.text("Click to copy to clipboard", NamedTextColor.WHITE))
-+                    .clickEvent(ClickEvent.copyToClipboard(desc.getVersion()))
-+                )
-+        );
-+        // Paper end - version command 2.0
-         if (desc.getDescription() != null) {
-             sender.sendMessage(desc.getDescription());
-         }
-@@ -146,14 +172,14 @@ public class VersionCommand extends BukkitCommand {
- 
-     private final ReentrantLock versionLock = new ReentrantLock();
-     private boolean hasVersion = false;
--    private String versionMessage = null;
-+    private Component versionMessage = null; // Paper
-     private final Set<CommandSender> versionWaiters = new HashSet<CommandSender>();
-     private boolean versionTaskStarted = false;
-     private long lastCheck = 0;
- 
-     private void sendVersion(@NotNull CommandSender sender) {
-         if (hasVersion) {
--            if (System.currentTimeMillis() - lastCheck > 21600000) {
-+            if (System.currentTimeMillis() - lastCheck > getVersionFetcher().getCacheTime()) { // Paper - use version supplier
-                 lastCheck = System.currentTimeMillis();
-                 hasVersion = false;
-             } else {
-@@ -168,7 +194,7 @@ public class VersionCommand extends BukkitCommand {
-                 return;
-             }
-             versionWaiters.add(sender);
--            sender.sendMessage("Checking version, please wait...");
-+            sender.sendMessage(Component.text("Checking version, please wait...", NamedTextColor.WHITE, TextDecoration.ITALIC)); // Paper
-             if (!versionTaskStarted) {
-                 versionTaskStarted = true;
-                 new Thread(new Runnable() {
-@@ -186,6 +212,13 @@ public class VersionCommand extends BukkitCommand {
- 
-     private void obtainVersion() {
-         String version = Bukkit.getVersion();
-+        // Paper start
-+        if (version.startsWith("null")) { // running from ide?
-+            setVersionMessage(Component.text("Unknown version, custom build?", NamedTextColor.YELLOW));
-+            return;
-+        }
-+        setVersionMessage(getVersionFetcher().getVersionMessage(version));
-+        /*
-         if (version == null) version = "Custom";
-         String[] parts = version.substring(0, version.indexOf(' ')).split("-");
-         if (parts.length == 4) {
-@@ -215,11 +248,24 @@ public class VersionCommand extends BukkitCommand {
-         } else {
-             setVersionMessage("Unknown version, custom build?");
-         }
-+         */
-+        // Paper end
-     }
- 
--    private void setVersionMessage(@NotNull String msg) {
-+    // Paper start
-+    private void setVersionMessage(final @NotNull Component msg) {
-         lastCheck = System.currentTimeMillis();
--        versionMessage = msg;
-+        final Component message = Component.textOfChildren(
-+            Component.text("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")", NamedTextColor.WHITE),
-+            Component.newline(),
-+            msg
-+        );
-+        this.versionMessage = Component.text()
-+            .append(message)
-+            .hoverEvent(Component.text("Click to copy to clipboard", NamedTextColor.WHITE))
-+            .clickEvent(ClickEvent.copyToClipboard(PlainTextComponentSerializer.plainText().serialize(message)))
-+            .build();
-+        // Paper end
-         versionLock.lock();
-         try {
-             hasVersion = true;
diff --git a/patches/api/0021-Expose-server-CommandMap.patch b/patches/api/0021-Expose-server-CommandMap.patch
index b57f0c2eff..bf07484451 100644
--- a/patches/api/0021-Expose-server-CommandMap.patch
+++ b/patches/api/0021-Expose-server-CommandMap.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..c427d9dd916db6fe5078fb570eb57cfbd0766080 100644
+index f4bf442b065e93b49a7e17658f73d7569d644b25..db217a9486e327b4340a54d65439055d86f363cc 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2294,6 +2294,19 @@ public final class Bukkit {
+@@ -2322,6 +2322,19 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -29,10 +29,10 @@ index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..c427d9dd916db6fe5078fb570eb57cfb
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e37649ce4b3981f2cff96b64ed3bd4093c015346..fbe2f6e349f242a2c4e64e63aa8ffdff7fa7dc81 100644
+index 7c646d1bb8b011c156b0688f9396bbcbba43d077..69153de6847bb8740803e5f731a0586d41a0eed3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1794,6 +1794,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1804,6 +1804,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      public double[] getTPS();
      // Paper end
  
diff --git a/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index b1812dae36..635d6c4fd5 100644
--- a/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c427d9dd916db6fe5078fb570eb57cfbd0766080..19efe5cb6a8c2dcc5b293ff24caa58c9a57fc083 100644
+index db217a9486e327b4340a54d65439055d86f363cc..25f506c344883d00a63ee2b5a998d3ff3ffd6cd5 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -443,6 +443,30 @@ public final class Bukkit {
+@@ -471,6 +471,30 @@ public final class Bukkit {
          return server.broadcastMessage(message);
      }
  
@@ -41,10 +41,10 @@ index c427d9dd916db6fe5078fb570eb57cfbd0766080..19efe5cb6a8c2dcc5b293ff24caa58c9
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index fbe2f6e349f242a2c4e64e63aa8ffdff7fa7dc81..4c9c14b60eb6fd1d9845632c2c2fa765d882a741 100644
+index 69153de6847bb8740803e5f731a0586d41a0eed3..65d68716e1ff8277c534399621cf961ddf312509 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -372,6 +372,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -382,6 +382,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Deprecated // Paper
      public int broadcastMessage(@NotNull String message);
  
diff --git a/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch
index e0fa8b2dd0..dab051a99c 100644
--- a/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 19efe5cb6a8c2dcc5b293ff24caa58c9a57fc083..c9be84560ee18ffe1bb84f159b2ed61c79f9e971 100644
+index 25f506c344883d00a63ee2b5a998d3ff3ffd6cd5..8dc5b43e937405070d9bdbd914fcdec243e59983 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2329,6 +2329,13 @@ public final class Bukkit {
+@@ -2357,6 +2357,13 @@ public final class Bukkit {
      public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index 19efe5cb6a8c2dcc5b293ff24caa58c9a57fc083..c9be84560ee18ffe1bb84f159b2ed61c
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 4c9c14b60eb6fd1d9845632c2c2fa765d882a741..c0c61a29ba8d3c95ff76c36e4333740320302b4a 100644
+index 65d68716e1ff8277c534399621cf961ddf312509..47766c5312a402e3329a1d4bc5e5e0c05f2b007f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2055,4 +2055,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2065,4 +2065,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      Spigot spigot();
      // Spigot end
diff --git a/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch
index d0b3ec2335..a6fac69663 100644
--- a/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c9be84560ee18ffe1bb84f159b2ed61c79f9e971..2dfd0080a0b0f05c5e5defa4326e0da9b85c2df5 100644
+index 8dc5b43e937405070d9bdbd914fcdec243e59983..fdf5b8c69e98e000f897aca73ef97fa03371bb7c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2336,6 +2336,15 @@ public final class Bukkit {
+@@ -2364,6 +2364,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index c9be84560ee18ffe1bb84f159b2ed61c79f9e971..2dfd0080a0b0f05c5e5defa4326e0da9
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c0c61a29ba8d3c95ff76c36e4333740320302b4a..422a000ec33163f2f07502a05302b5d8851b2318 100644
+index 47766c5312a402e3329a1d4bc5e5e0c05f2b007f..08141d729809132ed36d6088f37543e792395768 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2057,4 +2057,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2067,4 +2067,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      // Spigot end
  
      void reloadPermissions(); // Paper
diff --git a/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch
index 39e334dd8c..4d5786df14 100644
--- a/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 2dfd0080a0b0f05c5e5defa4326e0da9b85c2df5..6b3a332f556e7c49796a62f20fd33241bbcde09e 100644
+index fdf5b8c69e98e000f897aca73ef97fa03371bb7c..fbddd654b4ba7b2613884fdd22f3e62ddfc078c8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2345,6 +2345,16 @@ public final class Bukkit {
+@@ -2373,6 +2373,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index 2dfd0080a0b0f05c5e5defa4326e0da9b85c2df5..6b3a332f556e7c49796a62f20fd33241
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 422a000ec33163f2f07502a05302b5d8851b2318..9088bd9dfb515381d5df1c255ae3319f9cdde81e 100644
+index 08141d729809132ed36d6088f37543e792395768..1f039a3609a5a1208af408b0565f07664558a23f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2059,4 +2059,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2069,4 +2069,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper
diff --git a/patches/api/0056-Fix-upstream-javadocs.patch b/patches/api/0056-Fix-upstream-javadocs.patch
index 3e5ba4ab0e..dbf318927e 100644
--- a/patches/api/0056-Fix-upstream-javadocs.patch
+++ b/patches/api/0056-Fix-upstream-javadocs.patch
@@ -49,10 +49,10 @@ index a04cde615f8c4bc593f8d9f8f6f1438008aaa707..548f6d28c28d74bed8b58ee828759093
       * @param target the target to remove from this list
       */
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6b3a332f556e7c49796a62f20fd33241bbcde09e..3b7087d5c71a498f513f67514db9e118780363c7 100644
+index fbddd654b4ba7b2613884fdd22f3e62ddfc078c8..53f56d95bdf484caed9effbedfe507f6745bb8c0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1506,6 +1506,8 @@ public final class Bukkit {
+@@ -1534,6 +1534,8 @@ public final class Bukkit {
  
      /**
       * Gets every player that has ever played on this server.
@@ -127,10 +127,10 @@ index 4c9fd558fbf7f57a948fbb7f80f4651048c0fb57..458119a9ef7ce8e1f59bd47caa5b4bc6
       * @param statePredicate The predicate which should get used to test if a block should be set or not.
       * @return true if the tree was created successfully, otherwise false
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9088bd9dfb515381d5df1c255ae3319f9cdde81e..012b5954a2f9dc61fb8ad29c4b8bce2648ddc681 100644
+index 1f039a3609a5a1208af408b0565f07664558a23f..b0734f8253ed540916db7bc75cd7dd24e86031c7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -570,13 +570,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -580,13 +580,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * </ul>
       * <p>
       * <b>Note:</b> If set to 0, {@link SpawnCategory} mobs spawning will be disabled.
@@ -145,7 +145,7 @@ index 9088bd9dfb515381d5df1c255ae3319f9cdde81e..012b5954a2f9dc61fb8ad29c4b8bce26
       */
      public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory);
  
-@@ -1284,6 +1281,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1294,6 +1291,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
      /**
       * Gets every player that has ever played on this server.
diff --git a/patches/api/0060-Basic-PlayerProfile-API.patch b/patches/api/0060-Basic-PlayerProfile-API.patch
index 41fef215b1..55bf31edcc 100644
--- a/patches/api/0060-Basic-PlayerProfile-API.patch
+++ b/patches/api/0060-Basic-PlayerProfile-API.patch
@@ -327,10 +327,10 @@ index 0000000000000000000000000000000000000000..8f913a078dd692a9feafb98a6e6c9583
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3b7087d5c71a498f513f67514db9e118780363c7..b165a4f99802ced243f1fb56af2bcf2c2ab7abf1 100644
+index 53f56d95bdf484caed9effbedfe507f6745bb8c0..5aa1aafddd28a5aa52274f37c09bf0fda75f7ea3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2357,6 +2357,83 @@ public final class Bukkit {
+@@ -2385,6 +2385,83 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -415,10 +415,10 @@ index 3b7087d5c71a498f513f67514db9e118780363c7..b165a4f99802ced243f1fb56af2bcf2c
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 012b5954a2f9dc61fb8ad29c4b8bce2648ddc681..f7a9756d3e3cd337b72b406ca862b81c27d4e44e 100644
+index b0734f8253ed540916db7bc75cd7dd24e86031c7..c2cf0e547137b8a023ea009c7a5d0080def5f5f8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2067,5 +2067,76 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2077,5 +2077,76 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
diff --git a/patches/api/0092-Player.setPlayerProfile-API.patch b/patches/api/0092-Player.setPlayerProfile-API.patch
index c821f93d0d..9b98f823e5 100644
--- a/patches/api/0092-Player.setPlayerProfile-API.patch
+++ b/patches/api/0092-Player.setPlayerProfile-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b165a4f99802ced243f1fb56af2bcf2c2ab7abf1..3ea17583766a462317a6a609ac693b5e488e006d 100644
+index 5aa1aafddd28a5aa52274f37c09bf0fda75f7ea3..8521ef27d1e6c06e7228acb47388b02c50dc0e84 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1348,8 +1348,10 @@ public final class Bukkit {
+@@ -1376,8 +1376,10 @@ public final class Bukkit {
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if both the unique id is
       * <code>null</code> and the name is <code>null</code> or blank
@@ -20,7 +20,7 @@ index b165a4f99802ced243f1fb56af2bcf2c2ab7abf1..3ea17583766a462317a6a609ac693b5e
      public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) {
          return server.createPlayerProfile(uniqueId, name);
      }
-@@ -1360,8 +1362,10 @@ public final class Bukkit {
+@@ -1388,8 +1390,10 @@ public final class Bukkit {
       * @param uniqueId the unique id
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if the unique id is <code>null</code>
@@ -31,7 +31,7 @@ index b165a4f99802ced243f1fb56af2bcf2c2ab7abf1..3ea17583766a462317a6a609ac693b5e
      public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) {
          return server.createPlayerProfile(uniqueId);
      }
-@@ -1373,8 +1377,10 @@ public final class Bukkit {
+@@ -1401,8 +1405,10 @@ public final class Bukkit {
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if the name is <code>null</code> or
       * blank
@@ -56,10 +56,10 @@ index ff59479f4782ac7726504aab239de79fdc840cde..abbf3d6f11350ab2dd47a277771d9f46
      /**
       * Checks if this player has had their profile banned.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8e4bf531c0a2f7101c2a3733fe33733d31c611fd..427b49836becbb0c9e1cb2e94fab7eb1db452ad9 100644
+index c2cf0e547137b8a023ea009c7a5d0080def5f5f8..e4b42323e8d168f9daee3d1b38f3591b45bc6a1b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1153,8 +1153,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1163,8 +1163,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if both the unique id is
       * <code>null</code> and the name is <code>null</code> or blank
@@ -70,7 +70,7 @@ index 8e4bf531c0a2f7101c2a3733fe33733d31c611fd..427b49836becbb0c9e1cb2e94fab7eb1
      PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name);
  
      /**
-@@ -1163,8 +1165,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1173,8 +1175,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param uniqueId the unique id
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if the unique id is <code>null</code>
@@ -81,7 +81,7 @@ index 8e4bf531c0a2f7101c2a3733fe33733d31c611fd..427b49836becbb0c9e1cb2e94fab7eb1
      PlayerProfile createPlayerProfile(@NotNull UUID uniqueId);
  
      /**
-@@ -1174,8 +1178,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1184,8 +1188,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return the new PlayerProfile
       * @throws IllegalArgumentException if the name is <code>null</code> or
       * blank
diff --git a/patches/api/0093-getPlayerUniqueId-API.patch b/patches/api/0093-getPlayerUniqueId-API.patch
index cc120a8b1a..bcce62b587 100644
--- a/patches/api/0093-getPlayerUniqueId-API.patch
+++ b/patches/api/0093-getPlayerUniqueId-API.patch
@@ -9,10 +9,10 @@ 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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3ea17583766a462317a6a609ac693b5e488e006d..3e32a6bbf593b269f1af23c7e2fdafaccc0d2110 100644
+index 8521ef27d1e6c06e7228acb47388b02c50dc0e84..7bf662bd0eafcec46bb12cae78628e5045cbc299 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -721,6 +721,20 @@ public final class Bukkit {
+@@ -749,6 +749,20 @@ public final class Bukkit {
          return server.getPlayer(id);
      }
  
@@ -34,10 +34,10 @@ index 3ea17583766a462317a6a609ac693b5e488e006d..3e32a6bbf593b269f1af23c7e2fdafac
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 427b49836becbb0c9e1cb2e94fab7eb1db452ad9..19e6cee94caabfe93c841da783c86a3c283ebcb9 100644
+index e4b42323e8d168f9daee3d1b38f3591b45bc6a1b..f352b10ad81ee21ddbf9d09ccbc6e919cb670bf9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -619,6 +619,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -629,6 +629,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @Nullable
      public Player getPlayer(@NotNull UUID id);
  
diff --git a/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch
deleted file mode 100644
index 6c3f8d857b..0000000000
--- a/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Professor Bloodstone <[email protected]>
-Date: Sun, 20 Jun 2021 01:48:31 +0200
-Subject: [PATCH] Add Git information to version command/on startup
-
-
-diff --git a/src/main/java/io/papermc/paper/util/JarManifests.java b/src/main/java/io/papermc/paper/util/JarManifests.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b306076343
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/util/JarManifests.java
-@@ -0,0 +1,37 @@
-+package io.papermc.paper.util;
-+
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.net.URL;
-+import java.util.Collections;
-+import java.util.Map;
-+import java.util.WeakHashMap;
-+import java.util.jar.Manifest;
-+import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
[email protected]
-+public final class JarManifests {
-+    private JarManifests() {
-+    }
-+
-+    private static final Map<ClassLoader, Manifest> MANIFESTS = Collections.synchronizedMap(new WeakHashMap<>());
-+
-+    public static @Nullable Manifest manifest(final @NotNull Class<?> clazz) {
-+        return MANIFESTS.computeIfAbsent(clazz.getClassLoader(), classLoader -> {
-+            final String classLocation = "/" + clazz.getName().replace(".", "/") + ".class";
-+            final URL resource = clazz.getResource(classLocation);
-+            if (resource == null) {
-+                return null;
-+            }
-+            final String classFilePath = resource.toString().replace("\\", "/");
-+            final String archivePath = classFilePath.substring(0, classFilePath.length() - classLocation.length());
-+            try (final InputStream stream = new URL(archivePath + "/META-INF/MANIFEST.MF").openStream()) {
-+                return new Manifest(stream);
-+            } catch (final IOException ex) {
-+                return null;
-+            }
-+        });
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3e32a6bbf593b269f1af23c7e2fdafaccc0d2110..d60780a26e10f5f9c80446693552384281327b51 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -60,6 +60,7 @@ import org.bukkit.util.CachedServerIcon;
- import org.jetbrains.annotations.Contract;
- import org.jetbrains.annotations.NotNull;
- import org.jetbrains.annotations.Nullable;
-+import io.papermc.paper.util.JarManifests; // Paper
- 
- /**
-  * Represents the Bukkit core, for version and Server singleton handling
-@@ -109,7 +110,25 @@ public final class Bukkit {
-         }
- 
-         Bukkit.server = server;
--        server.getLogger().info("This server is running " + getName() + " version " + getVersion() + " (Implementing API version " + getBukkitVersion() + ")");
-+        // Paper start - add git information
-+        server.getLogger().info(getVersionMessage());
-+    }
-+    /**
-+      * Gets message describing the version server is running.
-+      *
-+      * @return message describing the version server is running
-+      */
-+    @NotNull
-+    public static String getVersionMessage() {
-+        final var manifest = JarManifests.manifest(Bukkit.getServer().getClass());
-+        final String gitBranch = manifest == null ? null : manifest.getMainAttributes().getValue("Git-Branch");
-+        final String gitCommit = manifest == null ? null : manifest.getMainAttributes().getValue("Git-Commit");
-+        String branchMsg = " on " + gitBranch;
-+        if ("master".equals(gitBranch) || "main".equals(gitBranch)) {
-+            branchMsg = "";  // Don't show branch on main/master
-+        }
-+        return "This server is running " + getName() + " version " + getVersion() + " (Implementing API version " + getBukkitVersion() + ") (Git: " + gitCommit + branchMsg + ")";
-+        // Paper end
-     }
- 
-     /**
-diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index b437cf212a63aa96a9492db8d01d5d37061aee23..fd5d9881abfd930bb883120f018f76dc78b62b14 100644
---- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -256,7 +256,7 @@ public class VersionCommand extends BukkitCommand {
-     private void setVersionMessage(final @NotNull Component msg) {
-         lastCheck = System.currentTimeMillis();
-         final Component message = Component.textOfChildren(
--            Component.text("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")", NamedTextColor.WHITE),
-+            Component.text(Bukkit.getVersionMessage(), NamedTextColor.WHITE),
-             Component.newline(),
-             msg
-         );
diff --git a/patches/api/0148-Mob-Pathfinding-API.patch b/patches/api/0147-Mob-Pathfinding-API.patch
index 83fb575817..83fb575817 100644
--- a/patches/api/0148-Mob-Pathfinding-API.patch
+++ b/patches/api/0147-Mob-Pathfinding-API.patch
diff --git a/patches/api/0149-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/0148-Performance-Concurrency-Improvements-to-Permissions.patch
index 6befcec378..6befcec378 100644
--- a/patches/api/0149-Performance-Concurrency-Improvements-to-Permissions.patch
+++ b/patches/api/0148-Performance-Concurrency-Improvements-to-Permissions.patch
diff --git a/patches/api/0150-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/0149-Add-ItemStackRecipeChoice-Draft-API.patch
index 4cfddc6f59..4cfddc6f59 100644
--- a/patches/api/0150-Add-ItemStackRecipeChoice-Draft-API.patch
+++ b/patches/api/0149-Add-ItemStackRecipeChoice-Draft-API.patch
diff --git a/patches/api/0151-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0150-Implement-furnace-cook-speed-multiplier-API.patch
index 6e836a844d..6e836a844d 100644
--- a/patches/api/0151-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/api/0150-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/api/0152-Material-API-additions.patch b/patches/api/0151-Material-API-additions.patch
index d64d21c758..d64d21c758 100644
--- a/patches/api/0152-Material-API-additions.patch
+++ b/patches/api/0151-Material-API-additions.patch
diff --git a/patches/api/0153-Add-Material-Tags.patch b/patches/api/0152-Add-Material-Tags.patch
index 9c8781e5b6..00b8a36df3 100644
--- a/patches/api/0153-Add-Material-Tags.patch
+++ b/patches/api/0152-Add-Material-Tags.patch
@@ -1132,7 +1132,7 @@ index 0000000000000000000000000000000000000000..5376e51adf5af15572b0d760b17f2de6
 +        .ensureSize("WATER_BASED", 11).lock();
 +}
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 1be862110e94654be12fcef5980388abf242ac7f..298ae1294a122705bca6bd74ea540185839d1ed5 100644
+index 54861b283e82f0a9789eda508356c8a8accb0545..33c75db0fcbbd771a59764c5d90484cee27b60cf 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
 @@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/api/0154-PreSpawnerSpawnEvent.patch b/patches/api/0153-PreSpawnerSpawnEvent.patch
index 4b6bbe6f7a..4b6bbe6f7a 100644
--- a/patches/api/0154-PreSpawnerSpawnEvent.patch
+++ b/patches/api/0153-PreSpawnerSpawnEvent.patch
diff --git a/patches/api/0155-Add-LivingEntity-getTargetEntity.patch b/patches/api/0154-Add-LivingEntity-getTargetEntity.patch
index 171a95979a..171a95979a 100644
--- a/patches/api/0155-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/api/0154-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/api/0156-Add-sun-related-API.patch b/patches/api/0155-Add-sun-related-API.patch
index 7132b29be0..7132b29be0 100644
--- a/patches/api/0156-Add-sun-related-API.patch
+++ b/patches/api/0155-Add-sun-related-API.patch
diff --git a/patches/api/0157-Turtle-API.patch b/patches/api/0156-Turtle-API.patch
index 3ec867d360..3ec867d360 100644
--- a/patches/api/0157-Turtle-API.patch
+++ b/patches/api/0156-Turtle-API.patch
diff --git a/patches/api/0158-Add-spectator-target-events.patch b/patches/api/0157-Add-spectator-target-events.patch
index 90f65b5fc8..90f65b5fc8 100644
--- a/patches/api/0158-Add-spectator-target-events.patch
+++ b/patches/api/0157-Add-spectator-target-events.patch
diff --git a/patches/api/0159-Add-more-Witch-API.patch b/patches/api/0158-Add-more-Witch-API.patch
index 0da75bb9b7..0da75bb9b7 100644
--- a/patches/api/0159-Add-more-Witch-API.patch
+++ b/patches/api/0158-Add-more-Witch-API.patch
diff --git a/patches/api/0160-Make-the-default-permission-message-configurable.patch b/patches/api/0159-Make-the-default-permission-message-configurable.patch
index 8dac5d0ae4..3718459df1 100644
--- a/patches/api/0160-Make-the-default-permission-message-configurable.patch
+++ b/patches/api/0159-Make-the-default-permission-message-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d60780a26e10f5f9c80446693552384281327b51..f248515862c3bc418b42b8e197feb43addfd122d 100644
+index 7bf662bd0eafcec46bb12cae78628e5045cbc299..de678fa681fbd94efa8fd85568ee092ae26fca85 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2397,6 +2397,28 @@ public final class Bukkit {
+@@ -2406,6 +2406,28 @@ public final class Bukkit {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
  
@@ -38,10 +38,10 @@ index d60780a26e10f5f9c80446693552384281327b51..f248515862c3bc418b42b8e197feb43a
       * Creates a PlayerProfile for the specified uuid, with name as null.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 19e6cee94caabfe93c841da783c86a3c283ebcb9..69f236d965c631510b008a7eb38aa1b62a4e196a 100644
+index f352b10ad81ee21ddbf9d09ccbc6e919cb670bf9..a7a04a4e9c94cc43ccf84abb3b7956b60c79e8fe 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2086,6 +2086,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2096,6 +2096,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
  
diff --git a/patches/api/0161-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0160-Support-cancellation-supression-of-EntityDismount-Ve.patch
index 420a97487d..420a97487d 100644
--- a/patches/api/0161-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/patches/api/0160-Support-cancellation-supression-of-EntityDismount-Ve.patch
diff --git a/patches/api/0162-Add-more-Zombie-API.patch b/patches/api/0161-Add-more-Zombie-API.patch
index 38efc859d8..38efc859d8 100644
--- a/patches/api/0162-Add-more-Zombie-API.patch
+++ b/patches/api/0161-Add-more-Zombie-API.patch
diff --git a/patches/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0162-Change-the-reserved-channel-check-to-be-sensible.patch
index 8975ff3c43..8975ff3c43 100644
--- a/patches/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/patches/api/0162-Change-the-reserved-channel-check-to-be-sensible.patch
diff --git a/patches/api/0164-Add-PlayerConnectionCloseEvent.patch b/patches/api/0163-Add-PlayerConnectionCloseEvent.patch
index 6264223dd9..6264223dd9 100644
--- a/patches/api/0164-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/api/0163-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0164-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index dd625f4153..dd625f4153 100644
--- a/patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/api/0164-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0165-Add-ItemStack-Recipe-API-helper-methods.patch
index 61a45e967f..61a45e967f 100644
--- a/patches/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/patches/api/0165-Add-ItemStack-Recipe-API-helper-methods.patch
diff --git a/patches/api/0167-BlockDestroyEvent.patch b/patches/api/0166-BlockDestroyEvent.patch
index d6ac7bfb8d..d6ac7bfb8d 100644
--- a/patches/api/0167-BlockDestroyEvent.patch
+++ b/patches/api/0166-BlockDestroyEvent.patch
diff --git a/patches/api/0168-Add-WhitelistToggleEvent.patch b/patches/api/0167-Add-WhitelistToggleEvent.patch
index 1e26aba2a3..1e26aba2a3 100644
--- a/patches/api/0168-Add-WhitelistToggleEvent.patch
+++ b/patches/api/0167-Add-WhitelistToggleEvent.patch
diff --git a/patches/api/0169-Add-GS4-Query-event.patch b/patches/api/0168-Add-GS4-Query-event.patch
index a153279317..a153279317 100644
--- a/patches/api/0169-Add-GS4-Query-event.patch
+++ b/patches/api/0168-Add-GS4-Query-event.patch
diff --git a/patches/api/0170-Add-PlayerPostRespawnEvent.patch b/patches/api/0169-Add-PlayerPostRespawnEvent.patch
index c261fc7375..c261fc7375 100644
--- a/patches/api/0170-Add-PlayerPostRespawnEvent.patch
+++ b/patches/api/0169-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/api/0171-Entity-getEntitySpawnReason.patch b/patches/api/0170-Entity-getEntitySpawnReason.patch
index ef25308f6c..ef25308f6c 100644
--- a/patches/api/0171-Entity-getEntitySpawnReason.patch
+++ b/patches/api/0170-Entity-getEntitySpawnReason.patch
diff --git a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch b/patches/api/0171-Fix-Spigot-annotation-mistakes.patch
index 74b42863cd..8229de10af 100644
--- a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0171-Fix-Spigot-annotation-mistakes.patch
@@ -40,10 +40,10 @@ index ac420f0059fc50d3e1294f85df7515c9e17ff78f..24daba85ce4129fb0babe67570059ca8
      public static Art getById(int id) {
          return BY_ID.get(id);
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f248515862c3bc418b42b8e197feb43addfd122d..395d7245aac45a1b805e15ee1fdb9949574f3f59 100644
+index de678fa681fbd94efa8fd85568ee092ae26fca85..cddf3250c4a7efe239248b5e9662f33f5c0b702f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -870,9 +870,8 @@ public final class Bukkit {
+@@ -879,9 +879,8 @@ public final class Bukkit {
       *
       * @param id the id of the map to get
       * @return a map view if it exists, or null otherwise
@@ -54,7 +54,7 @@ index f248515862c3bc418b42b8e197feb43addfd122d..395d7245aac45a1b805e15ee1fdb9949
      @Nullable
      public static MapView getMap(int id) {
          return server.getMap(id);
-@@ -951,8 +950,14 @@ public final class Bukkit {
+@@ -960,8 +959,14 @@ public final class Bukkit {
       * Returns the primary logger associated with this server instance.
       *
       * @return Logger associated with this server
@@ -69,7 +69,7 @@ index f248515862c3bc418b42b8e197feb43addfd122d..395d7245aac45a1b805e15ee1fdb9949
      public static Logger getLogger() {
          return server.getLogger();
      }
-@@ -1349,10 +1354,8 @@ public final class Bukkit {
+@@ -1358,10 +1363,8 @@ public final class Bukkit {
       * @param name the name the player to retrieve
       * @return an offline player
       * @see #getOfflinePlayer(java.util.UUID)
@@ -81,7 +81,7 @@ index f248515862c3bc418b42b8e197feb43addfd122d..395d7245aac45a1b805e15ee1fdb9949
      @NotNull
      public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
          return server.getOfflinePlayer(name);
-@@ -1954,7 +1957,7 @@ public final class Bukkit {
+@@ -1963,7 +1966,7 @@ public final class Bukkit {
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -498,10 +498,10 @@ index 6277451c3c6c551078c237cd767b6d70c4f585ea..10f5cfb1885833a1d2c1027c03974da4
      CRACKED(0x0),
      GLYPHED(0x1),
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3d5ef29bcfed92dc7fb3bb6d59538ba4a4e3de5f..43f8cdd600aa2c2e33136068b3c4b4b81a6544d4 100644
+index a7a04a4e9c94cc43ccf84abb3b7956b60c79e8fe..6412546d84874cb93fcdc8426a402bec4e276057 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -730,9 +730,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -740,9 +740,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @param id the id of the map to get
       * @return a map view if it exists, or null otherwise
@@ -512,7 +512,7 @@ index 3d5ef29bcfed92dc7fb3bb6d59538ba4a4e3de5f..43f8cdd600aa2c2e33136068b3c4b4b8
      @Nullable
      public MapView getMap(int id);
  
-@@ -799,8 +798,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -809,8 +808,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * Returns the primary logger associated with this server instance.
       *
       * @return Logger associated with this server
@@ -527,7 +527,7 @@ index 3d5ef29bcfed92dc7fb3bb6d59538ba4a4e3de5f..43f8cdd600aa2c2e33136068b3c4b4b8
      public Logger getLogger();
  
      /**
-@@ -1137,10 +1142,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1147,10 +1152,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param name the name the player to retrieve
       * @return an offline player
       * @see #getOfflinePlayer(java.util.UUID)
@@ -539,7 +539,7 @@ index 3d5ef29bcfed92dc7fb3bb6d59538ba4a4e3de5f..43f8cdd600aa2c2e33136068b3c4b4b8
      @NotNull
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
-@@ -1649,7 +1652,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1659,7 +1662,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
diff --git a/patches/api/0173-Server-Tick-Events.patch b/patches/api/0172-Server-Tick-Events.patch
index cc46a9f29a..cc46a9f29a 100644
--- a/patches/api/0173-Server-Tick-Events.patch
+++ b/patches/api/0172-Server-Tick-Events.patch
diff --git a/patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0173-PlayerDeathEvent-getItemsToKeep.patch
index 4d28221bcd..4d28221bcd 100644
--- a/patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/api/0173-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/api/0175-Add-Heightmap-API.patch b/patches/api/0174-Add-Heightmap-API.patch
index 9c0ab69035..9c0ab69035 100644
--- a/patches/api/0175-Add-Heightmap-API.patch
+++ b/patches/api/0174-Add-Heightmap-API.patch
diff --git a/patches/api/0176-Mob-Spawner-API-Enhancements.patch b/patches/api/0175-Mob-Spawner-API-Enhancements.patch
index 4607e8b4bf..4607e8b4bf 100644
--- a/patches/api/0176-Mob-Spawner-API-Enhancements.patch
+++ b/patches/api/0175-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/api/0177-Add-BlockSoundGroup-interface.patch b/patches/api/0176-Add-BlockSoundGroup-interface.patch
index 91f609d1e3..91f609d1e3 100644
--- a/patches/api/0177-Add-BlockSoundGroup-interface.patch
+++ b/patches/api/0176-Add-BlockSoundGroup-interface.patch
diff --git a/patches/api/0178-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/0177-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
index b5148c5574..b5148c5574 100644
--- a/patches/api/0178-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
+++ b/patches/api/0177-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
diff --git a/patches/api/0179-Set-true-custom-payload-channel-size-limit.patch b/patches/api/0178-Set-true-custom-payload-channel-size-limit.patch
index c524e2aaa0..c524e2aaa0 100644
--- a/patches/api/0179-Set-true-custom-payload-channel-size-limit.patch
+++ b/patches/api/0178-Set-true-custom-payload-channel-size-limit.patch
diff --git a/patches/api/0180-Expose-the-internal-current-tick.patch b/patches/api/0179-Expose-the-internal-current-tick.patch
index b89d40b430..31ca1dedb7 100644
--- a/patches/api/0180-Expose-the-internal-current-tick.patch
+++ b/patches/api/0179-Expose-the-internal-current-tick.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 395d7245aac45a1b805e15ee1fdb9949574f3f59..d1e1c49ecf6a1ede71548fbac6143e38ba6dfea1 100644
+index cddf3250c4a7efe239248b5e9662f33f5c0b702f..836b5d1363ffcff08708b6b4721253ade99eb987 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2498,6 +2498,10 @@ public final class Bukkit {
+@@ -2507,6 +2507,10 @@ public final class Bukkit {
      public static com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) {
          return server.createProfileExact(uuid, name);
      }
@@ -20,10 +20,10 @@ index 395d7245aac45a1b805e15ee1fdb9949574f3f59..d1e1c49ecf6a1ede71548fbac6143e38
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 43f8cdd600aa2c2e33136068b3c4b4b81a6544d4..f11c1caa81c97d1a31d8cc980ad4dab2e2573ec4 100644
+index 6412546d84874cb93fcdc8426a402bec4e276057..387478b3e4ad9877f3338b719ff447126ef16285 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2176,5 +2176,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2186,5 +2186,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name);
diff --git a/patches/api/0181-Improve-Block-breakNaturally-API.patch b/patches/api/0180-Improve-Block-breakNaturally-API.patch
index 54820995ca..54820995ca 100644
--- a/patches/api/0181-Improve-Block-breakNaturally-API.patch
+++ b/patches/api/0180-Improve-Block-breakNaturally-API.patch
diff --git a/patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0181-PlayerDeathEvent-shouldDropExperience.patch
index 9f043baab6..9f043baab6 100644
--- a/patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/api/0181-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/api/0183-Add-ThrownEggHatchEvent.patch b/patches/api/0182-Add-ThrownEggHatchEvent.patch
index 8636b6d6df..8636b6d6df 100644
--- a/patches/api/0183-Add-ThrownEggHatchEvent.patch
+++ b/patches/api/0182-Add-ThrownEggHatchEvent.patch
diff --git a/patches/api/0184-Entity-Jump-API.patch b/patches/api/0183-Entity-Jump-API.patch
index fb5b69da63..fb5b69da63 100644
--- a/patches/api/0184-Entity-Jump-API.patch
+++ b/patches/api/0183-Entity-Jump-API.patch
diff --git a/patches/api/0185-add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/0184-add-hand-to-BlockMultiPlaceEvent.patch
index f15b482d62..f15b482d62 100644
--- a/patches/api/0185-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/api/0184-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/api/0186-Add-tick-times-API.patch b/patches/api/0185-Add-tick-times-API.patch
index 40cbc279eb..bd91d2fb9b 100644
--- a/patches/api/0186-Add-tick-times-API.patch
+++ b/patches/api/0185-Add-tick-times-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add tick times API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d1e1c49ecf6a1ede71548fbac6143e38ba6dfea1..385be33869f3850f8b1d3e690c8e0fc43adcbdce 100644
+index 836b5d1363ffcff08708b6b4721253ade99eb987..1a8f4e122b84b423fe19bfafad56d6d3df9ec134 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2170,6 +2170,25 @@ public final class Bukkit {
+@@ -2179,6 +2179,25 @@ public final class Bukkit {
      public static double[] getTPS() {
          return server.getTPS();
      }
@@ -35,10 +35,10 @@ index d1e1c49ecf6a1ede71548fbac6143e38ba6dfea1..385be33869f3850f8b1d3e690c8e0fc4
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index cf242e2e6d538d3d38b7b10321ab375e018b24b1..d6d83b22389aee98967adda2631fa65ecbf00781 100644
+index 387478b3e4ad9877f3338b719ff447126ef16285..fc4e259e5ca7a4b25f276bda7f2f5ea022d0c552 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1836,6 +1836,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1846,6 +1846,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      public double[] getTPS();
diff --git a/patches/api/0187-Expose-MinecraftServer-isRunning.patch b/patches/api/0186-Expose-MinecraftServer-isRunning.patch
index 8912814c2b..b4b2e8c5c2 100644
--- a/patches/api/0187-Expose-MinecraftServer-isRunning.patch
+++ b/patches/api/0186-Expose-MinecraftServer-isRunning.patch
@@ -6,10 +6,10 @@ 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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 385be33869f3850f8b1d3e690c8e0fc43adcbdce..f24d57a89dc4fdf73298bbb4cc187794c7bd6706 100644
+index 1a8f4e122b84b423fe19bfafad56d6d3df9ec134..1c30e523d08250c8a5477fe4d749b779223f069a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2521,6 +2521,15 @@ public final class Bukkit {
+@@ -2530,6 +2530,15 @@ public final class Bukkit {
      public static int getCurrentTick() {
          return server.getCurrentTick();
      }
@@ -26,10 +26,10 @@ index 385be33869f3850f8b1d3e690c8e0fc43adcbdce..f24d57a89dc4fdf73298bbb4cc187794
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 965032124406a63c70dc9007245f74fb2e503c52..17f6b930c7d462cd8112bb5a845c25202e6c78b5 100644
+index fc4e259e5ca7a4b25f276bda7f2f5ea022d0c552..1f4ebdaf9cfd14de9ff2d0cea7d110fe7630dc9a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2198,5 +2198,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2208,5 +2208,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return Current tick
       */
      int getCurrentTick();
diff --git a/patches/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0187-Add-Raw-Byte-ItemStack-Serialization.patch
index 8035d3ac56..8035d3ac56 100644
--- a/patches/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/api/0187-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/api/0189-Add-Player-Client-Options-API.patch b/patches/api/0188-Add-Player-Client-Options-API.patch
index e4057fe25a..e4057fe25a 100644
--- a/patches/api/0189-Add-Player-Client-Options-API.patch
+++ b/patches/api/0188-Add-Player-Client-Options-API.patch
diff --git a/patches/api/0190-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/0189-Add-PlayerAttackEntityCooldownResetEvent.patch
index c3cfd0642b..c3cfd0642b 100644
--- a/patches/api/0190-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/api/0189-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/api/0191-Add-item-slot-convenience-methods.patch b/patches/api/0190-Add-item-slot-convenience-methods.patch
index 20638212e8..20638212e8 100644
--- a/patches/api/0191-Add-item-slot-convenience-methods.patch
+++ b/patches/api/0190-Add-item-slot-convenience-methods.patch
diff --git a/patches/api/0192-Villager-Restocks-API.patch b/patches/api/0191-Villager-Restocks-API.patch
index 5b3898429d..5b3898429d 100644
--- a/patches/api/0192-Villager-Restocks-API.patch
+++ b/patches/api/0191-Villager-Restocks-API.patch
diff --git a/patches/api/0194-Add-Mob-Goal-API.patch b/patches/api/0192-Add-Mob-Goal-API.patch
index 1d8c7585d7..46f1f37db4 100644
--- a/patches/api/0194-Add-Mob-Goal-API.patch
+++ b/patches/api/0192-Add-Mob-Goal-API.patch
@@ -226,10 +226,10 @@ index 0000000000000000000000000000000000000000..e21f7574763dd4f13794f91bbef192ef
 +    <T extends Mob> Collection<Goal<T>> getRunningGoalsWithout(@NotNull T mob, @NotNull GoalType type);
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b608a6dc26bfc6d08f1e31107fed8ef1aaf90e1d..79db7b5c25a7c824b107a5c79f40c61983d2757c 100644
+index 1c30e523d08250c8a5477fe4d749b779223f069a..f2fa4c419f212ea5d7ca0aab4ead4bd44dac5947 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2542,6 +2542,16 @@ public final class Bukkit {
+@@ -2539,6 +2539,16 @@ public final class Bukkit {
      public static boolean isStopping() {
          return server.isStopping();
      }
diff --git a/patches/api/0195-Add-villager-reputation-API.patch b/patches/api/0193-Add-villager-reputation-API.patch
index 4a2093aab9..4a2093aab9 100644
--- a/patches/api/0195-Add-villager-reputation-API.patch
+++ b/patches/api/0193-Add-villager-reputation-API.patch
diff --git a/patches/api/0193-Expose-game-version.patch b/patches/api/0193-Expose-game-version.patch
deleted file mode 100644
index 785d8563d2..0000000000
--- a/patches/api/0193-Expose-game-version.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Vainomaa <[email protected]>
-Date: Fri, 1 May 2020 17:39:02 +0300
-Subject: [PATCH] Expose game version
-
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f24d57a89dc4fdf73298bbb4cc187794c7bd6706..b608a6dc26bfc6d08f1e31107fed8ef1aaf90e1d 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -161,6 +161,18 @@ public final class Bukkit {
-         return server.getBukkitVersion();
-     }
- 
-+    // Paper start - expose game version
-+    /**
-+     * Gets the version of game this server implements
-+     *
-+     * @return version of game
-+     */
-+    @NotNull
-+    public static String getMinecraftVersion() {
-+        return server.getMinecraftVersion();
-+    }
-+    // Paper end
-+
-     /**
-      * Gets a view of all currently logged in players. This {@linkplain
-      * Collections#unmodifiableCollection(Collection) view} is a reused
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 015f1167bdc752fe6665807866caa0cda5ba0571..987e01f48f7f8b19fd6292a11988b1aeb90a09f6 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -119,6 +119,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     @NotNull
-     public String getBukkitVersion();
- 
-+    // Paper start - expose game version
-+    /**
-+     * Gets the version of game this server implements
-+     *
-+     * @return version of game
-+     */
-+    @NotNull
-+    String getMinecraftVersion();
-+    // Paper end
-+
-     /**
-      * Gets a view of all currently logged in players. This {@linkplain
-      * Collections#unmodifiableCollection(Collection) view} is a reused
diff --git a/patches/api/0196-Spawn-Reason-API.patch b/patches/api/0194-Spawn-Reason-API.patch
index 97edb6ab3f..97edb6ab3f 100644
--- a/patches/api/0196-Spawn-Reason-API.patch
+++ b/patches/api/0194-Spawn-Reason-API.patch
diff --git a/patches/api/0197-Potential-bed-API.patch b/patches/api/0195-Potential-bed-API.patch
index a842554f35..a842554f35 100644
--- a/patches/api/0197-Potential-bed-API.patch
+++ b/patches/api/0195-Potential-bed-API.patch
diff --git a/patches/api/0198-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0196-Inventory-getHolder-method-without-block-snapshot.patch
index d834d6cdb3..d834d6cdb3 100644
--- a/patches/api/0198-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/api/0196-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/api/0199-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0197-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 4fe75c486c..4fe75c486c 100644
--- a/patches/api/0199-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/api/0197-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/api/0200-Support-components-in-ItemMeta.patch b/patches/api/0198-Support-components-in-ItemMeta.patch
index 470cc2be97..470cc2be97 100644
--- a/patches/api/0200-Support-components-in-ItemMeta.patch
+++ b/patches/api/0198-Support-components-in-ItemMeta.patch
diff --git a/patches/api/0201-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0199-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
index 6c725bc833..6c725bc833 100644
--- a/patches/api/0201-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
+++ b/patches/api/0199-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
diff --git a/patches/api/0202-Add-entity-liquid-API.patch b/patches/api/0200-Add-entity-liquid-API.patch
index a1ac30dc85..a1ac30dc85 100644
--- a/patches/api/0202-Add-entity-liquid-API.patch
+++ b/patches/api/0200-Add-entity-liquid-API.patch
diff --git a/patches/api/0203-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0201-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
index 3906e443da..3906e443da 100644
--- a/patches/api/0203-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
+++ b/patches/api/0201-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
diff --git a/patches/api/0204-Add-BellRingEvent.patch b/patches/api/0202-Add-BellRingEvent.patch
index 2d5cb2a8b3..2d5cb2a8b3 100644
--- a/patches/api/0204-Add-BellRingEvent.patch
+++ b/patches/api/0202-Add-BellRingEvent.patch
diff --git a/patches/api/0205-Brand-support.patch b/patches/api/0203-Brand-support.patch
index 31a2278550..31a2278550 100644
--- a/patches/api/0205-Brand-support.patch
+++ b/patches/api/0203-Brand-support.patch
diff --git a/patches/api/0206-Add-moon-phase-API.patch b/patches/api/0204-Add-moon-phase-API.patch
index d949b274a6..d949b274a6 100644
--- a/patches/api/0206-Add-moon-phase-API.patch
+++ b/patches/api/0204-Add-moon-phase-API.patch
diff --git a/patches/api/0207-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0205-Add-playPickupItemAnimation-to-LivingEntity.patch
index 8530c705f9..8530c705f9 100644
--- a/patches/api/0207-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/api/0205-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/api/0208-Add-more-Evoker-API.patch b/patches/api/0206-Add-more-Evoker-API.patch
index 0d6f0f7328..0d6f0f7328 100644
--- a/patches/api/0208-Add-more-Evoker-API.patch
+++ b/patches/api/0206-Add-more-Evoker-API.patch
diff --git a/patches/api/0209-Add-methods-to-get-translation-keys.patch b/patches/api/0207-Add-methods-to-get-translation-keys.patch
index d504fbdf2a..d504fbdf2a 100644
--- a/patches/api/0209-Add-methods-to-get-translation-keys.patch
+++ b/patches/api/0207-Add-methods-to-get-translation-keys.patch
diff --git a/patches/api/0210-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0208-Create-HoverEvent-from-ItemStack-Entity.patch
index ff14019e55..b5ddd21440 100644
--- a/patches/api/0210-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/api/0208-Create-HoverEvent-from-ItemStack-Entity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Create HoverEvent from ItemStack Entity
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index e34c89a945a0f12cdc4be8cc232c8de986474372..dbebaf8172ec6872f56958b9583affde4f8400a4 100644
+index 4c4e52b2c200408c4e33a141e1eed78126ceaaee..53b8934cb829f37971cb3ecd5652c9974dec6ab0 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -265,4 +265,65 @@ public interface ItemFactory {
diff --git a/patches/api/0211-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0209-Add-additional-open-container-api-to-HumanEntity.patch
index 43e6937d05..43e6937d05 100644
--- a/patches/api/0211-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/api/0209-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/api/0212-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0210-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 01127fef5b..01127fef5b 100644
--- a/patches/api/0212-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/api/0210-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/api/0213-Entity-isTicking.patch b/patches/api/0211-Entity-isTicking.patch
index 37d0f8dce3..37d0f8dce3 100644
--- a/patches/api/0213-Entity-isTicking.patch
+++ b/patches/api/0211-Entity-isTicking.patch
diff --git a/patches/api/0214-Villager-resetOffers.patch b/patches/api/0212-Villager-resetOffers.patch
index 60fedfba0f..60fedfba0f 100644
--- a/patches/api/0214-Villager-resetOffers.patch
+++ b/patches/api/0212-Villager-resetOffers.patch
diff --git a/patches/api/0215-Player-elytra-boost-API.patch b/patches/api/0213-Player-elytra-boost-API.patch
index 29d5923494..29d5923494 100644
--- a/patches/api/0215-Player-elytra-boost-API.patch
+++ b/patches/api/0213-Player-elytra-boost-API.patch
diff --git a/patches/api/0216-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0214-Add-getOfflinePlayerIfCached-String.patch
index 402eff8c38..065ab10dd0 100644
--- a/patches/api/0216-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0214-Add-getOfflinePlayerIfCached-String.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 79db7b5c25a7c824b107a5c79f40c61983d2757c..732ed3724e784ad659cb4411dbd73b42a8330a2c 100644
+index f2fa4c419f212ea5d7ca0aab4ead4bd44dac5947..3210587c341bc8d80ddc7f387ca4030dbd0074c9 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1373,6 +1373,27 @@ public final class Bukkit {
+@@ -1370,6 +1370,27 @@ public final class Bukkit {
          return server.getOfflinePlayer(name);
      }
  
@@ -37,7 +37,7 @@ index 79db7b5c25a7c824b107a5c79f40c61983d2757c..732ed3724e784ad659cb4411dbd73b42
       * Gets the player by the given UUID, regardless if they are offline or
       * online.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8aba385b9d1a9b71c3304f1d802f18d4434f34d5..395f7910f535bfd33a5676b011ab62a53e30e140 100644
+index 711de014b7cf69459526e6c20c94f29ee4db11c4..f0c1d16c6bee58826a3cde3c4988e02690207fce 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1157,6 +1157,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0217-Add-ignore-discounts-API.patch b/patches/api/0215-Add-ignore-discounts-API.patch
index 89655ddef8..89655ddef8 100644
--- a/patches/api/0217-Add-ignore-discounts-API.patch
+++ b/patches/api/0215-Add-ignore-discounts-API.patch
diff --git a/patches/api/0218-Item-no-age-no-player-pickup.patch b/patches/api/0216-Item-no-age-no-player-pickup.patch
index d3be2301af..d3be2301af 100644
--- a/patches/api/0218-Item-no-age-no-player-pickup.patch
+++ b/patches/api/0216-Item-no-age-no-player-pickup.patch
diff --git a/patches/api/0219-Beacon-API-custom-effect-ranges.patch b/patches/api/0217-Beacon-API-custom-effect-ranges.patch
index effd7b3ae9..effd7b3ae9 100644
--- a/patches/api/0219-Beacon-API-custom-effect-ranges.patch
+++ b/patches/api/0217-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/api/0220-Add-API-for-quit-reason.patch b/patches/api/0218-Add-API-for-quit-reason.patch
index 0350afaf92..0350afaf92 100644
--- a/patches/api/0220-Add-API-for-quit-reason.patch
+++ b/patches/api/0218-Add-API-for-quit-reason.patch
diff --git a/patches/api/0221-Add-Destroy-Speed-API.patch b/patches/api/0219-Add-Destroy-Speed-API.patch
index cdf304d00b..cdf304d00b 100644
--- a/patches/api/0221-Add-Destroy-Speed-API.patch
+++ b/patches/api/0219-Add-Destroy-Speed-API.patch
diff --git a/patches/api/0222-Add-LivingEntity-clearActiveItem.patch b/patches/api/0220-Add-LivingEntity-clearActiveItem.patch
index 03307beabf..03307beabf 100644
--- a/patches/api/0222-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/api/0220-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/api/0223-Add-PlayerItemCooldownEvent.patch b/patches/api/0221-Add-PlayerItemCooldownEvent.patch
index ae5118c7da..ae5118c7da 100644
--- a/patches/api/0223-Add-PlayerItemCooldownEvent.patch
+++ b/patches/api/0221-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/0224-More-lightning-API.patch b/patches/api/0222-More-lightning-API.patch
index c4924dcdf2..c4924dcdf2 100644
--- a/patches/api/0224-More-lightning-API.patch
+++ b/patches/api/0222-More-lightning-API.patch
diff --git a/patches/api/0225-Add-PlayerShearBlockEvent.patch b/patches/api/0223-Add-PlayerShearBlockEvent.patch
index 1506924937..1506924937 100644
--- a/patches/api/0225-Add-PlayerShearBlockEvent.patch
+++ b/patches/api/0223-Add-PlayerShearBlockEvent.patch
diff --git a/patches/api/0226-Player-Chunk-Load-Unload-Events.patch b/patches/api/0224-Player-Chunk-Load-Unload-Events.patch
index c1779bb840..c1779bb840 100644
--- a/patches/api/0226-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/api/0224-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/api/0227-Expose-LivingEntity-hurt-direction.patch b/patches/api/0225-Expose-LivingEntity-hurt-direction.patch
index 2957bd50ae..2957bd50ae 100644
--- a/patches/api/0227-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/api/0225-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/api/0228-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0226-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 00552e9137..00552e9137 100644
--- a/patches/api/0228-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/api/0226-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/api/0229-Added-PlayerTradeEvent.patch b/patches/api/0227-Added-PlayerTradeEvent.patch
index 11ad019021..11ad019021 100644
--- a/patches/api/0229-Added-PlayerTradeEvent.patch
+++ b/patches/api/0227-Added-PlayerTradeEvent.patch
diff --git a/patches/api/0230-Add-TargetHitEvent-API.patch b/patches/api/0228-Add-TargetHitEvent-API.patch
index 6c68224363..6c68224363 100644
--- a/patches/api/0230-Add-TargetHitEvent-API.patch
+++ b/patches/api/0228-Add-TargetHitEvent-API.patch
diff --git a/patches/api/0231-Additional-Block-Material-API-s.patch b/patches/api/0229-Additional-Block-Material-API-s.patch
index ab3e6f9ac6..ab3e6f9ac6 100644
--- a/patches/api/0231-Additional-Block-Material-API-s.patch
+++ b/patches/api/0229-Additional-Block-Material-API-s.patch
diff --git a/patches/api/0232-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0230-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
index d297dd5c24..d297dd5c24 100644
--- a/patches/api/0232-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/api/0230-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/api/0233-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0231-Add-PlayerFlowerPotManipulateEvent.patch
index cb08fd1404..cb08fd1404 100644
--- a/patches/api/0233-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/api/0231-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/api/0234-Zombie-API-breaking-doors.patch b/patches/api/0232-Zombie-API-breaking-doors.patch
index 24118c13ee..24118c13ee 100644
--- a/patches/api/0234-Zombie-API-breaking-doors.patch
+++ b/patches/api/0232-Zombie-API-breaking-doors.patch
diff --git a/patches/api/0235-Add-EntityLoadCrossbowEvent.patch b/patches/api/0233-Add-EntityLoadCrossbowEvent.patch
index 2a60c84538..2a60c84538 100644
--- a/patches/api/0235-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/api/0233-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/api/0236-Added-WorldGameRuleChangeEvent.patch b/patches/api/0234-Added-WorldGameRuleChangeEvent.patch
index 348efda0ca..348efda0ca 100644
--- a/patches/api/0236-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/api/0234-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/api/0237-Added-ServerResourcesReloadedEvent.patch b/patches/api/0235-Added-ServerResourcesReloadedEvent.patch
index 150b70e6cc..150b70e6cc 100644
--- a/patches/api/0237-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/api/0235-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/api/0238-Add-BlockFailedDispenseEvent.patch b/patches/api/0236-Add-BlockFailedDispenseEvent.patch
index 4f480e7417..4f480e7417 100644
--- a/patches/api/0238-Add-BlockFailedDispenseEvent.patch
+++ b/patches/api/0236-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/api/0239-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0237-Added-PlayerLecternPageChangeEvent.patch
index 3c9f223aa5..3c9f223aa5 100644
--- a/patches/api/0239-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/api/0237-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/api/0240-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0238-Added-PlayerLoomPatternSelectEvent.patch
index 766e838ec8..766e838ec8 100644
--- a/patches/api/0240-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/api/0238-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/api/0241-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0239-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
index c25fbd796f..c25fbd796f 100644
--- a/patches/api/0241-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
+++ b/patches/api/0239-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/0242-Add-sendOpLevel-API.patch b/patches/api/0240-Add-sendOpLevel-API.patch
index c6d0eae4c3..c6d0eae4c3 100644
--- a/patches/api/0242-Add-sendOpLevel-API.patch
+++ b/patches/api/0240-Add-sendOpLevel-API.patch
diff --git a/patches/api/0243-Add-RegistryAccess-for-managing-registries.patch b/patches/api/0241-Add-RegistryAccess-for-managing-registries.patch
index 62f2578f51..f81b5e8480 100644
--- a/patches/api/0243-Add-RegistryAccess-for-managing-registries.patch
+++ b/patches/api/0241-Add-RegistryAccess-for-managing-registries.patch
@@ -190,10 +190,10 @@ index 791813220b2504214b1adecc69093cd600fb0f8c..47fe5b0d5d031110c27210a0a256c260
          final RegistryKey<T> registryKey = createInternal(key);
          REGISTRY_KEYS.add(registryKey);
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 732ed3724e784ad659cb4411dbd73b42a8330a2c..7be6710d28dea19bd0f9054c1c2e32dacd355c45 100644
+index 3210587c341bc8d80ddc7f387ca4030dbd0074c9..f35e5cd82c04bce3ca24120ca6cb5260a789b2d7 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2398,8 +2398,11 @@ public final class Bukkit {
+@@ -2395,8 +2395,11 @@ public final class Bukkit {
       * @param tClass of the registry to get
       * @param <T> type of the registry
       * @return the corresponding registry or null if not present
diff --git a/patches/api/0244-Add-StructuresLocateEvent.patch b/patches/api/0242-Add-StructuresLocateEvent.patch
index 4c155ca54a..4c155ca54a 100644
--- a/patches/api/0244-Add-StructuresLocateEvent.patch
+++ b/patches/api/0242-Add-StructuresLocateEvent.patch
diff --git a/patches/api/0245-Add-BlockPreDispenseEvent.patch b/patches/api/0243-Add-BlockPreDispenseEvent.patch
index 6a8e491828..6a8e491828 100644
--- a/patches/api/0245-Add-BlockPreDispenseEvent.patch
+++ b/patches/api/0243-Add-BlockPreDispenseEvent.patch
diff --git a/patches/api/0246-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0244-Added-PlayerChangeBeaconEffectEvent.patch
index 4d84c9e1b1..4d84c9e1b1 100644
--- a/patches/api/0246-Added-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/api/0244-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0247-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0245-Added-PlayerStonecutterRecipeSelectEvent.patch
index 46377a6798..46377a6798 100644
--- a/patches/api/0247-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/api/0245-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0248-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0246-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index f85f2a4f26..f85f2a4f26 100644
--- a/patches/api/0248-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/api/0246-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/0249-add-DragonEggFormEvent.patch b/patches/api/0247-add-DragonEggFormEvent.patch
index 3b40a9f99d..3b40a9f99d 100644
--- a/patches/api/0249-add-DragonEggFormEvent.patch
+++ b/patches/api/0247-add-DragonEggFormEvent.patch
diff --git a/patches/api/0250-EntityMoveEvent.patch b/patches/api/0248-EntityMoveEvent.patch
index d9e828eb8c..d9e828eb8c 100644
--- a/patches/api/0250-EntityMoveEvent.patch
+++ b/patches/api/0248-EntityMoveEvent.patch
diff --git a/patches/api/0251-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0249-Allow-adding-items-to-BlockDropItemEvent.patch
index c6b7565fe4..c6b7565fe4 100644
--- a/patches/api/0251-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/api/0249-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0252-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0250-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 7cc686da5a..7cc686da5a 100644
--- a/patches/api/0252-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/api/0250-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/0253-living-entity-allow-attribute-registration.patch b/patches/api/0251-living-entity-allow-attribute-registration.patch
index e7ded6dabb..e7ded6dabb 100644
--- a/patches/api/0253-living-entity-allow-attribute-registration.patch
+++ b/patches/api/0251-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0254-Add-missing-effects.patch b/patches/api/0252-Add-missing-effects.patch
index 52e92823ef..52e92823ef 100644
--- a/patches/api/0254-Add-missing-effects.patch
+++ b/patches/api/0252-Add-missing-effects.patch
diff --git a/patches/api/0255-Expose-Tracked-Players.patch b/patches/api/0253-Expose-Tracked-Players.patch
index 368fb84d94..368fb84d94 100644
--- a/patches/api/0255-Expose-Tracked-Players.patch
+++ b/patches/api/0253-Expose-Tracked-Players.patch
diff --git a/patches/api/0256-Add-worldborder-events.patch b/patches/api/0254-Add-worldborder-events.patch
index 9f3ae70435..9f3ae70435 100644
--- a/patches/api/0256-Add-worldborder-events.patch
+++ b/patches/api/0254-Add-worldborder-events.patch
diff --git a/patches/api/0257-added-PlayerNameEntityEvent.patch b/patches/api/0255-added-PlayerNameEntityEvent.patch
index 69bd20d13e..69bd20d13e 100644
--- a/patches/api/0257-added-PlayerNameEntityEvent.patch
+++ b/patches/api/0255-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0258-Add-recipe-to-cook-events.patch b/patches/api/0256-Add-recipe-to-cook-events.patch
index 8c8712541e..8c8712541e 100644
--- a/patches/api/0258-Add-recipe-to-cook-events.patch
+++ b/patches/api/0256-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0259-Add-Block-isValidTool.patch b/patches/api/0257-Add-Block-isValidTool.patch
index 835cf73b7a..835cf73b7a 100644
--- a/patches/api/0259-Add-Block-isValidTool.patch
+++ b/patches/api/0257-Add-Block-isValidTool.patch
diff --git a/patches/api/0260-Expand-world-key-API.patch b/patches/api/0258-Expand-world-key-API.patch
index e26cc12b26..51b61aef60 100644
--- a/patches/api/0260-Expand-world-key-API.patch
+++ b/patches/api/0258-Expand-world-key-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expand world key API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7be6710d28dea19bd0f9054c1c2e32dacd355c45..8fd1de659777595d9d8198e7ee638ad5500a6317 100644
+index f35e5cd82c04bce3ca24120ca6cb5260a789b2d7..94abdf67a057ef02fc98b61c1b9376454cc5b4c8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -864,6 +864,18 @@ public final class Bukkit {
+@@ -861,6 +861,18 @@ public final class Bukkit {
      public static World getWorld(@NotNull UUID uid) {
          return server.getWorld(uid);
      }
diff --git a/patches/api/0261-Improve-Item-Rarity-API.patch b/patches/api/0259-Improve-Item-Rarity-API.patch
index 3c1ddd5e14..3c1ddd5e14 100644
--- a/patches/api/0261-Improve-Item-Rarity-API.patch
+++ b/patches/api/0259-Improve-Item-Rarity-API.patch
diff --git a/patches/api/0262-Expose-protocol-version.patch b/patches/api/0260-Expose-protocol-version.patch
index ac67e3a922..ac67e3a922 100644
--- a/patches/api/0262-Expose-protocol-version.patch
+++ b/patches/api/0260-Expose-protocol-version.patch
diff --git a/patches/api/0263-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0261-add-isDeeplySleeping-to-HumanEntity.patch
index 45207a6064..45207a6064 100644
--- a/patches/api/0263-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/api/0261-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0264-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0262-add-consumeFuel-to-FurnaceBurnEvent.patch
index 07036efb43..07036efb43 100644
--- a/patches/api/0264-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/api/0262-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0265-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0263-add-get-set-drop-chance-to-EntityEquipment.patch
index d75f180c94..d75f180c94 100644
--- a/patches/api/0265-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/api/0263-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/api/0266-Added-PlayerDeepSleepEvent.patch b/patches/api/0264-Added-PlayerDeepSleepEvent.patch
index b333894788..b333894788 100644
--- a/patches/api/0266-Added-PlayerDeepSleepEvent.patch
+++ b/patches/api/0264-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0267-More-World-API.patch b/patches/api/0265-More-World-API.patch
index 7340819de5..7340819de5 100644
--- a/patches/api/0267-More-World-API.patch
+++ b/patches/api/0265-More-World-API.patch
diff --git a/patches/api/0268-Added-PlayerBedFailEnterEvent.patch b/patches/api/0266-Added-PlayerBedFailEnterEvent.patch
index 6f9decf5fc..6f9decf5fc 100644
--- a/patches/api/0268-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/api/0266-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0269-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0267-Introduce-beacon-activation-deactivation-events.patch
index 4e173b3d6c..4e173b3d6c 100644
--- a/patches/api/0269-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/api/0267-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0270-PlayerMoveEvent-Improvements.patch b/patches/api/0268-PlayerMoveEvent-Improvements.patch
index 33cf16e54b..33cf16e54b 100644
--- a/patches/api/0270-PlayerMoveEvent-Improvements.patch
+++ b/patches/api/0268-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0271-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0269-add-RespawnFlags-to-PlayerRespawnEvent.patch
index c596be8b98..c596be8b98 100644
--- a/patches/api/0271-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/api/0269-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0272-Add-more-WanderingTrader-API.patch b/patches/api/0270-Add-more-WanderingTrader-API.patch
index 99045d4949..99045d4949 100644
--- a/patches/api/0272-Add-more-WanderingTrader-API.patch
+++ b/patches/api/0270-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0273-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0271-Add-EntityBlockStorage-clearEntities.patch
index 7032ba6155..7032ba6155 100644
--- a/patches/api/0273-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/api/0271-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0274-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0272-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 16af3a7728..16af3a7728 100644
--- a/patches/api/0274-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/api/0272-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0275-Inventory-close.patch b/patches/api/0273-Inventory-close.patch
index 87dfa1a083..87dfa1a083 100644
--- a/patches/api/0275-Inventory-close.patch
+++ b/patches/api/0273-Inventory-close.patch
diff --git a/patches/api/0276-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0274-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 3103f1ce2c..3103f1ce2c 100644
--- a/patches/api/0276-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/api/0274-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0277-Add-basic-Datapack-API.patch b/patches/api/0275-Add-basic-Datapack-API.patch
index 25a17a8105..029031d1d7 100644
--- a/patches/api/0277-Add-basic-Datapack-API.patch
+++ b/patches/api/0275-Add-basic-Datapack-API.patch
@@ -70,10 +70,10 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7
 +
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8fd1de659777595d9d8198e7ee638ad5500a6317..e62d46629305a268906cd2cd5d5977d063c2f484 100644
+index 94abdf67a057ef02fc98b61c1b9376454cc5b4c8..e5a9b816b281017a08959d8e61acf59574dc1c50 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -330,9 +330,11 @@ public final class Bukkit {
+@@ -327,9 +327,11 @@ public final class Bukkit {
      /**
       * Get the DataPack Manager.
       *
@@ -85,7 +85,7 @@ index 8fd1de659777595d9d8198e7ee638ad5500a6317..e62d46629305a268906cd2cd5d5977d0
      public static DataPackManager getDataPackManager() {
          return server.getDataPackManager();
      }
-@@ -2588,6 +2590,14 @@ public final class Bukkit {
+@@ -2585,6 +2587,14 @@ public final class Bukkit {
      public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
          return server.getMobGoals();
      }
diff --git a/patches/api/0278-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0276-additions-to-PlayerGameModeChangeEvent.patch
index b2e65ae490..b2e65ae490 100644
--- a/patches/api/0278-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/api/0276-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0279-ItemStack-repair-check-API.patch b/patches/api/0277-ItemStack-repair-check-API.patch
index 6348f33164..6348f33164 100644
--- a/patches/api/0279-ItemStack-repair-check-API.patch
+++ b/patches/api/0277-ItemStack-repair-check-API.patch
diff --git a/patches/api/0280-More-Enchantment-API.patch b/patches/api/0278-More-Enchantment-API.patch
index a58f9ad820..a58f9ad820 100644
--- a/patches/api/0280-More-Enchantment-API.patch
+++ b/patches/api/0278-More-Enchantment-API.patch
diff --git a/patches/api/0281-Add-Mob-lookAt-API.patch b/patches/api/0279-Add-Mob-lookAt-API.patch
index 0dd5126905..0dd5126905 100644
--- a/patches/api/0281-Add-Mob-lookAt-API.patch
+++ b/patches/api/0279-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0282-ItemStack-editMeta.patch b/patches/api/0280-ItemStack-editMeta.patch
index c1ce9b264d..c1ce9b264d 100644
--- a/patches/api/0282-ItemStack-editMeta.patch
+++ b/patches/api/0280-ItemStack-editMeta.patch
diff --git a/patches/api/0283-Add-EntityInsideBlockEvent.patch b/patches/api/0281-Add-EntityInsideBlockEvent.patch
index 2805c40dcc..2805c40dcc 100644
--- a/patches/api/0283-Add-EntityInsideBlockEvent.patch
+++ b/patches/api/0281-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0284-Attributes-API-for-item-defaults.patch b/patches/api/0282-Attributes-API-for-item-defaults.patch
index 7fbe487dca..7fbe487dca 100644
--- a/patches/api/0284-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0282-Attributes-API-for-item-defaults.patch
diff --git a/patches/api/0285-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0283-Add-cause-to-Weather-ThunderChangeEvents.patch
index 8e5d45d87b..8e5d45d87b 100644
--- a/patches/api/0285-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/api/0283-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0286-More-Lidded-Block-API.patch b/patches/api/0284-More-Lidded-Block-API.patch
index a89f206f9a..a89f206f9a 100644
--- a/patches/api/0286-More-Lidded-Block-API.patch
+++ b/patches/api/0284-More-Lidded-Block-API.patch
diff --git a/patches/api/0287-Add-PlayerKickEvent-causes.patch b/patches/api/0285-Add-PlayerKickEvent-causes.patch
index 5bded2058c..5bded2058c 100644
--- a/patches/api/0287-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0285-Add-PlayerKickEvent-causes.patch
diff --git a/patches/api/0288-Add-PufferFishStateChangeEvent.patch b/patches/api/0286-Add-PufferFishStateChangeEvent.patch
index 7a719777e3..7a719777e3 100644
--- a/patches/api/0288-Add-PufferFishStateChangeEvent.patch
+++ b/patches/api/0286-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0289-Add-BellRevealRaiderEvent.patch b/patches/api/0287-Add-BellRevealRaiderEvent.patch
index c45f89fd4b..c45f89fd4b 100644
--- a/patches/api/0289-Add-BellRevealRaiderEvent.patch
+++ b/patches/api/0287-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0290-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0288-Add-ElderGuardianAppearanceEvent.patch
index 23897b7390..23897b7390 100644
--- a/patches/api/0290-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/api/0288-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0291-Add-more-line-of-sight-methods.patch b/patches/api/0289-Add-more-line-of-sight-methods.patch
index dc87546ce9..dc87546ce9 100644
--- a/patches/api/0291-Add-more-line-of-sight-methods.patch
+++ b/patches/api/0289-Add-more-line-of-sight-methods.patch
diff --git a/patches/api/0292-Add-WaterBottleSplashEvent.patch b/patches/api/0290-Add-WaterBottleSplashEvent.patch
index f5525245fa..f5525245fa 100644
--- a/patches/api/0292-Add-WaterBottleSplashEvent.patch
+++ b/patches/api/0290-Add-WaterBottleSplashEvent.patch
diff --git a/patches/api/0293-Add-more-LimitedRegion-API.patch b/patches/api/0291-Add-more-LimitedRegion-API.patch
index 292f95c890..292f95c890 100644
--- a/patches/api/0293-Add-more-LimitedRegion-API.patch
+++ b/patches/api/0291-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0294-Missing-Entity-API.patch b/patches/api/0292-Missing-Entity-API.patch
index e5b5628d97..e5b5628d97 100644
--- a/patches/api/0294-Missing-Entity-API.patch
+++ b/patches/api/0292-Missing-Entity-API.patch
diff --git a/patches/api/0295-Adds-PlayerArmSwingEvent.patch b/patches/api/0293-Adds-PlayerArmSwingEvent.patch
index 48e43517eb..48e43517eb 100644
--- a/patches/api/0295-Adds-PlayerArmSwingEvent.patch
+++ b/patches/api/0293-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/0296-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0294-Add-PlayerSignCommandPreprocessEvent.patch
index 8882c35337..8882c35337 100644
--- a/patches/api/0296-Add-PlayerSignCommandPreprocessEvent.patch
+++ b/patches/api/0294-Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/0297-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0295-fix-empty-array-elements-in-command-arguments.patch
index 4b66990211..4b66990211 100644
--- a/patches/api/0297-fix-empty-array-elements-in-command-arguments.patch
+++ b/patches/api/0295-fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/0298-Stinger-API.patch b/patches/api/0296-Stinger-API.patch
index e209e5da29..e209e5da29 100644
--- a/patches/api/0298-Stinger-API.patch
+++ b/patches/api/0296-Stinger-API.patch
diff --git a/patches/api/0299-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0297-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index aefa20a2d9..aefa20a2d9 100644
--- a/patches/api/0299-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/api/0297-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/0300-Add-PlayerSetSpawnEvent.patch b/patches/api/0298-Add-PlayerSetSpawnEvent.patch
index 42bce4d456..42bce4d456 100644
--- a/patches/api/0300-Add-PlayerSetSpawnEvent.patch
+++ b/patches/api/0298-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/0301-Added-EntityDamageItemEvent.patch b/patches/api/0299-Added-EntityDamageItemEvent.patch
index 60513a1cbd..60513a1cbd 100644
--- a/patches/api/0301-Added-EntityDamageItemEvent.patch
+++ b/patches/api/0299-Added-EntityDamageItemEvent.patch
diff --git a/patches/api/0302-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0300-Make-EntityUnleashEvent-cancellable.patch
index e99584c277..e99584c277 100644
--- a/patches/api/0302-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/api/0300-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/0303-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0301-Change-EnderEye-target-without-changing-other-things.patch
index d8e53593ae..d8e53593ae 100644
--- a/patches/api/0303-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/api/0301-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/0304-Add-BlockBreakBlockEvent.patch b/patches/api/0302-Add-BlockBreakBlockEvent.patch
index dd02c33432..dd02c33432 100644
--- a/patches/api/0304-Add-BlockBreakBlockEvent.patch
+++ b/patches/api/0302-Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/0305-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0303-Add-helpers-for-left-right-click-to-Action.patch
index 9dac2fe612..9dac2fe612 100644
--- a/patches/api/0305-Add-helpers-for-left-right-click-to-Action.patch
+++ b/patches/api/0303-Add-helpers-for-left-right-click-to-Action.patch
diff --git a/patches/api/0306-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/api/0304-Option-to-prevent-data-components-copy-in-smithing-r.patch
index fa4ad55705..fa4ad55705 100644
--- a/patches/api/0306-Option-to-prevent-data-components-copy-in-smithing-r.patch
+++ b/patches/api/0304-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/api/0307-More-CommandBlock-API.patch b/patches/api/0305-More-CommandBlock-API.patch
index c8c52c7587..c8c52c7587 100644
--- a/patches/api/0307-More-CommandBlock-API.patch
+++ b/patches/api/0305-More-CommandBlock-API.patch
diff --git a/patches/api/0308-Add-missing-team-sidebar-display-slots.patch b/patches/api/0306-Add-missing-team-sidebar-display-slots.patch
index cdecbd1764..cdecbd1764 100644
--- a/patches/api/0308-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/api/0306-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/0309-add-back-EntityPortalExitEvent.patch b/patches/api/0307-add-back-EntityPortalExitEvent.patch
index 5a153e2345..5a153e2345 100644
--- a/patches/api/0309-add-back-EntityPortalExitEvent.patch
+++ b/patches/api/0307-add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/0310-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0308-Add-methods-to-find-targets-for-lightning-strikes.patch
index ffa6fc8f05..ffa6fc8f05 100644
--- a/patches/api/0310-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/api/0308-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/api/0311-Get-entity-default-attributes.patch b/patches/api/0309-Get-entity-default-attributes.patch
index 097ec3ec3b..097ec3ec3b 100644
--- a/patches/api/0311-Get-entity-default-attributes.patch
+++ b/patches/api/0309-Get-entity-default-attributes.patch
diff --git a/patches/api/0312-Left-handed-API.patch b/patches/api/0310-Left-handed-API.patch
index cae17a697b..cae17a697b 100644
--- a/patches/api/0312-Left-handed-API.patch
+++ b/patches/api/0310-Left-handed-API.patch
diff --git a/patches/api/0313-Add-critical-damage-API.patch b/patches/api/0311-Add-critical-damage-API.patch
index f04ac65ac5..f04ac65ac5 100644
--- a/patches/api/0313-Add-critical-damage-API.patch
+++ b/patches/api/0311-Add-critical-damage-API.patch
diff --git a/patches/api/0314-Add-more-advancement-API.patch b/patches/api/0312-Add-more-advancement-API.patch
index 179dbdc225..179dbdc225 100644
--- a/patches/api/0314-Add-more-advancement-API.patch
+++ b/patches/api/0312-Add-more-advancement-API.patch
diff --git a/patches/api/0315-Fix-issues-with-mob-conversion.patch b/patches/api/0313-Fix-issues-with-mob-conversion.patch
index f451d967b6..f451d967b6 100644
--- a/patches/api/0315-Fix-issues-with-mob-conversion.patch
+++ b/patches/api/0313-Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/0316-Add-isCollidable-methods-to-various-places.patch b/patches/api/0314-Add-isCollidable-methods-to-various-places.patch
index a5b82e6e22..a5b82e6e22 100644
--- a/patches/api/0316-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/api/0314-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/api/0317-Goat-ram-API.patch b/patches/api/0315-Goat-ram-API.patch
index 06d426a786..06d426a786 100644
--- a/patches/api/0317-Goat-ram-API.patch
+++ b/patches/api/0315-Goat-ram-API.patch
diff --git a/patches/api/0318-Add-API-for-resetting-a-single-score.patch b/patches/api/0316-Add-API-for-resetting-a-single-score.patch
index 14142e8f6c..14142e8f6c 100644
--- a/patches/api/0318-Add-API-for-resetting-a-single-score.patch
+++ b/patches/api/0316-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/api/0319-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0317-Add-Raw-Byte-Entity-Serialization.patch
index f3a0ae6035..f3a0ae6035 100644
--- a/patches/api/0319-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/api/0317-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/api/0320-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0318-Add-PlayerItemFrameChangeEvent.patch
index b5d6cf7bd1..b5d6cf7bd1 100644
--- a/patches/api/0320-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/api/0318-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/api/0321-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0319-Allow-delegation-to-vanilla-chunk-gen.patch
index 46674bdd76..b5cc2e41d7 100644
--- a/patches/api/0321-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0319-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e62d46629305a268906cd2cd5d5977d063c2f484..8f88dc00c73810560070195fcf6e0f955e4ebdde 100644
+index e5a9b816b281017a08959d8e61acf59574dc1c50..6f4509bc3b997f773c19b31de91106c004c12af5 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2105,6 +2105,24 @@ public final class Bukkit {
+@@ -2102,6 +2102,24 @@ public final class Bukkit {
          return server.createChunkData(world);
      }
  
diff --git a/patches/api/0322-Add-more-Campfire-API.patch b/patches/api/0320-Add-more-Campfire-API.patch
index 80cdc0bb39..80cdc0bb39 100644
--- a/patches/api/0322-Add-more-Campfire-API.patch
+++ b/patches/api/0320-Add-more-Campfire-API.patch
diff --git a/patches/api/0323-Extend-VehicleCollisionEvent-move-HandlerList-up.patch b/patches/api/0321-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
index 5f5a4f4140..5f5a4f4140 100644
--- a/patches/api/0323-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
+++ b/patches/api/0321-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
diff --git a/patches/api/0324-Improve-scoreboard-entries.patch b/patches/api/0322-Improve-scoreboard-entries.patch
index d6e077bd86..d6e077bd86 100644
--- a/patches/api/0324-Improve-scoreboard-entries.patch
+++ b/patches/api/0322-Improve-scoreboard-entries.patch
diff --git a/patches/api/0325-Entity-powdered-snow-API.patch b/patches/api/0323-Entity-powdered-snow-API.patch
index b00af3e946..b00af3e946 100644
--- a/patches/api/0325-Entity-powdered-snow-API.patch
+++ b/patches/api/0323-Entity-powdered-snow-API.patch
diff --git a/patches/api/0326-Add-API-for-item-entity-health.patch b/patches/api/0324-Add-API-for-item-entity-health.patch
index 572034e557..572034e557 100644
--- a/patches/api/0326-Add-API-for-item-entity-health.patch
+++ b/patches/api/0324-Add-API-for-item-entity-health.patch
diff --git a/patches/api/0327-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0325-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index f094cdc255..f094cdc255 100644
--- a/patches/api/0327-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/api/0325-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0328-Bucketable-API.patch b/patches/api/0326-Bucketable-API.patch
index 26dbdc9f5d..26dbdc9f5d 100644
--- a/patches/api/0328-Bucketable-API.patch
+++ b/patches/api/0326-Bucketable-API.patch
diff --git a/patches/api/0329-System-prop-for-default-config-comment-parsing.patch b/patches/api/0327-System-prop-for-default-config-comment-parsing.patch
index 632f71e519..632f71e519 100644
--- a/patches/api/0329-System-prop-for-default-config-comment-parsing.patch
+++ b/patches/api/0327-System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/api/0330-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0328-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 9b189fc918..9b189fc918 100644
--- a/patches/api/0330-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/api/0328-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/api/0331-Multiple-Entries-with-Scoreboards.patch b/patches/api/0329-Multiple-Entries-with-Scoreboards.patch
index 920c2f117e..920c2f117e 100644
--- a/patches/api/0331-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/api/0329-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/api/0332-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0330-Warn-on-strange-EventHandler-return-types.patch
index c7807b823b..c7807b823b 100644
--- a/patches/api/0332-Warn-on-strange-EventHandler-return-types.patch
+++ b/patches/api/0330-Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/api/0333-Multi-Block-Change-API.patch b/patches/api/0331-Multi-Block-Change-API.patch
index 46d8adeb56..46d8adeb56 100644
--- a/patches/api/0333-Multi-Block-Change-API.patch
+++ b/patches/api/0331-Multi-Block-Change-API.patch
diff --git a/patches/api/0334-Fix-NotePlayEvent.patch b/patches/api/0332-Fix-NotePlayEvent.patch
index d3f827bfd8..d3f827bfd8 100644
--- a/patches/api/0334-Fix-NotePlayEvent.patch
+++ b/patches/api/0332-Fix-NotePlayEvent.patch
diff --git a/patches/api/0335-Freeze-Tick-Lock-API.patch b/patches/api/0333-Freeze-Tick-Lock-API.patch
index baaf0b2462..baaf0b2462 100644
--- a/patches/api/0335-Freeze-Tick-Lock-API.patch
+++ b/patches/api/0333-Freeze-Tick-Lock-API.patch
diff --git a/patches/api/0336-Dolphin-API.patch b/patches/api/0334-Dolphin-API.patch
index 73beed437b..73beed437b 100644
--- a/patches/api/0336-Dolphin-API.patch
+++ b/patches/api/0334-Dolphin-API.patch
diff --git a/patches/api/0337-More-PotionEffectType-API.patch b/patches/api/0335-More-PotionEffectType-API.patch
index b9dc5bb5d1..b9dc5bb5d1 100644
--- a/patches/api/0337-More-PotionEffectType-API.patch
+++ b/patches/api/0335-More-PotionEffectType-API.patch
diff --git a/patches/api/0338-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0336-API-for-creating-command-sender-which-forwards-feedb.patch
index 666b423f41..815ba515f1 100644
--- a/patches/api/0338-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0336-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] API for creating command sender which forwards feedback
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8f88dc00c73810560070195fcf6e0f955e4ebdde..1e96494c8080458f260ba94c4975ab18c4b4eefd 100644
+index 6f4509bc3b997f773c19b31de91106c004c12af5..f11b60d888e8f3a0c6213078cb5db35eafb82e3f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1583,6 +1583,20 @@ public final class Bukkit {
+@@ -1580,6 +1580,20 @@ public final class Bukkit {
          return server.getConsoleSender();
      }
  
diff --git a/patches/api/0339-Implement-regenerateChunk.patch b/patches/api/0337-Implement-regenerateChunk.patch
index 8f63e4dd7a..8f63e4dd7a 100644
--- a/patches/api/0339-Implement-regenerateChunk.patch
+++ b/patches/api/0337-Implement-regenerateChunk.patch
diff --git a/patches/api/0340-Add-GameEvent-tags.patch b/patches/api/0338-Add-GameEvent-tags.patch
index 361f439443..361f439443 100644
--- a/patches/api/0340-Add-GameEvent-tags.patch
+++ b/patches/api/0338-Add-GameEvent-tags.patch
diff --git a/patches/api/0341-Furnace-RecipesUsed-API.patch b/patches/api/0339-Furnace-RecipesUsed-API.patch
index 7fed82db21..7fed82db21 100644
--- a/patches/api/0341-Furnace-RecipesUsed-API.patch
+++ b/patches/api/0339-Furnace-RecipesUsed-API.patch
diff --git a/patches/api/0342-Configurable-sculk-sensor-listener-range.patch b/patches/api/0340-Configurable-sculk-sensor-listener-range.patch
index b1ad0cdb5b..b1ad0cdb5b 100644
--- a/patches/api/0342-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/api/0340-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/api/0343-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0341-Add-missing-block-data-mins-and-maxes.patch
index 63a647706a..63a647706a 100644
--- a/patches/api/0343-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/api/0341-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0344-Custom-Potion-Mixes.patch b/patches/api/0342-Custom-Potion-Mixes.patch
index 511fbb6d6c..9e3d5371aa 100644
--- a/patches/api/0344-Custom-Potion-Mixes.patch
+++ b/patches/api/0342-Custom-Potion-Mixes.patch
@@ -155,10 +155,10 @@ index 0000000000000000000000000000000000000000..3ede1e8f7bf0436fdc5bf395c0f9eaf1
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 1e96494c8080458f260ba94c4975ab18c4b4eefd..d56baf72235173121a694e8bb5331f2c515d3aa8 100644
+index f11b60d888e8f3a0c6213078cb5db35eafb82e3f..84d43e24a69352e2715935fd7ce3fd05aaca8601 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2630,6 +2630,15 @@ public final class Bukkit {
+@@ -2627,6 +2627,15 @@ public final class Bukkit {
      public static io.papermc.paper.datapack.DatapackManager getDatapackManager() {
          return server.getDatapackManager();
      }
diff --git a/patches/api/0345-Expose-furnace-minecart-push-values.patch b/patches/api/0343-Expose-furnace-minecart-push-values.patch
index 3d8c2336e7..3d8c2336e7 100644
--- a/patches/api/0345-Expose-furnace-minecart-push-values.patch
+++ b/patches/api/0343-Expose-furnace-minecart-push-values.patch
diff --git a/patches/api/0346-More-Projectile-API.patch b/patches/api/0344-More-Projectile-API.patch
index ba63dbcd3b..ba63dbcd3b 100644
--- a/patches/api/0346-More-Projectile-API.patch
+++ b/patches/api/0344-More-Projectile-API.patch
diff --git a/patches/api/0347-Add-getComputedBiome-API.patch b/patches/api/0345-Add-getComputedBiome-API.patch
index 6d24c2c66a..6d24c2c66a 100644
--- a/patches/api/0347-Add-getComputedBiome-API.patch
+++ b/patches/api/0345-Add-getComputedBiome-API.patch
diff --git a/patches/api/0348-Add-enchantWithLevels-API.patch b/patches/api/0346-Add-enchantWithLevels-API.patch
index 7cc63d19c9..7cc63d19c9 100644
--- a/patches/api/0348-Add-enchantWithLevels-API.patch
+++ b/patches/api/0346-Add-enchantWithLevels-API.patch
diff --git a/patches/api/0349-Add-TameableDeathMessageEvent.patch b/patches/api/0347-Add-TameableDeathMessageEvent.patch
index aec53f13ba..aec53f13ba 100644
--- a/patches/api/0349-Add-TameableDeathMessageEvent.patch
+++ b/patches/api/0347-Add-TameableDeathMessageEvent.patch
diff --git a/patches/api/0350-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0348-Allow-to-change-the-podium-of-the-EnderDragon.patch
index 08ffa1fdde..08ffa1fdde 100644
--- a/patches/api/0350-Allow-to-change-the-podium-of-the-EnderDragon.patch
+++ b/patches/api/0348-Allow-to-change-the-podium-of-the-EnderDragon.patch
diff --git a/patches/api/0351-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/api/0349-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
index 21b3f85c0b..21b3f85c0b 100644
--- a/patches/api/0351-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
+++ b/patches/api/0349-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
diff --git a/patches/api/0352-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0350-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 5775b6f33c..5775b6f33c 100644
--- a/patches/api/0352-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/api/0350-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/api/0353-WorldCreator-keepSpawnLoaded.patch b/patches/api/0351-WorldCreator-keepSpawnLoaded.patch
index 287c313c58..287c313c58 100644
--- a/patches/api/0353-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/api/0351-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/api/0354-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0352-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index e7a4ad2089..e7a4ad2089 100644
--- a/patches/api/0354-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/api/0352-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/api/0355-Add-PlayerStopUsingItemEvent.patch b/patches/api/0353-Add-PlayerStopUsingItemEvent.patch
index c8de1f6ed0..c8de1f6ed0 100644
--- a/patches/api/0355-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/api/0353-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/api/0356-Expand-FallingBlock-API.patch b/patches/api/0354-Expand-FallingBlock-API.patch
index d98776cf63..d98776cf63 100644
--- a/patches/api/0356-Expand-FallingBlock-API.patch
+++ b/patches/api/0354-Expand-FallingBlock-API.patch
diff --git a/patches/api/0357-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0355-Add-method-isTickingWorlds-to-Bukkit.patch
index 9627540551..21683de3d2 100644
--- a/patches/api/0357-Add-method-isTickingWorlds-to-Bukkit.patch
+++ b/patches/api/0355-Add-method-isTickingWorlds-to-Bukkit.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add method isTickingWorlds() to Bukkit.
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d56baf72235173121a694e8bb5331f2c515d3aa8..a1d9663730d5a63685d337f5eba40532b47ffbfc 100644
+index 84d43e24a69352e2715935fd7ce3fd05aaca8601..49c027f2c78660594caa51341291b1bcd35b8993 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -808,12 +808,26 @@ public final class Bukkit {
+@@ -805,12 +805,26 @@ public final class Bukkit {
          return server.getWorlds();
      }
  
@@ -35,7 +35,7 @@ index d56baf72235173121a694e8bb5331f2c515d3aa8..a1d9663730d5a63685d337f5eba40532
       *
       * @param creator the options to use when creating the world
       * @return newly created or loaded world
-@@ -825,6 +839,9 @@ public final class Bukkit {
+@@ -822,6 +836,9 @@ public final class Bukkit {
  
      /**
       * Unloads a world with the given name.
@@ -45,7 +45,7 @@ index d56baf72235173121a694e8bb5331f2c515d3aa8..a1d9663730d5a63685d337f5eba40532
       *
       * @param name Name of the world to unload
       * @param save whether to save the chunks before unloading
-@@ -836,6 +853,9 @@ public final class Bukkit {
+@@ -833,6 +850,9 @@ public final class Bukkit {
  
      /**
       * Unloads the given world.
diff --git a/patches/api/0358-Add-WardenAngerChangeEvent.patch b/patches/api/0356-Add-WardenAngerChangeEvent.patch
index 4291ccd615..4291ccd615 100644
--- a/patches/api/0358-Add-WardenAngerChangeEvent.patch
+++ b/patches/api/0356-Add-WardenAngerChangeEvent.patch
diff --git a/patches/api/0359-Nameable-Banner-API.patch b/patches/api/0357-Nameable-Banner-API.patch
index eba196daaf..eba196daaf 100644
--- a/patches/api/0359-Nameable-Banner-API.patch
+++ b/patches/api/0357-Nameable-Banner-API.patch
diff --git a/patches/api/0360-Add-Player-getFishHook.patch b/patches/api/0358-Add-Player-getFishHook.patch
index feae3b2e47..feae3b2e47 100644
--- a/patches/api/0360-Add-Player-getFishHook.patch
+++ b/patches/api/0358-Add-Player-getFishHook.patch
diff --git a/patches/api/0361-More-Teleport-API.patch b/patches/api/0359-More-Teleport-API.patch
index eb36f5ee5d..eb36f5ee5d 100644
--- a/patches/api/0361-More-Teleport-API.patch
+++ b/patches/api/0359-More-Teleport-API.patch
diff --git a/patches/api/0362-Add-EntityPortalReadyEvent.patch b/patches/api/0360-Add-EntityPortalReadyEvent.patch
index b9321a8e0d..b9321a8e0d 100644
--- a/patches/api/0362-Add-EntityPortalReadyEvent.patch
+++ b/patches/api/0360-Add-EntityPortalReadyEvent.patch
diff --git a/patches/api/0363-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0361-Custom-Chat-Completion-Suggestions-API.patch
index e22c1feefa..e22c1feefa 100644
--- a/patches/api/0363-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0361-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/api/0364-Collision-API.patch b/patches/api/0362-Collision-API.patch
index f59dc05fbb..f59dc05fbb 100644
--- a/patches/api/0364-Collision-API.patch
+++ b/patches/api/0362-Collision-API.patch
diff --git a/patches/api/0365-Block-Ticking-API.patch b/patches/api/0363-Block-Ticking-API.patch
index 02fed74c9e..02fed74c9e 100644
--- a/patches/api/0365-Block-Ticking-API.patch
+++ b/patches/api/0363-Block-Ticking-API.patch
diff --git a/patches/api/0366-Add-NamespacedKey-biome-methods.patch b/patches/api/0364-Add-NamespacedKey-biome-methods.patch
index d4c0137a3f..d4c0137a3f 100644
--- a/patches/api/0366-Add-NamespacedKey-biome-methods.patch
+++ b/patches/api/0364-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/api/0367-Also-load-resources-from-LibraryLoader.patch b/patches/api/0365-Also-load-resources-from-LibraryLoader.patch
index c2a41c2e53..c2a41c2e53 100644
--- a/patches/api/0367-Also-load-resources-from-LibraryLoader.patch
+++ b/patches/api/0365-Also-load-resources-from-LibraryLoader.patch
diff --git a/patches/api/0368-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0366-Added-byte-array-serialization-deserialization-for-P.patch
index 9b71f12681..9b71f12681 100644
--- a/patches/api/0368-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/api/0366-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/api/0369-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0367-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 291761dadb..291761dadb 100644
--- a/patches/api/0369-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/api/0367-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/api/0370-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0368-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
index 9b5ef25cf4..9b5ef25cf4 100644
--- a/patches/api/0370-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
+++ b/patches/api/0368-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
diff --git a/patches/api/0371-Add-getDrops-to-BlockState.patch b/patches/api/0369-Add-getDrops-to-BlockState.patch
index f9e8152229..f9e8152229 100644
--- a/patches/api/0371-Add-getDrops-to-BlockState.patch
+++ b/patches/api/0369-Add-getDrops-to-BlockState.patch
diff --git a/patches/api/0372-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0370-Add-PlayerInventorySlotChangeEvent.patch
index d76df6d87d..d76df6d87d 100644
--- a/patches/api/0372-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/api/0370-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/api/0373-Elder-Guardian-appearance-API.patch b/patches/api/0371-Elder-Guardian-appearance-API.patch
index 3490b6d5db..3490b6d5db 100644
--- a/patches/api/0373-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0371-Elder-Guardian-appearance-API.patch
diff --git a/patches/api/0374-Allow-changing-bed-s-occupied-property.patch b/patches/api/0372-Allow-changing-bed-s-occupied-property.patch
index 8dfafd6d33..8dfafd6d33 100644
--- a/patches/api/0374-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/api/0372-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/api/0375-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0373-Add-EquipmentSlot-convenience-methods.patch
index f7e2301f31..f7e2301f31 100644
--- a/patches/api/0375-Add-EquipmentSlot-convenience-methods.patch
+++ b/patches/api/0373-Add-EquipmentSlot-convenience-methods.patch
diff --git a/patches/api/0376-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0374-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
index fc814196e7..fc814196e7 100644
--- a/patches/api/0376-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
+++ b/patches/api/0374-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
diff --git a/patches/api/0377-Add-entity-knockback-API.patch b/patches/api/0375-Add-entity-knockback-API.patch
index b8c91440f6..b8c91440f6 100644
--- a/patches/api/0377-Add-entity-knockback-API.patch
+++ b/patches/api/0375-Add-entity-knockback-API.patch
diff --git a/patches/api/0378-Added-EntityToggleSitEvent.patch b/patches/api/0376-Added-EntityToggleSitEvent.patch
index d5a8c46dc8..d5a8c46dc8 100644
--- a/patches/api/0378-Added-EntityToggleSitEvent.patch
+++ b/patches/api/0376-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0379-Add-Moving-Piston-API.patch b/patches/api/0377-Add-Moving-Piston-API.patch
index 8f889f1e3d..8f889f1e3d 100644
--- a/patches/api/0379-Add-Moving-Piston-API.patch
+++ b/patches/api/0377-Add-Moving-Piston-API.patch
diff --git a/patches/api/0380-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0378-Add-PrePlayerAttackEntityEvent.patch
index ac0ebedde7..ac0ebedde7 100644
--- a/patches/api/0380-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/api/0378-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0381-Add-Player-Warden-Warning-API.patch b/patches/api/0379-Add-Player-Warden-Warning-API.patch
index 42426a3ae4..42426a3ae4 100644
--- a/patches/api/0381-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0379-Add-Player-Warden-Warning-API.patch
diff --git a/patches/api/0382-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0380-More-vanilla-friendly-methods-to-update-trades.patch
index f13fdb5601..f13fdb5601 100644
--- a/patches/api/0382-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/api/0380-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/api/0383-Add-paper-dumplisteners-command.patch b/patches/api/0381-Add-paper-dumplisteners-command.patch
index a5d858851f..a5d858851f 100644
--- a/patches/api/0383-Add-paper-dumplisteners-command.patch
+++ b/patches/api/0381-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0384-ItemStack-damage-API.patch b/patches/api/0382-ItemStack-damage-API.patch
index 6e2001f976..6e2001f976 100644
--- a/patches/api/0384-ItemStack-damage-API.patch
+++ b/patches/api/0382-ItemStack-damage-API.patch
diff --git a/patches/api/0385-Add-Tick-TemporalUnit.patch b/patches/api/0383-Add-Tick-TemporalUnit.patch
index 562eb00082..562eb00082 100644
--- a/patches/api/0385-Add-Tick-TemporalUnit.patch
+++ b/patches/api/0383-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0386-Friction-API.patch b/patches/api/0384-Friction-API.patch
index 4aab88652e..4aab88652e 100644
--- a/patches/api/0386-Friction-API.patch
+++ b/patches/api/0384-Friction-API.patch
diff --git a/patches/api/0387-Player-Entity-Tracking-Events.patch b/patches/api/0385-Player-Entity-Tracking-Events.patch
index 3dfa72c922..3dfa72c922 100644
--- a/patches/api/0387-Player-Entity-Tracking-Events.patch
+++ b/patches/api/0385-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0388-Add-missing-Fluid-type.patch b/patches/api/0386-Add-missing-Fluid-type.patch
index c260bf8497..c260bf8497 100644
--- a/patches/api/0388-Add-missing-Fluid-type.patch
+++ b/patches/api/0386-Add-missing-Fluid-type.patch
diff --git a/patches/api/0389-fix-Instruments.patch b/patches/api/0387-fix-Instruments.patch
index 468dc80a34..468dc80a34 100644
--- a/patches/api/0389-fix-Instruments.patch
+++ b/patches/api/0387-fix-Instruments.patch
diff --git a/patches/api/0390-Add-BlockLockCheckEvent.patch b/patches/api/0388-Add-BlockLockCheckEvent.patch
index c5d560192c..c5d560192c 100644
--- a/patches/api/0390-Add-BlockLockCheckEvent.patch
+++ b/patches/api/0388-Add-BlockLockCheckEvent.patch
diff --git a/patches/api/0391-Add-Sneaking-API-for-Entities.patch b/patches/api/0389-Add-Sneaking-API-for-Entities.patch
index 3f8d4c724f..3f8d4c724f 100644
--- a/patches/api/0391-Add-Sneaking-API-for-Entities.patch
+++ b/patches/api/0389-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/api/0392-Improve-PortalEvents.patch b/patches/api/0390-Improve-PortalEvents.patch
index f7f53b19fc..f7f53b19fc 100644
--- a/patches/api/0392-Improve-PortalEvents.patch
+++ b/patches/api/0390-Improve-PortalEvents.patch
diff --git a/patches/api/0393-Flying-Fall-Damage-API.patch b/patches/api/0391-Flying-Fall-Damage-API.patch
index b38eb93f1c..b38eb93f1c 100644
--- a/patches/api/0393-Flying-Fall-Damage-API.patch
+++ b/patches/api/0391-Flying-Fall-Damage-API.patch
diff --git a/patches/api/0394-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0392-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
index b8287d2850..b8287d2850 100644
--- a/patches/api/0394-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
+++ b/patches/api/0392-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0395-Win-Screen-API.patch b/patches/api/0393-Win-Screen-API.patch
index 05fbb589d3..05fbb589d3 100644
--- a/patches/api/0395-Win-Screen-API.patch
+++ b/patches/api/0393-Win-Screen-API.patch
diff --git a/patches/api/0396-Add-Entity-Body-Yaw-API.patch b/patches/api/0394-Add-Entity-Body-Yaw-API.patch
index d1d983e166..d1d983e166 100644
--- a/patches/api/0396-Add-Entity-Body-Yaw-API.patch
+++ b/patches/api/0394-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/api/0397-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0395-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
index c375206bf7..c375206bf7 100644
--- a/patches/api/0397-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
+++ b/patches/api/0395-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0398-Add-EntityFertilizeEggEvent.patch b/patches/api/0396-Add-EntityFertilizeEggEvent.patch
index 4ae6ff9f0f..4ae6ff9f0f 100644
--- a/patches/api/0398-Add-EntityFertilizeEggEvent.patch
+++ b/patches/api/0396-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0399-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0397-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 9dee250212..9dee250212 100644
--- a/patches/api/0399-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/api/0397-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0400-Add-Shearable-API.patch b/patches/api/0398-Add-Shearable-API.patch
index 19ef9a4a36..19ef9a4a36 100644
--- a/patches/api/0400-Add-Shearable-API.patch
+++ b/patches/api/0398-Add-Shearable-API.patch
diff --git a/patches/api/0401-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0399-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 27abcd1f93..27abcd1f93 100644
--- a/patches/api/0401-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/api/0399-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/api/0402-Add-Mob-Experience-reward-API.patch b/patches/api/0400-Add-Mob-Experience-reward-API.patch
index 2e3a09921e..2e3a09921e 100644
--- a/patches/api/0402-Add-Mob-Experience-reward-API.patch
+++ b/patches/api/0400-Add-Mob-Experience-reward-API.patch
diff --git a/patches/api/0403-Expand-PlayerItemMendEvent.patch b/patches/api/0401-Expand-PlayerItemMendEvent.patch
index 223922e05e..223922e05e 100644
--- a/patches/api/0403-Expand-PlayerItemMendEvent.patch
+++ b/patches/api/0401-Expand-PlayerItemMendEvent.patch
diff --git a/patches/api/0404-Add-transient-modifier-API.patch b/patches/api/0402-Add-transient-modifier-API.patch
index a32e4c86a9..a32e4c86a9 100644
--- a/patches/api/0404-Add-transient-modifier-API.patch
+++ b/patches/api/0402-Add-transient-modifier-API.patch
diff --git a/patches/api/0405-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0403-Properly-remove-the-experimental-smithing-inventory-.patch
index 3f9c7d07ec..3f9c7d07ec 100644
--- a/patches/api/0405-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/api/0403-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/api/0406-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0404-Add-method-to-remove-all-active-potion-effects.patch
index 65345ce8c8..65345ce8c8 100644
--- a/patches/api/0406-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/api/0404-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/api/0407-Folia-scheduler-and-owned-region-API.patch b/patches/api/0405-Folia-scheduler-and-owned-region-API.patch
index cd1049c172..6c159797d3 100644
--- a/patches/api/0407-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/api/0405-Folia-scheduler-and-owned-region-API.patch
@@ -499,10 +499,10 @@ index 0000000000000000000000000000000000000000..a6b50c9d8af589cc4747e14d343d2045
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a1d9663730d5a63685d337f5eba40532b47ffbfc..91476b9e5238caf49492cb23b549c9df6a45ed3e 100644
+index 49c027f2c78660594caa51341291b1bcd35b8993..290d692fccf63c5f109b8a3f1de726a12a20ddc9 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2661,6 +2661,141 @@ public final class Bukkit {
+@@ -2658,6 +2658,141 @@ public final class Bukkit {
      }
      // Paper end
  
diff --git a/patches/api/0408-Add-event-for-player-editing-sign.patch b/patches/api/0406-Add-event-for-player-editing-sign.patch
index b534aebde9..b534aebde9 100644
--- a/patches/api/0408-Add-event-for-player-editing-sign.patch
+++ b/patches/api/0406-Add-event-for-player-editing-sign.patch
diff --git a/patches/api/0409-Add-Sign-getInteractableSideFor.patch b/patches/api/0407-Add-Sign-getInteractableSideFor.patch
index 1e085323ca..1e085323ca 100644
--- a/patches/api/0409-Add-Sign-getInteractableSideFor.patch
+++ b/patches/api/0407-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/api/0410-Fix-BanList-API.patch b/patches/api/0408-Fix-BanList-API.patch
index 911f301327..911f301327 100644
--- a/patches/api/0410-Fix-BanList-API.patch
+++ b/patches/api/0408-Fix-BanList-API.patch
diff --git a/patches/api/0411-Add-whitelist-events.patch b/patches/api/0409-Add-whitelist-events.patch
index 75458e78df..75458e78df 100644
--- a/patches/api/0411-Add-whitelist-events.patch
+++ b/patches/api/0409-Add-whitelist-events.patch
diff --git a/patches/api/0412-API-for-updating-recipes-on-clients.patch b/patches/api/0410-API-for-updating-recipes-on-clients.patch
index 1eb7bb0fc2..d4e528d077 100644
--- a/patches/api/0412-API-for-updating-recipes-on-clients.patch
+++ b/patches/api/0410-API-for-updating-recipes-on-clients.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] API for updating recipes on clients
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 91476b9e5238caf49492cb23b549c9df6a45ed3e..d6be967c2fd480547bf9eb3938ca147382f835da 100644
+index 290d692fccf63c5f109b8a3f1de726a12a20ddc9..91405dee7c822bba9ef809f00cbd85db5b569b44 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -992,6 +992,26 @@ public final class Bukkit {
+@@ -989,6 +989,26 @@ public final class Bukkit {
          server.reloadData();
      }
  
@@ -35,7 +35,7 @@ index 91476b9e5238caf49492cb23b549c9df6a45ed3e..d6be967c2fd480547bf9eb3938ca1473
      /**
       * Returns the primary logger associated with this server instance.
       *
-@@ -1052,6 +1072,20 @@ public final class Bukkit {
+@@ -1049,6 +1069,20 @@ public final class Bukkit {
          return server.addRecipe(recipe);
      }
  
@@ -56,7 +56,7 @@ index 91476b9e5238caf49492cb23b549c9df6a45ed3e..d6be967c2fd480547bf9eb3938ca1473
      /**
       * Get a list of all recipes for a given item. The stack size is ignored
       * in comparisons. If the durability is -1, it will match any data value.
-@@ -1243,6 +1277,24 @@ public final class Bukkit {
+@@ -1240,6 +1274,24 @@ public final class Bukkit {
          return server.removeRecipe(key);
      }
  
diff --git a/patches/api/0413-Add-PlayerFailMoveEvent.patch b/patches/api/0411-Add-PlayerFailMoveEvent.patch
index c0687e2ae0..c0687e2ae0 100644
--- a/patches/api/0413-Add-PlayerFailMoveEvent.patch
+++ b/patches/api/0411-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0414-Fix-custom-statistic-criteria-creation.patch b/patches/api/0412-Fix-custom-statistic-criteria-creation.patch
index bbfdc162d8..bbfdc162d8 100644
--- a/patches/api/0414-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/api/0412-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0415-SculkCatalyst-bloom-API.patch b/patches/api/0413-SculkCatalyst-bloom-API.patch
index 49d8c8c2bd..49d8c8c2bd 100644
--- a/patches/api/0415-SculkCatalyst-bloom-API.patch
+++ b/patches/api/0413-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0416-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0414-API-for-an-entity-s-scoreboard-name.patch
index 9820a1a54f..9820a1a54f 100644
--- a/patches/api/0416-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/api/0414-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/api/0417-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0415-Deprecate-and-replace-methods-with-old-StructureType.patch
index b9b94d0f4b..69d5af26d8 100644
--- a/patches/api/0417-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/api/0415-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d6be967c2fd480547bf9eb3938ca147382f835da..81203ad1460f3b64413a8426fb58a051b7d78f03 100644
+index 91405dee7c822bba9ef809f00cbd85db5b569b44..2726ee0338cbcf4233588d0eb7dcce3b0c571908 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -937,9 +937,6 @@ public final class Bukkit {
+@@ -934,9 +934,6 @@ public final class Bukkit {
      /**
       * Create a new explorer map targeting the closest nearby structure of a
       * given {@link StructureType}.
@@ -18,7 +18,7 @@ index d6be967c2fd480547bf9eb3938ca147382f835da..81203ad1460f3b64413a8426fb58a051
       *
       * @param world the world the map will belong to
       * @param location the origin location to find the nearest structure
-@@ -948,7 +945,9 @@ public final class Bukkit {
+@@ -945,7 +942,9 @@ public final class Bukkit {
       *
       * @see World#locateNearestStructure(org.bukkit.Location,
       *      org.bukkit.StructureType, int, boolean)
@@ -28,7 +28,7 @@ index d6be967c2fd480547bf9eb3938ca147382f835da..81203ad1460f3b64413a8426fb58a051
      @NotNull
      public static ItemStack createExplorerMap(@NotNull World world, @NotNull Location location, @NotNull StructureType structureType) {
          return server.createExplorerMap(world, location, structureType);
-@@ -971,11 +970,54 @@ public final class Bukkit {
+@@ -968,11 +967,54 @@ public final class Bukkit {
       *
       * @see World#locateNearestStructure(org.bukkit.Location,
       *      org.bukkit.StructureType, int, boolean)
diff --git a/patches/api/0418-Add-Listing-API-for-Player.patch b/patches/api/0416-Add-Listing-API-for-Player.patch
index 94d5892bd0..94d5892bd0 100644
--- a/patches/api/0418-Add-Listing-API-for-Player.patch
+++ b/patches/api/0416-Add-Listing-API-for-Player.patch
diff --git a/patches/api/0419-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0417-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index 34d1940866..34d1940866 100644
--- a/patches/api/0419-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/api/0417-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0420-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0418-Fix-NPE-on-Boat-getStatus.patch
index 1cf6096a92..1cf6096a92 100644
--- a/patches/api/0420-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/api/0418-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0421-Expand-Pose-API.patch b/patches/api/0419-Expand-Pose-API.patch
index b6d907acb4..b6d907acb4 100644
--- a/patches/api/0421-Expand-Pose-API.patch
+++ b/patches/api/0419-Expand-Pose-API.patch
diff --git a/patches/api/0422-MerchantRecipe-add-copy-constructor.patch b/patches/api/0420-MerchantRecipe-add-copy-constructor.patch
index 1c5ba2803c..1c5ba2803c 100644
--- a/patches/api/0422-MerchantRecipe-add-copy-constructor.patch
+++ b/patches/api/0420-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0423-More-DragonBattle-API.patch b/patches/api/0421-More-DragonBattle-API.patch
index e25208ec19..e25208ec19 100644
--- a/patches/api/0423-More-DragonBattle-API.patch
+++ b/patches/api/0421-More-DragonBattle-API.patch
diff --git a/patches/api/0424-Add-PlayerPickItemEvent.patch b/patches/api/0422-Add-PlayerPickItemEvent.patch
index 6dd0be80a8..6dd0be80a8 100644
--- a/patches/api/0424-Add-PlayerPickItemEvent.patch
+++ b/patches/api/0422-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0425-Allow-trident-custom-damage.patch b/patches/api/0423-Allow-trident-custom-damage.patch
index 870b735548..870b735548 100644
--- a/patches/api/0425-Allow-trident-custom-damage.patch
+++ b/patches/api/0423-Allow-trident-custom-damage.patch
diff --git a/patches/api/0426-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0424-Expose-hand-during-BlockCanBuildEvent.patch
index 97d99a40d2..97d99a40d2 100644
--- a/patches/api/0426-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/api/0424-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0427-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0425-Limit-setBurnTime-to-valid-short-values.patch
index 2faac56fd8..2faac56fd8 100644
--- a/patches/api/0427-Limit-setBurnTime-to-valid-short-values.patch
+++ b/patches/api/0425-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0428-Add-OfflinePlayer-isConnected.patch b/patches/api/0426-Add-OfflinePlayer-isConnected.patch
index fad59b6a54..fad59b6a54 100644
--- a/patches/api/0428-Add-OfflinePlayer-isConnected.patch
+++ b/patches/api/0426-Add-OfflinePlayer-isConnected.patch
diff --git a/patches/api/0429-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0427-Add-titleOverride-to-InventoryOpenEvent.patch
index 68e755f010..68e755f010 100644
--- a/patches/api/0429-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/api/0427-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0430-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0428-Allow-proper-checking-of-empty-item-stacks.patch
index a77293644e..a77293644e 100644
--- a/patches/api/0430-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/api/0428-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/api/0431-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0429-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
index e72f86be5d..e72f86be5d 100644
--- a/patches/api/0431-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
+++ b/patches/api/0429-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0432-Add-player-idle-duration-API.patch b/patches/api/0430-Add-player-idle-duration-API.patch
index 41b55311ed..41b55311ed 100644
--- a/patches/api/0432-Add-player-idle-duration-API.patch
+++ b/patches/api/0430-Add-player-idle-duration-API.patch
diff --git a/patches/api/0433-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0431-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 0481690ad4..0481690ad4 100644
--- a/patches/api/0433-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/api/0431-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/api/0434-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0432-Add-predicate-for-blocks-when-raytracing.patch
index c212167a42..c212167a42 100644
--- a/patches/api/0434-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/api/0432-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/api/0435-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0433-Add-hand-to-fish-event-for-all-player-interactions.patch
index b431332b9a..b431332b9a 100644
--- a/patches/api/0435-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/api/0433-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0436-Add-UUID-attribute-modifier-API.patch b/patches/api/0434-Add-UUID-attribute-modifier-API.patch
index 251ae6e425..251ae6e425 100644
--- a/patches/api/0436-Add-UUID-attribute-modifier-API.patch
+++ b/patches/api/0434-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/api/0437-Expand-LingeringPotion-API.patch b/patches/api/0435-Expand-LingeringPotion-API.patch
index 40b5a5f547..40b5a5f547 100644
--- a/patches/api/0437-Expand-LingeringPotion-API.patch
+++ b/patches/api/0435-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0438-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0436-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
index 2eed94d07c..2eed94d07c 100644
--- a/patches/api/0438-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
+++ b/patches/api/0436-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
diff --git a/patches/api/0439-Add-Structure-check-API.patch b/patches/api/0437-Add-Structure-check-API.patch
index 4c0756c86e..4c0756c86e 100644
--- a/patches/api/0439-Add-Structure-check-API.patch
+++ b/patches/api/0437-Add-Structure-check-API.patch
diff --git a/patches/api/0440-add-missing-Experimental-annotations.patch b/patches/api/0438-add-missing-Experimental-annotations.patch
index 343675b768..343675b768 100644
--- a/patches/api/0440-add-missing-Experimental-annotations.patch
+++ b/patches/api/0438-add-missing-Experimental-annotations.patch
diff --git a/patches/api/0441-Add-more-scoreboard-API.patch b/patches/api/0439-Add-more-scoreboard-API.patch
index 201af36b0c..201af36b0c 100644
--- a/patches/api/0441-Add-more-scoreboard-API.patch
+++ b/patches/api/0439-Add-more-scoreboard-API.patch
diff --git a/patches/api/0442-Improve-Registry.patch b/patches/api/0440-Improve-Registry.patch
index aa0646669b..aa0646669b 100644
--- a/patches/api/0442-Improve-Registry.patch
+++ b/patches/api/0440-Improve-Registry.patch
diff --git a/patches/api/0443-Add-experience-points-API.patch b/patches/api/0441-Add-experience-points-API.patch
index a0add5e837..a0add5e837 100644
--- a/patches/api/0443-Add-experience-points-API.patch
+++ b/patches/api/0441-Add-experience-points-API.patch
diff --git a/patches/api/0444-Add-missing-InventoryType.patch b/patches/api/0442-Add-missing-InventoryType.patch
index 9c578e05a4..9c578e05a4 100644
--- a/patches/api/0444-Add-missing-InventoryType.patch
+++ b/patches/api/0442-Add-missing-InventoryType.patch
diff --git a/patches/api/0445-Add-drops-to-shear-events.patch b/patches/api/0443-Add-drops-to-shear-events.patch
index c87460e48d..c87460e48d 100644
--- a/patches/api/0445-Add-drops-to-shear-events.patch
+++ b/patches/api/0443-Add-drops-to-shear-events.patch
diff --git a/patches/api/0446-Add-HiddenPotionEffect-API.patch b/patches/api/0444-Add-HiddenPotionEffect-API.patch
index 8ac61db064..8ac61db064 100644
--- a/patches/api/0446-Add-HiddenPotionEffect-API.patch
+++ b/patches/api/0444-Add-HiddenPotionEffect-API.patch
diff --git a/patches/api/0447-Add-PlayerShieldDisableEvent.patch b/patches/api/0445-Add-PlayerShieldDisableEvent.patch
index 29c7daa0e3..29c7daa0e3 100644
--- a/patches/api/0447-Add-PlayerShieldDisableEvent.patch
+++ b/patches/api/0445-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/api/0448-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0446-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
index 93ba48c77c..93ba48c77c 100644
--- a/patches/api/0448-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
+++ b/patches/api/0446-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
diff --git a/patches/api/0449-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0447-Add-BlockStateMeta-clearBlockState.patch
index 7e8c47a8e2..7e8c47a8e2 100644
--- a/patches/api/0449-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/api/0447-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/api/0450-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0448-Expose-LootTable-of-DecoratedPot.patch
index 42a8de4123..42a8de4123 100644
--- a/patches/api/0450-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/api/0448-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/api/0451-Add-ShulkerDuplicateEvent.patch b/patches/api/0449-Add-ShulkerDuplicateEvent.patch
index a0a81094ce..a0a81094ce 100644
--- a/patches/api/0451-Add-ShulkerDuplicateEvent.patch
+++ b/patches/api/0449-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/api/0452-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0450-Add-api-for-spawn-egg-texture-colors.patch
index 082f5a3005..082f5a3005 100644
--- a/patches/api/0452-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/api/0450-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/api/0453-Add-Lifecycle-Event-system.patch b/patches/api/0451-Add-Lifecycle-Event-system.patch
index b40399205b..b40399205b 100644
--- a/patches/api/0453-Add-Lifecycle-Event-system.patch
+++ b/patches/api/0451-Add-Lifecycle-Event-system.patch
diff --git a/patches/api/0454-ItemStack-Tooltip-API.patch b/patches/api/0452-ItemStack-Tooltip-API.patch
index 3983a283cd..3983a283cd 100644
--- a/patches/api/0454-ItemStack-Tooltip-API.patch
+++ b/patches/api/0452-ItemStack-Tooltip-API.patch
diff --git a/patches/api/0455-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0453-Add-getChunkSnapshot-includeLightData-parameter.patch
index 0437924b94..0437924b94 100644
--- a/patches/api/0455-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/api/0453-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/api/0456-Add-FluidState-API.patch b/patches/api/0454-Add-FluidState-API.patch
index 3235c393f5..3235c393f5 100644
--- a/patches/api/0456-Add-FluidState-API.patch
+++ b/patches/api/0454-Add-FluidState-API.patch
diff --git a/patches/api/0457-add-number-format-api.patch b/patches/api/0455-add-number-format-api.patch
index 6d32302ad0..6d32302ad0 100644
--- a/patches/api/0457-add-number-format-api.patch
+++ b/patches/api/0455-add-number-format-api.patch
diff --git a/patches/api/0458-improve-BanList-types.patch b/patches/api/0456-improve-BanList-types.patch
index cee321426a..18c627689d 100644
--- a/patches/api/0458-improve-BanList-types.patch
+++ b/patches/api/0456-improve-BanList-types.patch
@@ -68,10 +68,10 @@ index a77c0411a68a9bad33ddfb335b7a996a843e478c..0e0baadde9e34d28db56dc68e66aaf66
          /**
           * Banned player names
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 81203ad1460f3b64413a8426fb58a051b7d78f03..5d1b55fdbcbe63f6b42b694d05211a3cc691a09d 100644
+index 2726ee0338cbcf4233588d0eb7dcce3b0c571908..71f1c361ebccbe83193c37ec3a90faa4085001c3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1651,11 +1651,27 @@ public final class Bukkit {
+@@ -1648,11 +1648,27 @@ public final class Bukkit {
       * @param <T> The ban target
       *
       * @return a ban list of the specified type
diff --git a/patches/api/0459-Suspicious-Effect-Entry-API.patch b/patches/api/0457-Suspicious-Effect-Entry-API.patch
index 7c9548be79..7c9548be79 100644
--- a/patches/api/0459-Suspicious-Effect-Entry-API.patch
+++ b/patches/api/0457-Suspicious-Effect-Entry-API.patch
diff --git a/patches/api/0460-Fix-DamageSource-API.patch b/patches/api/0458-Fix-DamageSource-API.patch
index efe4403e2c..efe4403e2c 100644
--- a/patches/api/0460-Fix-DamageSource-API.patch
+++ b/patches/api/0458-Fix-DamageSource-API.patch
diff --git a/patches/api/0461-Expanded-Hopper-API.patch b/patches/api/0459-Expanded-Hopper-API.patch
index 51cb6dfee2..51cb6dfee2 100644
--- a/patches/api/0461-Expanded-Hopper-API.patch
+++ b/patches/api/0459-Expanded-Hopper-API.patch
diff --git a/patches/api/0462-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0460-Clone-mutables-to-prevent-unexpected-issues.patch
index e84ea7d3aa..e84ea7d3aa 100644
--- a/patches/api/0462-Clone-mutables-to-prevent-unexpected-issues.patch
+++ b/patches/api/0460-Clone-mutables-to-prevent-unexpected-issues.patch
diff --git a/patches/api/0463-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0461-Add-BlockBreakProgressUpdateEvent.patch
index a2b5a83baf..a2b5a83baf 100644
--- a/patches/api/0463-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/api/0461-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/api/0464-Deprecate-ItemStack-setType.patch b/patches/api/0462-Deprecate-ItemStack-setType.patch
index 8883aeb309..8883aeb309 100644
--- a/patches/api/0464-Deprecate-ItemStack-setType.patch
+++ b/patches/api/0462-Deprecate-ItemStack-setType.patch
diff --git a/patches/api/0465-Item-Mutation-Fixes.patch b/patches/api/0463-Item-Mutation-Fixes.patch
index c1c3508b78..c1c3508b78 100644
--- a/patches/api/0465-Item-Mutation-Fixes.patch
+++ b/patches/api/0463-Item-Mutation-Fixes.patch
diff --git a/patches/api/0466-API-for-checking-sent-chunks.patch b/patches/api/0464-API-for-checking-sent-chunks.patch
index 8d97e181b0..8d97e181b0 100644
--- a/patches/api/0466-API-for-checking-sent-chunks.patch
+++ b/patches/api/0464-API-for-checking-sent-chunks.patch
diff --git a/patches/api/0467-Add-CartographyItemEvent.patch b/patches/api/0465-Add-CartographyItemEvent.patch
index 1f19663c9f..1f19663c9f 100644
--- a/patches/api/0467-Add-CartographyItemEvent.patch
+++ b/patches/api/0465-Add-CartographyItemEvent.patch
diff --git a/patches/api/0468-More-Raid-API.patch b/patches/api/0466-More-Raid-API.patch
index 921bc9c6fb..921bc9c6fb 100644
--- a/patches/api/0468-More-Raid-API.patch
+++ b/patches/api/0466-More-Raid-API.patch
diff --git a/patches/api/0469-Fix-SpawnerEntry-Equipment-API.patch b/patches/api/0467-Fix-SpawnerEntry-Equipment-API.patch
index 0a16b34cd5..0a16b34cd5 100644
--- a/patches/api/0469-Fix-SpawnerEntry-Equipment-API.patch
+++ b/patches/api/0467-Fix-SpawnerEntry-Equipment-API.patch
diff --git a/patches/api/0470-Fix-ItemFlags.patch b/patches/api/0468-Fix-ItemFlags.patch
index 989af1fc2a..989af1fc2a 100644
--- a/patches/api/0470-Fix-ItemFlags.patch
+++ b/patches/api/0468-Fix-ItemFlags.patch
diff --git a/patches/api/0471-Allow-modifying-library-loader-jars-bytecode.patch b/patches/api/0469-Allow-modifying-library-loader-jars-bytecode.patch
index 0c0311e790..0c0311e790 100644
--- a/patches/api/0471-Allow-modifying-library-loader-jars-bytecode.patch
+++ b/patches/api/0469-Allow-modifying-library-loader-jars-bytecode.patch
diff --git a/patches/api/0472-Add-hook-to-remap-library-jars.patch b/patches/api/0470-Add-hook-to-remap-library-jars.patch
index fe1609629e..fe1609629e 100644
--- a/patches/api/0472-Add-hook-to-remap-library-jars.patch
+++ b/patches/api/0470-Add-hook-to-remap-library-jars.patch
diff --git a/patches/api/0473-Add-GameMode-isInvulnerable.patch b/patches/api/0471-Add-GameMode-isInvulnerable.patch
index b4b81c5f52..b4b81c5f52 100644
--- a/patches/api/0473-Add-GameMode-isInvulnerable.patch
+++ b/patches/api/0471-Add-GameMode-isInvulnerable.patch
diff --git a/patches/api/0474-Expose-hasColor-to-leather-armor.patch b/patches/api/0472-Expose-hasColor-to-leather-armor.patch
index df21a83f91..df21a83f91 100644
--- a/patches/api/0474-Expose-hasColor-to-leather-armor.patch
+++ b/patches/api/0472-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/api/0475-Add-missing-wind-charge-damage-type.patch b/patches/api/0473-Add-missing-wind-charge-damage-type.patch
index 8a77bddf2a..8a77bddf2a 100644
--- a/patches/api/0475-Add-missing-wind-charge-damage-type.patch
+++ b/patches/api/0473-Add-missing-wind-charge-damage-type.patch
diff --git a/patches/api/0476-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0474-Added-API-to-get-player-ha-proxy-address.patch
index 66f3365768..66f3365768 100644
--- a/patches/api/0476-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/api/0474-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/api/0477-More-Chest-Block-API.patch b/patches/api/0475-More-Chest-Block-API.patch
index 1fc3614c74..1fc3614c74 100644
--- a/patches/api/0477-More-Chest-Block-API.patch
+++ b/patches/api/0475-More-Chest-Block-API.patch
diff --git a/patches/api/0478-Brigadier-based-command-API.patch b/patches/api/0476-Brigadier-based-command-API.patch
index 911d9fb384..911d9fb384 100644
--- a/patches/api/0478-Brigadier-based-command-API.patch
+++ b/patches/api/0476-Brigadier-based-command-API.patch
diff --git a/patches/api/0479-Improve-Recipe-validation.patch b/patches/api/0477-Improve-Recipe-validation.patch
index 1989238381..1989238381 100644
--- a/patches/api/0479-Improve-Recipe-validation.patch
+++ b/patches/api/0477-Improve-Recipe-validation.patch
diff --git a/patches/server/0034-Expose-server-build-information.patch b/patches/server/0034-Expose-server-build-information.patch
new file mode 100644
index 0000000000..44620f57a0
--- /dev/null
+++ b/patches/server/0034-Expose-server-build-information.patch
@@ -0,0 +1,702 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <[email protected]>
+Date: Tue, 1 Mar 2016 14:32:43 -0600
+Subject: [PATCH] Expose server build information
+
+Co-authored-by: Zach Brown <[email protected]>
+Co-authored-by: Kyle Wood <[email protected]>
+Co-authored-by: Mark Vainomaa <[email protected]>
+Co-authored-by: Riley Park <[email protected]>
+Co-authored-by: Jake Potrebic <[email protected]>
+Co-authored-by: masmc05 <[email protected]>
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 158779a3590f089c4224b2b128c2e653aef42a94..2caa4c8e250a7925e7d6f9ba00a95956b5328568 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -1,4 +1,5 @@
+ import io.papermc.paperweight.util.*
++import java.time.Instant
+ 
+ plugins {
+     java
+@@ -64,18 +65,24 @@ tasks.jar {
+ 
+     manifest {
+         val git = Git(rootProject.layout.projectDirectory.path)
++        val mcVersion = rootProject.providers.gradleProperty("mcVersion").get()
++        val build = System.getenv("BUILD_NUMBER") ?: null
+         val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
+-        val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
++        val implementationVersion = "$mcVersion-${build ?: "DEV"}-$gitHash"
+         val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
+         val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
+         attributes(
+             "Main-Class" to "org.bukkit.craftbukkit.Main",
+-            "Implementation-Title" to "CraftBukkit",
+-            "Implementation-Version" to "git-Paper-$implementationVersion",
++            "Implementation-Title" to "Paper",
++            "Implementation-Version" to implementationVersion,
+             "Implementation-Vendor" to date, // Paper
+-            "Specification-Title" to "Bukkit",
++            "Specification-Title" to "Paper",
+             "Specification-Version" to project.version,
+-            "Specification-Vendor" to "Bukkit Team",
++            "Specification-Vendor" to "Paper Team",
++            "Brand-Id" to "papermc:paper",
++            "Brand-Name" to "Paper",
++            "Build-Number" to (build ?: ""),
++            "Build-Time" to Instant.now().toString(),
+             "Git-Branch" to gitBranch, // Paper
+             "Git-Commit" to gitHash, // Paper
+             "CraftBukkit-Package-Version" to paperweight.craftBukkitPackageVersion.get(), // Paper
+diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..532306cacd52579cdf37e4aca25887b1ed3ba6a1
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+@@ -0,0 +1,146 @@
++package com.destroystokyo.paper;
++
++import com.destroystokyo.paper.util.VersionFetcher;
++import com.google.common.base.Charsets;
++import com.google.common.io.Resources;
++import com.google.gson.Gson;
++import com.google.gson.JsonArray;
++import com.google.gson.JsonElement;
++import com.google.gson.JsonObject;
++import com.google.gson.JsonSyntaxException;
++import com.mojang.logging.LogUtils;
++import io.papermc.paper.ServerBuildInfo;
++import java.io.BufferedReader;
++import java.io.IOException;
++import java.io.InputStreamReader;
++import java.net.HttpURLConnection;
++import java.net.URI;
++import java.util.Optional;
++import java.util.OptionalInt;
++import java.util.stream.StreamSupport;
++import net.kyori.adventure.text.Component;
++import net.kyori.adventure.text.event.ClickEvent;
++import net.kyori.adventure.text.format.NamedTextColor;
++import net.kyori.adventure.text.format.TextDecoration;
++import org.checkerframework.checker.nullness.qual.NonNull;
++import org.checkerframework.checker.nullness.qual.Nullable;
++import org.checkerframework.framework.qual.DefaultQualifier;
++import org.slf4j.Logger;
++
++import static net.kyori.adventure.text.Component.text;
++import static net.kyori.adventure.text.format.TextColor.color;
++
++@DefaultQualifier(NonNull.class)
++public class PaperVersionFetcher implements VersionFetcher {
++    private static final Logger LOGGER = LogUtils.getClassLogger();
++    private static final int DISTANCE_ERROR = -1;
++    private static final int DISTANCE_UNKNOWN = -2;
++    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
++
++    @Override
++    public long getCacheTime() {
++        return 720000;
++    }
++
++    @Override
++    public Component getVersionMessage(final String serverVersion) {
++        final Component updateMessage;
++        final ServerBuildInfo build = ServerBuildInfo.buildInfo();
++        if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) {
++            updateMessage = text("You are running a development version without access to version information", color(0xFF5300));
++        } else {
++            updateMessage = getUpdateStatusMessage("PaperMC/Paper", build);
++        }
++        final @Nullable Component history = this.getHistory();
++
++        return history != null ? Component.textOfChildren(updateMessage, Component.newline(), history) : updateMessage;
++    }
++
++    private static Component getUpdateStatusMessage(final String repo, final ServerBuildInfo build) {
++        int distance = DISTANCE_ERROR;
++
++        final OptionalInt buildNumber = build.buildNumber();
++        if (buildNumber.isPresent()) {
++            distance = fetchDistanceFromSiteApi(build, buildNumber.getAsInt());
++        } else {
++            final Optional<String> gitBranch = build.gitBranch();
++            final Optional<String> gitCommit = build.gitCommit();
++            if (gitBranch.isPresent() && gitCommit.isPresent()) {
++                distance = fetchDistanceFromGitHub(repo, gitBranch.get(), gitCommit.get());
++            }
++        }
++
++        return switch (distance) {
++            case DISTANCE_ERROR -> text("Error obtaining version information", NamedTextColor.YELLOW);
++            case 0 -> text("You are running the latest version", NamedTextColor.GREEN);
++            case DISTANCE_UNKNOWN -> text("Unknown version", NamedTextColor.YELLOW);
++            default -> text("You are " + distance + " version(s) behind", NamedTextColor.YELLOW)
++                .append(Component.newline())
++                .append(text("Download the new version at: ")
++                    .append(text(DOWNLOAD_PAGE, NamedTextColor.GOLD)
++                        .hoverEvent(text("Click to open", NamedTextColor.WHITE))
++                        .clickEvent(ClickEvent.openUrl(DOWNLOAD_PAGE))));
++        };
++    }
++
++    private static int fetchDistanceFromSiteApi(final ServerBuildInfo build, final int jenkinsBuild) {
++        try {
++            try (final BufferedReader reader = Resources.asCharSource(
++                URI.create("https://api.papermc.io/v2/projects/paper/versions/" + build.minecraftVersionId()).toURL(),
++                Charsets.UTF_8
++            ).openBufferedStream()) {
++                final JsonObject json = new Gson().fromJson(reader, JsonObject.class);
++                final JsonArray builds = json.getAsJsonArray("builds");
++                final int latest = StreamSupport.stream(builds.spliterator(), false)
++                    .mapToInt(JsonElement::getAsInt)
++                    .max()
++                    .orElseThrow();
++                return latest - jenkinsBuild;
++            } catch (final JsonSyntaxException ex) {
++                LOGGER.error("Error parsing json from Paper's downloads API", ex);
++                return DISTANCE_ERROR;
++            }
++        } catch (final IOException e) {
++            LOGGER.error("Error while parsing version", e);
++            return DISTANCE_ERROR;
++        }
++    }
++
++    // Contributed by Techcable <[email protected]> in GH-65
++    private static int fetchDistanceFromGitHub(final String repo, final String branch, final String hash) {
++        try {
++            final HttpURLConnection connection = (HttpURLConnection) URI.create("https://api.github.com/repos/%s/compare/%s...%s".formatted(repo, branch, hash)).toURL().openConnection();
++            connection.connect();
++            if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) return DISTANCE_UNKNOWN; // Unknown commit
++            try (final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), Charsets.UTF_8))) {
++                final JsonObject obj = new Gson().fromJson(reader, JsonObject.class);
++                final String status = obj.get("status").getAsString();
++                return switch (status) {
++                    case "identical" -> 0;
++                    case "behind" -> obj.get("behind_by").getAsInt();
++                    default -> DISTANCE_ERROR;
++                };
++            } catch (final JsonSyntaxException | NumberFormatException e) {
++                LOGGER.error("Error parsing json from GitHub's API", e);
++                return DISTANCE_ERROR;
++            }
++        } catch (final IOException e) {
++            LOGGER.error("Error while parsing version", e);
++            return DISTANCE_ERROR;
++        }
++    }
++
++    private @Nullable Component getHistory() {
++        final VersionHistoryManager.@Nullable VersionData data = VersionHistoryManager.INSTANCE.getVersionData();
++        if (data == null) {
++            return null;
++        }
++
++        final @Nullable String oldVersion = data.getOldVersion();
++        if (oldVersion == null) {
++            return null;
++        }
++
++        return text("Previous version: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC);
++    }
++}
+diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..660b2ec6b63a4ceffee44ab11f54dfa7c0d0996f
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
+@@ -0,0 +1,153 @@
++package com.destroystokyo.paper;
++
++import com.google.common.base.MoreObjects;
++import com.google.gson.Gson;
++import com.google.gson.JsonSyntaxException;
++import java.io.BufferedReader;
++import java.io.BufferedWriter;
++import java.io.IOException;
++import java.nio.charset.StandardCharsets;
++import java.nio.file.Files;
++import java.nio.file.Path;
++import java.nio.file.Paths;
++import java.nio.file.StandardOpenOption;
++import java.util.Objects;
++import java.util.logging.Level;
++import java.util.logging.Logger;
++import org.bukkit.Bukkit;
++
++import javax.annotation.Nonnull;
++import javax.annotation.Nullable;
++
++public enum VersionHistoryManager {
++    INSTANCE;
++
++    private final Gson gson = new Gson();
++
++    private final Logger logger = Bukkit.getLogger();
++
++    private VersionData currentData = null;
++
++    VersionHistoryManager() {
++        final Path path = Paths.get("version_history.json");
++
++        if (Files.exists(path)) {
++            // Basic file santiy checks
++            if (!Files.isRegularFile(path)) {
++                if (Files.isDirectory(path)) {
++                    logger.severe(path + " is a directory, cannot be used for version history");
++                } else {
++                    logger.severe(path + " is not a regular file, cannot be used for version history");
++                }
++                // We can't continue
++                return;
++            }
++
++            try (final BufferedReader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) {
++                currentData = gson.fromJson(reader, VersionData.class);
++            } catch (final IOException e) {
++                logger.log(Level.SEVERE, "Failed to read version history file '" + path + "'", e);
++                return;
++            } catch (final JsonSyntaxException e) {
++                logger.log(Level.SEVERE, "Invalid json syntax for file '" + path + "'", e);
++                return;
++            }
++
++            final String version = Bukkit.getVersion();
++            if (version == null) {
++                logger.severe("Failed to retrieve current version");
++                return;
++            }
++
++            if (currentData == null) {
++                // Empty file
++                currentData = new VersionData();
++                currentData.setCurrentVersion(version);
++                writeFile(path);
++                return;
++            }
++
++            if (!version.equals(currentData.getCurrentVersion())) {
++                // The version appears to have changed
++                currentData.setOldVersion(currentData.getCurrentVersion());
++                currentData.setCurrentVersion(version);
++                writeFile(path);
++            }
++        } else {
++            // File doesn't exist, start fresh
++            currentData = new VersionData();
++            // oldVersion is null
++            currentData.setCurrentVersion(Bukkit.getVersion());
++            writeFile(path);
++        }
++    }
++
++    private void writeFile(@Nonnull final Path path) {
++        try (final BufferedWriter writer = Files.newBufferedWriter(
++            path,
++            StandardCharsets.UTF_8,
++            StandardOpenOption.WRITE,
++            StandardOpenOption.CREATE,
++            StandardOpenOption.TRUNCATE_EXISTING
++        )) {
++            gson.toJson(currentData, writer);
++        } catch (final IOException e) {
++            logger.log(Level.SEVERE, "Failed to write to version history file", e);
++        }
++    }
++
++    @Nullable
++    public VersionData getVersionData() {
++        return currentData;
++    }
++
++    public static class VersionData {
++        private String oldVersion;
++
++        private String currentVersion;
++
++        @Nullable
++        public String getOldVersion() {
++            return oldVersion;
++        }
++
++        public void setOldVersion(@Nullable String oldVersion) {
++            this.oldVersion = oldVersion;
++        }
++
++        @Nullable
++        public String getCurrentVersion() {
++            return currentVersion;
++        }
++
++        public void setCurrentVersion(@Nullable String currentVersion) {
++            this.currentVersion = currentVersion;
++        }
++
++        @Override
++        public String toString() {
++            return MoreObjects.toStringHelper(this)
++                .add("oldVersion", oldVersion)
++                .add("currentVersion", currentVersion)
++                .toString();
++        }
++
++        @Override
++        public boolean equals(@Nullable Object o) {
++            if (this == o) {
++                return true;
++            }
++            if (o == null || getClass() != o.getClass()) {
++                return false;
++            }
++            final VersionData versionData = (VersionData) o;
++            return Objects.equals(oldVersion, versionData.oldVersion) &&
++                Objects.equals(currentVersion, versionData.currentVersion);
++        }
++
++        @Override
++        public int hashCode() {
++            return Objects.hash(oldVersion, currentVersion);
++        }
++    }
++}
+diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..790bad0494454ca12ee152e3de6da3da634d9b20
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
+@@ -0,0 +1,104 @@
++package io.papermc.paper;
++
++import com.google.common.base.Strings;
++import io.papermc.paper.util.JarManifests;
++import java.time.Instant;
++import java.time.temporal.ChronoUnit;
++import java.util.Optional;
++import java.util.OptionalInt;
++import java.util.jar.Manifest;
++import net.kyori.adventure.key.Key;
++import net.minecraft.SharedConstants;
++import org.bukkit.craftbukkit.CraftServer;
++import org.bukkit.craftbukkit.Main;
++import org.jetbrains.annotations.NotNull;
++
++public record ServerBuildInfoImpl(
++    Key brandId,
++    String brandName,
++    String minecraftVersionId,
++    String minecraftVersionName,
++    OptionalInt buildNumber,
++    Instant buildTime,
++    Optional<String> gitBranch,
++    Optional<String> gitCommit
++) implements ServerBuildInfo {
++    private static final String ATTRIBUTE_BRAND_ID = "Brand-Id";
++    private static final String ATTRIBUTE_BRAND_NAME = "Brand-Name";
++    private static final String ATTRIBUTE_BUILD_TIME = "Build-Time";
++    private static final String ATTRIBUTE_BUILD_NUMBER = "Build-Number";
++    private static final String ATTRIBUTE_GIT_BRANCH = "Git-Branch";
++    private static final String ATTRIBUTE_GIT_COMMIT = "Git-Commit";
++
++    private static final String BRAND_PAPER_NAME = "Paper";
++
++    private static final String BUILD_DEV = "DEV";
++
++    public ServerBuildInfoImpl() {
++        this(JarManifests.manifest(CraftServer.class));
++    }
++
++    private ServerBuildInfoImpl(final Manifest manifest) {
++        this(
++            getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID)
++                .map(Key::key)
++                .orElse(BRAND_PAPER_ID),
++            getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME)
++                .orElse(BRAND_PAPER_NAME),
++            SharedConstants.getCurrentVersion().getId(),
++            SharedConstants.getCurrentVersion().getName(),
++            getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)
++                .map(Integer::parseInt)
++                .map(OptionalInt::of)
++                .orElse(OptionalInt.empty()),
++            getManifestAttribute(manifest, ATTRIBUTE_BUILD_TIME)
++                .map(Instant::parse)
++                .orElse(Main.BOOT_TIME),
++            getManifestAttribute(manifest, ATTRIBUTE_GIT_BRANCH),
++            getManifestAttribute(manifest, ATTRIBUTE_GIT_COMMIT)
++        );
++    }
++
++    @Override
++    public boolean isBrandCompatible(final @NotNull Key brandId) {
++        return brandId.equals(this.brandId);
++    }
++
++    @Override
++    public @NotNull String asString(final @NotNull StringRepresentation representation) {
++        final StringBuilder sb = new StringBuilder();
++        sb.append(this.minecraftVersionId);
++        sb.append('-');
++        if (this.buildNumber.isPresent()) {
++            sb.append(this.buildNumber.getAsInt());
++        } else {
++            sb.append(BUILD_DEV);
++        }
++        final boolean hasGitBranch = this.gitBranch.isPresent();
++        final boolean hasGitCommit = this.gitCommit.isPresent();
++        if (hasGitBranch || hasGitCommit) {
++            sb.append('-');
++        }
++        if (hasGitBranch && representation == StringRepresentation.VERSION_FULL) {
++            sb.append(this.gitBranch.get());
++            if (hasGitCommit) {
++                sb.append('@');
++            }
++        }
++        if (hasGitCommit) {
++            sb.append(this.gitCommit.get());
++        }
++        if (representation == StringRepresentation.VERSION_FULL) {
++            sb.append(' ');
++            sb.append('(');
++            sb.append(this.buildTime.truncatedTo(ChronoUnit.SECONDS));
++            sb.append(')');
++        }
++        return sb.toString();
++    }
++
++    private static Optional<String> getManifestAttribute(final Manifest manifest, final String name) {
++        final String value = manifest != null ? manifest.getMainAttributes().getValue(name) : null;
++        return Optional.ofNullable(Strings.emptyToNull(value));
++    }
++}
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index dee319882d7d51a0e03e0f5f31ab6312048e189d..80a20dce63658842a0fa04004b8eaa8af7685fb4 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -43,7 +43,6 @@ import java.util.Set;
+ import java.util.UUID;
+ import java.util.concurrent.CompletableFuture;
+ import java.util.concurrent.Executor;
+-import java.util.concurrent.RejectedExecutionException;
+ import java.util.concurrent.atomic.AtomicReference;
+ import java.util.function.BooleanSupplier;
+ import java.util.function.Consumer;
+@@ -185,8 +184,6 @@ import net.minecraft.world.phys.Vec2;
+ import net.minecraft.world.phys.Vec3;
+ import org.bukkit.Bukkit;
+ import org.bukkit.craftbukkit.CraftRegistry;
+-import org.bukkit.craftbukkit.CraftServer;
+-import org.bukkit.craftbukkit.Main;
+ import org.bukkit.event.server.ServerLoadEvent;
+ // CraftBukkit end
+ 
+@@ -1680,7 +1677,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
+     @DontObfuscate
+     public String getServerModName() {
+-        return "Spigot"; // Spigot - Spigot > // CraftBukkit - cb > vanilla!
++        return io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
+     }
+ 
+     public SystemReport fillSystemReport(SystemReport details) {
+diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+index bbe2fabc9251838f232480a04f0a2cf2b49f2812..a6126515e497cb0769bdc96881389026196bbbae 100644
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -214,6 +214,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         // Paper end - initialize global and world-defaults configuration
+         io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
+         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
++        com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
+ 
+         this.setPvpAllowed(dedicatedserverproperties.pvp);
+         this.setFlightAllowed(dedicatedserverproperties.allowFlight);
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java b/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java
+index f077b8ff0bf0d96628db3569132696b68fd79921..5f11f5b16766f9d1d5640ae037e259bed9020384 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java
+@@ -18,8 +18,10 @@ public class CraftCrashReport implements Supplier<String> {
+ 
+     @Override
+     public String get() {
++        final io.papermc.paper.ServerBuildInfo build = io.papermc.paper.ServerBuildInfo.buildInfo(); // Paper
+         StringWriter value = new StringWriter();
+         try {
++            value.append("\n   BrandInfo: ").append(String.format("%s (%s) version %s", build.brandName(), build.brandId(), build.asString(io.papermc.paper.ServerBuildInfo.StringRepresentation.VERSION_FULL))); // Paper
+             value.append("\n   Running: ").append(Bukkit.getName()).append(" version ").append(Bukkit.getVersion()).append(" (Implementing API version ").append(Bukkit.getBukkitVersion()).append(") ").append(String.valueOf(MinecraftServer.getServer().usesAuthentication()));
+             value.append("\n   Plugins: {");
+             for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index b32ae5b9c232e5d9b3bd89303db3d2cc6258ea29..4d31fb8bc8bf285720a9d5828325d7124cf41c6e 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -10,8 +10,6 @@ import com.google.common.collect.MapMaker;
+ import com.mojang.authlib.GameProfile;
+ import com.mojang.brigadier.StringReader;
+ import com.mojang.brigadier.exceptions.CommandSyntaxException;
+-import com.mojang.brigadier.tree.CommandNode;
+-import com.mojang.brigadier.tree.LiteralCommandNode;
+ import com.mojang.serialization.Dynamic;
+ import com.mojang.serialization.Lifecycle;
+ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+@@ -26,7 +24,6 @@ import java.net.InetAddress;
+ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.Date;
+-import java.util.HashMap;
+ import java.util.HashSet;
+ import java.util.Iterator;
+ import java.util.LinkedHashMap;
+@@ -153,7 +150,6 @@ import org.bukkit.craftbukkit.ban.CraftProfileBanList;
+ import org.bukkit.craftbukkit.block.data.CraftBlockData;
+ import org.bukkit.craftbukkit.boss.CraftBossBar;
+ import org.bukkit.craftbukkit.boss.CraftKeyedBossbar;
+-import org.bukkit.craftbukkit.command.BukkitCommandWrapper;
+ import org.bukkit.craftbukkit.command.CraftCommandMap;
+ import org.bukkit.craftbukkit.command.VanillaCommandWrapper;
+ import org.bukkit.craftbukkit.entity.CraftEntityFactory;
+@@ -249,7 +245,6 @@ import org.bukkit.plugin.PluginManager;
+ import org.bukkit.plugin.ServicesManager;
+ import org.bukkit.plugin.SimplePluginManager;
+ import org.bukkit.plugin.SimpleServicesManager;
+-import org.bukkit.plugin.java.JavaPluginLoader;
+ import org.bukkit.plugin.messaging.Messenger;
+ import org.bukkit.plugin.messaging.StandardMessenger;
+ import org.bukkit.profile.PlayerProfile;
+@@ -266,7 +261,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
+ import net.md_5.bungee.api.chat.BaseComponent; // Spigot
+ 
+ public final class CraftServer implements Server {
+-    private final String serverName = "CraftBukkit";
++    private final String serverName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
+     private final String serverVersion;
+     private final String bukkitVersion = Versioning.getBukkitVersion();
+     private final Logger logger = Logger.getLogger("Minecraft");
+@@ -320,7 +315,7 @@ public final class CraftServer implements Server {
+                 return player.getBukkitEntity();
+             }
+         }));
+-        this.serverVersion = CraftServer.class.getPackage().getImplementationVersion();
++        this.serverVersion = io.papermc.paper.ServerBuildInfo.buildInfo().asString(io.papermc.paper.ServerBuildInfo.StringRepresentation.VERSION_SIMPLE); // Paper - improve version
+         this.structureManager = new CraftStructureManager(console.getStructureManager(), console.registryAccess());
+         this.dataPackManager = new CraftDataPackManager(this.getServer().getPackRepository());
+         this.serverTickManager = new CraftServerTickManager(console.tickRateManager());
+@@ -573,6 +568,13 @@ public final class CraftServer implements Server {
+         return this.bukkitVersion;
+     }
+ 
++    // Paper start - expose game version
++    @Override
++    public String getMinecraftVersion() {
++        return console.getServerVersion();
++    }
++    // Paper end
++
+     @Override
+     public List<CraftPlayer> getOnlinePlayers() {
+         return this.playerView;
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index bc664b090e16ed27ba795c204dc5639679e6eee8..9dc72b01092783c436bc1fa8ce29ff7cdaa39b19 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -15,6 +15,7 @@ import joptsimple.OptionSet;
+ import joptsimple.util.PathConverter;
+ 
+ public class Main {
++    public static final java.time.Instant BOOT_TIME = java.time.Instant.now(); // Paper - track initial start time
+     public static boolean useJline = true;
+     public static boolean useConsole = true;
+ 
+@@ -252,13 +253,26 @@ public class Main {
+                     deadline.add(Calendar.DAY_OF_YEAR, -3);
+                     if (buildDate.before(deadline.getTime())) {
+                         System.err.println("*** Error, this build is outdated ***");
+-                        System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***");
++                        System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper
+                         System.err.println("*** Server will start in 20 seconds ***");
+                         Thread.sleep(TimeUnit.SECONDS.toMillis(20));
+                     }
+                 }
+ 
+                 System.setProperty("library.jansi.version", "Paper"); // Paper - set meaningless jansi version to prevent git builds from crashing on Windows
++                // Paper start - Log Java and OS versioning to help with debugging plugin issues
++                java.lang.management.RuntimeMXBean runtimeMX = java.lang.management.ManagementFactory.getRuntimeMXBean();
++                java.lang.management.OperatingSystemMXBean osMX = java.lang.management.ManagementFactory.getOperatingSystemMXBean();
++                if (runtimeMX != null && osMX != null) {
++                    String javaInfo = "Java " + runtimeMX.getSpecVersion() + " (" + runtimeMX.getVmName() + " " + runtimeMX.getVmVersion() + ")";
++                    String osInfo = "Host: " + osMX.getName() + " " + osMX.getVersion() + " (" + osMX.getArch() + ")";
++
++                    System.out.println("System Info: " + javaInfo + " " + osInfo);
++                } else {
++                    System.out.println("Unable to read system info");
++                }
++                // Paper end - Log Java and OS versioning to help with debugging plugin issues
++
+                 System.out.println("Loading libraries, please wait...");
+                 net.minecraft.server.Main.main(options);
+             } catch (Throwable t) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+index 983660c1cc4df5ec6f08ab7363a1bb5d47af9f19..f541ca7cb3328a9366e08a9933b24ed5c76059c0 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+@@ -477,6 +477,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
+     public String getTimingsServerName() {
+         return io.papermc.paper.configuration.GlobalConfiguration.get().timings.serverName;
+     }
++
++    @Override
++    public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
++        return new com.destroystokyo.paper.PaperVersionFetcher();
++    }
+     // Paper end
+ 
+     @Override
+diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
+index f697d45e0ac4e9cdc8a46121510a04c0f294d91f..e086765dec32241bc5a77afcf072c77a40c6d785 100644
+--- a/src/main/java/org/spigotmc/WatchdogThread.java
++++ b/src/main/java/org/spigotmc/WatchdogThread.java
+@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
+ 
+     private WatchdogThread(long timeoutTime, boolean restart)
+     {
+-        super( "Spigot Watchdog Thread" );
++        super( "Paper Watchdog Thread" );
+         this.timeoutTime = timeoutTime;
+         this.restart = restart;
+     }
+@@ -65,14 +65,14 @@ public class WatchdogThread extends Thread
+             {
+                 Logger log = Bukkit.getServer().getLogger();
+                 log.log( Level.SEVERE, "------------------------------" );
+-                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Spigot bug." );
++                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Paper bug." ); // Paper
+                 log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
+                 log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" );
+                 log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" );
+                 log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
+-                log.log( Level.SEVERE, "If you are unsure or still think this is a Spigot bug, please report to https://www.spigotmc.org/" );
++                log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" );
+                 log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
+-                log.log( Level.SEVERE, "Spigot version: " + Bukkit.getServer().getVersion() );
++                log.log( Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion() );
+                 //
+                 if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
+                 {
+@@ -82,7 +82,7 @@ public class WatchdogThread extends Thread
+                 }
+                 //
+                 log.log( Level.SEVERE, "------------------------------" );
+-                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Spigot!):" );
++                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
+                 WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
+                 log.log( Level.SEVERE, "------------------------------" );
+                 //
+diff --git a/src/main/resources/META-INF/services/io.papermc.paper.ServerBuildInfo b/src/main/resources/META-INF/services/io.papermc.paper.ServerBuildInfo
+new file mode 100644
+index 0000000000000000000000000000000000000000..79b4b25784cfeabd5f619ed5454ef843f35041db
+--- /dev/null
++++ b/src/main/resources/META-INF/services/io.papermc.paper.ServerBuildInfo
+@@ -0,0 +1 @@
++io.papermc.paper.ServerBuildInfoImpl
diff --git a/patches/server/0034-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0034-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
deleted file mode 100644
index 0827c86c18..0000000000
--- a/patches/server/0034-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <[email protected]>
-Date: Tue, 1 Mar 2016 14:32:43 -0600
-Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
- stats
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8ead44e27598c01249f710e10a765dd1796ed249..fcb2d06f088a938b5bb76e6b42581d8f292d2eaf 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1680,7 +1680,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     @DontObfuscate
-     public String getServerModName() {
--        return "Spigot"; // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return "Paper"; // Paper
-     }
- 
-     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 035c541290e5ff67d0db65fc0d68c612bba19840..a8a23daac1d102f9f5a17c9ed6aa821b16345f32 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -266,7 +266,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
- import net.md_5.bungee.api.chat.BaseComponent; // Spigot
- 
- public final class CraftServer implements Server {
--    private final String serverName = "CraftBukkit";
-+    private final String serverName = "Paper"; // Paper
-     private final String serverVersion;
-     private final String bukkitVersion = Versioning.getBukkitVersion();
-     private final Logger logger = Logger.getLogger("Minecraft");
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index bc664b090e16ed27ba795c204dc5639679e6eee8..3c4a593cfbc111084abc971bc7532898d094bd9a 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -252,13 +252,26 @@ public class Main {
-                     deadline.add(Calendar.DAY_OF_YEAR, -3);
-                     if (buildDate.before(deadline.getTime())) {
-                         System.err.println("*** Error, this build is outdated ***");
--                        System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***");
-+                        System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper
-                         System.err.println("*** Server will start in 20 seconds ***");
-                         Thread.sleep(TimeUnit.SECONDS.toMillis(20));
-                     }
-                 }
- 
-                 System.setProperty("library.jansi.version", "Paper"); // Paper - set meaningless jansi version to prevent git builds from crashing on Windows
-+                // Paper start - Log Java and OS versioning to help with debugging plugin issues
-+                java.lang.management.RuntimeMXBean runtimeMX = java.lang.management.ManagementFactory.getRuntimeMXBean();
-+                java.lang.management.OperatingSystemMXBean osMX = java.lang.management.ManagementFactory.getOperatingSystemMXBean();
-+                if (runtimeMX != null && osMX != null) {
-+                    String javaInfo = "Java " + runtimeMX.getSpecVersion() + " (" + runtimeMX.getVmName() + " " + runtimeMX.getVmVersion() + ")";
-+                    String osInfo = "Host: " + osMX.getName() + " " + osMX.getVersion() + " (" + osMX.getArch() + ")";
-+
-+                    System.out.println("System Info: " + javaInfo + " " + osInfo);
-+                } else {
-+                    System.out.println("Unable to read system info");
-+                }
-+                // Paper end - Log Java and OS versioning to help with debugging plugin issues
-+
-                 System.out.println("Loading libraries, please wait...");
-                 net.minecraft.server.Main.main(options);
-             } catch (Throwable t) {
-diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index f697d45e0ac4e9cdc8a46121510a04c0f294d91f..e086765dec32241bc5a77afcf072c77a40c6d785 100644
---- a/src/main/java/org/spigotmc/WatchdogThread.java
-+++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
- 
-     private WatchdogThread(long timeoutTime, boolean restart)
-     {
--        super( "Spigot Watchdog Thread" );
-+        super( "Paper Watchdog Thread" );
-         this.timeoutTime = timeoutTime;
-         this.restart = restart;
-     }
-@@ -65,14 +65,14 @@ public class WatchdogThread extends Thread
-             {
-                 Logger log = Bukkit.getServer().getLogger();
-                 log.log( Level.SEVERE, "------------------------------" );
--                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Spigot bug." );
-+                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Paper bug." ); // Paper
-                 log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
-                 log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" );
-                 log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" );
-                 log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
--                log.log( Level.SEVERE, "If you are unsure or still think this is a Spigot bug, please report to https://www.spigotmc.org/" );
-+                log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" );
-                 log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
--                log.log( Level.SEVERE, "Spigot version: " + Bukkit.getServer().getVersion() );
-+                log.log( Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion() );
-                 //
-                 if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
-                 {
-@@ -82,7 +82,7 @@ public class WatchdogThread extends Thread
-                 }
-                 //
-                 log.log( Level.SEVERE, "------------------------------" );
--                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Spigot!):" );
-+                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
-                 WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
-                 log.log( Level.SEVERE, "------------------------------" );
-                 //
diff --git a/patches/server/0035-Implement-Paper-VersionChecker.patch b/patches/server/0035-Implement-Paper-VersionChecker.patch
deleted file mode 100644
index 27e99e60b6..0000000000
--- a/patches/server/0035-Implement-Paper-VersionChecker.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <[email protected]>
-Date: Mon, 27 May 2019 03:40:05 -0500
-Subject: [PATCH] Implement Paper VersionChecker
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..22a55be34fde453fedd987173d95b8b347a03588
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -0,0 +1,129 @@
-+package com.destroystokyo.paper;
-+
-+import com.destroystokyo.paper.util.VersionFetcher;
-+import com.google.common.base.Charsets;
-+import com.google.common.io.Resources;
-+import com.google.gson.*;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.event.ClickEvent;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+
-+import javax.annotation.Nonnull;
-+import javax.annotation.Nullable;
-+import java.io.*;
-+import java.net.HttpURLConnection;
-+import java.net.URL;
-+import java.util.stream.StreamSupport;
-+
-+public class PaperVersionFetcher implements VersionFetcher {
-+    private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
-+    private static final String GITHUB_BRANCH_NAME = "master";
-+    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
-+    private static @Nullable String mcVer;
-+
-+    @Override
-+    public long getCacheTime() {
-+        return 720000;
-+    }
-+
-+    @Nonnull
-+    @Override
-+    public Component getVersionMessage(@Nonnull String serverVersion) {
-+        String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]");
-+        return getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
-+    }
-+
-+    private static @Nullable String getMinecraftVersion() {
-+        if (mcVer == null) {
-+            java.util.regex.Matcher matcher = VER_PATTERN.matcher(org.bukkit.Bukkit.getBukkitVersion());
-+            if (matcher.find()) {
-+                String result = matcher.group();
-+                mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-'
-+            } else {
-+                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to PaperMC!");
-+                org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString());
-+                org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
-+            }
-+        }
-+
-+        return mcVer;
-+    }
-+
-+    private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
-+        int distance;
-+        try {
-+            int jenkinsBuild = Integer.parseInt(versionInfo);
-+            distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion());
-+        } catch (NumberFormatException ignored) {
-+            versionInfo = versionInfo.replace("\"", "");
-+            distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
-+        }
-+
-+        switch (distance) {
-+            case -1:
-+                return Component.text("Error obtaining version information", NamedTextColor.YELLOW);
-+            case 0:
-+                return Component.text("You are running the latest version", NamedTextColor.GREEN);
-+            case -2:
-+                return Component.text("Unknown version", NamedTextColor.YELLOW);
-+            default:
-+                return Component.text("You are " + distance + " version(s) behind", NamedTextColor.YELLOW)
-+                        .append(Component.newline())
-+                        .append(Component.text("Download the new version at: ")
-+                                .append(Component.text(DOWNLOAD_PAGE, NamedTextColor.GOLD)
-+                                        .hoverEvent(Component.text("Click to open", NamedTextColor.WHITE))
-+                                        .clickEvent(ClickEvent.openUrl(DOWNLOAD_PAGE))));
-+        }
-+    }
-+
-+    private static int fetchDistanceFromSiteApi(int jenkinsBuild, @Nullable String siteApiVersion) {
-+        if (siteApiVersion == null) { return -1; }
-+        try {
-+            try (BufferedReader reader = Resources.asCharSource(
-+                new URL("https://api.papermc.io/v2/projects/paper/versions/" + siteApiVersion),
-+                Charsets.UTF_8
-+            ).openBufferedStream()) {
-+                JsonObject json = new Gson().fromJson(reader, JsonObject.class);
-+                JsonArray builds = json.getAsJsonArray("builds");
-+                int latest = StreamSupport.stream(builds.spliterator(), false)
-+                    .mapToInt(e -> e.getAsInt())
-+                    .max()
-+                    .getAsInt();
-+                return latest - jenkinsBuild;
-+            } catch (JsonSyntaxException ex) {
-+                ex.printStackTrace();
-+                return -1;
-+            }
-+        } catch (IOException e) {
-+            e.printStackTrace();
-+            return -1;
-+        }
-+    }
-+
-+    // Contributed by Techcable <[email protected]> in GH-65
-+    private static int fetchDistanceFromGitHub(@Nonnull String repo, @Nonnull String branch, @Nonnull String hash) {
-+        try {
-+            HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + branch + "..." + hash).openConnection();
-+            connection.connect();
-+            if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) return -2; // Unknown commit
-+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), Charsets.UTF_8))) {
-+                JsonObject obj = new Gson().fromJson(reader, JsonObject.class);
-+                String status = obj.get("status").getAsString();
-+                switch (status) {
-+                    case "identical":
-+                        return 0;
-+                    case "behind":
-+                        return obj.get("behind_by").getAsInt();
-+                    default:
-+                        return -1;
-+                }
-+            } catch (JsonSyntaxException | NumberFormatException e) {
-+                e.printStackTrace();
-+                return -1;
-+            }
-+        } catch (IOException e) {
-+            e.printStackTrace();
-+            return -1;
-+        }
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index e7b98cefde1e0ecfbd151ef968062a774a6ebf55..5df312c8c663b51dcdfa69945050baadbc2f5f92 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -477,6 +477,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public String getTimingsServerName() {
-         return io.papermc.paper.configuration.GlobalConfiguration.get().timings.serverName;
-     }
-+
-+    @Override
-+    public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
-+        return new com.destroystokyo.paper.PaperVersionFetcher();
-+    }
-     // Paper end
- 
-     @Override
diff --git a/patches/server/0037-Player-affects-spawning-API.patch b/patches/server/0035-Player-affects-spawning-API.patch
index 344d53a4d2..344d53a4d2 100644
--- a/patches/server/0037-Player-affects-spawning-API.patch
+++ b/patches/server/0035-Player-affects-spawning-API.patch
diff --git a/patches/server/0036-Add-version-history-to-version-command.patch b/patches/server/0036-Add-version-history-to-version-command.patch
deleted file mode 100644
index 4d5ccce75a..0000000000
--- a/patches/server/0036-Add-version-history-to-version-command.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kyle Wood <[email protected]>
-Date: Thu, 1 Mar 2018 19:37:52 -0600
-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 22a55be34fde453fedd987173d95b8b347a03588..9d687da5bdf398bb3f6c84cdf1249a7213d09f2e 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.*;
- import net.kyori.adventure.text.Component;
- import net.kyori.adventure.text.event.ClickEvent;
- import net.kyori.adventure.text.format.NamedTextColor;
-+import net.kyori.adventure.text.format.TextDecoration;
-+import net.kyori.adventure.text.TextComponent;
- 
- import javax.annotation.Nonnull;
- import javax.annotation.Nullable;
-@@ -30,7 +32,10 @@ public class PaperVersionFetcher implements VersionFetcher {
-     @Override
-     public Component getVersionMessage(@Nonnull String serverVersion) {
-         String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]");
--        return getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
-+        final Component updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
-+        final Component history = getHistory();
-+
-+        return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
-     }
- 
-     private static @Nullable String getMinecraftVersion() {
-@@ -126,4 +131,19 @@ public class PaperVersionFetcher implements VersionFetcher {
-             return -1;
-         }
-     }
-+
-+    @Nullable
-+    private Component getHistory() {
-+        final VersionHistoryManager.VersionData data = VersionHistoryManager.INSTANCE.getVersionData();
-+        if (data == null) {
-+            return null;
-+        }
-+
-+        final String oldVersion = data.getOldVersion();
-+        if (oldVersion == null) {
-+            return null;
-+        }
-+
-+        return Component.text("Previous version: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC);
-+    }
- }
-diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..660b2ec6b63a4ceffee44ab11f54dfa7c0d0996f
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
-@@ -0,0 +1,153 @@
-+package com.destroystokyo.paper;
-+
-+import com.google.common.base.MoreObjects;
-+import com.google.gson.Gson;
-+import com.google.gson.JsonSyntaxException;
-+import java.io.BufferedReader;
-+import java.io.BufferedWriter;
-+import java.io.IOException;
-+import java.nio.charset.StandardCharsets;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
-+import java.nio.file.StandardOpenOption;
-+import java.util.Objects;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+import org.bukkit.Bukkit;
-+
-+import javax.annotation.Nonnull;
-+import javax.annotation.Nullable;
-+
-+public enum VersionHistoryManager {
-+    INSTANCE;
-+
-+    private final Gson gson = new Gson();
-+
-+    private final Logger logger = Bukkit.getLogger();
-+
-+    private VersionData currentData = null;
-+
-+    VersionHistoryManager() {
-+        final Path path = Paths.get("version_history.json");
-+
-+        if (Files.exists(path)) {
-+            // Basic file santiy checks
-+            if (!Files.isRegularFile(path)) {
-+                if (Files.isDirectory(path)) {
-+                    logger.severe(path + " is a directory, cannot be used for version history");
-+                } else {
-+                    logger.severe(path + " is not a regular file, cannot be used for version history");
-+                }
-+                // We can't continue
-+                return;
-+            }
-+
-+            try (final BufferedReader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) {
-+                currentData = gson.fromJson(reader, VersionData.class);
-+            } catch (final IOException e) {
-+                logger.log(Level.SEVERE, "Failed to read version history file '" + path + "'", e);
-+                return;
-+            } catch (final JsonSyntaxException e) {
-+                logger.log(Level.SEVERE, "Invalid json syntax for file '" + path + "'", e);
-+                return;
-+            }
-+
-+            final String version = Bukkit.getVersion();
-+            if (version == null) {
-+                logger.severe("Failed to retrieve current version");
-+                return;
-+            }
-+
-+            if (currentData == null) {
-+                // Empty file
-+                currentData = new VersionData();
-+                currentData.setCurrentVersion(version);
-+                writeFile(path);
-+                return;
-+            }
-+
-+            if (!version.equals(currentData.getCurrentVersion())) {
-+                // The version appears to have changed
-+                currentData.setOldVersion(currentData.getCurrentVersion());
-+                currentData.setCurrentVersion(version);
-+                writeFile(path);
-+            }
-+        } else {
-+            // File doesn't exist, start fresh
-+            currentData = new VersionData();
-+            // oldVersion is null
-+            currentData.setCurrentVersion(Bukkit.getVersion());
-+            writeFile(path);
-+        }
-+    }
-+
-+    private void writeFile(@Nonnull final Path path) {
-+        try (final BufferedWriter writer = Files.newBufferedWriter(
-+            path,
-+            StandardCharsets.UTF_8,
-+            StandardOpenOption.WRITE,
-+            StandardOpenOption.CREATE,
-+            StandardOpenOption.TRUNCATE_EXISTING
-+        )) {
-+            gson.toJson(currentData, writer);
-+        } catch (final IOException e) {
-+            logger.log(Level.SEVERE, "Failed to write to version history file", e);
-+        }
-+    }
-+
-+    @Nullable
-+    public VersionData getVersionData() {
-+        return currentData;
-+    }
-+
-+    public static class VersionData {
-+        private String oldVersion;
-+
-+        private String currentVersion;
-+
-+        @Nullable
-+        public String getOldVersion() {
-+            return oldVersion;
-+        }
-+
-+        public void setOldVersion(@Nullable String oldVersion) {
-+            this.oldVersion = oldVersion;
-+        }
-+
-+        @Nullable
-+        public String getCurrentVersion() {
-+            return currentVersion;
-+        }
-+
-+        public void setCurrentVersion(@Nullable String currentVersion) {
-+            this.currentVersion = currentVersion;
-+        }
-+
-+        @Override
-+        public String toString() {
-+            return MoreObjects.toStringHelper(this)
-+                .add("oldVersion", oldVersion)
-+                .add("currentVersion", currentVersion)
-+                .toString();
-+        }
-+
-+        @Override
-+        public boolean equals(@Nullable Object o) {
-+            if (this == o) {
-+                return true;
-+            }
-+            if (o == null || getClass() != o.getClass()) {
-+                return false;
-+            }
-+            final VersionData versionData = (VersionData) o;
-+            return Objects.equals(oldVersion, versionData.oldVersion) &&
-+                Objects.equals(currentVersion, versionData.currentVersion);
-+        }
-+
-+        @Override
-+        public int hashCode() {
-+            return Objects.hash(oldVersion, currentVersion);
-+        }
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index bbe2fabc9251838f232480a04f0a2cf2b49f2812..a6126515e497cb0769bdc96881389026196bbbae 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -214,6 +214,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         // Paper end - initialize global and world-defaults configuration
-         io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
-         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
-+        com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
- 
-         this.setPvpAllowed(dedicatedserverproperties.pvp);
-         this.setFlightAllowed(dedicatedserverproperties.allowFlight);
diff --git a/patches/server/0038-Only-refresh-abilities-if-needed.patch b/patches/server/0036-Only-refresh-abilities-if-needed.patch
index 08edf92e96..08edf92e96 100644
--- a/patches/server/0038-Only-refresh-abilities-if-needed.patch
+++ b/patches/server/0036-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0039-Entity-Origin-API.patch b/patches/server/0037-Entity-Origin-API.patch
index ac1b821538..b021245302 100644
--- a/patches/server/0039-Entity-Origin-API.patch
+++ b/patches/server/0037-Entity-Origin-API.patch
@@ -25,7 +25,7 @@ index a6e78b8a6ced8ec84273e2c5d18ffccacb005cb6..c476a49f69261868f74ad528a2ad746a
  
          public void onTrackingEnd(Entity entity) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 09ce9511f52f7f8643fedc325c49580eba4e4645..030be85ff601711007bd2e550f3c534d34e73085 100644
+index 074292615a13cf1f42ee74d629109ec1be390da5..35ec3d6557a02a29df15c7302c1007f335c3db65 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -322,7 +322,27 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0040-Prevent-block-entity-and-entity-crashes.patch b/patches/server/0038-Prevent-block-entity-and-entity-crashes.patch
index 1b4eff07fa..ccdc3ed18a 100644
--- a/patches/server/0040-Prevent-block-entity-and-entity-crashes.patch
+++ b/patches/server/0038-Prevent-block-entity-and-entity-crashes.patch
@@ -26,7 +26,7 @@ index 5f881af95bd5ee94daadfd9e5d64ee6d411255c4..472df81e4aef21e0cf2684a9e04d6ce1
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index fb495fcbf42be3825bfb785a9887148c54f5b00b..8d281ce2a0e44b97957cea2992e273abc86bd157 100644
+index 7fa49fcf5469276e25c40af4cd27943f665d8721..d116d427ed692a9ef7d65e06ebef18012ce22aab 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 @@ -263,7 +263,12 @@ public abstract class BlockEntity {
diff --git a/patches/server/0041-Configurable-top-of-nether-void-damage.patch b/patches/server/0039-Configurable-top-of-nether-void-damage.patch
index 715e63f758..78fb2dce6b 100644
--- a/patches/server/0041-Configurable-top-of-nether-void-damage.patch
+++ b/patches/server/0039-Configurable-top-of-nether-void-damage.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable top of nether void damage
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 030be85ff601711007bd2e550f3c534d34e73085..f4e0a10eb936ed9d43c9a2fc3ed03a785bf00901 100644
+index 35ec3d6557a02a29df15c7302c1007f335c3db65..795ac5f58469f10ce35fff55bbc4fa5f395eea2a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -696,7 +696,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0042-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/server/0040-Check-online-mode-before-converting-and-renaming-pla.patch
index f89cf885a5..f89cf885a5 100644
--- a/patches/server/0042-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/patches/server/0040-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0043-Add-more-entities-to-activation-range-ignore-list.patch b/patches/server/0041-Add-more-entities-to-activation-range-ignore-list.patch
index c402bdafa2..c402bdafa2 100644
--- a/patches/server/0043-Add-more-entities-to-activation-range-ignore-list.patch
+++ b/patches/server/0041-Add-more-entities-to-activation-range-ignore-list.patch
diff --git a/patches/server/0044-Configurable-end-credits.patch b/patches/server/0042-Configurable-end-credits.patch
index 4c53dd9e33..f53785fc6c 100644
--- a/patches/server/0044-Configurable-end-credits.patch
+++ b/patches/server/0042-Configurable-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end credits
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8292f45aa100e2788584f568430d76560c2fa9a8..244be33d0000189556ce7c6714e5a9768c16ba6b 100644
+index 08b2d5c6fb6d236b805ca6556270ad1891b411f5..5b33cc5c54ab38b32f232dae00684d8b1e276acf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1107,6 +1107,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0045-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/server/0043-Fix-lag-from-explosions-processing-dead-entities.patch
index 390dc10580..549e7e93fb 100644
--- a/patches/server/0045-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/patches/server/0043-Fix-lag-from-explosions-processing-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix lag from explosions processing dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 296de8e9ae1284d4805932e746291d1148f7f8eb..b8b142f573b297ba72d45be3ae4c2729f3cffe1e 100644
+index 93c6d28df13077a2759fecf31d7dba5db10e11f9..598050c77c5a875d3fa27271debd916ab8b5259f 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -226,7 +226,7 @@ public class Explosion {
diff --git a/patches/server/0046-Optimize-explosions.patch b/patches/server/0044-Optimize-explosions.patch
index 50bb8f8a47..6704afe14d 100644
--- a/patches/server/0046-Optimize-explosions.patch
+++ b/patches/server/0044-Optimize-explosions.patch
@@ -10,10 +10,10 @@ This patch adds a per-tick cache that is used for storing and retrieving
 an entity's exposure during an explosion.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fcb2d06f088a938b5bb76e6b42581d8f292d2eaf..231fba80a25601cdfba4f6f44ac7c2888e505ed2 100644
+index 80a20dce63658842a0fa04004b8eaa8af7685fb4..a0fda40b2b7b16b424ed08d3a63da8704317133c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1554,6 +1554,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1551,6 +1551,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.profiler.pop();
              this.profiler.pop();
@@ -22,7 +22,7 @@ index fcb2d06f088a938b5bb76e6b42581d8f292d2eaf..231fba80a25601cdfba4f6f44ac7c288
  
          this.profiler.popPush("connection");
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index b8b142f573b297ba72d45be3ae4c2729f3cffe1e..157eac2a0a92f13ec191ee07774bdb3680e7e5b5 100644
+index 598050c77c5a875d3fa27271debd916ab8b5259f..8faa868787d63663cf844a9a6782a13405b30372 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -278,7 +278,7 @@ public class Explosion {
diff --git a/patches/server/0047-Disable-explosion-knockback.patch b/patches/server/0045-Disable-explosion-knockback.patch
index aef7f59ef6..01f044f93e 100644
--- a/patches/server/0047-Disable-explosion-knockback.patch
+++ b/patches/server/0045-Disable-explosion-knockback.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable explosion knockback
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 157eac2a0a92f13ec191ee07774bdb3680e7e5b5..754ca46d11dfe0495aa3109b68b1032e6d7d76e9 100644
+index 8faa868787d63663cf844a9a6782a13405b30372..da9a9b235d1c8bcab3762134d69dcb112470e55d 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -284,7 +284,7 @@ public class Explosion {
diff --git a/patches/server/0048-Disable-thunder.patch b/patches/server/0046-Disable-thunder.patch
index 55d3e6add9..55d3e6add9 100644
--- a/patches/server/0048-Disable-thunder.patch
+++ b/patches/server/0046-Disable-thunder.patch
diff --git a/patches/server/0049-Disable-ice-and-snow.patch b/patches/server/0047-Disable-ice-and-snow.patch
index d17551d9f5..d17551d9f5 100644
--- a/patches/server/0049-Disable-ice-and-snow.patch
+++ b/patches/server/0047-Disable-ice-and-snow.patch
diff --git a/patches/server/0050-Configurable-mob-spawner-tick-rate.patch b/patches/server/0048-Configurable-mob-spawner-tick-rate.patch
index deb1ddde3f..deb1ddde3f 100644
--- a/patches/server/0050-Configurable-mob-spawner-tick-rate.patch
+++ b/patches/server/0048-Configurable-mob-spawner-tick-rate.patch
diff --git a/patches/server/0051-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0049-Implement-PlayerLocaleChangeEvent.patch
index 68b2c72b6f..68b2c72b6f 100644
--- a/patches/server/0051-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0049-Implement-PlayerLocaleChangeEvent.patch
diff --git a/patches/server/0052-Add-BeaconEffectEvent.patch b/patches/server/0050-Add-BeaconEffectEvent.patch
index 52b61d4284..52b61d4284 100644
--- a/patches/server/0052-Add-BeaconEffectEvent.patch
+++ b/patches/server/0050-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0053-Configurable-container-update-tick-rate.patch b/patches/server/0051-Configurable-container-update-tick-rate.patch
index 22abc975b7..eea4b9d182 100644
--- a/patches/server/0053-Configurable-container-update-tick-rate.patch
+++ b/patches/server/0051-Configurable-container-update-tick-rate.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable container update tick rate
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index abc8c7928eed1ba385e9ebb0b0cd059c9048d439..1cda7166fe8974f05d20fdbfbced72f101663d56 100644
+index 29020296e4f3bbddc0faabb1eeaa07a921b5b68f..eb04f9ae48d1122cd08ccdd2798131dd124221df 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0054-Use-UserCache-for-player-heads.patch b/patches/server/0052-Use-UserCache-for-player-heads.patch
index 8a33892e11..8a33892e11 100644
--- a/patches/server/0054-Use-UserCache-for-player-heads.patch
+++ b/patches/server/0052-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0055-Disable-spigot-tick-limiters.patch b/patches/server/0053-Disable-spigot-tick-limiters.patch
index 0884563fa8..0884563fa8 100644
--- a/patches/server/0055-Disable-spigot-tick-limiters.patch
+++ b/patches/server/0053-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0056-Add-PlayerInitialSpawnEvent.patch b/patches/server/0054-Add-PlayerInitialSpawnEvent.patch
index 6afbd430d3..6afbd430d3 100644
--- a/patches/server/0056-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/server/0054-Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/server/0057-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/server/0055-Configurable-Disabling-Cat-Chest-Detection.patch
index 684534ebbe..232eb8f5f4 100644
--- a/patches/server/0057-Configurable-Disabling-Cat-Chest-Detection.patch
+++ b/patches/server/0055-Configurable-Disabling-Cat-Chest-Detection.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Disabling Cat Chest Detection
 Offers a gameplay feature to stop cats from blocking chests
 
 diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-index 0b7b447aeb0e592b51e4ae205df09e1b8ef4d0bb..491474b66856fccb038ee436968c9a5d3e4bf75c 100644
+index e197891f61580f92787d9400ff486439a92a54c7..8fbfd18b3caeed769396b3ffb1b1778b2f38edc0 100644
 --- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
 @@ -349,6 +349,11 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
diff --git a/patches/server/0058-Improve-Player-chat-API-handling.patch b/patches/server/0056-Improve-Player-chat-API-handling.patch
index 5a08a8685a..d940e1d9b2 100644
--- a/patches/server/0058-Improve-Player-chat-API-handling.patch
+++ b/patches/server/0056-Improve-Player-chat-API-handling.patch
@@ -40,10 +40,10 @@ index b700cd5ccf37f3592f7cb931101397fbc59dc60f..ad598e57feb2d9db1b71cb3a432df222
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a8a23daac1d102f9f5a17c9ed6aa821b16345f32..0287b2a02a94fa0671ee242ad3f5dac44d62dbbd 100644
+index 4d31fb8bc8bf285720a9d5828325d7124cf41c6e..2ca22c4d3f15ec3d7c2f8abf68ce7d810fe7c3ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -898,7 +898,7 @@ public final class CraftServer implements Server {
+@@ -900,7 +900,7 @@ public final class CraftServer implements Server {
      public boolean dispatchCommand(CommandSender sender, String commandLine) {
          Preconditions.checkArgument(sender != null, "sender cannot be null");
          Preconditions.checkArgument(commandLine != null, "commandLine cannot be null");
diff --git a/patches/server/0059-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/server/0057-All-chunks-are-slime-spawn-chunks-toggle.patch
index 7735158345..7735158345 100644
--- a/patches/server/0059-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/patches/server/0057-All-chunks-are-slime-spawn-chunks-toggle.patch
diff --git a/patches/server/0060-Expose-server-CommandMap.patch b/patches/server/0058-Expose-server-CommandMap.patch
index c23d4895f5..7e5affaf5a 100644
--- a/patches/server/0060-Expose-server-CommandMap.patch
+++ b/patches/server/0058-Expose-server-CommandMap.patch
@@ -5,10 +5,10 @@ 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 0287b2a02a94fa0671ee242ad3f5dac44d62dbbd..3218c620cb09e5da7ed75df125adc2d8ba41c306 100644
+index 2ca22c4d3f15ec3d7c2f8abf68ce7d810fe7c3ea..61f2e7faa5c5497eb5c45e127166b933c532036a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2141,6 +2141,7 @@ public final class CraftServer implements Server {
+@@ -2143,6 +2143,7 @@ public final class CraftServer implements Server {
          return this.helpMap;
      }
  
diff --git a/patches/server/0061-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0059-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 5c996dd4f7..5c996dd4f7 100644
--- a/patches/server/0061-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/patches/server/0059-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0062-Player-Tab-List-and-Title-APIs.patch b/patches/server/0060-Player-Tab-List-and-Title-APIs.patch
index 396ca10a8d..c2b14bfc41 100644
--- a/patches/server/0062-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/server/0060-Player-Tab-List-and-Title-APIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Tab List and Title APIs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a51bce9252328df85b485a5af7786db0622a4672..b53d62754f823c2e41c92a95f200af7c388ed011 100644
+index e4be5445045c28e0bf6c84f4b6695ff47f8df72e..b6932bee839cac9b819b9cd7a3f7668688bfe44e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -384,6 +384,98 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0063-Add-configurable-portal-search-radius.patch b/patches/server/0061-Add-configurable-portal-search-radius.patch
index 41391fe2ae..f65dd2ef82 100644
--- a/patches/server/0063-Add-configurable-portal-search-radius.patch
+++ b/patches/server/0061-Add-configurable-portal-search-radius.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable portal search radius
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f4e0a10eb936ed9d43c9a2fc3ed03a785bf00901..406d69220b315b47bd3d03a0dacc39addaaf9294 100644
+index 795ac5f58469f10ce35fff55bbc4fa5f395eea2a..fb3f9082b16f5ec420ddc1f5a0e81b8130a71e4f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3208,7 +3208,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0064-Add-velocity-warnings.patch b/patches/server/0062-Add-velocity-warnings.patch
index 0776a543ef..58c2ab5bf6 100644
--- a/patches/server/0064-Add-velocity-warnings.patch
+++ b/patches/server/0062-Add-velocity-warnings.patch
@@ -5,10 +5,10 @@ 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 3218c620cb09e5da7ed75df125adc2d8ba41c306..2dd6af53220dcdc21d7f3d304a9fadaa22b61b86 100644
+index 61f2e7faa5c5497eb5c45e127166b933c532036a..8ebd605a35b16a07ed1d927ebc9308a56a497c40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -303,6 +303,7 @@ public final class CraftServer implements Server {
+@@ -298,6 +298,7 @@ public final class CraftServer implements Server {
      public boolean ignoreVanillaPermissions = false;
      private final List<CraftPlayer> playerView;
      public int reloadCount;
diff --git a/patches/server/0065-Configurable-inter-world-teleportation-safety.patch b/patches/server/0063-Configurable-inter-world-teleportation-safety.patch
index 2154200454..e6af143352 100644
--- a/patches/server/0065-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/server/0063-Configurable-inter-world-teleportation-safety.patch
@@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended
 This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b53d62754f823c2e41c92a95f200af7c388ed011..392d77e43d5add1fd71f35817435c2b3c6a7a8fa 100644
+index b6932bee839cac9b819b9cd7a3f7668688bfe44e..24621c11ff91df8695eecc818e6a94a095c5a9cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1235,7 +1235,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0066-Add-exception-reporting-event.patch b/patches/server/0064-Add-exception-reporting-event.patch
index b0a4afc624..b0a4afc624 100644
--- a/patches/server/0066-Add-exception-reporting-event.patch
+++ b/patches/server/0064-Add-exception-reporting-event.patch
diff --git a/patches/server/0067-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0065-Disable-Scoreboards-for-non-players-by-default.patch
index 492c8f6fe9..e008b70806 100644
--- a/patches/server/0067-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/patches/server/0065-Disable-Scoreboards-for-non-players-by-default.patch
@@ -11,7 +11,7 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 406d69220b315b47bd3d03a0dacc39addaaf9294..1cd40266418a3805f05b09c554d561e2e83822e5 100644
+index fb3f9082b16f5ec420ddc1f5a0e81b8130a71e4f..66ba606ccbff3a578a090d5170f3ff866ecf99af 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2836,6 +2836,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -23,7 +23,7 @@ index 406d69220b315b47bd3d03a0dacc39addaaf9294..1cd40266418a3805f05b09c554d561e2
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a2cbe1fd8aef67cc9c71ef22bf4c7efd9d8d6a95..8f13f53b14209542283586c437e5cbf549ec8e46 100644
+index 856fb1a15279efc1e24a93fa289ca1ca8effd43e..e0ad0e242181261adccdec9c006a9937ac4a24e6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -873,6 +873,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0068-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index aa48fe9119..aa48fe9119 100644
--- a/patches/server/0068-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/server/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0069-Chunk-Save-Reattempt.patch b/patches/server/0067-Chunk-Save-Reattempt.patch
index 7a39e17bad..7a39e17bad 100644
--- a/patches/server/0069-Chunk-Save-Reattempt.patch
+++ b/patches/server/0067-Chunk-Save-Reattempt.patch
diff --git a/patches/server/0070-Complete-resource-pack-API.patch b/patches/server/0068-Complete-resource-pack-API.patch
index 0ce7ea57c1..0ce7ea57c1 100644
--- a/patches/server/0070-Complete-resource-pack-API.patch
+++ b/patches/server/0068-Complete-resource-pack-API.patch
diff --git a/patches/server/0071-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0069-Default-loading-permissions.yml-before-plugins.patch
index ba81a22f2c..26b2484c59 100644
--- a/patches/server/0071-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/server/0069-Default-loading-permissions.yml-before-plugins.patch
@@ -16,10 +16,10 @@ 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/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2dd6af53220dcdc21d7f3d304a9fadaa22b61b86..39767d5de04c11ab0ccacad6a677209df301d3e9 100644
+index 8ebd605a35b16a07ed1d927ebc9308a56a497c40..a4fffd20b0617563a67d5b9980814a7dc6fda997 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -459,6 +459,7 @@ public final class CraftServer implements Server {
+@@ -454,6 +454,7 @@ public final class CraftServer implements Server {
          if (type == PluginLoadOrder.STARTUP) {
              this.helpMap.clear();
              this.helpMap.initializeGeneralTopics();
@@ -27,7 +27,7 @@ index 2dd6af53220dcdc21d7f3d304a9fadaa22b61b86..39767d5de04c11ab0ccacad6a677209d
          }
  
          Plugin[] plugins = this.pluginManager.getPlugins();
-@@ -478,7 +479,7 @@ public final class CraftServer implements Server {
+@@ -473,7 +474,7 @@ public final class CraftServer implements Server {
              this.commandMap.registerServerAliases();
              DefaultPermissions.registerCorePermissions();
              CraftDefaultPermissions.registerCorePermissions();
diff --git a/patches/server/0072-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0070-Allow-Reloading-of-Custom-Permissions.patch
index 24eb99a038..810bbb2a2b 100644
--- a/patches/server/0072-Allow-Reloading-of-Custom-Permissions.patch
+++ b/patches/server/0070-Allow-Reloading-of-Custom-Permissions.patch
@@ -6,10 +6,10 @@ 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 39767d5de04c11ab0ccacad6a677209df301d3e9..8c3954a4b9adff7d41a772870d955e8f618a19cc 100644
+index a4fffd20b0617563a67d5b9980814a7dc6fda997..363a56ab9e1debb075ae8d441c9e2d31fa4fd5bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2752,5 +2752,23 @@ public final class CraftServer implements Server {
+@@ -2754,5 +2754,23 @@ public final class CraftServer implements Server {
          }
          return this.adventure$audiences;
      }
diff --git a/patches/server/0073-Remove-Metadata-on-reload.patch b/patches/server/0071-Remove-Metadata-on-reload.patch
index 3f6a30810f..ced7fd2271 100644
--- a/patches/server/0073-Remove-Metadata-on-reload.patch
+++ b/patches/server/0071-Remove-Metadata-on-reload.patch
@@ -7,10 +7,10 @@ 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 8c3954a4b9adff7d41a772870d955e8f618a19cc..219f34bf52d561ade27d9bb4876fc49ee2de30f6 100644
+index 363a56ab9e1debb075ae8d441c9e2d31fa4fd5bb..9eb00817b757fea2d2400aac7a33f72866ab8796 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -965,8 +965,16 @@ public final class CraftServer implements Server {
+@@ -967,8 +967,16 @@ public final class CraftServer implements Server {
              world.spigotConfig.init(); // Spigot
          }
  
diff --git a/patches/server/0074-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0072-Handle-Item-Meta-Inconsistencies.patch
index b7c0d2e42f..b7c0d2e42f 100644
--- a/patches/server/0074-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/server/0072-Handle-Item-Meta-Inconsistencies.patch
diff --git a/patches/server/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index e9a2a02b12..e9a2a02b12 100644
--- a/patches/server/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/patches/server/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch
diff --git a/patches/server/0076-Add-World-Util-Methods.patch b/patches/server/0074-Add-World-Util-Methods.patch
index ddac3fe2dc..ddac3fe2dc 100644
--- a/patches/server/0076-Add-World-Util-Methods.patch
+++ b/patches/server/0074-Add-World-Util-Methods.patch
diff --git a/patches/server/0077-Custom-replacement-for-eaten-items.patch b/patches/server/0075-Custom-replacement-for-eaten-items.patch
index 5aa65e4e45..b619a02688 100644
--- a/patches/server/0077-Custom-replacement-for-eaten-items.patch
+++ b/patches/server/0075-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 8f13f53b14209542283586c437e5cbf549ec8e46..801577d2c9e6eacd8e3038f5b3cdb026c62a5d09 100644
+index e0ad0e242181261adccdec9c006a9937ac4a24e6..d710e20447df4767e10f9250ce91dcd3141eaab0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3808,10 +3808,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0076-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index e36d19f9b0..e36d19f9b0 100644
--- a/patches/server/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0076-handle-NaN-health-absorb-values-and-repair-bad-data.patch
diff --git a/patches/server/0079-Use-a-Shared-Random-for-Entities.patch b/patches/server/0077-Use-a-Shared-Random-for-Entities.patch
index 8be701d5d4..62162b7089 100644
--- a/patches/server/0079-Use-a-Shared-Random-for-Entities.patch
+++ b/patches/server/0077-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 1cd40266418a3805f05b09c554d561e2e83822e5..bc098b6a9c0e3b19b9154ab3727949232bddb20a 100644
+index 66ba606ccbff3a578a090d5170f3ff866ecf99af..2fcdd61e9669904756aa33b1ff8ab7160ea5e371 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -169,6 +169,79 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0080-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0078-Configurable-spawn-chances-for-skeleton-horses.patch
index ea9b957f2c..ea9b957f2c 100644
--- a/patches/server/0080-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/server/0078-Configurable-spawn-chances-for-skeleton-horses.patch
diff --git a/patches/server/0081-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0079-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index 7a21368c62..e0209fe811 100644
--- a/patches/server/0081-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/server/0079-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
 Saves on some object allocation and processing when no plugin listens to this
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 231fba80a25601cdfba4f6f44ac7c2888e505ed2..4dc8fcd8e118a1c2f5fac0fc291b5555abeec124 100644
+index a0fda40b2b7b16b424ed08d3a63da8704317133c..4a9669422567983e2c3b3cee4f4ef945d4486d97 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1520,6 +1520,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1517,6 +1517,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
diff --git a/patches/server/0082-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0080-Entity-AddTo-RemoveFrom-World-Events.patch
index 701980a603..701980a603 100644
--- a/patches/server/0082-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/server/0080-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/server/0083-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0081-Configurable-Chunk-Inhabited-Time.patch
index 5c8f105ea5..5c8f105ea5 100644
--- a/patches/server/0083-Configurable-Chunk-Inhabited-Time.patch
+++ b/patches/server/0081-Configurable-Chunk-Inhabited-Time.patch
diff --git a/patches/server/0084-EntityPathfindEvent.patch b/patches/server/0082-EntityPathfindEvent.patch
index e29cff85e6..e29cff85e6 100644
--- a/patches/server/0084-EntityPathfindEvent.patch
+++ b/patches/server/0082-EntityPathfindEvent.patch
diff --git a/patches/server/0085-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0083-Sanitise-RegionFileCache-and-make-configurable.patch
index eeb14ca415..eeb14ca415 100644
--- a/patches/server/0085-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/patches/server/0083-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/0086-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0084-Do-not-load-chunks-for-Pathfinding.patch
index 76cfe02b0f..76cfe02b0f 100644
--- a/patches/server/0086-Do-not-load-chunks-for-Pathfinding.patch
+++ b/patches/server/0084-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0087-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0085-Add-PlayerUseUnknownEntityEvent.patch
index 8a7921ae97..8a7921ae97 100644
--- a/patches/server/0087-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/server/0085-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/server/0088-Configurable-random-tick-rates-for-blocks.patch b/patches/server/0086-Configurable-random-tick-rates-for-blocks.patch
index c936bd291e..c936bd291e 100644
--- a/patches/server/0088-Configurable-random-tick-rates-for-blocks.patch
+++ b/patches/server/0086-Configurable-random-tick-rates-for-blocks.patch
diff --git a/patches/server/0089-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0087-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 0e30285466..0e30285466 100644
--- a/patches/server/0089-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/server/0087-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/patches/server/0090-Optimize-DataBits.patch b/patches/server/0088-Optimize-DataBits.patch
index fa5c0b02f0..fa5c0b02f0 100644
--- a/patches/server/0090-Optimize-DataBits.patch
+++ b/patches/server/0088-Optimize-DataBits.patch
diff --git a/patches/server/0091-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0089-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 1108c99038..1108c99038 100644
--- a/patches/server/0091-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/patches/server/0089-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0092-Configurable-Player-Collision.patch b/patches/server/0090-Configurable-Player-Collision.patch
index 6fe211a509..6ec2840ad6 100644
--- a/patches/server/0092-Configurable-Player-Collision.patch
+++ b/patches/server/0090-Configurable-Player-Collision.patch
@@ -18,10 +18,10 @@ index 9a1a961eabd4362c171da78c6be82c867f3696a4..1d0c473442b5c72245c356054440323e
              ComponentSerialization.TRUSTED_STREAM_CODEC.encode(buf, this.playerPrefix);
              ComponentSerialization.TRUSTED_STREAM_CODEC.encode(buf, this.playerSuffix);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4712da0fcc454c1747e2677be821959c6f845f5e..6a5f4e8feb3c88662a78575590998efdf529bb51 100644
+index 4a9669422567983e2c3b3cee4f4ef945d4486d97..e637de2ead5b646a066a80944b4c831740298eb5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -636,6 +636,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -633,6 +633,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
          }
  
diff --git a/patches/server/0093-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0091-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 87920d8d8c..87920d8d8c 100644
--- a/patches/server/0093-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/server/0091-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0094-Configurable-RCON-IP-address.patch b/patches/server/0092-Configurable-RCON-IP-address.patch
index 5f1a673a18..5f1a673a18 100644
--- a/patches/server/0094-Configurable-RCON-IP-address.patch
+++ b/patches/server/0092-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0095-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0093-EntityRegainHealthEvent-isFastRegen-API.patch
index a6481fa8df..301f1ad846 100644
--- a/patches/server/0095-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/server/0093-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 24e6d6c356cccf656cd20bcea069f5fdf123e4c8..7ac642aaf39a73f18c89be2b0c412b57a96e99d9 100644
+index e1d34c666f88bdbead59aff0d349a49608a7b8cd..19dbfbef6d008ba858ab37fb6d5139b0846ef95f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1344,10 +1344,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0096-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0094-Add-ability-to-configure-frosted_ice-properties.patch
index edd8aee842..edd8aee842 100644
--- a/patches/server/0096-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/patches/server/0094-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0097-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0095-remove-null-possibility-for-getServer-singleton.patch
index 33e773e0fe..ac9259adcb 100644
--- a/patches/server/0097-remove-null-possibility-for-getServer-singleton.patch
+++ b/patches/server/0095-remove-null-possibility-for-getServer-singleton.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 53a344b3ee3813872f5f061aab660bf602b573a5..fa4a7babd045021545514f214c1d027faca99b48 100644
+index e637de2ead5b646a066a80944b4c831740298eb5..9db493f4eb356b10ea3be421e22d806ca7355adc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -194,6 +194,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
+@@ -191,6 +191,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
  
  public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements ServerInfo, CommandSource, AutoCloseable {
  
@@ -17,7 +17,7 @@ index 53a344b3ee3813872f5f061aab660bf602b573a5..fa4a7babd045021545514f214c1d027f
      public static final Logger LOGGER = LogUtils.getLogger();
      public static final net.kyori.adventure.text.logger.slf4j.ComponentLogger COMPONENT_LOGGER = net.kyori.adventure.text.logger.slf4j.ComponentLogger.logger(LOGGER.getName()); // Paper
      public static final String VANILLA_BRAND = "vanilla";
-@@ -327,6 +328,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -324,6 +325,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      public MinecraftServer(OptionSet options, WorldLoader.DataLoadContext worldLoader, Thread thread, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PackRepository resourcepackrepository, WorldStem worldstem, Proxy proxy, DataFixer datafixer, Services services, ChunkProgressListenerFactory worldloadlistenerfactory) {
          super("Server");
@@ -25,7 +25,7 @@ index 53a344b3ee3813872f5f061aab660bf602b573a5..fa4a7babd045021545514f214c1d027f
          this.metricsRecorder = InactiveMetricsRecorder.INSTANCE;
          this.profiler = this.metricsRecorder.getProfiler();
          this.onMetricsRecordingStopped = (methodprofilerresults) -> {
-@@ -2529,9 +2531,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2526,9 +2528,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return false;
      }
  
diff --git a/patches/server/0098-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index bb493d5a5f..bb493d5a5f 100644
--- a/patches/server/0098-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/0099-LootTable-API-and-replenishable-lootables.patch b/patches/server/0097-LootTable-API-and-replenishable-lootables.patch
index b09c92c498..d78da70503 100644
--- a/patches/server/0099-LootTable-API-and-replenishable-lootables.patch
+++ b/patches/server/0097-LootTable-API-and-replenishable-lootables.patch
@@ -509,7 +509,7 @@ index 0000000000000000000000000000000000000000..fb72bdea520ccc0928cfbda0569e02a1
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bc098b6a9c0e3b19b9154ab3727949232bddb20a..10687787a5fd1a81ad5a625848db4649381eab67 100644
+index 2fcdd61e9669904756aa33b1ff8ab7160ea5e371..e04c0d333f8a425e4a1315b20f182b2206c22277 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -242,6 +242,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0100-System-property-for-disabling-watchdoge.patch b/patches/server/0098-System-property-for-disabling-watchdoge.patch
index 4a35e21392..4a35e21392 100644
--- a/patches/server/0100-System-property-for-disabling-watchdoge.patch
+++ b/patches/server/0098-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0101-Async-GameProfileCache-saving.patch b/patches/server/0099-Async-GameProfileCache-saving.patch
index 6ca5cfdff1..301cc8412c 100644
--- a/patches/server/0101-Async-GameProfileCache-saving.patch
+++ b/patches/server/0099-Async-GameProfileCache-saving.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Async GameProfileCache saving
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fa4a7babd045021545514f214c1d027faca99b48..5a52369c1e4c462f401c4b6699a2b7376b8bc0e9 100644
+index 9db493f4eb356b10ea3be421e22d806ca7355adc..fb0904312cad3a8853f2f92888f9e21c3ab50f27 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -995,7 +995,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -992,7 +992,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          } catch (java.lang.InterruptedException ignored) {} // Paper
          if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
              MinecraftServer.LOGGER.info("Saving usercache.json");
diff --git a/patches/server/0102-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0100-Optional-TNT-doesn-t-move-in-water.patch
index e78b02bbd5..e78b02bbd5 100644
--- a/patches/server/0102-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/server/0100-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/0103-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0101-Faster-redstone-torch-rapid-clock-removal.patch
index 4ec00fb17a..4ec00fb17a 100644
--- a/patches/server/0103-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/server/0101-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/0104-Add-server-name-parameter.patch b/patches/server/0102-Add-server-name-parameter.patch
index 465d38a30d..74018176e7 100644
--- a/patches/server/0104-Add-server-name-parameter.patch
+++ b/patches/server/0102-Add-server-name-parameter.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 3c4a593cfbc111084abc971bc7532898d094bd9a..dc93fd6f89694d9ae3c05de9a9d427ecce564fc9 100644
+index 9dc72b01092783c436bc1fa8ce29ff7cdaa39b19..9515a6f72b54bc8926f10182143b2aa9b684a341 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -167,6 +167,14 @@ public class Main {
+@@ -168,6 +168,14 @@ public class Main {
                          .defaultsTo(new File[] {})
                          .describedAs("Jar file");
                  // Paper end
diff --git a/patches/server/0105-Fix-global-sound-handling.patch b/patches/server/0103-Fix-global-sound-handling.patch
index 81efd49063..81efd49063 100644
--- a/patches/server/0105-Fix-global-sound-handling.patch
+++ b/patches/server/0103-Fix-global-sound-handling.patch
diff --git a/patches/server/0106-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0104-Avoid-blocking-on-Network-Manager-creation.patch
index 1c6ee84de8..1c6ee84de8 100644
--- a/patches/server/0106-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/patches/server/0104-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0107-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 82dc93463f..82dc93463f 100644
--- a/patches/server/0107-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/patches/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0108-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch
index 2c4efec1dc..2b24c887a6 100644
--- a/patches/server/0108-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch
@@ -60,10 +60,10 @@ index a0b0614ac7d2009db5c6c10ab4a5f09dd447c635..653856d0b8dcf2baf4cc77a276f17c8c
          } 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 219f34bf52d561ade27d9bb4876fc49ee2de30f6..902f985042136f9179f85c2be838ba7dec4f5ce9 100644
+index 9eb00817b757fea2d2400aac7a33f72866ab8796..762c9b039cb4591745d341ae0988dafae38d1aed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1850,7 +1850,7 @@ public final class CraftServer implements Server {
+@@ -1852,7 +1852,7 @@ public final class CraftServer implements Server {
          if (result == null) {
              GameProfile profile = null;
              // Only fetch an online UUID in online mode
diff --git a/patches/server/0109-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0107-Optimise-BlockState-s-hashCode-equals.patch
index 348097f8ce..348097f8ce 100644
--- a/patches/server/0109-Optimise-BlockState-s-hashCode-equals.patch
+++ b/patches/server/0107-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0110-Configurable-packet-in-spam-threshold.patch b/patches/server/0108-Configurable-packet-in-spam-threshold.patch
index cb3dbe2ee5..8f086734c2 100644
--- a/patches/server/0110-Configurable-packet-in-spam-threshold.patch
+++ b/patches/server/0108-Configurable-packet-in-spam-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0d0bc67bd019c6a203cdb46a778d2963359e43f7..5af3e01efd4176c828043ffaba341ae21fad3a73 100644
+index 555623fa4176c9ac4534cc7c5174d45f7c321ba1..c25c9e2a20243083b7ca928e1d4d5c3a562b7b11 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1522,13 +1522,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0111-Configurable-flying-kick-messages.patch b/patches/server/0109-Configurable-flying-kick-messages.patch
index d8a269459b..5cc2a061cc 100644
--- a/patches/server/0111-Configurable-flying-kick-messages.patch
+++ b/patches/server/0109-Configurable-flying-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5af3e01efd4176c828043ffaba341ae21fad3a73..31ccca2a4e94cb1b3f43de38907634f7e6e18aa5 100644
+index c25c9e2a20243083b7ca928e1d4d5c3a562b7b11..b4b775687ec47c0deeced7fbf1316e0766797d0d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -346,7 +346,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0112-Add-EntityZapEvent.patch b/patches/server/0110-Add-EntityZapEvent.patch
index 3d8af4f823..3d8af4f823 100644
--- a/patches/server/0112-Add-EntityZapEvent.patch
+++ b/patches/server/0110-Add-EntityZapEvent.patch
diff --git a/patches/server/0113-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch b/patches/server/0111-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
index c961e57817..c961e57817 100644
--- a/patches/server/0113-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
+++ b/patches/server/0111-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
diff --git a/patches/server/0114-Cache-user-authenticator-threads.patch b/patches/server/0112-Cache-user-authenticator-threads.patch
index af62d4792e..af62d4792e 100644
--- a/patches/server/0114-Cache-user-authenticator-threads.patch
+++ b/patches/server/0112-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0115-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch
index fca05fd988..3001c29465 100644
--- a/patches/server/0115-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch
@@ -6,10 +6,10 @@ 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 902f985042136f9179f85c2be838ba7dec4f5ce9..6ae881afc0fd5a5fe9f8970f99985a39e8cd37ce 100644
+index 762c9b039cb4591745d341ae0988dafae38d1aed..26dc95f14efbe293c0a8548e050a213206aeb582 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2778,5 +2778,24 @@ public final class CraftServer implements Server {
+@@ -2780,5 +2780,24 @@ public final class CraftServer implements Server {
          DefaultPermissions.registerCorePermissions();
          CraftDefaultPermissions.registerCorePermissions();
      }
diff --git a/patches/server/0116-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch
index 5d39447d9f..5d39447d9f 100644
--- a/patches/server/0116-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0117-Add-ProjectileCollideEvent.patch b/patches/server/0115-Add-ProjectileCollideEvent.patch
index ac05d08cbe..ac05d08cbe 100644
--- a/patches/server/0117-Add-ProjectileCollideEvent.patch
+++ b/patches/server/0115-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0118-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
index ce3053228d..ce3053228d 100644
--- a/patches/server/0118-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0119-Optimize-Level.hasChunkAt-BlockPosition-Z.patch b/patches/server/0117-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
index e4bdedfa83..e4bdedfa83 100644
--- a/patches/server/0119-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
+++ b/patches/server/0117-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
diff --git a/patches/server/0120-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch
index 507479d986..507479d986 100644
--- a/patches/server/0120-Bound-Treasure-Maps-to-World-Border.patch
+++ b/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0121-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch
index 52b259bda3..52b259bda3 100644
--- a/patches/server/0121-Configurable-Cartographer-Treasure-Maps.patch
+++ b/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0122-Add-API-methods-to-control-if-armor-stands-can-move.patch b/patches/server/0120-Add-API-methods-to-control-if-armor-stands-can-move.patch
index e164186ab4..e164186ab4 100644
--- a/patches/server/0122-Add-API-methods-to-control-if-armor-stands-can-move.patch
+++ b/patches/server/0120-Add-API-methods-to-control-if-armor-stands-can-move.patch
diff --git a/patches/server/0123-String-based-Action-Bar-API.patch b/patches/server/0121-String-based-Action-Bar-API.patch
index c6afb32b4d..6f39c759ac 100644
--- a/patches/server/0123-String-based-Action-Bar-API.patch
+++ b/patches/server/0121-String-based-Action-Bar-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d616f6c1fe63e3fe9d811d670dbc78a44e7afcbd..a9922e5f5c19cd6455b6ca9a3db7aa0a42f99524 100644
+index 4923e6bba9eb95c3e7f6fafef63961cec091e1f8..3b0d7980801688d83bd4aa33f58e560d62659839 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -386,6 +386,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0124-Properly-fix-item-duplication-bug.patch b/patches/server/0122-Properly-fix-item-duplication-bug.patch
index 7e73626956..5462debbf6 100644
--- a/patches/server/0124-Properly-fix-item-duplication-bug.patch
+++ b/patches/server/0122-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 1cda7166fe8974f05d20fdbfbced72f101663d56..a5122de4602db3b93a9221e1a9a33bcb73dbe771 100644
+index eb04f9ae48d1122cd08ccdd2798131dd124221df..96bc2fa87502c363c68822d512e3c63c09a29513 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2559,7 +2559,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0125-Firework-API-s.patch b/patches/server/0123-Firework-API-s.patch
index 97437e72f2..97437e72f2 100644
--- a/patches/server/0125-Firework-API-s.patch
+++ b/patches/server/0123-Firework-API-s.patch
diff --git a/patches/server/0126-PlayerTeleportEndGatewayEvent.patch b/patches/server/0124-PlayerTeleportEndGatewayEvent.patch
index b63f7764ee..b63f7764ee 100644
--- a/patches/server/0126-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/server/0124-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0127-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
index 1c42b6754f..1c42b6754f 100644
--- a/patches/server/0127-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/0128-Enforce-Sync-Player-Saves.patch b/patches/server/0126-Enforce-Sync-Player-Saves.patch
index 0a5c3c945c..0a5c3c945c 100644
--- a/patches/server/0128-Enforce-Sync-Player-Saves.patch
+++ b/patches/server/0126-Enforce-Sync-Player-Saves.patch
diff --git a/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 98bbd87f00..d4497b804f 100644
--- a/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -127,7 +127,7 @@ index 1f29ed95ef3d1904a014715028d9d591fe39231f..1a829f79e6f9e03ead745e13ece4d1b5
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7ac642aaf39a73f18c89be2b0c412b57a96e99d9..c6e666f57c199b4408b32e076622ba05b42fcea9 100644
+index 19dbfbef6d008ba858ab37fb6d5139b0846ef95f..1379f0ba7cf99e7829aaaca62ac4c56c359f6bf0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1819,7 +1819,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -186,7 +186,7 @@ index 40ea9af580f841c3aba61db7c34efb88d542a547..d2dfccd1e31b2f050c9f480220cf17df
                      // CraftBukkit end
                  }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index 1f6703a089df0c53d022321618a303edefcf0f77..e6bc782683ea5d69840ca7b89b20cfdc1adac5fd 100644
+index e401efe0c15bbc6236259645447791142ea2fbda..cf565f3a4baf5898000d23eeedcf314b0c10db5a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -455,7 +455,7 @@ public class Turtle extends Animal {
diff --git a/patches/server/0130-Cap-Entity-Collisions.patch b/patches/server/0128-Cap-Entity-Collisions.patch
index 3fefadf5a6..366c579285 100644
--- a/patches/server/0130-Cap-Entity-Collisions.patch
+++ b/patches/server/0128-Cap-Entity-Collisions.patch
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 10687787a5fd1a81ad5a625848db4649381eab67..9f906e51f236e84f6cee8eba4b7587edee7ce796 100644
+index e04c0d333f8a425e4a1315b20f182b2206c22277..1bdf39894b4224d38fb3141e6445f6782b4e1920 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -396,6 +396,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -24,7 +24,7 @@ index 10687787a5fd1a81ad5a625848db4649381eab67..9f906e51f236e84f6cee8eba4b7587ed
      @javax.annotation.Nullable
      private org.bukkit.util.Vector origin;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c6e666f57c199b4408b32e076622ba05b42fcea9..134106c7c98c87e593157a794287973327d055fc 100644
+index 1379f0ba7cf99e7829aaaca62ac4c56c359f6bf0..894772009bd3ca2615297b6ca856a9ffe23f3c42 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3460,10 +3460,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch
index 721f748db6..721f748db6 100644
--- a/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
index eb9dccee49..f9dd43b3aa 100644
--- a/patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
@@ -30,10 +30,10 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5a52369c1e4c462f401c4b6699a2b7376b8bc0e9..ec0fe27a6475cc3d097d394cf9694a17cba76332 100644
+index fb0904312cad3a8853f2f92888f9e21c3ab50f27..260e364c91d8c3d774681f9f0ecba63df5dd3f5c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -239,6 +239,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -236,6 +236,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      private Map<ResourceKey<Level>, ServerLevel> levels;
      private PlayerList playerList;
      private volatile boolean running;
@@ -41,7 +41,7 @@ index 5a52369c1e4c462f401c4b6699a2b7376b8bc0e9..ec0fe27a6475cc3d097d394cf9694a17
      private boolean stopped;
      private int tickCount;
      private int ticksUntilAutosave;
-@@ -934,7 +935,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -931,7 +932,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (this.playerList != null) {
              MinecraftServer.LOGGER.info("Saving players");
              this.playerList.saveAll();
@@ -50,7 +50,7 @@ index 5a52369c1e4c462f401c4b6699a2b7376b8bc0e9..ec0fe27a6475cc3d097d394cf9694a17
              try { Thread.sleep(100); } catch (InterruptedException ex) {} // CraftBukkit - SPIGOT-625 - give server at least a chance to send packets
          }
  
-@@ -1014,6 +1015,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1011,6 +1012,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void halt(boolean waitForShutdown) {
diff --git a/patches/server/0133-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 869abf5e86..808589b545 100644
--- a/patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -14,7 +14,7 @@ To be converted into a Paper-API event at some point in the future?
 public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 31ccca2a4e94cb1b3f43de38907634f7e6e18aa5..385dd65af8b526d128ac4c99cecdb69aad9f9a07 100644
+index b4b775687ec47c0deeced7fbf1316e0766797d0d..df0cc552024c64c7e4f53386a75f8fee3008155b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2242,6 +2242,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
index f07dec53bd..de9524e18e 100644
--- a/patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6ae881afc0fd5a5fe9f8970f99985a39e8cd37ce..8903ae05a2671cf3d5894ba1c2664bb98fa4b8bf 100644
+index 26dc95f14efbe293c0a8548e050a213206aeb582..02308021712a2e947bd389e625b5d93e62f5024b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2797,5 +2797,10 @@ public final class CraftServer implements Server {
+@@ -2799,5 +2799,10 @@ public final class CraftServer implements Server {
          commandMap.registerServerAliases();
          return true;
      }
diff --git a/patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0133-provide-a-configurable-option-to-disable-creeper-lin.patch
index 5d6a56dbae..0ea235e63e 100644
--- a/patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/patches/server/0133-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 3b496eaac4eaadadb3f366f4121ce899aa212532..01938fc75158c13c4b040fa623934ec841cbf719 100644
+index 204685bc15650c1b40067d4374e2e6bb53948eb6..b76b637ff940dde21647d1f34acd59a23159bb3c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -286,7 +286,7 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0136-Item-canEntityPickup.patch b/patches/server/0134-Item-canEntityPickup.patch
index d38a9da345..d38a9da345 100644
--- a/patches/server/0136-Item-canEntityPickup.patch
+++ b/patches/server/0134-Item-canEntityPickup.patch
diff --git a/patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0135-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 6a32c3b05f..6a32c3b05f 100644
--- a/patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/server/0135-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0138-PlayerAttemptPickupItemEvent.patch b/patches/server/0136-PlayerAttemptPickupItemEvent.patch
index af6c33cefe..af6c33cefe 100644
--- a/patches/server/0138-PlayerAttemptPickupItemEvent.patch
+++ b/patches/server/0136-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0137-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index 3b7ee69e84..b20b78d6f1 100644
--- a/patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/server/0137-Do-not-submit-profile-lookups-to-worldgen-threads.patch
@@ -63,7 +63,7 @@ index 6097e0ab387cfa4c2c9ab0389fc5bb6cd899ecc3..ebba6bc5b337d19e32be5a78294501ed
  
      public static void clear() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
-index 866f9d00669923ee01ac97399cd78b5ee58f950f..6f0edd4d1c473179c03253326a3c7b5910ec53ad 100644
+index 44174c5a7b255af489c1e4bf589299e6bdbb90a3..ab18b1d480f7ecc0ad9a51471d8f45b0da74d8cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 +++ b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 @@ -134,7 +134,7 @@ public final class CraftPlayerProfile implements PlayerProfile {
diff --git a/patches/server/0140-Basic-PlayerProfile-API.patch b/patches/server/0138-Basic-PlayerProfile-API.patch
index 74a8967162..e0c4f23366 100644
--- a/patches/server/0140-Basic-PlayerProfile-API.patch
+++ b/patches/server/0138-Basic-PlayerProfile-API.patch
@@ -623,10 +623,10 @@ index 416b26c2ab62b29d640169166980e398d5824b14..774d81c702edb76a2f6184d4dc53687d
          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 8903ae05a2671cf3d5894ba1c2664bb98fa4b8bf..17db4fa42f08a86b1c3e08f9a7e5692eab7011ab 100644
+index 02308021712a2e947bd389e625b5d93e62f5024b..f7c258b6f0f4eb6094828da20e4a5af2388a04ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -265,6 +265,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
+@@ -260,6 +260,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
  
  import net.md_5.bungee.api.chat.BaseComponent; // Spigot
  
@@ -634,9 +634,9 @@ index 8903ae05a2671cf3d5894ba1c2664bb98fa4b8bf..17db4fa42f08a86b1c3e08f9a7e5692e
 +import javax.annotation.Nonnull; // Paper
 +
  public final class CraftServer implements Server {
-     private final String serverName = "Paper"; // Paper
+     private final String serverName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
      private final String serverVersion;
-@@ -308,6 +311,7 @@ public final class CraftServer implements Server {
+@@ -303,6 +306,7 @@ public final class CraftServer implements Server {
      static {
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
          ConfigurationSerialization.registerClass(CraftPlayerProfile.class);
@@ -644,7 +644,7 @@ index 8903ae05a2671cf3d5894ba1c2664bb98fa4b8bf..17db4fa42f08a86b1c3e08f9a7e5692e
          CraftItemFactory.instance();
          CraftEntityFactory.instance();
      }
-@@ -2802,5 +2806,42 @@ public final class CraftServer implements Server {
+@@ -2804,5 +2808,42 @@ public final class CraftServer implements Server {
      public boolean suggestPlayerNamesWhenNullTabCompletions() {
          return io.papermc.paper.configuration.GlobalConfiguration.get().commands.suggestPlayerNamesWhenNullTabCompletions;
      }
diff --git a/patches/server/0141-Add-UnknownCommandEvent.patch b/patches/server/0139-Add-UnknownCommandEvent.patch
index a84a4cea15..9951af2c67 100644
--- a/patches/server/0141-Add-UnknownCommandEvent.patch
+++ b/patches/server/0139-Add-UnknownCommandEvent.patch
@@ -78,10 +78,10 @@ index b81a4204a85e5b431cd6137fd8b80e43779c97b7..eec5279ac4386132fa053c57889e32e6
  
              return null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 17db4fa42f08a86b1c3e08f9a7e5692eab7011ab..5abb033ff78a0e1d79a71ed65d82774738aa9ba4 100644
+index f7c258b6f0f4eb6094828da20e4a5af2388a04ac..ea8e5b4775944fc2bf4e30c311b281363bd21049 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -912,7 +912,13 @@ public final class CraftServer implements Server {
+@@ -914,7 +914,13 @@ public final class CraftServer implements Server {
  
          // Spigot start
          if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {
diff --git a/patches/server/0142-Shoulder-Entities-Release-API.patch b/patches/server/0140-Shoulder-Entities-Release-API.patch
index 9db14c66fd..9db14c66fd 100644
--- a/patches/server/0142-Shoulder-Entities-Release-API.patch
+++ b/patches/server/0140-Shoulder-Entities-Release-API.patch
diff --git a/patches/server/0143-Profile-Lookup-Events.patch b/patches/server/0141-Profile-Lookup-Events.patch
index 8a3c9a944e..8a3c9a944e 100644
--- a/patches/server/0143-Profile-Lookup-Events.patch
+++ b/patches/server/0141-Profile-Lookup-Events.patch
diff --git a/patches/server/0144-Block-player-logins-during-server-shutdown.patch b/patches/server/0142-Block-player-logins-during-server-shutdown.patch
index 0a09c804d3..0a09c804d3 100644
--- a/patches/server/0144-Block-player-logins-during-server-shutdown.patch
+++ b/patches/server/0142-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0145-Entity-fromMobSpawner.patch b/patches/server/0143-Entity-fromMobSpawner.patch
index dc08de6d4b..4b9b4d2a44 100644
--- a/patches/server/0145-Entity-fromMobSpawner.patch
+++ b/patches/server/0143-Entity-fromMobSpawner.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9f906e51f236e84f6cee8eba4b7587edee7ce796..e612921a7fb68dd74d8fd4084a8beccc299ff6ea 100644
+index 1bdf39894b4224d38fb3141e6445f6782b4e1920..9a8d70c1f92ecc8da6444ba5581a8d4b24af0672 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -397,6 +397,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0146-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0144-Improve-the-Saddle-API-for-Horses.patch
index ddf19f0208..ddf19f0208 100644
--- a/patches/server/0146-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/server/0144-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0147-ensureServerConversions-API.patch b/patches/server/0145-ensureServerConversions-API.patch
index 85e770b115..85e770b115 100644
--- a/patches/server/0147-ensureServerConversions-API.patch
+++ b/patches/server/0145-ensureServerConversions-API.patch
diff --git a/patches/server/0148-Implement-getI18NDisplayName.patch b/patches/server/0146-Implement-getI18NDisplayName.patch
index 9493175f29..9493175f29 100644
--- a/patches/server/0148-Implement-getI18NDisplayName.patch
+++ b/patches/server/0146-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0149-ProfileWhitelistVerifyEvent.patch b/patches/server/0147-ProfileWhitelistVerifyEvent.patch
index b11dd2a0d1..b11dd2a0d1 100644
--- a/patches/server/0149-ProfileWhitelistVerifyEvent.patch
+++ b/patches/server/0147-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/server/0150-Fix-this-stupid-bullshit.patch b/patches/server/0148-Fix-this-stupid-bullshit.patch
index 0ac6601973..bef52e1305 100644
--- a/patches/server/0150-Fix-this-stupid-bullshit.patch
+++ b/patches/server/0148-Fix-this-stupid-bullshit.patch
@@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.
 
 diff --git a/src/main/java/net/minecraft/server/Bootstrap.java b/src/main/java/net/minecraft/server/Bootstrap.java
-index d0d95d729853fc296c4931a2f73a3fc5f94302c9..05f4be8dfff37ab6804a2d990b1f8c430d42dc7c 100644
+index 26892378d27dadce25c178333188ba093dc1617b..a3a2097716430b30c9bac2581b9f67fe0c595bd2 100644
 --- a/src/main/java/net/minecraft/server/Bootstrap.java
 +++ b/src/main/java/net/minecraft/server/Bootstrap.java
 @@ -44,7 +44,7 @@ public class Bootstrap {
@@ -31,10 +31,10 @@ index d0d95d729853fc296c4931a2f73a3fc5f94302c9..05f4be8dfff37ab6804a2d990b1f8c43
              Bootstrap.isBootstrapped = true;
              Instant instant = Instant.now();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index dc93fd6f89694d9ae3c05de9a9d427ecce564fc9..caa7fefab037a24713e9f7f15a541d47bc7655ee 100644
+index 9515a6f72b54bc8926f10182143b2aa9b684a341..faa228698c7dd60bde0f3767cc27957ece04b8be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -259,10 +259,12 @@ public class Main {
+@@ -260,10 +260,12 @@ public class Main {
                      Calendar deadline = Calendar.getInstance();
                      deadline.add(Calendar.DAY_OF_YEAR, -3);
                      if (buildDate.before(deadline.getTime())) {
diff --git a/patches/server/0151-LivingEntity-setKiller.patch b/patches/server/0149-LivingEntity-setKiller.patch
index 9fd26436ef..9fd26436ef 100644
--- a/patches/server/0151-LivingEntity-setKiller.patch
+++ b/patches/server/0149-LivingEntity-setKiller.patch
diff --git a/patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch
index 9dc664ab89..9dc664ab89 100644
--- a/patches/server/0152-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/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 129e8461dc..129e8461dc 100644
--- a/patches/server/0153-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/0154-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch
index 8abd11f071..8abd11f071 100644
--- a/patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/patches/server/0155-Add-PlayerJumpEvent.patch b/patches/server/0153-Add-PlayerJumpEvent.patch
index df545a0e0c..d0a1375498 100644
--- a/patches/server/0155-Add-PlayerJumpEvent.patch
+++ b/patches/server/0153-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 385dd65af8b526d128ac4c99cecdb69aad9f9a07..74c7a690f654558baf12ba2085d0e897a45c0baa 100644
+index df0cc552024c64c7e4f53386a75f8fee3008155b..196682a91c47ed2c4d2a8e1b71728200cc22191c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1204,7 +1204,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0154-handle-ServerboundKeepAlivePacket-async.patch
index b7fa733d4a..b7fa733d4a 100644
--- a/patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch
+++ b/patches/server/0154-handle-ServerboundKeepAlivePacket-async.patch
diff --git a/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0155-Expose-client-protocol-version-and-virtual-host.patch
index 99dcb0e80f..80e98075a3 100644
--- a/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0155-Expose-client-protocol-version-and-virtual-host.patch
@@ -90,7 +90,7 @@ index 9214fb6b8e21ff6aee8be0691f1fe6e41c901ba3..65333e0244d7c3c415266f1740929761
  
      private void beginLogin(ClientIntentionPacket packet, boolean transfer) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a9922e5f5c19cd6455b6ca9a3db7aa0a42f99524..7e1f6e23980f12786abaa4218d8d77dd1a8feb3c 100644
+index 3b0d7980801688d83bd4aa33f58e560d62659839..7635c501d71273ef85e6500ff15434c6b89c9e3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -332,6 +332,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0158-revert-serverside-behavior-of-keepalives.patch b/patches/server/0156-revert-serverside-behavior-of-keepalives.patch
index 167f18e6c9..167f18e6c9 100644
--- a/patches/server/0158-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/0156-revert-serverside-behavior-of-keepalives.patch
diff --git a/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0157-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index cb530598f0..cb530598f0 100644
--- a/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/server/0157-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0160-Add-PlayerArmorChangeEvent.patch b/patches/server/0158-Add-PlayerArmorChangeEvent.patch
index e99409e6ec..0856677995 100644
--- a/patches/server/0160-Add-PlayerArmorChangeEvent.patch
+++ b/patches/server/0158-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 134106c7c98c87e593157a794287973327d055fc..4f742679669aea2a19267f3774da1f8b094a45cf 100644
+index 894772009bd3ca2615297b6ca856a9ffe23f3c42..72c5da58cc13ff7dc33159073b92c8e8fbb5bb28 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3143,6 +3143,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0159-Prevent-logins-from-being-processed-when-the-player-.patch
index f6552aac5d..f6552aac5d 100644
--- a/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/server/0159-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0162-Fix-MC-117075-Block-entity-unload-lag-spike.patch b/patches/server/0160-Fix-MC-117075-Block-entity-unload-lag-spike.patch
index 4dda00330b..4dda00330b 100644
--- a/patches/server/0162-Fix-MC-117075-Block-entity-unload-lag-spike.patch
+++ b/patches/server/0160-Fix-MC-117075-Block-entity-unload-lag-spike.patch
diff --git a/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0161-use-CB-BlockState-implementations-for-captured-block.patch
index 50782d18cc..50782d18cc 100644
--- a/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/server/0161-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0162-API-to-get-a-BlockState-without-a-snapshot.patch
index 025273bead..e09cc3df6b 100644
--- a/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/server/0162-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -114,7 +114,7 @@ index f8b5595dc92036cc1889c0835f69389c93501fa7..a7bb7d263cb981fcf6dd35a3b32270e8
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
-index 0173a8eac2153d889536e48970f967040490e4b7..83ac5fc6cbbd249b5865ab203b150f53f01c9f05 100644
+index 1cf2d13ac6addcf61168b95aafa936d4b9432f8a..e40973b65ece11d9c5a76abad51f72e610bf02ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
 @@ -387,15 +387,30 @@ public final class CraftBlockStates {
diff --git a/patches/server/0165-AsyncTabCompleteEvent.patch b/patches/server/0163-AsyncTabCompleteEvent.patch
index 002198becb..20c857e615 100644
--- a/patches/server/0165-AsyncTabCompleteEvent.patch
+++ b/patches/server/0163-AsyncTabCompleteEvent.patch
@@ -80,10 +80,10 @@ index 196682a91c47ed2c4d2a8e1b71728200cc22191c..fffd671feb7a4e9805eafc473632b232
  
          this.server.getCommands().getDispatcher().getCompletionSuggestions(parseresults).thenAccept((suggestions) -> {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5abb033ff78a0e1d79a71ed65d82774738aa9ba4..990fad51d6fc1800d8ad815708c26747f46cfef0 100644
+index ea8e5b4775944fc2bf4e30c311b281363bd21049..9126d9409d1df900790db05c4c30a224460c36cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2251,7 +2251,7 @@ public final class CraftServer implements Server {
+@@ -2253,7 +2253,7 @@ public final class CraftServer implements Server {
              offers = this.tabCompleteChat(player, message);
          }
  
diff --git a/patches/server/0166-PlayerPickupExperienceEvent.patch b/patches/server/0164-PlayerPickupExperienceEvent.patch
index e604445c7b..e604445c7b 100644
--- a/patches/server/0166-PlayerPickupExperienceEvent.patch
+++ b/patches/server/0164-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0165-Ability-to-apply-mending-to-XP-API.patch
index 92a6a66574..46d2cc7b09 100644
--- a/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0165-Ability-to-apply-mending-to-XP-API.patch
@@ -14,7 +14,7 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
 public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7e1f6e23980f12786abaa4218d8d77dd1a8feb3c..96277af4b3c1ebe081bf4aa42c7b78f1f084cbd6 100644
+index 7635c501d71273ef85e6500ff15434c6b89c9e3c..2928c835d2f99ea82db2bb06761cd273e1427caf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1624,7 +1624,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0166-PlayerNaturallySpawnCreaturesEvent.patch
index e8b8f3b1e7..7d9889cafe 100644
--- a/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0166-PlayerNaturallySpawnCreaturesEvent.patch
@@ -60,7 +60,7 @@ index 3f60a3289ec58d5eb3c0c5634ca62ef2fa287ce7..bc81649b09c39188697b8851abedafca
                  boolean flag1 = this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && this.level.getLevelData().getGameTime() % this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
                  Iterator iterator1 = list.iterator();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a5122de4602db3b93a9221e1a9a33bcb73dbe771..785c7e56a053acffa79fb11a32849d99961e35a4 100644
+index 96bc2fa87502c363c68822d512e3c63c09a29513..53246654bf8154e723b26097e864f83fd203caa5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -282,6 +282,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0167-Add-setPlayerProfile-API-for-Skulls.patch
index 99435ec31e..99435ec31e 100644
--- a/patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/server/0167-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0170-PreCreatureSpawnEvent.patch b/patches/server/0168-PreCreatureSpawnEvent.patch
index 3ebb425a2c..3ebb425a2c 100644
--- a/patches/server/0170-PreCreatureSpawnEvent.patch
+++ b/patches/server/0168-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0171-Fill-Profile-Property-Events.patch b/patches/server/0169-Fill-Profile-Property-Events.patch
index ef1f330999..ef1f330999 100644
--- a/patches/server/0171-Fill-Profile-Property-Events.patch
+++ b/patches/server/0169-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0172-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0170-Add-PlayerAdvancementCriterionGrantEvent.patch
index d407c53d24..d407c53d24 100644
--- a/patches/server/0172-Add-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/server/0170-Add-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0173-Add-ArmorStand-Item-Meta.patch b/patches/server/0171-Add-ArmorStand-Item-Meta.patch
index 189bb53dc0..189bb53dc0 100644
--- a/patches/server/0173-Add-ArmorStand-Item-Meta.patch
+++ b/patches/server/0171-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0174-Extend-Player-Interact-cancellation.patch b/patches/server/0172-Extend-Player-Interact-cancellation.patch
index fee4959d90..fee4959d90 100644
--- a/patches/server/0174-Extend-Player-Interact-cancellation.patch
+++ b/patches/server/0172-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0175-Tameable-getOwnerUniqueId-API.patch b/patches/server/0173-Tameable-getOwnerUniqueId-API.patch
index 8ef9a7ad54..8ef9a7ad54 100644
--- a/patches/server/0175-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/server/0173-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0176-Toggleable-player-crits.patch b/patches/server/0174-Toggleable-player-crits.patch
index df29b0135d..df29b0135d 100644
--- a/patches/server/0176-Toggleable-player-crits.patch
+++ b/patches/server/0174-Toggleable-player-crits.patch
diff --git a/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0175-Disable-Explicit-Network-Manager-Flushing.patch
index 7795462dbe..7795462dbe 100644
--- a/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/patches/server/0175-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0176-Implement-extended-PaperServerListPingEvent.patch
index 3ecad64906..4373d2086a 100644
--- a/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/server/0176-Implement-extended-PaperServerListPingEvent.patch
@@ -181,7 +181,7 @@ index 0000000000000000000000000000000000000000..6b0bdc266109cdfb874f08bf74323603
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ec0fe27a6475cc3d097d394cf9694a17cba76332..478445e7ed67b17d7aff0e10e9aae0788605a4b9 100644
+index 260e364c91d8c3d774681f9f0ecba63df5dd3f5c..2ae6eb3a05bd0574143699e1286f63f5fd699f30 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,6 +3,9 @@ package net.minecraft.server;
@@ -194,7 +194,7 @@ index ec0fe27a6475cc3d097d394cf9694a17cba76332..478445e7ed67b17d7aff0e10e9aae078
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
-@@ -1493,7 +1496,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1490,7 +1493,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (this.hidesOnlinePlayers()) {
              return new ServerStatus.Players(i, list.size(), List.of());
          } else {
diff --git a/patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/server/0177-Add-more-fields-to-AsyncPreLoginEvent.patch
index 05bf2e60ad..05bf2e60ad 100644
--- a/patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch
+++ b/patches/server/0177-Add-more-fields-to-AsyncPreLoginEvent.patch
diff --git a/patches/server/0180-Player.setPlayerProfile-API.patch b/patches/server/0178-Player.setPlayerProfile-API.patch
index 643359b01d..64dd4dabde 100644
--- a/patches/server/0180-Player.setPlayerProfile-API.patch
+++ b/patches/server/0178-Player.setPlayerProfile-API.patch
@@ -9,7 +9,7 @@ This can be useful for changing name or skins after a player has logged in.
 public-f net.minecraft.world.entity.player.Player gameProfile
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1b563aa6be76286c49ad3f037cb70b01d33c4458..c3bd22a0a4220d14aaad3821ffc920001c0b290b 100644
+index fffd671feb7a4e9805eafc473632b23225599b85..de772530d290d58c1d8270bd14915e37db8dbf42 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1459,7 +1459,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -77,7 +77,7 @@ index 818df09e9245b5d89b4180b1eaa51470b7539341..461656e1cb095243bfe7a9ee2906e5b0
  
      public Server getServer() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 96277af4b3c1ebe081bf4aa42c7b78f1f084cbd6..d299e8012a8821b8b797370910039528ab6a2a88 100644
+index 2928c835d2f99ea82db2bb06761cd273e1427caf..a1e7fe7fb36e8ee9a76a50d6508c0d8150b6ddd3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -247,11 +247,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0181-getPlayerUniqueId-API.patch b/patches/server/0179-getPlayerUniqueId-API.patch
index 31d5e88327..9e3520cb13 100644
--- a/patches/server/0181-getPlayerUniqueId-API.patch
+++ b/patches/server/0179-getPlayerUniqueId-API.patch
@@ -9,10 +9,10 @@ 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 990fad51d6fc1800d8ad815708c26747f46cfef0..8429a11896a28831dfa27633f313068238cc0773 100644
+index 9126d9409d1df900790db05c4c30a224460c36cd..cd249a21120f7d24fe224c2bcbeae26cf07c6298 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1850,6 +1850,25 @@ public final class CraftServer implements Server {
+@@ -1852,6 +1852,25 @@ public final class CraftServer implements Server {
          return recipients.size();
      }
  
diff --git a/patches/server/0182-Improved-Async-Task-Scheduler.patch b/patches/server/0180-Improved-Async-Task-Scheduler.patch
index 3ce3a754e3..3ce3a754e3 100644
--- a/patches/server/0182-Improved-Async-Task-Scheduler.patch
+++ b/patches/server/0180-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0183-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0181-Make-legacy-ping-handler-more-reliable.patch
index e9431bd1eb..e9431bd1eb 100644
--- a/patches/server/0183-Make-legacy-ping-handler-more-reliable.patch
+++ b/patches/server/0181-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0182-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 5265180dd5..5265180dd5 100644
--- a/patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/patches/server/0182-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0185-Flag-to-disable-the-channel-limit.patch b/patches/server/0183-Flag-to-disable-the-channel-limit.patch
index 93c6db28f5..93c6db28f5 100644
--- a/patches/server/0185-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0183-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0186-Add-openSign-method-to-HumanEntity.patch b/patches/server/0184-Add-openSign-method-to-HumanEntity.patch
index 969c29ccc9..969c29ccc9 100644
--- a/patches/server/0186-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/server/0184-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/server/0187-Configurable-sprint-interruption-on-attack.patch b/patches/server/0185-Configurable-sprint-interruption-on-attack.patch
index 1b98985534..1b98985534 100644
--- a/patches/server/0187-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/server/0185-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0188-EndermanEscapeEvent.patch b/patches/server/0186-EndermanEscapeEvent.patch
index 8508ed70d2..8508ed70d2 100644
--- a/patches/server/0188-EndermanEscapeEvent.patch
+++ b/patches/server/0186-EndermanEscapeEvent.patch
diff --git a/patches/server/0189-Enderman.teleportRandomly.patch b/patches/server/0187-Enderman.teleportRandomly.patch
index aeb2e69493..aeb2e69493 100644
--- a/patches/server/0189-Enderman.teleportRandomly.patch
+++ b/patches/server/0187-Enderman.teleportRandomly.patch
diff --git a/patches/server/0190-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0188-Block-Enderpearl-Travel-Exploit.patch
index 37ffcb8ff8..37ffcb8ff8 100644
--- a/patches/server/0190-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/server/0188-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0189-Expand-World.spawnParticle-API-and-add-Builder.patch
index 763d9a65b6..763d9a65b6 100644
--- a/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0189-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0190-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 5f4980ec04..5f4980ec04 100644
--- a/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/server/0190-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/0193-EndermanAttackPlayerEvent.patch b/patches/server/0191-EndermanAttackPlayerEvent.patch
index ccd3efb275..ccd3efb275 100644
--- a/patches/server/0193-EndermanAttackPlayerEvent.patch
+++ b/patches/server/0191-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0194-WitchConsumePotionEvent.patch b/patches/server/0192-WitchConsumePotionEvent.patch
index 8c307613d4..8c307613d4 100644
--- a/patches/server/0194-WitchConsumePotionEvent.patch
+++ b/patches/server/0192-WitchConsumePotionEvent.patch
diff --git a/patches/server/0195-WitchThrowPotionEvent.patch b/patches/server/0193-WitchThrowPotionEvent.patch
index 309ef84532..309ef84532 100644
--- a/patches/server/0195-WitchThrowPotionEvent.patch
+++ b/patches/server/0193-WitchThrowPotionEvent.patch
diff --git a/patches/server/0196-WitchReadyPotionEvent.patch b/patches/server/0194-WitchReadyPotionEvent.patch
index 0e12aa1c8a..0e12aa1c8a 100644
--- a/patches/server/0196-WitchReadyPotionEvent.patch
+++ b/patches/server/0194-WitchReadyPotionEvent.patch
diff --git a/patches/server/0197-ItemStack-getMaxItemUseDuration.patch b/patches/server/0195-ItemStack-getMaxItemUseDuration.patch
index d7b18de72a..d7b18de72a 100644
--- a/patches/server/0197-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/server/0195-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0198-Add-EntityTeleportEndGatewayEvent.patch b/patches/server/0196-Add-EntityTeleportEndGatewayEvent.patch
index c43c6a3b23..c43c6a3b23 100644
--- a/patches/server/0198-Add-EntityTeleportEndGatewayEvent.patch
+++ b/patches/server/0196-Add-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0199-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0197-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 61d4865bc1..9086df0564 100644
--- a/patches/server/0199-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/server/0197-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
 Otherwise the creeper infinite explodes
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 01938fc75158c13c4b040fa623934ec841cbf719..dd57da9dc663484c4266d9973aee927899292749 100644
+index b76b637ff940dde21647d1f34acd59a23159bb3c..c49aad3a4b2dbb6db1ac10e668b196b6bea3b7f3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -277,6 +277,7 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0200-Fix-CraftEntity-hashCode.patch b/patches/server/0198-Fix-CraftEntity-hashCode.patch
index cc51f19266..cc51f19266 100644
--- a/patches/server/0200-Fix-CraftEntity-hashCode.patch
+++ b/patches/server/0198-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0201-Configurable-LootPool-luck-formula.patch b/patches/server/0199-Configurable-LootPool-luck-formula.patch
index 33c95e3339..33c95e3339 100644
--- a/patches/server/0201-Configurable-LootPool-luck-formula.patch
+++ b/patches/server/0199-Configurable-LootPool-luck-formula.patch
diff --git a/patches/server/0202-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0200-Print-Error-details-when-failing-to-save-player-data.patch
index 19f2e71553..19f2e71553 100644
--- a/patches/server/0202-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/server/0200-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0203-Make-shield-blocking-delay-configurable.patch b/patches/server/0201-Make-shield-blocking-delay-configurable.patch
index 1615b19324..b154ac1a9e 100644
--- a/patches/server/0203-Make-shield-blocking-delay-configurable.patch
+++ b/patches/server/0201-Make-shield-blocking-delay-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4f742679669aea2a19267f3774da1f8b094a45cf..3f50533b89345a74392e0e6ef0407e6aa544876e 100644
+index 72c5da58cc13ff7dc33159073b92c8e8fbb5bb28..b10d532d81efa8330f363f86d5a19e8847b90ba0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3917,12 +3917,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0204-Improve-EntityShootBowEvent.patch b/patches/server/0202-Improve-EntityShootBowEvent.patch
index b0811d8d24..b0811d8d24 100644
--- a/patches/server/0204-Improve-EntityShootBowEvent.patch
+++ b/patches/server/0202-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0205-PlayerReadyArrowEvent.patch b/patches/server/0203-PlayerReadyArrowEvent.patch
index 875fc3aa58..875fc3aa58 100644
--- a/patches/server/0205-PlayerReadyArrowEvent.patch
+++ b/patches/server/0203-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch b/patches/server/0204-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
index 16837a9f75..b7a904cff8 100644
--- a/patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
+++ b/patches/server/0204-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
@@ -9,7 +9,7 @@ Co-authored-by: aerulion <[email protected]>
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e612921a7fb68dd74d8fd4084a8beccc299ff6ea..49b100e2cf9868c4f06aae0bf538fcd4a2ae0ba9 100644
+index 9a8d70c1f92ecc8da6444ba5581a8d4b24af0672..6ade79a291f0443fbb8cb3bf7ef622b12b391b72 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1892,9 +1892,23 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -39,7 +39,7 @@ index e612921a7fb68dd74d8fd4084a8beccc299ff6ea..49b100e2cf9868c4f06aae0bf538fcd4
  
      protected void markHurt() {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3f50533b89345a74392e0e6ef0407e6aa544876e..b153247b4be38e8ecaf3df64db55df88b7501cfd 100644
+index b10d532d81efa8330f363f86d5a19e8847b90ba0..8baf8f715d68c96133085d625599ab2aa30bb83c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1593,7 +1593,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -218,7 +218,7 @@ index 9f9b7373c9a714597858ddcd8932e31b902cf5a1..f7f26d595072372004143c4e26506ed5
      public abstract void explode();
  
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 754ca46d11dfe0495aa3109b68b1032e6d7d76e9..4c7795e1ba7bb3135fcf5bab1c8aa857b8e7417b 100644
+index da9a9b235d1c8bcab3762134d69dcb112470e55d..a24e9c9e80659b5508e3c5ef3fa3d1a26b96b483 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -303,6 +303,16 @@ public class Explosion {
diff --git a/patches/server/0207-Expand-Explosions-API.patch b/patches/server/0205-Expand-Explosions-API.patch
index c8b7653db6..c8b7653db6 100644
--- a/patches/server/0207-Expand-Explosions-API.patch
+++ b/patches/server/0205-Expand-Explosions-API.patch
diff --git a/patches/server/0208-LivingEntity-Active-Item-API.patch b/patches/server/0206-LivingEntity-Active-Item-API.patch
index 8bed563bc0..8bed563bc0 100644
--- a/patches/server/0208-LivingEntity-Active-Item-API.patch
+++ b/patches/server/0206-LivingEntity-Active-Item-API.patch
diff --git a/patches/server/0209-RangedEntity-API.patch b/patches/server/0207-RangedEntity-API.patch
index 5383dfd935..2b548743e2 100644
--- a/patches/server/0209-RangedEntity-API.patch
+++ b/patches/server/0207-RangedEntity-API.patch
@@ -83,7 +83,7 @@ index 995c77ee53347328bfd0ad66fcc1b39589967476..5b2af80e584977683cd39e6f440e65a7
      public CraftIllusioner(CraftServer server, net.minecraft.world.entity.monster.Illusioner entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index dfd4cf1e613b7ccf3ad986f8e0d783593a411194..9986ac517e11b076a29a8c8e3f480ec286fa5825 100644
+index 189b5ac97f3354b8dea082c2acef242f8ff2f002..bf297388c75521266c93580a9caafe6bad70ab45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 @@ -8,7 +8,7 @@ import org.bukkit.entity.Llama;
diff --git a/patches/server/0210-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0208-Add-config-to-disable-ender-dragon-legacy-check.patch
index c9acef0191..c9acef0191 100644
--- a/patches/server/0210-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/server/0208-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0211-Implement-World.getEntity-UUID-API.patch b/patches/server/0209-Implement-World.getEntity-UUID-API.patch
index 3e9389db22..3e9389db22 100644
--- a/patches/server/0211-Implement-World.getEntity-UUID-API.patch
+++ b/patches/server/0209-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0212-InventoryCloseEvent-Reason-API.patch b/patches/server/0210-InventoryCloseEvent-Reason-API.patch
index d7351129b8..d7351129b8 100644
--- a/patches/server/0212-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0210-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/server/0213-Vex-get-setSummoner-API.patch b/patches/server/0211-Vex-get-setSummoner-API.patch
index 9c014ff1fc..9c014ff1fc 100644
--- a/patches/server/0213-Vex-get-setSummoner-API.patch
+++ b/patches/server/0211-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0212-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index d41697f837..d41697f837 100644
--- a/patches/server/0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0212-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/patches/server/0215-add-more-information-to-Entity.toString.patch b/patches/server/0213-add-more-information-to-Entity.toString.patch
index 075a1453d8..948060c5bc 100644
--- a/patches/server/0215-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0213-add-more-information-to-Entity.toString.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 49b100e2cf9868c4f06aae0bf538fcd4a2ae0ba9..c2dd3767fbeb7215c9b2703054c9068252828355 100644
+index 6ade79a291f0443fbb8cb3bf7ef622b12b391b72..ffc3cee1e19a039ef78634b9f94b045be8a2a3f8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3182,7 +3182,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0216-EnderDragon-Events.patch b/patches/server/0214-EnderDragon-Events.patch
index 17519e6abe..17519e6abe 100644
--- a/patches/server/0216-EnderDragon-Events.patch
+++ b/patches/server/0214-EnderDragon-Events.patch
diff --git a/patches/server/0217-PlayerElytraBoostEvent.patch b/patches/server/0215-PlayerElytraBoostEvent.patch
index 0581d2cd0a..0581d2cd0a 100644
--- a/patches/server/0217-PlayerElytraBoostEvent.patch
+++ b/patches/server/0215-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0218-PlayerLaunchProjectileEvent.patch b/patches/server/0216-PlayerLaunchProjectileEvent.patch
index c696862b1d..c696862b1d 100644
--- a/patches/server/0218-PlayerLaunchProjectileEvent.patch
+++ b/patches/server/0216-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0219-Improve-BlockPosition-inlining.patch b/patches/server/0217-Improve-BlockPosition-inlining.patch
index 469c5f7390..469c5f7390 100644
--- a/patches/server/0219-Improve-BlockPosition-inlining.patch
+++ b/patches/server/0217-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0220-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0218-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 4c4526b87a..4c9123e6bf 100644
--- a/patches/server/0220-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0218-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index d33c49c4a4b87a5203f9b4592deff9389e6e870d..62d63883f6a9f4da099491f697b309d4194b6082 100644
+index dd7ecba4525d90e6b9509d1c3cab24c1615e37a9..521ad674b42e40df30916cf02ae6ace42c0368a2 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -344,6 +344,7 @@ public class ArmorStand extends LivingEntity {
diff --git a/patches/server/0221-Vanished-players-don-t-have-rights.patch b/patches/server/0219-Vanished-players-don-t-have-rights.patch
index 19cd52d6f4..19cd52d6f4 100644
--- a/patches/server/0221-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0219-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0222-Allow-disabling-armor-stand-ticking.patch b/patches/server/0220-Allow-disabling-armor-stand-ticking.patch
index 9b24c8fb78..9b24c8fb78 100644
--- a/patches/server/0222-Allow-disabling-armor-stand-ticking.patch
+++ b/patches/server/0220-Allow-disabling-armor-stand-ticking.patch
diff --git a/patches/server/0223-SkeletonHorse-Additions.patch b/patches/server/0221-SkeletonHorse-Additions.patch
index fa351dc912..fa351dc912 100644
--- a/patches/server/0223-SkeletonHorse-Additions.patch
+++ b/patches/server/0221-SkeletonHorse-Additions.patch
diff --git a/patches/server/0224-Expand-ArmorStand-API.patch b/patches/server/0222-Expand-ArmorStand-API.patch
index 1112902d66..1112902d66 100644
--- a/patches/server/0224-Expand-ArmorStand-API.patch
+++ b/patches/server/0222-Expand-ArmorStand-API.patch
diff --git a/patches/server/0225-AnvilDamageEvent.patch b/patches/server/0223-AnvilDamageEvent.patch
index e7fa11cbd6..e7fa11cbd6 100644
--- a/patches/server/0225-AnvilDamageEvent.patch
+++ b/patches/server/0223-AnvilDamageEvent.patch
diff --git a/patches/server/0226-Add-TNTPrimeEvent.patch b/patches/server/0224-Add-TNTPrimeEvent.patch
index 20aea2bef7..20aea2bef7 100644
--- a/patches/server/0226-Add-TNTPrimeEvent.patch
+++ b/patches/server/0224-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0227-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch
index 70d25047c5..dd6bdb1a1e 100644
--- a/patches/server/0227-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0225-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/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a8c48cc286807a742838d372dc6dc2d2bb843f89..b74bee4fa7bd222e5bb707f00aebe437dfa0886a 100644
+index 096a7f51684fa1939a6b1b973fbbffe58775f003..b4bf6e47378ddf4c836479773fe833f1aa321292 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -265,6 +265,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0228-Fix-NBT-type-issues.patch b/patches/server/0226-Fix-NBT-type-issues.patch
index 041a4039c7..041a4039c7 100644
--- a/patches/server/0228-Fix-NBT-type-issues.patch
+++ b/patches/server/0226-Fix-NBT-type-issues.patch
diff --git a/patches/server/0229-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0227-Remove-unnecessary-itemmeta-handling.patch
index bf8b2dfd3b..bf8b2dfd3b 100644
--- a/patches/server/0229-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/server/0227-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0230-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0228-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 27da8072f4..376591dda4 100644
--- a/patches/server/0230-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0228-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -43,7 +43,7 @@ index 6f2e316480c4cd1ffb32e8d01009a18c2234c731..42dd9ab70c07e92258da70ad29b51c77
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c2dd3767fbeb7215c9b2703054c9068252828355..d39aec1b3233e91aa5b953396d876e7466a9a5bc 100644
+index ffc3cee1e19a039ef78634b9f94b045be8a2a3f8..50c5ad0eea45c1828b9a1c6c47727e4800940252 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -245,6 +245,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0231-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch
index b0978f4a22..404d2e0141 100644
--- a/patches/server/0231-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,10 +9,10 @@ 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/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8f5eaecb0bda3c4d69bb077ca727458f3f190f44..5fe925b85a7783e3b972d24e01cfe4a4b878dd38 100644
+index 2ae6eb3a05bd0574143699e1286f63f5fd699f30..6d871dd9bc4a954046f03f0911003e3fb2d4dfd6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1104,6 +1104,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1101,6 +1101,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.status = this.buildServerStatus();
  
              // Spigot start
@@ -33,10 +33,10 @@ index 0ffa25a6e41cc56e78c79e0cee45e3b811794129..1b47e228ad7365b31d6ddd8c572d3bc5
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8429a11896a28831dfa27633f313068238cc0773..f9b2c9e3dae0af6b2992b290b1dac7a13c98d856 100644
+index cd249a21120f7d24fe224c2bcbeae26cf07c6298..6144d3c422fe5cac93e4468a5879cbfba018d1a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -927,6 +927,7 @@ public final class CraftServer implements Server {
+@@ -929,6 +929,7 @@ public final class CraftServer implements Server {
  
      @Override
      public void reload() {
@@ -44,7 +44,7 @@ index 8429a11896a28831dfa27633f313068238cc0773..f9b2c9e3dae0af6b2992b290b1dac7a1
          this.reloadCount++;
          this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
          this.commandsConfiguration = YamlConfiguration.loadConfiguration(this.getCommandsConfigFile());
-@@ -1017,6 +1018,7 @@ public final class CraftServer implements Server {
+@@ -1019,6 +1020,7 @@ public final class CraftServer implements Server {
          this.enablePlugins(PluginLoadOrder.POSTWORLD);
          if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
          this.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.RELOAD));
diff --git a/patches/server/0232-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0230-Use-ConcurrentHashMap-in-JsonList.patch
index f2227d0d63..f2227d0d63 100644
--- a/patches/server/0232-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/server/0230-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0233-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0231-Use-a-Queue-for-Queueing-Commands.patch
index 34b61b9cfc..34b61b9cfc 100644
--- a/patches/server/0233-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/server/0231-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0234-Ability-to-get-block-entities-from-a-chunk-without-s.patch b/patches/server/0232-Ability-to-get-block-entities-from-a-chunk-without-s.patch
index 7c3bd3c439..7c3bd3c439 100644
--- a/patches/server/0234-Ability-to-get-block-entities-from-a-chunk-without-s.patch
+++ b/patches/server/0232-Ability-to-get-block-entities-from-a-chunk-without-s.patch
diff --git a/patches/server/0235-Optimize-BlockPosition-helper-methods.patch b/patches/server/0233-Optimize-BlockPosition-helper-methods.patch
index 3e78fec75c..3e78fec75c 100644
--- a/patches/server/0235-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/server/0233-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0236-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0234-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index aa9cfcc962..aa9cfcc962 100644
--- a/patches/server/0236-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/server/0234-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0237-Slime-Pathfinder-Events.patch b/patches/server/0235-Slime-Pathfinder-Events.patch
index dcc57291f0..dcc57291f0 100644
--- a/patches/server/0237-Slime-Pathfinder-Events.patch
+++ b/patches/server/0235-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0238-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0236-Configurable-speed-for-water-flowing-over-lava.patch
index fafdd583ab..fafdd583ab 100644
--- a/patches/server/0238-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/server/0236-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0239-Optimize-CraftBlockData-Creation.patch b/patches/server/0237-Optimize-CraftBlockData-Creation.patch
index 990b35be96..990b35be96 100644
--- a/patches/server/0239-Optimize-CraftBlockData-Creation.patch
+++ b/patches/server/0237-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0240-Optimize-MappedRegistry.patch b/patches/server/0238-Optimize-MappedRegistry.patch
index de87a88672..de87a88672 100644
--- a/patches/server/0240-Optimize-MappedRegistry.patch
+++ b/patches/server/0238-Optimize-MappedRegistry.patch
diff --git a/patches/server/0241-Add-PhantomPreSpawnEvent.patch b/patches/server/0239-Add-PhantomPreSpawnEvent.patch
index 20c2fee95a..20c2fee95a 100644
--- a/patches/server/0241-Add-PhantomPreSpawnEvent.patch
+++ b/patches/server/0239-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0242-Add-More-Creeper-API.patch b/patches/server/0240-Add-More-Creeper-API.patch
index c5b211840f..94ae8925c8 100644
--- a/patches/server/0242-Add-More-Creeper-API.patch
+++ b/patches/server/0240-Add-More-Creeper-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add More Creeper API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index dd57da9dc663484c4266d9973aee927899292749..4b94e21d05d6deae75f0c2fb711e43a4c7d06f90 100644
+index c49aad3a4b2dbb6db1ac10e668b196b6bea3b7f3..7db5de71b0353d9807978c0351870fd99b76ee67 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -134,7 +134,7 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0243-Inventory-removeItemAnySlot.patch b/patches/server/0241-Inventory-removeItemAnySlot.patch
index 1316343a0a..1316343a0a 100644
--- a/patches/server/0243-Inventory-removeItemAnySlot.patch
+++ b/patches/server/0241-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0244-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0242-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 07df345386..07df345386 100644
--- a/patches/server/0244-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/server/0242-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0245-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0243-Add-ray-tracing-methods-to-LivingEntity.patch
index 262e7ecb7c..af8daf193b 100644
--- a/patches/server/0245-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/server/0243-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b153247b4be38e8ecaf3df64db55df88b7501cfd..337fda9f87ece1fc2264ae6a2af2b7abbb23d788 100644
+index 8baf8f715d68c96133085d625599ab2aa30bb83c..12e205a01366a5825fd1b99097f1cef75dc0408e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3938,6 +3938,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0246-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0244-Expose-attack-cooldown-methods-for-Player.patch
index f736e3418f..f736e3418f 100644
--- a/patches/server/0246-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0244-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0247-Improve-death-events.patch b/patches/server/0245-Improve-death-events.patch
index 0a2d60f7ee..0a2d60f7ee 100644
--- a/patches/server/0247-Improve-death-events.patch
+++ b/patches/server/0245-Improve-death-events.patch
diff --git a/patches/server/0248-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0246-Allow-chests-to-be-placed-with-NBT-data.patch
index 1a3e71696c..1a3e71696c 100644
--- a/patches/server/0248-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/server/0246-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0249-Mob-Pathfinding-API.patch b/patches/server/0247-Mob-Pathfinding-API.patch
index 7cf9f7d7fa..7cf9f7d7fa 100644
--- a/patches/server/0249-Mob-Pathfinding-API.patch
+++ b/patches/server/0247-Mob-Pathfinding-API.patch
diff --git a/patches/server/0250-Prevent-various-interactions-from-causing-chunk-load.patch b/patches/server/0248-Prevent-various-interactions-from-causing-chunk-load.patch
index 16fa7f5101..16fa7f5101 100644
--- a/patches/server/0250-Prevent-various-interactions-from-causing-chunk-load.patch
+++ b/patches/server/0248-Prevent-various-interactions-from-causing-chunk-load.patch
diff --git a/patches/server/0251-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0249-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 1ca48ef5a8..1ca48ef5a8 100644
--- a/patches/server/0251-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/server/0249-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0252-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0250-Implement-furnace-cook-speed-multiplier-API.patch
index 1b102b8639..1b102b8639 100644
--- a/patches/server/0252-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/server/0250-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0253-Honor-EntityAgeable.ageLock.patch b/patches/server/0251-Honor-EntityAgeable.ageLock.patch
index e1922af42f..e1922af42f 100644
--- a/patches/server/0253-Honor-EntityAgeable.ageLock.patch
+++ b/patches/server/0251-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0254-Configurable-connection-throttle-kick-message.patch b/patches/server/0252-Configurable-connection-throttle-kick-message.patch
index 4da61fc469..4da61fc469 100644
--- a/patches/server/0254-Configurable-connection-throttle-kick-message.patch
+++ b/patches/server/0252-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0255-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0253-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 50c82e5d54..50c82e5d54 100644
--- a/patches/server/0255-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/patches/server/0253-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0256-PreSpawnerSpawnEvent.patch b/patches/server/0254-PreSpawnerSpawnEvent.patch
index 3512bab510..3512bab510 100644
--- a/patches/server/0256-PreSpawnerSpawnEvent.patch
+++ b/patches/server/0254-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0257-Add-LivingEntity-getTargetEntity.patch b/patches/server/0255-Add-LivingEntity-getTargetEntity.patch
index 8f82d5749b..1c30f64220 100644
--- a/patches/server/0257-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0255-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 21d2c43a97122025edd91662e39d44cc867593a3..bac78415e34d41e3a5de482b86185f2202ecf068 100644
+index 3b9bd1e1043d7388c03936d5b131e9e288fb8fec..9bb2b2baecfd4cfb9dbbf7cf5c8be939f1ecc4d6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -121,6 +121,7 @@ import net.minecraft.world.level.storage.loot.LootTable;
diff --git a/patches/server/0258-Add-sun-related-API.patch b/patches/server/0256-Add-sun-related-API.patch
index 6ae32c9602..6ae32c9602 100644
--- a/patches/server/0258-Add-sun-related-API.patch
+++ b/patches/server/0256-Add-sun-related-API.patch
diff --git a/patches/server/0259-Catch-JsonParseException-in-block-entity-names.patch b/patches/server/0257-Catch-JsonParseException-in-block-entity-names.patch
index 92699c4219..92699c4219 100644
--- a/patches/server/0259-Catch-JsonParseException-in-block-entity-names.patch
+++ b/patches/server/0257-Catch-JsonParseException-in-block-entity-names.patch
diff --git a/patches/server/0260-Turtle-API.patch b/patches/server/0258-Turtle-API.patch
index 4069d4db59..08043ab3dc 100644
--- a/patches/server/0260-Turtle-API.patch
+++ b/patches/server/0258-Turtle-API.patch
@@ -12,7 +12,7 @@ public net.minecraft.world.entity.animal.Turtle isTravelling()Z
 public net.minecraft.world.entity.animal.Turtle setTravelling(Z)V
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index e6bc782683ea5d69840ca7b89b20cfdc1adac5fd..b550befd7bd05951be160f81600200b0b31bae5b 100644
+index cf565f3a4baf5898000d23eeedcf314b0c10db5a..83759d65d5be3e4df2b1815f82bf195fad41c542 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -487,14 +487,17 @@ public class Turtle extends Animal {
diff --git a/patches/server/0261-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0259-Call-player-spectator-target-events-and-improve-impl.patch
index d584dd8b7d..ab2281ee82 100644
--- a/patches/server/0261-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0259-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 4c0afa2589606d2748e54961f2a25e28a5309073..bea2c72cf0f4bed73984cde8f7d06cef797cd769 100644
+index a0801437d631b148d435b3700e60f97f95e2bb92..7076801dce113004b255866c659bdc5e29d8e951 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2133,6 +2133,21 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0262-Add-more-Witch-API.patch b/patches/server/0260-Add-more-Witch-API.patch
index a4d09e1bb4..a4d09e1bb4 100644
--- a/patches/server/0262-Add-more-Witch-API.patch
+++ b/patches/server/0260-Add-more-Witch-API.patch
diff --git a/patches/server/0263-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0261-Check-Drowned-for-Villager-Aggression-Config.patch
index efafeb919c..efafeb919c 100644
--- a/patches/server/0263-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/server/0261-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0262-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 278991d650..5a51e81fb4 100644
--- a/patches/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0262-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b74bee4fa7bd222e5bb707f00aebe437dfa0886a..2cfd937f30e481038483a6ba2c552f5da316c66e 100644
+index b4bf6e47378ddf4c836479773fe833f1aa321292..c5a9bd1d5dcf96d0b206de48000ebf63f7a0fcb1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -494,9 +494,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0265-Reset-players-airTicks-on-respawn.patch b/patches/server/0263-Reset-players-airTicks-on-respawn.patch
index 0754da0a5c..7259a2564f 100644
--- a/patches/server/0265-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0263-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 bea2c72cf0f4bed73984cde8f7d06cef797cd769..91ce1788e2a019c15fba2daf9ee383618f874fd4 100644
+index 7076801dce113004b255866c659bdc5e29d8e951..665fcf8382fbcb214eda16dae9e40e33e257ec6f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2624,6 +2624,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0266-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0264-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index d871ee76b6..d871ee76b6 100644
--- a/patches/server/0266-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/server/0264-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0265-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 5930ac11e6..553a1ab418 100644
--- a/patches/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0265-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -92,10 +92,10 @@ index cf54e2c8e8aadb9e7343382a5ba59c657234c9b9..c7a21a11efba5c212958d56095217621
          return executorService;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 077b2e1d06a4bb0c2ce10274dc6144ee76608d90..9477d6f850b112ff8e835ba5e80d56bc090f9c48 100644
+index 6d871dd9bc4a954046f03f0911003e3fb2d4dfd6..41ffbf38f8bc4423f7670edf86702330f02e488d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -319,6 +319,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -316,6 +316,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          thread.setUncaughtExceptionHandler((thread1, throwable) -> {
              MinecraftServer.LOGGER.error("Uncaught exception in server thread", throwable);
          });
diff --git a/patches/server/0268-Optimize-World-Time-Updates.patch b/patches/server/0266-Optimize-World-Time-Updates.patch
index 4b1b035dfe..618501d083 100644
--- a/patches/server/0268-Optimize-World-Time-Updates.patch
+++ b/patches/server/0266-Optimize-World-Time-Updates.patch
@@ -8,10 +8,10 @@ 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 9477d6f850b112ff8e835ba5e80d56bc090f9c48..65e9ac5ba7237e97e286953568f28db86d244d1e 100644
+index 41ffbf38f8bc4423f7670edf86702330f02e488d..c543a7e7ef3b26ab610811448b8091894a0a36d5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1538,12 +1538,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1535,12 +1535,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          MinecraftTimings.timeUpdateTimer.startTiming(); // Spigot // Paper
          // Send time updates to everyone, it will get the right time from the world the player is in.
diff --git a/patches/server/0269-Restore-custom-InventoryHolder-support.patch b/patches/server/0267-Restore-custom-InventoryHolder-support.patch
index 99ca50730b..99ca50730b 100644
--- a/patches/server/0269-Restore-custom-InventoryHolder-support.patch
+++ b/patches/server/0267-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0270-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0268-Fix-SpongeAbsortEvent-handling.patch
index be21ac2045..be21ac2045 100644
--- a/patches/server/0270-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/server/0268-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0271-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0269-Don-t-allow-digging-into-unloaded-chunks.patch
index fb98100e18..9d4d0f1082 100644
--- a/patches/server/0271-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0269-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -59,7 +59,7 @@ index 5f2dec1917f1c1c3bb69446832321f3fc21dc129..cd6f34ee326228036f8c025e4e6d04e0
  
                  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 2cfd937f30e481038483a6ba2c552f5da316c66e..b137faaf3a6f12b532555bfeebf245f0d6b38c59 100644
+index c5a9bd1d5dcf96d0b206de48000ebf63f7a0fcb1..e880b41e1824f986d04a0a32cc735d77f25cf987 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1583,6 +1583,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0272-Make-the-default-permission-message-configurable.patch b/patches/server/0270-Make-the-default-permission-message-configurable.patch
index fb162cf290..da3bb83024 100644
--- a/patches/server/0272-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0270-Make-the-default-permission-message-configurable.patch
@@ -18,10 +18,10 @@ index 6d06b772ffb9d47d6a717462a4b2b494544e80ae..69ffd6ea2ce7c6d4f211c6081fcea79a
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f9b2c9e3dae0af6b2992b290b1dac7a13c98d856..f3fb47cd2c8302e21941f0ecb0bf8215f7d1b433 100644
+index 6144d3c422fe5cac93e4468a5879cbfba018d1a0..32765f19f6cd4973b4d2d8085637124f8192373c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2834,6 +2834,16 @@ public final class CraftServer implements Server {
+@@ -2836,6 +2836,16 @@ public final class CraftServer implements Server {
          return io.papermc.paper.configuration.GlobalConfiguration.get().commands.suggestPlayerNamesWhenNullTabCompletions;
      }
  
diff --git a/patches/server/0273-force-entity-dismount-during-teleportation.patch b/patches/server/0271-force-entity-dismount-during-teleportation.patch
index e1f996b5ac..19d2dab5a9 100644
--- a/patches/server/0273-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0271-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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d39aec1b3233e91aa5b953396d876e7466a9a5bc..28708e1e8ade8fbfec24120478d250ddf1351bf4 100644
+index 50c5ad0eea45c1828b9a1c6c47727e4800940252..d372e2793948f532f473cd6eca578ebd3ff3fbfb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2601,11 +2601,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -72,7 +72,7 @@ index d39aec1b3233e91aa5b953396d876e7466a9a5bc..28708e1e8ade8fbfec24120478d250dd
              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 bac78415e34d41e3a5de482b86185f2202ecf068..a4eee658ecfc0f25e854c17a7715cb16715859b1 100644
+index 9bb2b2baecfd4cfb9dbbf7cf5c8be939f1ecc4d6..47b1a4ec278cf9762c9eb9c1448cf78912b7d77a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3585,9 +3585,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0274-Add-more-Zombie-API.patch b/patches/server/0272-Add-more-Zombie-API.patch
index 68302fc88c..68302fc88c 100644
--- a/patches/server/0274-Add-more-Zombie-API.patch
+++ b/patches/server/0272-Add-more-Zombie-API.patch
diff --git a/patches/server/0275-Book-Size-Limits.patch b/patches/server/0273-Book-Size-Limits.patch
index 1a377ffc13..6449e1dc0c 100644
--- a/patches/server/0275-Book-Size-Limits.patch
+++ b/patches/server/0273-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/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b137faaf3a6f12b532555bfeebf245f0d6b38c59..8892e4a7ba98421cc41d5cabdb45ff8de755a442 100644
+index e880b41e1824f986d04a0a32cc735d77f25cf987..3b3384fcbcb66a87dd50dece6bdac558491f66f0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1040,6 +1040,45 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0276-Add-PlayerConnectionCloseEvent.patch b/patches/server/0274-Add-PlayerConnectionCloseEvent.patch
index f9b0532074..f9b0532074 100644
--- a/patches/server/0276-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0274-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0277-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0275-Replace-OfflinePlayer-getLastPlayed.patch
index 9c16ff2c94..9c16ff2c94 100644
--- a/patches/server/0277-Replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0275-Replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0278-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0276-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 8362051b8a..ea0a2860c4 100644
--- a/patches/server/0278-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0276-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 74da4c332045cb749104f2bc573e3116df91d01f..8fa241f2f229a8b0950bc1f8a7de61a02bc1020c 100644
+index 6267cd96191d771edafe1db7c7fc570b71a59f5f..562cb110e979ef165004fbe10986846ab29706bd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1799,6 +1799,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0279-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0277-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
index 7ff0d9c37b..546586614e 100644
--- a/patches/server/0279-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
+++ b/patches/server/0277-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
@@ -8,7 +8,7 @@ We just add a check to ensure that the CraftPlayer's handle
 is a ServerPlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 11c429225f3242a0bb4bcef8c47fad1cbb5c9a43..4c12ad37d304460ca79033282c52cf851537d1f9 100644
+index 78d3e176f2cae7637ed62c2b732fd4ccf4e5f4cf..6572ca279d8ffe896b852fc138e01816fd28058a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -222,8 +222,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0280-BlockDestroyEvent.patch b/patches/server/0278-BlockDestroyEvent.patch
index 726ae64149..726ae64149 100644
--- a/patches/server/0280-BlockDestroyEvent.patch
+++ b/patches/server/0278-BlockDestroyEvent.patch
diff --git a/patches/server/0281-Async-command-map-building.patch b/patches/server/0279-Async-command-map-building.patch
index 7f58d78b88..370fccd4b4 100644
--- a/patches/server/0281-Async-command-map-building.patch
+++ b/patches/server/0279-Async-command-map-building.patch
@@ -53,10 +53,10 @@ index eec5279ac4386132fa053c57889e32e6b8141614..b754c0b3e2cd878fca5f702daca64f83
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 65e9ac5ba7237e97e286953568f28db86d244d1e..4f4e662e8f21e92b49c3d3811a24f9acedde9fff 100644
+index c543a7e7ef3b26ab610811448b8091894a0a36d5..043dbf59effbbddc5b2e3b8837717997a1771e6f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -927,6 +927,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -924,6 +924,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
  
          MinecraftServer.LOGGER.info("Stopping server");
diff --git a/patches/server/0282-Brigadier-Mojang-API.patch b/patches/server/0280-Brigadier-Mojang-API.patch
index 5e4c8c55ff..e955c2ef35 100644
--- a/patches/server/0282-Brigadier-Mojang-API.patch
+++ b/patches/server/0280-Brigadier-Mojang-API.patch
@@ -119,7 +119,7 @@ index b754c0b3e2cd878fca5f702daca64f837ec83451..f15c388434a0a501f86868de35cc1387
  
              if (commandnode2.canUse(source)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8892e4a7ba98421cc41d5cabdb45ff8de755a442..e241e0cae476ba963aff70b4f7ab038f07207303 100644
+index 3b3384fcbcb66a87dd50dece6bdac558491f66f0..04a9c48b9a9895ffe6ec0721bdfafb1b524bf386 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -766,19 +766,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0283-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0281-Improve-exact-choice-recipe-ingredients.patch
index 99b2e8b822..99b2e8b822 100644
--- a/patches/server/0283-Improve-exact-choice-recipe-ingredients.patch
+++ b/patches/server/0281-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/0284-Limit-Client-Sign-length-more.patch b/patches/server/0282-Limit-Client-Sign-length-more.patch
index 68d596c6cf..68d596c6cf 100644
--- a/patches/server/0284-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0282-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0285-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0283-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 17ab7a0e08..17ab7a0e08 100644
--- a/patches/server/0285-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0283-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0286-Entity-getEntitySpawnReason.patch b/patches/server/0284-Entity-getEntitySpawnReason.patch
index 1a57fcb5d4..29743df4c5 100644
--- a/patches/server/0286-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0284-Entity-getEntitySpawnReason.patch
@@ -59,7 +59,7 @@ index f91e145a748dc524e1e95ee3afe00aa74a1aee9a..e3ce13685499e2adea5b776ec4abbdd9
  
              if (entity != null) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 28708e1e8ade8fbfec24120478d250ddf1351bf4..ce2594baa8eb5cfff75a2fb9f3277676a7b08e18 100644
+index d372e2793948f532f473cd6eca578ebd3ff3fbfb..5bb379251c5af88d4350bd2715147e6442d695fd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -241,6 +241,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0287-Fire-event-on-GS4-query.patch b/patches/server/0285-Fire-event-on-GS4-query.patch
index 6468ff12c1..6468ff12c1 100644
--- a/patches/server/0287-Fire-event-on-GS4-query.patch
+++ b/patches/server/0285-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0288-Add-PlayerPostRespawnEvent.patch b/patches/server/0286-Add-PlayerPostRespawnEvent.patch
index 0b64cfe5fe..0b64cfe5fe 100644
--- a/patches/server/0288-Add-PlayerPostRespawnEvent.patch
+++ b/patches/server/0286-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0289-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0287-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index f94771a112..f94771a112 100644
--- a/patches/server/0289-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0287-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0290-Server-Tick-Events.patch b/patches/server/0288-Server-Tick-Events.patch
index 384e60e5de..2c666190b7 100644
--- a/patches/server/0290-Server-Tick-Events.patch
+++ b/patches/server/0288-Server-Tick-Events.patch
@@ -6,10 +6,10 @@ 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 4f4e662e8f21e92b49c3d3811a24f9acedde9fff..91981ef15a9d8a46681f39ec8cf0f136f9931968 100644
+index 043dbf59effbbddc5b2e3b8837717997a1771e6f..5d8fb0a781b2f86ab15c7045cd09c58563848848 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1410,6 +1410,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1407,6 +1407,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          });
          isOversleep = false;MinecraftTimings.serverOversleep.stopTiming();
          // Paper end
@@ -17,7 +17,7 @@ index 4f4e662e8f21e92b49c3d3811a24f9acedde9fff..91981ef15a9d8a46681f39ec8cf0f136
  
          ++this.tickCount;
          this.tickRateManager.tick();
-@@ -1436,6 +1437,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1433,6 +1434,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.runAllTasks();
          }
          // Paper end
diff --git a/patches/server/0291-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0289-PlayerDeathEvent-getItemsToKeep.patch
index ae34cde5f2..808b27239e 100644
--- a/patches/server/0291-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0289-PlayerDeathEvent-getItemsToKeep.patch
@@ -11,7 +11,7 @@ Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 public net.minecraft.world.entity.player.Inventory compartments
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8fa241f2f229a8b0950bc1f8a7de61a02bc1020c..0fd8af120734973d425dbd286a59d2b9c1a05162 100644
+index 562cb110e979ef165004fbe10986846ab29706bd..e7da9cda8d1f4eef25d88c6d9f1cf742e2fdaaa0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -890,6 +890,46 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0292-Optimize-Captured-BlockEntity-Lookup.patch b/patches/server/0290-Optimize-Captured-BlockEntity-Lookup.patch
index ca3803242c..ca3803242c 100644
--- a/patches/server/0292-Optimize-Captured-BlockEntity-Lookup.patch
+++ b/patches/server/0290-Optimize-Captured-BlockEntity-Lookup.patch
diff --git a/patches/server/0293-Add-Heightmap-API.patch b/patches/server/0291-Add-Heightmap-API.patch
index 6a2bacf567..6a2bacf567 100644
--- a/patches/server/0293-Add-Heightmap-API.patch
+++ b/patches/server/0291-Add-Heightmap-API.patch
diff --git a/patches/server/0294-Mob-Spawner-API-Enhancements.patch b/patches/server/0292-Mob-Spawner-API-Enhancements.patch
index cd16a9d0ca..dc419af692 100644
--- a/patches/server/0294-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0292-Mob-Spawner-API-Enhancements.patch
@@ -69,7 +69,7 @@ index 1d0964a7f544735a0213d5c7832c71f53db139a9..b90127f9f805fdb5bb43a4b8ad2b1049
          nbt.putShort("MaxNearbyEntities", (short) this.maxNearbyEntities);
          nbt.putShort("RequiredPlayerRange", (short) this.requiredPlayerRange);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
-index 1a8fe7adf7c3ab9eb4cbc9847df4cfc872b97921..ebd6b07b8bcad3bc621fe99b0bee394fd2dd154f 100644
+index 33718f8861b46452ef9977ac0cbd7624a86edb30..4659f11c3aadda2617951f9d98b4858efe1400d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 @@ -256,4 +256,36 @@ public class CraftCreatureSpawner extends CraftBlockEntityState<SpawnerBlockEnti
diff --git a/patches/server/0295-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0293-Fix-CB-call-to-changed-postToMainThread-method.patch
index b3bb4ebaec..a09231712f 100644
--- a/patches/server/0295-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0293-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/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index b8b22a2b140b4d757add6eefa562d32430fb7424..237e3d8d2fd539f1fc6cd466ff124890dfa644d6 100644
+index a0dc17702fb6c8c96f262bc917624a46a40920fa..289a74e35836717bd20c777e9fc8c17722e90411 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -366,7 +366,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0296-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0294-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 8e45f027aa..8e45f027aa 100644
--- a/patches/server/0296-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/server/0294-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0297-Implement-CraftBlockSoundGroup.patch b/patches/server/0295-Implement-CraftBlockSoundGroup.patch
index 9bf16806b3..9bf16806b3 100644
--- a/patches/server/0297-Implement-CraftBlockSoundGroup.patch
+++ b/patches/server/0295-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0298-Expose-the-internal-current-tick.patch b/patches/server/0296-Expose-the-internal-current-tick.patch
index 4c03c5754a..3432ea5f6b 100644
--- a/patches/server/0298-Expose-the-internal-current-tick.patch
+++ b/patches/server/0296-Expose-the-internal-current-tick.patch
@@ -5,10 +5,10 @@ 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 f3fb47cd2c8302e21941f0ecb0bf8215f7d1b433..2ceffbde4f12c5ac34c156e32c5fac3f9ecc8cc4 100644
+index 32765f19f6cd4973b4d2d8085637124f8192373c..11ef05f685b040f90988436bd07b1e747777dbb8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2880,5 +2880,10 @@ public final class CraftServer implements Server {
+@@ -2882,5 +2882,10 @@ public final class CraftServer implements Server {
          profile.getProperties().putAll(((CraftPlayer) player).getHandle().getGameProfile().getProperties());
          return new com.destroystokyo.paper.profile.CraftPlayerProfile(profile);
      }
diff --git a/patches/server/0299-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0297-Show-blockstate-location-if-we-failed-to-read-it.patch
index 35f4f6c443..35f4f6c443 100644
--- a/patches/server/0299-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/server/0297-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0300-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0298-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index cb2e502f71..cb2e502f71 100644
--- a/patches/server/0300-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0298-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0301-Configurable-projectile-relative-velocity.patch b/patches/server/0299-Configurable-projectile-relative-velocity.patch
index c96f031ef6..c96f031ef6 100644
--- a/patches/server/0301-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0299-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0302-offset-item-frame-ticking.patch b/patches/server/0300-offset-item-frame-ticking.patch
index e5be0eb235..e5be0eb235 100644
--- a/patches/server/0302-offset-item-frame-ticking.patch
+++ b/patches/server/0300-offset-item-frame-ticking.patch
diff --git a/patches/server/0303-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0301-Prevent-consuming-the-wrong-itemstack.patch
index 2ff170a3bf..40fdb056a9 100644
--- a/patches/server/0303-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0301-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 a4eee658ecfc0f25e854c17a7715cb16715859b1..d88b13be2d72cc40c5ca846a55eece1d9ca5fd37 100644
+index 47b1a4ec278cf9762c9eb9c1448cf78912b7d77a..ebdc95a04400ab71a261a1a4fd6e4477ee9d3122 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3821,9 +3821,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0304-Dont-send-unnecessary-sign-update.patch b/patches/server/0302-Dont-send-unnecessary-sign-update.patch
index afca8562db..afca8562db 100644
--- a/patches/server/0304-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0302-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0305-Add-option-to-disable-pillager-patrols.patch b/patches/server/0303-Add-option-to-disable-pillager-patrols.patch
index 3021a1f6c8..3021a1f6c8 100644
--- a/patches/server/0305-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/server/0303-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0306-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0304-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index 82277a287f..82277a287f 100644
--- a/patches/server/0306-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/server/0304-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0307-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0305-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 528cf153ea..528cf153ea 100644
--- a/patches/server/0307-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/server/0305-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0308-Duplicate-UUID-Resolve-Option.patch b/patches/server/0306-Duplicate-UUID-Resolve-Option.patch
index a8fd0cc85e..a8fd0cc85e 100644
--- a/patches/server/0308-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0306-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0309-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0307-PlayerDeathEvent-shouldDropExperience.patch
index 371eaa1631..9eb431496f 100644
--- a/patches/server/0309-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0307-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 0fd8af120734973d425dbd286a59d2b9c1a05162..760ec9a315ff254b4c1e44310e3c1e2f7ab57125 100644
+index e7da9cda8d1f4eef25d88c6d9f1cf742e2fdaaa0..3a24a46fca271e12f8ad5b716ef6ea6621b8801c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1011,7 +1011,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0310-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0308-Prevent-bees-loading-chunks-checking-hive-position.patch
index 9e8924d226..9e8924d226 100644
--- a/patches/server/0310-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0308-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0311-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0309-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 3b189be4e4..3b189be4e4 100644
--- a/patches/server/0311-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/server/0309-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0312-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0310-Optimise-EntityGetter-getPlayerByUUID.patch
index 0428d89897..0428d89897 100644
--- a/patches/server/0312-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0310-Optimise-EntityGetter-getPlayerByUUID.patch
diff --git a/patches/server/0313-Fix-items-not-falling-correctly.patch b/patches/server/0311-Fix-items-not-falling-correctly.patch
index a9746d7d4e..a9746d7d4e 100644
--- a/patches/server/0313-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0311-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0314-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0312-Optimize-call-to-getFluid-for-explosions.patch
index d9b979b49f..15594e5ae8 100644
--- a/patches/server/0314-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0312-Optimize-call-to-getFluid-for-explosions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize call to getFluid for explosions
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 4c7795e1ba7bb3135fcf5bab1c8aa857b8e7417b..0f02361110143c839fde6ada38e9e0b512aef978 100644
+index a24e9c9e80659b5508e3c5ef3fa3d1a26b96b483..f7cb61c85074fc0f79b0b11dcb11e96b93548554 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -192,7 +192,7 @@ public class Explosion {
diff --git a/patches/server/0315-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0313-Guard-against-serializing-mismatching-chunk-coordina.patch
index 98e6fa59a3..98e6fa59a3 100644
--- a/patches/server/0315-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/0313-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0316-Alternative-item-despawn-rate.patch b/patches/server/0314-Alternative-item-despawn-rate.patch
index a3a719c954..a3a719c954 100644
--- a/patches/server/0316-Alternative-item-despawn-rate.patch
+++ b/patches/server/0314-Alternative-item-despawn-rate.patch
diff --git a/patches/server/0317-Tracking-Range-Improvements.patch b/patches/server/0315-Tracking-Range-Improvements.patch
index 0c63932883..0c63932883 100644
--- a/patches/server/0317-Tracking-Range-Improvements.patch
+++ b/patches/server/0315-Tracking-Range-Improvements.patch
diff --git a/patches/server/0318-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0316-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 19d4ba5fa9..19d4ba5fa9 100644
--- a/patches/server/0318-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0316-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0319-Improve-Block-breakNaturally-API.patch b/patches/server/0317-Improve-Block-breakNaturally-API.patch
index 59270e660a..59270e660a 100644
--- a/patches/server/0319-Improve-Block-breakNaturally-API.patch
+++ b/patches/server/0317-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0320-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0318-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index a96e5d4769..a96e5d4769 100644
--- a/patches/server/0320-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0318-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0321-Add-debug-for-sync-chunk-loads.patch b/patches/server/0319-Add-debug-for-sync-chunk-loads.patch
index f96cf2c189..f96cf2c189 100644
--- a/patches/server/0321-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0319-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0322-Improve-java-version-check.patch b/patches/server/0320-Improve-java-version-check.patch
index e5761ec018..df50b64ab2 100644
--- a/patches/server/0322-Improve-java-version-check.patch
+++ b/patches/server/0320-Improve-java-version-check.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Improve java version check
 Co-Authored-By: MiniDigger <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index caa7fefab037a24713e9f7f15a541d47bc7655ee..11b1e23ea2a0d4faf7e74d3c9580b7a776ac795b 100644
+index faa228698c7dd60bde0f3767cc27957ece04b8be..f3bce016e729d553aaa6185470bbf4317f94352b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -202,23 +202,27 @@ public class Main {
+@@ -203,23 +203,27 @@ public class Main {
                  return;
              }
  
diff --git a/patches/server/0323-Add-ThrownEggHatchEvent.patch b/patches/server/0321-Add-ThrownEggHatchEvent.patch
index acec0a7669..acec0a7669 100644
--- a/patches/server/0323-Add-ThrownEggHatchEvent.patch
+++ b/patches/server/0321-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0324-Entity-Jump-API.patch b/patches/server/0322-Entity-Jump-API.patch
index 33973d1d65..2b4b803a54 100644
--- a/patches/server/0324-Entity-Jump-API.patch
+++ b/patches/server/0322-Entity-Jump-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Entity Jump API
 public net.minecraft.world.entity.LivingEntity jumping
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d88b13be2d72cc40c5ca846a55eece1d9ca5fd37..c2934dc1d87bd8211714ab8af8ddfc32695b7953 100644
+index ebdc95a04400ab71a261a1a4fd6e4477ee9d3122..fa9da0e3b9fc579f16c3b05c8c45310940e68d62 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3401,8 +3401,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0325-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 21df90e99e..515c726562 100644
--- a/patches/server/0325-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ce2594baa8eb5cfff75a2fb9f3277676a7b08e18..f1b8e3f06db9bef44319c6d53574b1e7188c5931 100644
+index 5bb379251c5af88d4350bd2715147e6442d695fd..f75457a5297fc041de5f2d7eabcc072201a42a09 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -399,6 +399,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0326-Make-the-GUI-graph-fancier.patch b/patches/server/0324-Make-the-GUI-graph-fancier.patch
index 9e79ca7b91..9e79ca7b91 100644
--- a/patches/server/0326-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0324-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0327-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0325-add-hand-to-BlockMultiPlaceEvent.patch
index 17fa73f9af..da943486d3 100644
--- a/patches/server/0327-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0325-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 e2d74bf7e888b5161b210393e72c484058a3657b..fae07957147ee22a91d5da925e834a0495021958 100644
+index 6d947a11bc94cb8792a3ce0b5314d7226485e8ab..74fc73549b504eb2b7fcaa141aa125f84a077ed9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -401,13 +401,18 @@ public class CraftEventFactory {
diff --git a/patches/server/0328-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0326-Validate-tripwire-hook-placement-before-update.patch
index bc1125b169..bc1125b169 100644
--- a/patches/server/0328-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/server/0326-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0329-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0327-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index e09ab64290..e09ab64290 100644
--- a/patches/server/0329-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/server/0327-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0330-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0328-Configurable-chance-of-villager-zombie-infection.patch
index ecb3c72bd4..ecb3c72bd4 100644
--- a/patches/server/0330-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0328-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0331-Optimise-Chunk-getFluid.patch b/patches/server/0329-Optimise-Chunk-getFluid.patch
index 211f2b345f..211f2b345f 100644
--- a/patches/server/0331-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0329-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0332-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0330-Set-spigots-verbose-world-setting-to-false-by-def.patch
index f00c33db91..f00c33db91 100644
--- a/patches/server/0332-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0330-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0333-Add-tick-times-API-and-mspt-command.patch b/patches/server/0331-Add-tick-times-API-and-mspt-command.patch
index 5596b1d188..130e46cf47 100644
--- a/patches/server/0333-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0331-Add-tick-times-API-and-mspt-command.patch
@@ -125,10 +125,10 @@ index 72f2e81b9905a0d57ed8e2a88578f62d5235c456..7b58b2d6297800c2dcdbf7539e5ab8e7
  
      public static void registerCommands(final MinecraftServer server) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 91981ef15a9d8a46681f39ec8cf0f136f9931968..b260b197bc254d22a9fd0f1c2dd799930489c8f7 100644
+index 5d8fb0a781b2f86ab15c7045cd09c58563848848..3788057fa995d11c23f189c39d0554e9ccac0a68 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -255,6 +255,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -252,6 +252,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      private int playerIdleTimeout;
      private final long[] tickTimesNanos;
      private long aggregatedTickTimesNanos;
@@ -140,7 +140,7 @@ index 91981ef15a9d8a46681f39ec8cf0f136f9931968..b260b197bc254d22a9fd0f1c2dd79993
      @Nullable
      private KeyPair keyPair;
      @Nullable
-@@ -1450,6 +1455,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1447,6 +1452,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.aggregatedTickTimesNanos += j;
          this.tickTimesNanos[k] = j;
          this.smoothedTickTimeMillis = this.smoothedTickTimeMillis * 0.8F + (float) j / (float) TimeUtil.NANOSECONDS_PER_MILLISECOND * 0.19999999F;
@@ -152,7 +152,7 @@ index 91981ef15a9d8a46681f39ec8cf0f136f9931968..b260b197bc254d22a9fd0f1c2dd79993
          this.logTickMethodTime(i);
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot
-@@ -2790,4 +2800,30 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2787,4 +2797,30 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static record ServerResourcePackInfo(UUID id, String url, String hash, boolean isRequired, @Nullable Component prompt) {
  
      }
@@ -184,10 +184,10 @@ index 91981ef15a9d8a46681f39ec8cf0f136f9931968..b260b197bc254d22a9fd0f1c2dd79993
 +    // Paper end - Add tick times API and /mspt command
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2ceffbde4f12c5ac34c156e32c5fac3f9ecc8cc4..e3743114309d94dcf04acee5d41019f38f51299e 100644
+index 11ef05f685b040f90988436bd07b1e747777dbb8..6e10244fe14d6271c0215c09a6df3f55a3ca6ade 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2648,6 +2648,16 @@ public final class CraftServer implements Server {
+@@ -2650,6 +2650,16 @@ public final class CraftServer implements Server {
          return CraftMagicNumbers.INSTANCE;
      }
  
diff --git a/patches/server/0334-Expose-MinecraftServer-isRunning.patch b/patches/server/0332-Expose-MinecraftServer-isRunning.patch
index 088bb21907..d73035f1ef 100644
--- a/patches/server/0334-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0332-Expose-MinecraftServer-isRunning.patch
@@ -6,10 +6,10 @@ 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 e3743114309d94dcf04acee5d41019f38f51299e..e7a56475d7fdeabe7a864bac06477051ef7aeda8 100644
+index 6e10244fe14d6271c0215c09a6df3f55a3ca6ade..8e082ec92c437e27d71e70a91a0bf65153de29a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2895,5 +2895,10 @@ public final class CraftServer implements Server {
+@@ -2897,5 +2897,10 @@ public final class CraftServer implements Server {
      public int getCurrentTick() {
          return net.minecraft.server.MinecraftServer.currentTick;
      }
diff --git a/patches/server/0335-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0333-Add-Raw-Byte-ItemStack-Serialization.patch
index b294d74cc9..18fd31bec3 100644
--- a/patches/server/0335-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0333-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 5df312c8c663b51dcdfa69945050baadbc2f5f92..ed736df71472578fbeb6a86123083d95a6cd7057 100644
+index f541ca7cb3328a9366e08a9933b24ed5c76059c0..3547edda0db53ec6c59f30f478f1614bd932be02 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -482,6 +482,53 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0336-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0334-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 95935c86fc..dfa35fee3f 100644
--- a/patches/server/0336-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0334-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 760ec9a315ff254b4c1e44310e3c1e2f7ab57125..2c9494fb52c39a6aacd4d1dd553ca08e96abca78 100644
+index 3a24a46fca271e12f8ad5b716ef6ea6621b8801c..553e9bcac962085e38464493650c47ee1636c0e0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -265,6 +265,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0337-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0335-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index d5833fa44c..d5833fa44c 100644
--- a/patches/server/0337-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0335-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0338-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0336-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index 80606e638c..80606e638c 100644
--- a/patches/server/0338-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0336-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0339-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0337-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 8403fc132e..8403fc132e 100644
--- a/patches/server/0339-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0337-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0340-Don-t-tick-dead-players.patch b/patches/server/0338-Don-t-tick-dead-players.patch
index 52e63e2774..5301bf6d95 100644
--- a/patches/server/0340-Don-t-tick-dead-players.patch
+++ b/patches/server/0338-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 2c9494fb52c39a6aacd4d1dd553ca08e96abca78..4a9b5238cd1ab99920756d72c2ff32e04b35935a 100644
+index 553e9bcac962085e38464493650c47ee1636c0e0..a55707fc74f6cc2ac1e1f1f6dc60e3de9ccbbb5e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -758,7 +758,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0341-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0339-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 6c42f020df..6c42f020df 100644
--- a/patches/server/0341-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0339-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0342-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0340-Don-t-move-existing-players-to-world-spawn.patch
index 781abaf10c..d4c692afa8 100644
--- a/patches/server/0342-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0340-Don-t-move-existing-players-to-world-spawn.patch
@@ -13,7 +13,7 @@ By skipping this, we avoid potential for a large spike on server start.
 public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4a9b5238cd1ab99920756d72c2ff32e04b35935a..af40929f5d90973d8e624b98d5059fcce237b659 100644
+index a55707fc74f6cc2ac1e1f1f6dc60e3de9ccbbb5e..188d087576944cc19794151ed380c7471afc8b16 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -353,7 +353,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0343-Optimize-Pathfinding.patch b/patches/server/0341-Optimize-Pathfinding.patch
index 281988ce37..281988ce37 100644
--- a/patches/server/0343-Optimize-Pathfinding.patch
+++ b/patches/server/0341-Optimize-Pathfinding.patch
diff --git a/patches/server/0344-Reduce-Either-Optional-allocation.patch b/patches/server/0342-Reduce-Either-Optional-allocation.patch
index d42e0ac184..d42e0ac184 100644
--- a/patches/server/0344-Reduce-Either-Optional-allocation.patch
+++ b/patches/server/0342-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0345-Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0343-Reduce-memory-footprint-of-CompoundTag.patch
index 55111ab6e8..55111ab6e8 100644
--- a/patches/server/0345-Reduce-memory-footprint-of-CompoundTag.patch
+++ b/patches/server/0343-Reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/server/0346-Prevent-opening-inventories-when-frozen.patch b/patches/server/0344-Prevent-opening-inventories-when-frozen.patch
index 574aa307db..4fc06e5cb2 100644
--- a/patches/server/0346-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0344-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 af40929f5d90973d8e624b98d5059fcce237b659..4492d082b172a8bfc65405bfa73865237d02dd3f 100644
+index 188d087576944cc19794151ed380c7471afc8b16..ce2df5daf3854b541ce0206ea6105c33aad3d010 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -703,7 +703,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0347-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0345-Don-t-run-entity-collision-code-if-not-needed.patch
index 2da84f514d..7ed6158b59 100644
--- a/patches/server/0347-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0345-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -12,7 +12,7 @@ The entity's current team collision rule causes them to NEVER collide.
 Co-authored-by: Owen1212055 <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c2934dc1d87bd8211714ab8af8ddfc32695b7953..a54024b88555bd6a47314dcc42deae1252be7125 100644
+index fa9da0e3b9fc579f16c3b05c8c45310940e68d62..b8ea7830f9dc1b4ee0052bf3b83127c415cc8085 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3512,10 +3512,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0348-Implement-Player-Client-Options-API.patch b/patches/server/0346-Implement-Player-Client-Options-API.patch
index 48f83018f9..4603218155 100644
--- a/patches/server/0348-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0346-Implement-Player-Client-Options-API.patch
@@ -87,7 +87,7 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4492d082b172a8bfc65405bfa73865237d02dd3f..9f74168b0dd9392d2f4164fc7011e98623e28882 100644
+index ce2df5daf3854b541ce0206ea6105c33aad3d010..234b290896ba9dfb36d110740cd0494b0fbfe1e4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -354,7 +354,7 @@ public class ServerPlayer extends Player {
@@ -136,7 +136,7 @@ index 4492d082b172a8bfc65405bfa73865237d02dd3f..9f74168b0dd9392d2f4164fc7011e986
          this.adventure$locale = java.util.Objects.requireNonNullElse(net.kyori.adventure.translation.Translator.parseLocale(this.language), java.util.Locale.US); // Paper
          this.requestedViewDistance = clientOptions.viewDistance();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4c12ad37d304460ca79033282c52cf851537d1f9..381207e020e5b06cacb98142663db5f2030615ce 100644
+index 6572ca279d8ffe896b852fc138e01816fd28058a..4131b83117e399d7113442def85101d20c493d06 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -651,6 +651,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0349-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0347-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 0859eed952..0859eed952 100644
--- a/patches/server/0349-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/server/0347-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0350-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0348-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
index f8725ebf87..a771469d23 100644
--- a/patches/server/0350-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
+++ b/patches/server/0348-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
@@ -43,7 +43,7 @@ index 66936834a80ef6b645ab44f3439defcb90237bfa..406c78dcb97d954f16f05d379d4dbf74
              EntityType<?> entitytypes = entity.getType();
              int i = entitytypes.clientTrackingRange() * 16;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9f74168b0dd9392d2f4164fc7011e98623e28882..a8c9a9cea8d527f2bb4393c0539b3c8f3b25e06e 100644
+index 234b290896ba9dfb36d110740cd0494b0fbfe1e4..dde6d567521a08b416ee50b1249b653b0bf6e87a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -284,6 +284,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0351-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0349-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 3cf5caf32a..0361e80eeb 100644
--- a/patches/server/0351-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0349-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -84,7 +84,7 @@ index a4db0bcefc92091ff26b146a2ce914c1d36a3c23..935061ed5c22b48e43d27fe0840cc69f
          }
          // Paper end - Entity#getEntitySpawnReason
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f1b8e3f06db9bef44319c6d53574b1e7188c5931..04bd6d6bc6af0e423f56329dc3554b04170932f9 100644
+index f75457a5297fc041de5f2d7eabcc072201a42a09..511208e323b26df24263b87eeb7d2645572d9ff8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2317,27 +2317,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0352-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch
index e96017d4ce..4c9e16dda5 100644
--- a/patches/server/0352-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0350-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 a54024b88555bd6a47314dcc42deae1252be7125..022ff3f125b7fe4f59b8c4bf75533d9b6cac4189 100644
+index b8ea7830f9dc1b4ee0052bf3b83127c415cc8085..2f3615cb8e4206ed2eb87c1341de4258879d3907 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2264,7 +2264,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0353-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0351-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 8a262c1f35..8a262c1f35 100644
--- a/patches/server/0353-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0351-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0354-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0352-Add-phantom-creative-and-insomniac-controls.patch
index 8101fc3b6a..8101fc3b6a 100644
--- a/patches/server/0354-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0352-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0355-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0353-Fix-item-duplication-and-teleport-issues.patch
index b59b420d07..b59b420d07 100644
--- a/patches/server/0355-Fix-item-duplication-and-teleport-issues.patch
+++ b/patches/server/0353-Fix-item-duplication-and-teleport-issues.patch
diff --git a/patches/server/0356-Villager-Restocks-API.patch b/patches/server/0354-Villager-Restocks-API.patch
index 75b7928672..75b7928672 100644
--- a/patches/server/0356-Villager-Restocks-API.patch
+++ b/patches/server/0354-Villager-Restocks-API.patch
diff --git a/patches/server/0357-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0355-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 03ebc55195..aa5fcfc6ac 100644
--- a/patches/server/0357-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0355-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 fedc4654178a3771004394665914efd2b842432a..b3026d2c70419a9de11f5887cbc998f29b7820eb 100644
+index e728b9f317d12c3c452db70ba7d1e930c84e345d..7277c9b82c127cd38db2daec3df4d33e8376b8dc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -892,7 +892,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0359-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0356-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index a5ad213696..44bd324f68 100644
--- a/patches/server/0359-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0356-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -17,10 +17,10 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index cc4f7f5bdb6b930af4130dc775e4ed754be87783..90911cd3ba86e02baf8684099f0762fab563581c 100644
+index f3bce016e729d553aaa6185470bbf4317f94352b..02243b69cca7255588b43dab57e1c9ca4c3ca87f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -26,6 +26,7 @@ public class Main {
+@@ -27,6 +27,7 @@ public class Main {
          }
          // Paper end
          // Todo: Installation script
diff --git a/patches/server/0360-misc-debugging-dumps.patch b/patches/server/0357-misc-debugging-dumps.patch
index eaf88ad341..759c0ff6fd 100644
--- a/patches/server/0360-misc-debugging-dumps.patch
+++ b/patches/server/0357-misc-debugging-dumps.patch
@@ -49,10 +49,10 @@ index f15c388434a0a501f86868de35cc138756975027..5044a7dc120c8b040ee23365d2bf97e6
                  StackTraceElement[] astacktraceelement = exception.getStackTrace();
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b260b197bc254d22a9fd0f1c2dd799930489c8f7..c0d467cc65c208aa1166a24dec753b1e2b3d995b 100644
+index 3788057fa995d11c23f189c39d0554e9ccac0a68..386f8b825dac6dda253b0c55a3a0eeef5bdca271 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -912,6 +912,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -909,6 +909,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      // CraftBukkit start
      private boolean hasStopped = false;
@@ -60,7 +60,7 @@ index b260b197bc254d22a9fd0f1c2dd799930489c8f7..c0d467cc65c208aa1166a24dec753b1e
      private final Object stopLock = new Object();
      public final boolean hasStopped() {
          synchronized (this.stopLock) {
-@@ -926,6 +927,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -923,6 +924,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              if (this.hasStopped) return;
              this.hasStopped = true;
          }
@@ -68,7 +68,7 @@ index b260b197bc254d22a9fd0f1c2dd799930489c8f7..c0d467cc65c208aa1166a24dec753b1e
          // CraftBukkit end
          if (this.metricsRecorder.isRecording()) {
              this.cancelRecordingMetrics();
-@@ -1030,6 +1032,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1027,6 +1029,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
          this.isRestarting = isRestarting;
@@ -105,10 +105,10 @@ index 970d1ddf0a014b47b0ac97440489706137324991..e4086bea596e5f5d71491e0b7ad650d7
              this.connection.disconnect(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 750c976c596ea149634229754984f2d95682874d..c7d95adbd675af54dcd32773ab88c79e829df745 100644
+index 8e082ec92c437e27d71e70a91a0bf65153de29a3..26bebc3ddd15e963e818011556f216f275bd7415 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1018,6 +1018,7 @@ public final class CraftServer implements Server {
+@@ -1013,6 +1013,7 @@ public final class CraftServer implements Server {
                  plugin.getDescription().getFullName(),
                  "This plugin is not properly shutting down its async tasks when it is being reloaded.  This may cause conflicts with the newly loaded version of the plugin"
              ));
diff --git a/patches/server/0358-Expose-game-version.patch b/patches/server/0358-Expose-game-version.patch
deleted file mode 100644
index ae948b246d..0000000000
--- a/patches/server/0358-Expose-game-version.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Vainomaa <[email protected]>
-Date: Fri, 1 May 2020 17:39:26 +0300
-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 e7a56475d7fdeabe7a864bac06477051ef7aeda8..750c976c596ea149634229754984f2d95682874d 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -579,6 +579,13 @@ public final class CraftServer implements Server {
-         return this.bukkitVersion;
-     }
- 
-+    // Paper start - expose game version
-+    @Override
-+    public String getMinecraftVersion() {
-+        return console.getServerVersion();
-+    }
-+    // Paper end
-+
-     @Override
-     public List<CraftPlayer> getOnlinePlayers() {
-         return this.playerView;
diff --git a/patches/server/0361-Prevent-teleporting-dead-entities.patch b/patches/server/0358-Prevent-teleporting-dead-entities.patch
index 2820b8f349..034646a8bb 100644
--- a/patches/server/0361-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0358-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 b3026d2c70419a9de11f5887cbc998f29b7820eb..b715e7b3230dba24d10230d5e4d8dd5589f93018 100644
+index 7277c9b82c127cd38db2daec3df4d33e8376b8dc..d0ce184da22352b591f4783918104a4c473cc873 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1540,6 +1540,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0362-Implement-Mob-Goal-API.patch b/patches/server/0359-Implement-Mob-Goal-API.patch
index 494c441c11..628d807ab1 100644
--- a/patches/server/0362-Implement-Mob-Goal-API.patch
+++ b/patches/server/0359-Implement-Mob-Goal-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0d757b4a1b5d1bb68a48ec0a398019bf1f64c6a4..cab6f19bb69da3b51bf05fac7075675b2a55564b 100644
+index 2caa4c8e250a7925e7d6f9ba00a95956b5328568..69b5d39f57a63130c0b83f6238898bdf68fa1e9a 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -40,6 +40,7 @@ dependencies {
+@@ -41,6 +41,7 @@ dependencies {
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
  
@@ -773,10 +773,10 @@ index 6667ecc4b7eded4e20a415cef1e1b1179e6710b8..16f9a98b8a939e5ca7e2dc04f87134a7
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c7d95adbd675af54dcd32773ab88c79e829df745..8fa6496605c3f2ac7f16abd0e32190a189d6549a 100644
+index 26bebc3ddd15e963e818011556f216f275bd7415..8e0e38bc85ca97f4c632299affc366ece7e63a52 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2908,5 +2908,11 @@ public final class CraftServer implements Server {
+@@ -2903,5 +2903,11 @@ public final class CraftServer implements Server {
      public boolean isStopping() {
          return net.minecraft.server.MinecraftServer.getServer().hasStopped();
      }
diff --git a/patches/server/0363-Add-villager-reputation-API.patch b/patches/server/0360-Add-villager-reputation-API.patch
index 5043e90bdc..5043e90bdc 100644
--- a/patches/server/0363-Add-villager-reputation-API.patch
+++ b/patches/server/0360-Add-villager-reputation-API.patch
diff --git a/patches/server/0364-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0361-Option-for-maximum-exp-value-when-merging-orbs.patch
index 6b0e5e5279..ce8ca08ee9 100644
--- a/patches/server/0364-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0361-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f39bfda4487114f5a0a720e328321485839dd790..13147a658bc9c254538632bad12cdc4f0ba67bff 100644
+index ac4a8c9d4f727f3caa16f6dc5497d69f9db52aab..feffc6a539738e584dd6eda8c1f2f5b267f617f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -703,16 +703,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0365-ExperienceOrbMergeEvent.patch b/patches/server/0362-ExperienceOrbMergeEvent.patch
index 2d56cb06bf..aad5f90997 100644
--- a/patches/server/0365-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0362-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 13147a658bc9c254538632bad12cdc4f0ba67bff..36999a5c603aef1dc1e79adb2f2f6801899bfacc 100644
+index feffc6a539738e584dd6eda8c1f2f5b267f617f6..1e9835647a0f9eb1e1a264467a62af85af664594 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -712,7 +712,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0366-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0363-Fix-PotionEffect-ignores-icon-flag.patch
index ecd472e97b..ecd472e97b 100644
--- a/patches/server/0366-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0363-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0367-Potential-bed-API.patch b/patches/server/0364-Potential-bed-API.patch
index 34470bcfc1..34470bcfc1 100644
--- a/patches/server/0367-Potential-bed-API.patch
+++ b/patches/server/0364-Potential-bed-API.patch
diff --git a/patches/server/0368-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0365-Wait-for-Async-Tasks-during-shutdown.patch
index 8175c30658..4df8e38b8b 100644
--- a/patches/server/0368-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0365-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,10 +10,10 @@ 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 c0d467cc65c208aa1166a24dec753b1e2b3d995b..6da91e7236ee2d2a0bcbe1f3933b562425ec06a5 100644
+index 386f8b825dac6dda253b0c55a3a0eeef5bdca271..0087e8037e2d30d940e6efa886226e59e8daa98f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -939,6 +939,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -936,6 +936,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
@@ -22,10 +22,10 @@ index c0d467cc65c208aa1166a24dec753b1e2b3d995b..6da91e7236ee2d2a0bcbe1f3933b5624
          // CraftBukkit end
          if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.shutdown(); // Paper - Plugin remapping
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8fa6496605c3f2ac7f16abd0e32190a189d6549a..6d3e22ba084498beb46cdb7cd7737eee8bfe477c 100644
+index 8e0e38bc85ca97f4c632299affc366ece7e63a52..01224af0835a00343923767186dceb53900c0832 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1029,6 +1029,31 @@ public final class CraftServer implements Server {
+@@ -1024,6 +1024,31 @@ public final class CraftServer implements Server {
          org.spigotmc.WatchdogThread.hasStarted = true; // Paper - Disable watchdog early timeout on reload
      }
  
diff --git a/patches/server/0369-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0366-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index a65b9bbbbc..a65b9bbbbc 100644
--- a/patches/server/0369-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0366-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0370-Ensure-safe-gateway-teleport.patch b/patches/server/0367-Ensure-safe-gateway-teleport.patch
index c1867dbc2c..c1867dbc2c 100644
--- a/patches/server/0370-Ensure-safe-gateway-teleport.patch
+++ b/patches/server/0367-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0371-Add-option-for-console-having-all-permissions.patch b/patches/server/0368-Add-option-for-console-having-all-permissions.patch
index ace91d22dd..ace91d22dd 100644
--- a/patches/server/0371-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0368-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0372-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0369-Fix-villager-trading-demand-MC-163962.patch
index bd7b6c4273..bd7b6c4273 100644
--- a/patches/server/0372-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/server/0369-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0373-Maps-shouldn-t-load-chunks.patch b/patches/server/0370-Maps-shouldn-t-load-chunks.patch
index 3bc3299f81..3bc3299f81 100644
--- a/patches/server/0373-Maps-shouldn-t-load-chunks.patch
+++ b/patches/server/0370-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0374-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0371-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 27672e59d7..27672e59d7 100644
--- a/patches/server/0374-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/server/0371-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0375-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0372-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 4175cae3b0..4175cae3b0 100644
--- a/patches/server/0375-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/server/0372-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0376-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0373-Fix-piston-physics-inconsistency-MC-188840.patch
index 44f85960c4..44f85960c4 100644
--- a/patches/server/0376-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0373-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0377-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0374-Fix-missing-chunks-due-to-integer-overflow.patch
index e7af97469b..e7af97469b 100644
--- a/patches/server/0377-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0374-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0378-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0375-Prevent-position-desync-causing-tp-exploit.patch
index f789abcfe7..92eeabe500 100644
--- a/patches/server/0378-Prevent-position-desync-causing-tp-exploit.patch
+++ b/patches/server/0375-Prevent-position-desync-causing-tp-exploit.patch
@@ -13,7 +13,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 b715e7b3230dba24d10230d5e4d8dd5589f93018..2e27141c6cc2dec758f294381da39a683c4e194d 100644
+index d0ce184da22352b591f4783918104a4c473cc873..7fab3281116aa917c96223c1a1caf6280293df65 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1355,6 +1355,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0379-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0376-Inventory-getHolder-method-without-block-snapshot.patch
index b30d42bf56..b30d42bf56 100644
--- a/patches/server/0379-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0376-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0380-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0377-Add-PlayerRecipeBookClickEvent.patch
index 2f223b4810..2f223b4810 100644
--- a/patches/server/0380-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0377-Add-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0381-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0378-Hide-sync-chunk-writes-behind-flag.patch
index 030a5a1365..030a5a1365 100644
--- a/patches/server/0381-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0378-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0382-Add-permission-for-command-blocks.patch b/patches/server/0379-Add-permission-for-command-blocks.patch
index f95c6d1035..d1ac75f76f 100644
--- a/patches/server/0382-Add-permission-for-command-blocks.patch
+++ b/patches/server/0379-Add-permission-for-command-blocks.patch
@@ -18,7 +18,7 @@ index cd6f34ee326228036f8c025e4e6d04e0c15ba06f..2f0d56c78584abe27ef050258827103f
                  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 a6cd53e08a0770b93876f98efa7ebfe5b77a2f15..8011266f5fe082c0a81a7a828fe2cf7445fba0f7 100644
+index 591f4f43dd023facf0a8990682069190c388d64b..299a2e78f4a83d224038c80287636a5d6b9b7450 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -803,7 +803,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0383-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0380-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index db4f96e468..96e499e98f 100644
--- a/patches/server/0383-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/server/0380-Ensure-Entity-position-and-AABB-are-never-invalid.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Entity position and AABB are never invalid
 Co-authored-by: Spottedleaf <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index af49ff55865b327c167efedcb7413c270824efe3..e6422024dd4aa472156d9751dcdeb55b5e210f53 100644
+index c6877df96229eb922fa0d4029f31d9698eab78ab..8576e7919dfaf6a17e6442a2047a7d6bef3b53cb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -665,8 +665,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0384-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0381-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index c69a9ef532..dea556a606 100644
--- a/patches/server/0384-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0381-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -8,10 +8,10 @@ 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 6da91e7236ee2d2a0bcbe1f3933b562425ec06a5..44521086adbb9db6574045414c7b23a4dde22387 100644
+index 0087e8037e2d30d940e6efa886226e59e8daa98f..a7de512a019a51d3133d4304b9ef80a6b6b6b80d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -833,7 +833,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -830,7 +830,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          worldloadlistener.stop();
          // CraftBukkit start
          // this.updateMobSpawningFlags();
@@ -20,7 +20,7 @@ index 6da91e7236ee2d2a0bcbe1f3933b562425ec06a5..44521086adbb9db6574045414c7b23a4
  
          this.forceTicks = false;
          // CraftBukkit end
-@@ -1829,11 +1829,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1826,11 +1826,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
  
@@ -40,7 +40,7 @@ index 6da91e7236ee2d2a0bcbe1f3933b562425ec06a5..44521086adbb9db6574045414c7b23a4
          }
      }
  
-@@ -1847,7 +1850,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1844,7 +1847,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
  
@@ -102,10 +102,10 @@ index 299a2e78f4a83d224038c80287636a5d6b9b7450..95d20facdc43a356fd2e82f5d597f52e
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6d3e22ba084498beb46cdb7cd7737eee8bfe477c..26ba33d1eeb77b73cff3c423c08675df7118265c 100644
+index 01224af0835a00343923767186dceb53900c0832..e7535d4739f217a8fda2c15c74d44637825a0322 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -967,8 +967,8 @@ public final class CraftServer implements Server {
+@@ -962,8 +962,8 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
          for (ServerLevel world : this.console.getAllLevels()) {
diff --git a/patches/server/0385-Paper-dumpitem-command.patch b/patches/server/0382-Paper-dumpitem-command.patch
index a752f44867..a752f44867 100644
--- a/patches/server/0385-Paper-dumpitem-command.patch
+++ b/patches/server/0382-Paper-dumpitem-command.patch
diff --git a/patches/server/0386-Improve-Legacy-Component-serialization-size.patch b/patches/server/0383-Improve-Legacy-Component-serialization-size.patch
index 2fc5b1860f..fe2249ef25 100644
--- a/patches/server/0386-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0383-Improve-Legacy-Component-serialization-size.patch
@@ -7,7 +7,7 @@ Don't constantly send format: false for all formatting options when parent alrea
 has it false
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-index 51094fe6e37d3c0fad2682353f8de3d1b9c9aef5..42ab6e0ba77fb2f0350bee72488e905074989b4d 100644
+index cb6cc3896e862291a058d21fa9704dd1519ff5e1..10aad9c05aa8f35d8f2952315a896bed7775c4bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 @@ -47,6 +47,7 @@ public final class CraftChatMessage {
diff --git a/patches/server/0387-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0384-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 642eac03a9..e8c13b9e83 100644
--- a/patches/server/0387-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0384-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,10 +22,10 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 26ba33d1eeb77b73cff3c423c08675df7118265c..52733657a1bc8529fa68faaa212ea9b78b094793 100644
+index e7535d4739f217a8fda2c15c74d44637825a0322..d996a0d5d14448e49a8b6730425dd5b50abc1e72 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -380,7 +380,7 @@ public final class CraftServer implements Server {
+@@ -375,7 +375,7 @@ public final class CraftServer implements Server {
          this.overrideSpawnLimits();
          console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
          this.warningState = WarningState.value(this.configuration.getString("settings.deprecated-verbose"));
@@ -34,7 +34,7 @@ index 26ba33d1eeb77b73cff3c423c08675df7118265c..52733657a1bc8529fa68faaa212ea9b7
          this.minimumAPI = ApiVersion.getOrCreateVersion(this.configuration.getString("settings.minimum-api"));
          this.loadIcon();
  
-@@ -947,7 +947,7 @@ public final class CraftServer implements Server {
+@@ -942,7 +942,7 @@ public final class CraftServer implements Server {
          this.console.setMotd(config.motd);
          this.overrideSpawnLimits();
          this.warningState = WarningState.value(this.configuration.getString("settings.deprecated-verbose"));
diff --git a/patches/server/0388-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0385-Add-BlockStateMeta-clearBlockState.patch
index 89c8308159..88d5b8fb28 100644
--- a/patches/server/0388-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/server/0385-Add-BlockStateMeta-clearBlockState.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add BlockStateMeta#clearBlockState
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
-index 17ed658bd2afb1c115af2140a987edc84af3bef2..ad2bc225a93fc90661c488252b9139533d5803a2 100644
+index a72a3ea995a874150325189e11dc2bd338bd3bbf..9034905aabf057f387b65957a254d056b12e0519 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
 @@ -292,6 +292,13 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
diff --git a/patches/server/0389-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0386-Convert-legacy-attributes-in-Item-Meta.patch
index dd8c5ba601..dd8c5ba601 100644
--- a/patches/server/0389-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0386-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0390-Do-not-accept-invalid-client-settings.patch b/patches/server/0387-Do-not-accept-invalid-client-settings.patch
index 0cfa8d4f81..0cfa8d4f81 100644
--- a/patches/server/0390-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0387-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0391-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0388-Improve-fix-EntityTargetLivingEntityEvent.patch
index 513faeb27d..513faeb27d 100644
--- a/patches/server/0391-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/server/0388-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0392-Add-entity-liquid-API.patch b/patches/server/0389-Add-entity-liquid-API.patch
index ab34d7ab7a..ab34d7ab7a 100644
--- a/patches/server/0392-Add-entity-liquid-API.patch
+++ b/patches/server/0389-Add-entity-liquid-API.patch
diff --git a/patches/server/0393-Add-PrepareResultEvent.patch b/patches/server/0390-Add-PrepareResultEvent.patch
index aecbaf783c..aecbaf783c 100644
--- a/patches/server/0393-Add-PrepareResultEvent.patch
+++ b/patches/server/0390-Add-PrepareResultEvent.patch
diff --git a/patches/server/0394-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0391-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index b7931f343c..248e9dd5ca 100644
--- a/patches/server/0394-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0391-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 be1eff193cd0d581209d34e2ae81d1db67e5a153..81838056cacb9f2fd2d3c05b125461ac3013e82b 100644
+index c640d68c35b4454bfa0ae1764dee341041d9c31e..4bf48ce1824e404906a551ceec720c8e485adb44 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3624,7 +3624,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0395-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0392-Fix-arrows-never-despawning-MC-125757.patch
index a08ff237f0..a08ff237f0 100644
--- a/patches/server/0395-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0392-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0396-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0393-Thread-Safe-Vanilla-Command-permission-checking.patch
index a210e43dce..a210e43dce 100644
--- a/patches/server/0396-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0393-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0397-Fix-SPIGOT-5989.patch b/patches/server/0394-Fix-SPIGOT-5989.patch
index 5b41e0742c..5b41e0742c 100644
--- a/patches/server/0397-Fix-SPIGOT-5989.patch
+++ b/patches/server/0394-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0398-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0395-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index fe347fabc4..fe347fabc4 100644
--- a/patches/server/0398-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0395-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0399-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0396-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index df26348fac..df26348fac 100644
--- a/patches/server/0399-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0396-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0400-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0397-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 817e925f2f..817e925f2f 100644
--- a/patches/server/0400-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0397-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0401-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0398-Optimize-NetworkManager-Exception-Handling.patch
index 8626e3b900..8626e3b900 100644
--- a/patches/server/0401-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0398-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0402-Fix-some-rails-connecting-improperly.patch b/patches/server/0399-Fix-some-rails-connecting-improperly.patch
index 4f5cd86538..4f5cd86538 100644
--- a/patches/server/0402-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0399-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0403-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0400-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 75cd32bb83..75cd32bb83 100644
--- a/patches/server/0403-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0400-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0404-Brand-support.patch b/patches/server/0401-Brand-support.patch
index 511e3bd37a..511e3bd37a 100644
--- a/patches/server/0404-Brand-support.patch
+++ b/patches/server/0401-Brand-support.patch
diff --git a/patches/server/0405-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0402-Add-playPickupItemAnimation-to-LivingEntity.patch
index 00d87adf6c..00d87adf6c 100644
--- a/patches/server/0405-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0402-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0406-Don-t-require-FACING-data.patch b/patches/server/0403-Don-t-require-FACING-data.patch
index 98d0ef923f..98d0ef923f 100644
--- a/patches/server/0406-Don-t-require-FACING-data.patch
+++ b/patches/server/0403-Don-t-require-FACING-data.patch
diff --git a/patches/server/0407-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0404-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 47d790e9ed..47d790e9ed 100644
--- a/patches/server/0407-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0404-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0408-Add-moon-phase-API.patch b/patches/server/0405-Add-moon-phase-API.patch
index bcc15c76d0..bcc15c76d0 100644
--- a/patches/server/0408-Add-moon-phase-API.patch
+++ b/patches/server/0405-Add-moon-phase-API.patch
diff --git a/patches/server/0409-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0406-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 4c1742107a..4c1742107a 100644
--- a/patches/server/0409-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0406-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0410-Prevent-headless-pistons-from-being-created.patch b/patches/server/0407-Prevent-headless-pistons-from-being-created.patch
index d5d5a474f6..67afd12454 100644
--- a/patches/server/0410-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0407-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/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 0f02361110143c839fde6ada38e9e0b512aef978..414297ab9e953049b5f0b091e54d37c6e9edf861 100644
+index f7cb61c85074fc0f79b0b11dcb11e96b93548554..7227345914c9e4288faa227be568d974b3cfcf45 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -206,6 +206,15 @@ public class Explosion {
diff --git a/patches/server/0411-Add-BellRingEvent.patch b/patches/server/0408-Add-BellRingEvent.patch
index 114bbe332a..df065143ce 100644
--- a/patches/server/0411-Add-BellRingEvent.patch
+++ b/patches/server/0408-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/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a5253dc7fc611e599ab83c08bf4ce71afc4ee3c5..f0e1bb3d9e4254d2c32f28fb715ea429c7646cec 100644
+index 461b25d3d0660f973e6db670899bce05010e7c49..737fbe02c630da0a95dbed49ff152fb5c7ec4d37 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -367,10 +367,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0412-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0409-Add-zombie-targets-turtle-egg-config.patch
index 553e712827..553e712827 100644
--- a/patches/server/0412-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0409-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0413-Buffer-joins-to-world.patch b/patches/server/0410-Buffer-joins-to-world.patch
index 26675cacaf..26675cacaf 100644
--- a/patches/server/0413-Buffer-joins-to-world.patch
+++ b/patches/server/0410-Buffer-joins-to-world.patch
diff --git a/patches/server/0414-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0411-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 05d525bde0..05d525bde0 100644
--- a/patches/server/0414-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0411-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0415-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0412-PortalCreateEvent-needs-to-know-its-entity.patch
index f4c4bfc8bb..f4c4bfc8bb 100644
--- a/patches/server/0415-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0412-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0416-Add-more-Evoker-API.patch b/patches/server/0413-Add-more-Evoker-API.patch
index f44eceff55..f44eceff55 100644
--- a/patches/server/0416-Add-more-Evoker-API.patch
+++ b/patches/server/0413-Add-more-Evoker-API.patch
diff --git a/patches/server/0417-Add-methods-to-get-translation-keys.patch b/patches/server/0414-Add-methods-to-get-translation-keys.patch
index 9e2c16ba64..9e2c16ba64 100644
--- a/patches/server/0417-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0414-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0418-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0415-Create-HoverEvent-from-ItemStack-Entity.patch
index 4117c384be..4117c384be 100644
--- a/patches/server/0418-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0415-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0419-Cache-block-data-strings.patch b/patches/server/0416-Cache-block-data-strings.patch
index 933c5a446f..aa5d5797be 100644
--- a/patches/server/0419-Cache-block-data-strings.patch
+++ b/patches/server/0416-Cache-block-data-strings.patch
@@ -5,10 +5,10 @@ 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 44521086adbb9db6574045414c7b23a4dde22387..8d572e02747b86fb975776c2b3689b91699f3220 100644
+index a7de512a019a51d3133d4304b9ef80a6b6b6b80d..c2182db2233d765713089367804bf542d11af73c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2128,6 +2128,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2125,6 +2125,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.getPlayerList().reloadResources();
              this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
              this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
diff --git a/patches/server/0420-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0417-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 3df9c42e9a..3e8cc4c61a 100644
--- a/patches/server/0420-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0417-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 33c53c0b2dd755cb63288e9df5bb3dc11b3af55e..0583820095ab35c1083409f6f4a82adaa06c4574 100644
+index bc9c68c4df11ece9a9cba9b8cff1182c1d21551f..5d8b1fb9ee96ca397b8f3a0629bc4273ee21f41c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -676,7 +676,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -31,7 +31,7 @@ index 33c53c0b2dd755cb63288e9df5bb3dc11b3af55e..0583820095ab35c1083409f6f4a82ada
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e6422024dd4aa472156d9751dcdeb55b5e210f53..c8e4e37b706bd8cb9698ac2d13d0d8668e2d1d14 100644
+index 8576e7919dfaf6a17e6442a2047a7d6bef3b53cb..cde8925d0754c2428cf830ac58d83b9420947e30 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -165,6 +165,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0421-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0418-Add-additional-open-container-api-to-HumanEntity.patch
index 47aa453acf..47aa453acf 100644
--- a/patches/server/0421-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0418-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0422-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0419-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 572dc995c0..572dc995c0 100644
--- a/patches/server/0422-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0419-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0423-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0420-Extend-block-drop-capture-to-capture-all-items-added.patch
index bf2c2519f2..bf2c2519f2 100644
--- a/patches/server/0423-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0420-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0424-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0421-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 35fd51c448..927ef4c338 100644
--- a/patches/server/0424-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0421-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -21,7 +21,7 @@ index cde8925d0754c2428cf830ac58d83b9420947e30..e40387e9a822603379fabb9a9c64c55e
 +    // Paper end - Expose entity id counter
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index ed736df71472578fbeb6a86123083d95a6cd7057..7c864d7d70accc7d52e2b198c30be7f6a2f4e813 100644
+index 3547edda0db53ec6c59f30f478f1614bd932be02..390e8ebbc3d96cd6eaaae616d4366bfe52d6d62e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -529,6 +529,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0425-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0422-Lazily-track-plugin-scoreboards-by-default.patch
index 28ae9df043..28ae9df043 100644
--- a/patches/server/0425-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0422-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0426-Entity-isTicking.patch b/patches/server/0423-Entity-isTicking.patch
index 5add9ab4cb..ff5ad88eba 100644
--- a/patches/server/0426-Entity-isTicking.patch
+++ b/patches/server/0423-Entity-isTicking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 909575a02bf5f7040eb9c8edb034e7b6578e92b9..bbce55b02f848be720ad95cb5b896ff9ad1f66d0 100644
+index e40387e9a822603379fabb9a9c64c55e64c3bec3..81c9f06bdba9eb51c9ee3d1d969f8d8e6302a70f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4444,5 +4444,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0427-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0424-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index eab9b96e28..48cc71598a 100644
--- a/patches/server/0427-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0424-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,10 +6,10 @@ 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 8d572e02747b86fb975776c2b3689b91699f3220..a3e5b5075ff8097479689bf5cff66cdf93014128 100644
+index c2182db2233d765713089367804bf542d11af73c..58a208501fc8e23b0bfe977e4b4964ac8e3c238f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2253,13 +2253,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2250,13 +2250,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (this.isEnforceWhitelist()) {
              PlayerList playerlist = source.getServer().getPlayerList();
              UserWhiteList whitelist = playerlist.getWhiteList();
diff --git a/patches/server/0428-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0425-Fix-Concurrency-issue-in-ShufflingList.patch
index f04a40e1ac..f04a40e1ac 100644
--- a/patches/server/0428-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0425-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0429-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0426-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index f727c2200f..f727c2200f 100644
--- a/patches/server/0429-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0426-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0430-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0427-Fix-for-large-move-vectors-crashing-server.patch
index d7ab320b2d..5d5bf70211 100644
--- a/patches/server/0430-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0427-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 0583820095ab35c1083409f6f4a82adaa06c4574..4f7c15bf80092d91038b42d91fcd6634375d4446 100644
+index 5d8b1fb9ee96ca397b8f3a0629bc4273ee21f41c..a1f17d1044d6ecb05c98af45e77f92229e377114 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -492,9 +492,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0431-Optimise-getType-calls.patch b/patches/server/0428-Optimise-getType-calls.patch
index 1b14b0202b..1b14b0202b 100644
--- a/patches/server/0431-Optimise-getType-calls.patch
+++ b/patches/server/0428-Optimise-getType-calls.patch
diff --git a/patches/server/0432-Villager-resetOffers.patch b/patches/server/0429-Villager-resetOffers.patch
index e8e71e6b5c..e8e71e6b5c 100644
--- a/patches/server/0432-Villager-resetOffers.patch
+++ b/patches/server/0429-Villager-resetOffers.patch
diff --git a/patches/server/0433-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0430-Retain-block-place-order-when-capturing-blockstates.patch
index 9de684873f..9de684873f 100644
--- a/patches/server/0433-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0430-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0434-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0431-Fix-item-locations-dropped-from-campfires.patch
index 65034de65e..65034de65e 100644
--- a/patches/server/0434-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0431-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0435-Fix-bell-block-entity-memory-leak.patch b/patches/server/0432-Fix-bell-block-entity-memory-leak.patch
index 5343b073cd..5343b073cd 100644
--- a/patches/server/0435-Fix-bell-block-entity-memory-leak.patch
+++ b/patches/server/0432-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0436-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0433-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 87d59f556c..87d59f556c 100644
--- a/patches/server/0436-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0433-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0437-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0434-Add-getOfflinePlayerIfCached-String.patch
index 7d32e46cbc..f776ebd805 100644
--- a/patches/server/0437-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0434-Add-getOfflinePlayerIfCached-String.patch
@@ -5,10 +5,10 @@ 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 52733657a1bc8529fa68faaa212ea9b78b094793..0a7eccd5d0bc6e2463f4e0f2fffad8f667d3e9a7 100644
+index d996a0d5d14448e49a8b6730425dd5b50abc1e72..f809efa0e9640f3ccd6233d8ed7864a23bbd0bba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1933,6 +1933,28 @@ public final class CraftServer implements Server {
+@@ -1928,6 +1928,28 @@ public final class CraftServer implements Server {
          return result;
      }
  
diff --git a/patches/server/0438-Add-ignore-discounts-API.patch b/patches/server/0435-Add-ignore-discounts-API.patch
index 2f9c40bb4c..2f9c40bb4c 100644
--- a/patches/server/0438-Add-ignore-discounts-API.patch
+++ b/patches/server/0435-Add-ignore-discounts-API.patch
diff --git a/patches/server/0439-Toggle-for-removing-existing-dragon.patch b/patches/server/0436-Toggle-for-removing-existing-dragon.patch
index 1bfa511969..1bfa511969 100644
--- a/patches/server/0439-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0436-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0440-Fix-client-lag-on-advancement-loading.patch b/patches/server/0437-Fix-client-lag-on-advancement-loading.patch
index a080a6665d..55f9d5cf55 100644
--- a/patches/server/0440-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0437-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 7c864d7d70accc7d52e2b198c30be7f6a2f4e813..336a245395f8802a1ed1d9e2f615effda85fc947 100644
+index 390e8ebbc3d96cd6eaaae616d4366bfe52d6d62e..d3723fa5f64d0c12867d57c44513db08f6eed599 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -336,7 +336,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0441-Item-no-age-no-player-pickup.patch b/patches/server/0438-Item-no-age-no-player-pickup.patch
index 1fffbaf558..1fffbaf558 100644
--- a/patches/server/0441-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0438-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0442-Beacon-API-custom-effect-ranges.patch b/patches/server/0439-Beacon-API-custom-effect-ranges.patch
index b8790eb9fa..b8790eb9fa 100644
--- a/patches/server/0442-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0439-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0443-Add-API-for-quit-reason.patch b/patches/server/0440-Add-API-for-quit-reason.patch
index 2bcaaecee6..8c4d9380d6 100644
--- a/patches/server/0443-Add-API-for-quit-reason.patch
+++ b/patches/server/0440-Add-API-for-quit-reason.patch
@@ -25,7 +25,7 @@ index 68d5be903a0d13e59c9e4bd6d85baaf0773547a0..fe89e8f509f3972ceb71c9aa6277524b
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          if (this.getSending() == PacketFlow.CLIENTBOUND) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4b07b5f7a92a7bfe74f157fd69ecd864df38c495..c4ba4b378aee28e7479207aff46c27307bd6b105 100644
+index 38e62a9251b0b0cceb0a350a649897f357293428..89aa23a4443311771775adc2e98cb78c4bb369a5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -291,6 +291,7 @@ public class ServerPlayer extends Player {
@@ -37,7 +37,7 @@ index 4b07b5f7a92a7bfe74f157fd69ecd864df38c495..c4ba4b378aee28e7479207aff46c2730
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index d7ddfabcbacb077c337c789083a24ad82e08e82e..2872bef40440b11a206c3ec88e2c6d95cd1a72e9 100644
+index a5dce1e83e63292054b21ec693ec3006e08d3ff2..661765a9fe1c2e49299262190501ee3b3294a2f1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -371,6 +371,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0444-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0441-Add-Wandering-Trader-spawn-rate-config-options.patch
index 98525387d7..98525387d7 100644
--- a/patches/server/0444-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0441-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0445-Expose-world-spawn-angle.patch b/patches/server/0442-Expose-world-spawn-angle.patch
index 8a6e41905d..8a6e41905d 100644
--- a/patches/server/0445-Expose-world-spawn-angle.patch
+++ b/patches/server/0442-Expose-world-spawn-angle.patch
diff --git a/patches/server/0446-Add-Destroy-Speed-API.patch b/patches/server/0443-Add-Destroy-Speed-API.patch
index 3d0806c67f..3073fd31e7 100644
--- a/patches/server/0446-Add-Destroy-Speed-API.patch
+++ b/patches/server/0443-Add-Destroy-Speed-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Destroy Speed API
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index 2303525542daa933a8de5978ac43d16223c6e5fd..3fe60f5ee38ecb704194a8c2dd6e40c5bb57d9cc 100644
+index 9953b6b36cbcbfd1756bac478b568ca5700fc898..21ad2f461a5a578a2bf7fec1deeb421071245e6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -721,4 +721,19 @@ public class CraftBlockData implements BlockData {
diff --git a/patches/server/0447-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0444-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 204e3a83dd..204e3a83dd 100644
--- a/patches/server/0447-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0444-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0448-Add-LivingEntity-clearActiveItem.patch b/patches/server/0445-Add-LivingEntity-clearActiveItem.patch
index 50382e523c..50382e523c 100644
--- a/patches/server/0448-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0445-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0449-Add-PlayerItemCooldownEvent.patch b/patches/server/0446-Add-PlayerItemCooldownEvent.patch
index 4b90903dd2..4b90903dd2 100644
--- a/patches/server/0449-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0446-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0450-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0447-Significantly-improve-performance-of-the-end-generat.patch
index ed3ee50bc9..ed3ee50bc9 100644
--- a/patches/server/0450-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0447-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0451-More-lightning-API.patch b/patches/server/0448-More-lightning-API.patch
index 967871902a..967871902a 100644
--- a/patches/server/0451-More-lightning-API.patch
+++ b/patches/server/0448-More-lightning-API.patch
diff --git a/patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0449-Climbing-should-not-bypass-cramming-gamerule.patch
index c2f72432f5..d5cd7c6469 100644
--- a/patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0449-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bbce55b02f848be720ad95cb5b896ff9ad1f66d0..717d596b2479a66861a83445ed87f40c7c0f69d8 100644
+index 81c9f06bdba9eb51c9ee3d1d969f8d8e6302a70f..3bc4b964d49d7de789506a482de9eb700051a2b8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2011,6 +2011,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -44,7 +44,7 @@ index ee4495b67c46cf1282cdd6ad15b224b0b7b10bfb..e382a29b441b656f35bc24cb90f95cb4
              } 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 81838056cacb9f2fd2d3c05b125461ac3013e82b..636bef0624f71dea27cbab261c3072fdf73fbf4b 100644
+index 4bf48ce1824e404906a551ceec720c8e485adb44..48f772bcbc207c07aef9d28011ff935b58f8c381 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3540,7 +3540,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -116,7 +116,7 @@ index bff2627aa0c2cc48020e65c71a5862ab6e995f99..d53ef42e64d87790ea86d806153f0470
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index bf717b5bcd14291a99414eae5366c0b91ce68a68..b1b0b0554e0ad035463fd53aa440d9c079b7cfb4 100644
+index e1f6853c450a2e6a0d7607f1faec7bc5c82d9621..767f076c6fad7a1146bc409bf47f1d2fc3caf3ce 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -350,7 +350,7 @@ public class ArmorStand extends LivingEntity {
diff --git a/patches/server/0453-Add-missing-default-perms-for-commands.patch b/patches/server/0450-Add-missing-default-perms-for-commands.patch
index d49628ee32..d49628ee32 100644
--- a/patches/server/0453-Add-missing-default-perms-for-commands.patch
+++ b/patches/server/0450-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0454-Add-PlayerShearBlockEvent.patch b/patches/server/0451-Add-PlayerShearBlockEvent.patch
index e212c2217b..e212c2217b 100644
--- a/patches/server/0454-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0451-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0455-Limit-recipe-packets.patch b/patches/server/0452-Limit-recipe-packets.patch
index ff56a355b5..ff56a355b5 100644
--- a/patches/server/0455-Limit-recipe-packets.patch
+++ b/patches/server/0452-Limit-recipe-packets.patch
diff --git a/patches/server/0456-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0453-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0456-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0453-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0457-Player-Chunk-Load-Unload-Events.patch b/patches/server/0454-Player-Chunk-Load-Unload-Events.patch
index bd58a9a7ec..bd58a9a7ec 100644
--- a/patches/server/0457-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0454-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0458-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0455-Optimize-Dynamic-get-Missing-Keys.patch
index e8bbac8b76..e8bbac8b76 100644
--- a/patches/server/0458-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0455-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0459-Expose-LivingEntity-hurt-direction.patch b/patches/server/0456-Expose-LivingEntity-hurt-direction.patch
index 35d1e83e02..35d1e83e02 100644
--- a/patches/server/0459-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0456-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0460-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0457-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index ca3ce280b4..d6bcac37e8 100644
--- a/patches/server/0460-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0457-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 f0e1bb3d9e4254d2c32f28fb715ea429c7646cec..253563371aa05954c19607b98675e37450e772ef 100644
+index 737fbe02c630da0a95dbed49ff152fb5c7ec4d37..e55dafab2f986e445d9499cecd346bc96673bc9c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -302,6 +302,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0461-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0458-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
index 762023bb09..762023bb09 100644
--- a/patches/server/0461-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
+++ b/patches/server/0458-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0462-Add-TargetHitEvent.patch b/patches/server/0459-Add-TargetHitEvent.patch
index 816c525fd2..816c525fd2 100644
--- a/patches/server/0462-Add-TargetHitEvent.patch
+++ b/patches/server/0459-Add-TargetHitEvent.patch
diff --git a/patches/server/0463-MC-4-Fix-item-position-desync.patch b/patches/server/0460-MC-4-Fix-item-position-desync.patch
index 56d177e95e..c30714f374 100644
--- a/patches/server/0463-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0460-MC-4-Fix-item-position-desync.patch
@@ -28,7 +28,7 @@ index ffec3deb9bcd31d51974c1deda2e76bc8374e5c5..a3d247c93ac1a2d872ff0e3841efc3d7
  
      public Vec3 decode(long x, long y, long z) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 717d596b2479a66861a83445ed87f40c7c0f69d8..31911870e5056391d67c49fa68d59010534bf35f 100644
+index 3bc4b964d49d7de789506a482de9eb700051a2b8..67dd20b6fae2ee39eaae3286eba7b485a6dd41cc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4212,6 +4212,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0464-Additional-Block-Material-API.patch b/patches/server/0461-Additional-Block-Material-API.patch
index 81728edf48..81728edf48 100644
--- a/patches/server/0464-Additional-Block-Material-API.patch
+++ b/patches/server/0461-Additional-Block-Material-API.patch
diff --git a/patches/server/0465-Fix-harming-potion-dupe.patch b/patches/server/0462-Fix-harming-potion-dupe.patch
index 8fdd027d4f..8fdd027d4f 100644
--- a/patches/server/0465-Fix-harming-potion-dupe.patch
+++ b/patches/server/0462-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0466-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0463-API-to-get-Material-from-Boats-and-Minecarts.patch
index 9bcb17ad14..9bcb17ad14 100644
--- a/patches/server/0466-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/server/0463-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0467-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0464-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index da8441444c..da8441444c 100644
--- a/patches/server/0467-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0464-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0468-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0465-Fix-Not-a-string-Map-Conversion-spam.patch
index 00f5d0e877..00f5d0e877 100644
--- a/patches/server/0468-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0465-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0469-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0466-Add-PlayerFlowerPotManipulateEvent.patch
index 8b61833059..8b61833059 100644
--- a/patches/server/0469-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0466-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0470-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0467-Fix-interact-event-not-being-called-sometimes.patch
index 7781f60252..96d7a637db 100644
--- a/patches/server/0470-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0467-Fix-interact-event-not-being-called-sometimes.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes
 Co-authored-by: Moulberry <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7ea22e99de646f439ae738354c1336b11a4c542f..1d71aa9237ee17b009568f6d67f900ffe64ff301 100644
+index 35c8aa3971de05be66acd49b6a0b76cba59f93ac..362bd15dc359762095bdc5120a25460227a0175e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1759,7 +1759,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0471-Zombie-API-breaking-doors.patch b/patches/server/0468-Zombie-API-breaking-doors.patch
index 50bb6965cf..50bb6965cf 100644
--- a/patches/server/0471-Zombie-API-breaking-doors.patch
+++ b/patches/server/0468-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0472-Fix-nerfed-slime-when-splitting.patch b/patches/server/0469-Fix-nerfed-slime-when-splitting.patch
index 2ebdf09288..2ebdf09288 100644
--- a/patches/server/0472-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0469-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0473-Add-EntityLoadCrossbowEvent.patch b/patches/server/0470-Add-EntityLoadCrossbowEvent.patch
index 3c63e2be5a..3c63e2be5a 100644
--- a/patches/server/0473-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0470-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0474-Add-WorldGameRuleChangeEvent.patch b/patches/server/0471-Add-WorldGameRuleChangeEvent.patch
index 547e9cb24d..547e9cb24d 100644
--- a/patches/server/0474-Add-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0471-Add-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0475-Add-ServerResourcesReloadedEvent.patch b/patches/server/0472-Add-ServerResourcesReloadedEvent.patch
index 05289f3429..b7df3b9934 100644
--- a/patches/server/0475-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0472-Add-ServerResourcesReloadedEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a3e5b5075ff8097479689bf5cff66cdf93014128..7a12028ab83cb6162a7f5d7e22c52af0853b79ee 100644
+index 58a208501fc8e23b0bfe977e4b4964ac8e3c238f..d86f01599b02626c72ad0b8da0b6b9d741f8c894 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2097,7 +2097,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2094,7 +2094,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return this.functionManager;
      }
  
@@ -22,7 +22,7 @@ index a3e5b5075ff8097479689bf5cff66cdf93014128..7a12028ab83cb6162a7f5d7e22c52af0
          CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
              Stream<String> stream = dataPacks.stream(); // CraftBukkit - decompile error
              PackRepository resourcepackrepository = this.packRepository;
-@@ -2129,6 +2135,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2126,6 +2132,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
              this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
              org.bukkit.craftbukkit.block.data.CraftBlockData.reloadCache(); // Paper - cache block data strings; they can be defined by datapacks so refresh it here
diff --git a/patches/server/0476-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0473-Add-world-settings-for-mobs-picking-up-loot.patch
index d75813f3ee..d75813f3ee 100644
--- a/patches/server/0476-Add-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0473-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0477-Add-BlockFailedDispenseEvent.patch b/patches/server/0474-Add-BlockFailedDispenseEvent.patch
index b1c5648ed3..b1c5648ed3 100644
--- a/patches/server/0477-Add-BlockFailedDispenseEvent.patch
+++ b/patches/server/0474-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0478-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0475-Add-PlayerLecternPageChangeEvent.patch
index 2e62d2becf..2e62d2becf 100644
--- a/patches/server/0478-Add-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0475-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0479-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0476-Add-PlayerLoomPatternSelectEvent.patch
index 4d74c20681..4d74c20681 100644
--- a/patches/server/0479-Add-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0476-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0480-Configurable-door-breaking-difficulty.patch b/patches/server/0477-Configurable-door-breaking-difficulty.patch
index 9fdaf01170..9fdaf01170 100644
--- a/patches/server/0480-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0477-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0481-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0478-Empty-commands-shall-not-be-dispatched.patch
index 947eb79c2e..947eb79c2e 100644
--- a/patches/server/0481-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0478-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0482-Remove-stale-POIs.patch b/patches/server/0479-Remove-stale-POIs.patch
index fece7e3371..fece7e3371 100644
--- a/patches/server/0482-Remove-stale-POIs.patch
+++ b/patches/server/0479-Remove-stale-POIs.patch
diff --git a/patches/server/0483-Fix-villager-boat-exploit.patch b/patches/server/0480-Fix-villager-boat-exploit.patch
index 91f979915f..91f979915f 100644
--- a/patches/server/0483-Fix-villager-boat-exploit.patch
+++ b/patches/server/0480-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0484-Add-sendOpLevel-API.patch b/patches/server/0481-Add-sendOpLevel-API.patch
index fd90e10a99..6b79d31046 100644
--- a/patches/server/0484-Add-sendOpLevel-API.patch
+++ b/patches/server/0481-Add-sendOpLevel-API.patch
@@ -32,7 +32,7 @@ index 505af87eaf8209437978848be1dde86f879f82f2..d5071f9f2d433706fc378f77906bb5f0
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5550586022538be993a7b1d9f3d33c6785df73b5..36aaf37154c01c7a8f8543149e6bedec1386f5e7 100644
+index d04cf4eb55cf652d7ac7ae80b417b8cb592e75b7..58f47db6ed35e5e94cc7eae4c83bf65a589699db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -675,6 +675,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0485-Add-RegistryAccess-for-managing-Registries.patch b/patches/server/0482-Add-RegistryAccess-for-managing-Registries.patch
index a55a86910d..fab1edef16 100644
--- a/patches/server/0485-Add-RegistryAccess-for-managing-Registries.patch
+++ b/patches/server/0482-Add-RegistryAccess-for-managing-Registries.patch
@@ -789,10 +789,10 @@ index 7c1304b42c6692cf66613fb2cf851b9df17f21e5..0b19ddf411933240f3cdc6b4e9ce3817
      @Override
      public B get(NamespacedKey namespacedKey) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a25fd6ad9438bd80a9acc21d694d9e9129f4a897..85bad6c85c1662a0693765e235d3b5736cb3a553 100644
+index f809efa0e9640f3ccd6233d8ed7864a23bbd0bba..1f4efb4ee9454b3115607f4e1f05d0b03f20c882 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -284,7 +284,7 @@ public final class CraftServer implements Server {
+@@ -279,7 +279,7 @@ public final class CraftServer implements Server {
      protected final DedicatedServer console;
      protected final DedicatedPlayerList playerList;
      private final Map<String, World> worlds = new LinkedHashMap<String, World>();
@@ -801,7 +801,7 @@ index a25fd6ad9438bd80a9acc21d694d9e9129f4a897..85bad6c85c1662a0693765e235d3b573
      private YamlConfiguration configuration;
      private YamlConfiguration commandsConfiguration;
      private final Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
-@@ -2694,7 +2694,7 @@ public final class CraftServer implements Server {
+@@ -2689,7 +2689,7 @@ public final class CraftServer implements Server {
  
      @Override
      public <T extends Keyed> Registry<T> getRegistry(Class<T> aClass) {
diff --git a/patches/server/0486-Add-StructuresLocateEvent.patch b/patches/server/0483-Add-StructuresLocateEvent.patch
index 82cdf051db..82cdf051db 100644
--- a/patches/server/0486-Add-StructuresLocateEvent.patch
+++ b/patches/server/0483-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0487-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0484-Collision-option-for-requiring-a-player-participant.patch
index 8d8ebfc1f4..0f66837ab0 100644
--- a/patches/server/0487-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0484-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/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 31911870e5056391d67c49fa68d59010534bf35f..04581cd90272775208a0192ef36f9c7458ad3a0c 100644
+index 67dd20b6fae2ee39eaae3286eba7b485a6dd41cc..eb5cc58e5b53407de5d2a0ddcbbfbc7cdd3bb072 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1872,6 +1872,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0488-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0485-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index bb6de57d99..bb6de57d99 100644
--- a/patches/server/0488-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0485-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0489-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0486-Return-chat-component-with-empty-text-instead-of-thr.patch
index 4dea2ddeed..4dea2ddeed 100644
--- a/patches/server/0489-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0486-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0490-Make-schedule-command-per-world.patch b/patches/server/0487-Make-schedule-command-per-world.patch
index 2d8f63ad1e..2d8f63ad1e 100644
--- a/patches/server/0490-Make-schedule-command-per-world.patch
+++ b/patches/server/0487-Make-schedule-command-per-world.patch
diff --git a/patches/server/0491-Configurable-max-leash-distance.patch b/patches/server/0488-Configurable-max-leash-distance.patch
index e228b633f0..e228b633f0 100644
--- a/patches/server/0491-Configurable-max-leash-distance.patch
+++ b/patches/server/0488-Configurable-max-leash-distance.patch
diff --git a/patches/server/0492-Add-BlockPreDispenseEvent.patch b/patches/server/0489-Add-BlockPreDispenseEvent.patch
index 3157a918d0..3157a918d0 100644
--- a/patches/server/0492-Add-BlockPreDispenseEvent.patch
+++ b/patches/server/0489-Add-BlockPreDispenseEvent.patch
diff --git a/patches/server/0493-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0490-Add-PlayerChangeBeaconEffectEvent.patch
index b3444419ee..b3444419ee 100644
--- a/patches/server/0493-Add-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0490-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0494-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0491-Add-toggle-for-always-placing-the-dragon-egg.patch
index 2576990e24..2576990e24 100644
--- a/patches/server/0494-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0491-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0495-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0492-Add-PlayerStonecutterRecipeSelectEvent.patch
index 6aad83c0bc..6aad83c0bc 100644
--- a/patches/server/0495-Add-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0492-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0496-Expand-EntityUnleashEvent.patch b/patches/server/0493-Expand-EntityUnleashEvent.patch
index 1a84331347..1a84331347 100644
--- a/patches/server/0496-Expand-EntityUnleashEvent.patch
+++ b/patches/server/0493-Expand-EntityUnleashEvent.patch
diff --git a/patches/server/0497-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0494-Reset-shield-blocking-on-dimension-change.patch
index c33708022d..5125656c21 100644
--- a/patches/server/0497-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0494-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 c4ba4b378aee28e7479207aff46c27307bd6b105..7eab41ac49707a52adcfd6fb3c3d70cff3a4ad1b 100644
+index 89aa23a4443311771775adc2e98cb78c4bb369a5..f920c134716620c69d31a88e2ad0ee1e7e2431b0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1275,6 +1275,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0498-Add-DragonEggFormEvent.patch b/patches/server/0495-Add-DragonEggFormEvent.patch
index c9ec752038..c9ec752038 100644
--- a/patches/server/0498-Add-DragonEggFormEvent.patch
+++ b/patches/server/0495-Add-DragonEggFormEvent.patch
diff --git a/patches/server/0499-Add-EntityMoveEvent.patch b/patches/server/0496-Add-EntityMoveEvent.patch
index 5f87e7e8ec..d88e5489cc 100644
--- a/patches/server/0499-Add-EntityMoveEvent.patch
+++ b/patches/server/0496-Add-EntityMoveEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7a12028ab83cb6162a7f5d7e22c52af0853b79ee..784bcb1a504482bafcccfe57f72186e5322253ae 100644
+index d86f01599b02626c72ad0b8da0b6b9d741f8c894..a9851d2c6d89e30f40da35586ac3dddfa72ba421 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1583,6 +1583,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1580,6 +1580,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
@@ -29,7 +29,7 @@ index a9a39c99874001f1024f71bfc97130e8c9a507e7..19333b61bcb50f2171ac2c75d7f4ca4f
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 636bef0624f71dea27cbab261c3072fdf73fbf4b..df0286a972dfa4e3b4c1898f8936062aaf3cdde6 100644
+index 48f772bcbc207c07aef9d28011ff935b58f8c381..f523514e65039b0683617653625c2c33559d9874 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3477,6 +3477,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0500-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0497-added-option-to-disable-pathfinding-updates-on-block.patch
index 1af4840387..1af4840387 100644
--- a/patches/server/0500-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0497-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0501-Inline-shift-direction-fields.patch b/patches/server/0498-Inline-shift-direction-fields.patch
index 910b881e3a..910b881e3a 100644
--- a/patches/server/0501-Inline-shift-direction-fields.patch
+++ b/patches/server/0498-Inline-shift-direction-fields.patch
diff --git a/patches/server/0502-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0499-Allow-adding-items-to-BlockDropItemEvent.patch
index ea45c33555..1a444afd42 100644
--- a/patches/server/0502-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0499-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 dadb4f13ec6b9915108603aa34d4112c47337c44..ea9a12ff01203072975bb2f22a077d1d2e46376f 100644
+index 0c2e8921d1048cb138a48215853c04c5d73f3514..dbb7b8e93c1773058c78de71a3e6e3559eb0a46b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -451,13 +451,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0503-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0500-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 57d54a0434..57d54a0434 100644
--- a/patches/server/0503-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0500-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0504-living-entity-allow-attribute-registration.patch b/patches/server/0501-living-entity-allow-attribute-registration.patch
index fc60a15040..fc60a15040 100644
--- a/patches/server/0504-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0501-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0505-fix-dead-slime-setSize-invincibility.patch b/patches/server/0502-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0505-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0502-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0506-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0503-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0506-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0503-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0507-Expose-Tracked-Players.patch b/patches/server/0504-Expose-Tracked-Players.patch
index b15fc67f75..b15fc67f75 100644
--- a/patches/server/0507-Expose-Tracked-Players.patch
+++ b/patches/server/0504-Expose-Tracked-Players.patch
diff --git a/patches/server/0508-Improve-ServerGUI.patch b/patches/server/0505-Improve-ServerGUI.patch
index 872206f5fe..872206f5fe 100644
--- a/patches/server/0508-Improve-ServerGUI.patch
+++ b/patches/server/0505-Improve-ServerGUI.patch
diff --git a/patches/server/0509-fix-converting-txt-to-json-file.patch b/patches/server/0506-fix-converting-txt-to-json-file.patch
index ad83e310fc..ad83e310fc 100644
--- a/patches/server/0509-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0506-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0510-Add-worldborder-events.patch b/patches/server/0507-Add-worldborder-events.patch
index 2ab55e30ef..2ab55e30ef 100644
--- a/patches/server/0510-Add-worldborder-events.patch
+++ b/patches/server/0507-Add-worldborder-events.patch
diff --git a/patches/server/0511-Add-PlayerNameEntityEvent.patch b/patches/server/0508-Add-PlayerNameEntityEvent.patch
index 9287edc1b7..9287edc1b7 100644
--- a/patches/server/0511-Add-PlayerNameEntityEvent.patch
+++ b/patches/server/0508-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0512-Add-recipe-to-cook-events.patch b/patches/server/0509-Add-recipe-to-cook-events.patch
index 05bf67ef6c..05bf67ef6c 100644
--- a/patches/server/0512-Add-recipe-to-cook-events.patch
+++ b/patches/server/0509-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0513-Add-Block-isValidTool.patch b/patches/server/0510-Add-Block-isValidTool.patch
index 5f36fb047c..5f36fb047c 100644
--- a/patches/server/0513-Add-Block-isValidTool.patch
+++ b/patches/server/0510-Add-Block-isValidTool.patch
diff --git a/patches/server/0514-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0511-Allow-using-signs-inside-spawn-protection.patch
index fba8a91080..560f3be3dd 100644
--- a/patches/server/0514-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0511-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1d71aa9237ee17b009568f6d67f900ffe64ff301..e385bad877dd7ab529e67a7dced5b53a0f55d795 100644
+index 362bd15dc359762095bdc5120a25460227a0175e..55c311ddc8add7d5838d112bc3a71baeb52356a8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1747,8 +1747,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0515-Expand-world-key-API.patch b/patches/server/0512-Expand-world-key-API.patch
index 4822c7f48e..616d224ea3 100644
--- a/patches/server/0515-Expand-world-key-API.patch
+++ b/patches/server/0512-Expand-world-key-API.patch
@@ -20,10 +20,10 @@ index 9801f78f1d44fd5a72fbdb319681b683e8fb85c4..1e720b96f0367652db6924b8654deaa9
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ab9c9f62da229faadddd68560db41d9f5e46689d..31602e41b9c5370f583cc8a22f15a4e999b58830 100644
+index 1f4efb4ee9454b3115607f4e1f05d0b03f20c882..1f6218e580a2a0138d128940a709147c20354b39 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1150,9 +1150,15 @@ public final class CraftServer implements Server {
+@@ -1145,9 +1145,15 @@ public final class CraftServer implements Server {
          File folder = new File(this.getWorldContainer(), name);
          World world = this.getWorld(name);
  
@@ -41,7 +41,7 @@ index ab9c9f62da229faadddd68560db41d9f5e46689d..31602e41b9c5370f583cc8a22f15a4e9
  
          if (folder.exists()) {
              Preconditions.checkArgument(folder.isDirectory(), "File (%s) exists and isn't a folder", name);
-@@ -1278,7 +1284,7 @@ public final class CraftServer implements Server {
+@@ -1273,7 +1279,7 @@ public final class CraftServer implements Server {
          } else if (name.equals(levelName + "_the_end")) {
              worldKey = net.minecraft.world.level.Level.END;
          } else {
@@ -50,7 +50,7 @@ index ab9c9f62da229faadddd68560db41d9f5e46689d..31602e41b9c5370f583cc8a22f15a4e9
          }
  
          // If set to not keep spawn in memory (changed from default) then adjust rule accordingly
-@@ -1374,6 +1380,15 @@ public final class CraftServer implements Server {
+@@ -1369,6 +1375,15 @@ public final class CraftServer implements Server {
          return null;
      }
  
@@ -67,7 +67,7 @@ index ab9c9f62da229faadddd68560db41d9f5e46689d..31602e41b9c5370f583cc8a22f15a4e9
          // Check if a World already exists with the UID.
          if (this.getWorld(world.getUID()) != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 336a245395f8802a1ed1d9e2f615effda85fc947..dc9742e553632cdc760ba1b392f60643a025a922 100644
+index d3723fa5f64d0c12867d57c44513db08f6eed599..7e8bd8204dcdc64897464331c99eae25b127d30c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -540,6 +540,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0516-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0513-Add-fast-alternative-constructor-for-Rotations.patch
index e28775fc9a..e28775fc9a 100644
--- a/patches/server/0516-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0513-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0517-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0514-Drop-carried-item-when-player-has-disconnected.patch
index 4683817946..4683817946 100644
--- a/patches/server/0517-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0514-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0518-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0515-forced-whitelist-use-configurable-kick-message.patch
index 484e77b357..9e79f88fe6 100644
--- a/patches/server/0518-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0515-forced-whitelist-use-configurable-kick-message.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 784bcb1a504482bafcccfe57f72186e5322253ae..e31b5775b00148b6e8ac9545e589a87987a8b377 100644
+index a9851d2c6d89e30f40da35586ac3dddfa72ba421..7353beeea3f1e02d62a4d2456124edcf723371f3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2269,7 +2269,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2266,7 +2266,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  ServerPlayer entityplayer = (ServerPlayer) iterator.next();
  
                  if (!whitelist.isWhiteListed(entityplayer.getGameProfile()) && !this.getPlayerList().isOp(entityplayer.getGameProfile())) { // Paper - Fix kicking ops when whitelist is reloaded (MC-171420)
diff --git a/patches/server/0519-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0516-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 71bc52ad49..16d596879b 100644
--- a/patches/server/0519-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0516-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 e385bad877dd7ab529e67a7dced5b53a0f55d795..8eef1b90b124d366970be0e90ff6c81581aaed29 100644
+index 55c311ddc8add7d5838d112bc3a71baeb52356a8..cf53e6270ef3cdd3baa251e813eeb3526919bbcc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1152,7 +1152,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0520-Expose-protocol-version.patch b/patches/server/0517-Expose-protocol-version.patch
index 3b666949c8..e9d7b980a1 100644
--- a/patches/server/0520-Expose-protocol-version.patch
+++ b/patches/server/0517-Expose-protocol-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index dc9742e553632cdc760ba1b392f60643a025a922..12446063a6c0f6c6f15a6a6500e76a99f5214001 100644
+index 7e8bd8204dcdc64897464331c99eae25b127d30c..28f8a85c35c9c160bb223b8cd4245949b259dd5c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -545,6 +545,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0521-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0518-Enhance-console-tab-completions-for-brigadier-comman.patch
index 8e6ac6e4c9..8e6ac6e4c9 100644
--- a/patches/server/0521-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0518-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0522-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0519-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 8ee954570b..45451d4dfb 100644
--- a/patches/server/0522-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0519-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 df0286a972dfa4e3b4c1898f8936062aaf3cdde6..541debdee83cbef985aafa0c3cb344a5bee18625 100644
+index f523514e65039b0683617653625c2c33559d9874..3f375ec80357c3727092ce016d2697d17281976f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3971,6 +3971,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0523-Add-bypass-host-check.patch b/patches/server/0520-Add-bypass-host-check.patch
index d6c893d808..d6c893d808 100644
--- a/patches/server/0523-Add-bypass-host-check.patch
+++ b/patches/server/0520-Add-bypass-host-check.patch
diff --git a/patches/server/0524-Set-area-affect-cloud-rotation.patch b/patches/server/0521-Set-area-affect-cloud-rotation.patch
index e78e14e0a0..e78e14e0a0 100644
--- a/patches/server/0524-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0521-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0525-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0522-add-isDeeplySleeping-to-HumanEntity.patch
index 26e38b4777..26e38b4777 100644
--- a/patches/server/0525-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0522-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0526-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0523-add-consumeFuel-to-FurnaceBurnEvent.patch
index 2f79b2a47f..2f79b2a47f 100644
--- a/patches/server/0526-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0523-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0527-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0524-add-get-set-drop-chance-to-EntityEquipment.patch
index fd7cafa884..fd7cafa884 100644
--- a/patches/server/0527-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0524-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0528-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0525-fix-PigZombieAngerEvent-cancellation.patch
index ad3619023e..ad3619023e 100644
--- a/patches/server/0528-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0525-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0529-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0526-fix-PlayerItemHeldEvent-firing-twice.patch
index 6506af4c0c..ea56241b84 100644
--- a/patches/server/0529-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0526-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 8eef1b90b124d366970be0e90ff6c81581aaed29..58853de5fda01114ddc7196c632d4daf5b59b6ce 100644
+index cf53e6270ef3cdd3baa251e813eeb3526919bbcc..22da7f7c4b033d31b7a71878e34562a4370a4bd4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1917,6 +1917,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0530-Add-PlayerDeepSleepEvent.patch b/patches/server/0527-Add-PlayerDeepSleepEvent.patch
index b9ed97ec97..b9ed97ec97 100644
--- a/patches/server/0530-Add-PlayerDeepSleepEvent.patch
+++ b/patches/server/0527-Add-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0531-More-World-API.patch b/patches/server/0528-More-World-API.patch
index 0e444d651b..0e444d651b 100644
--- a/patches/server/0531-More-World-API.patch
+++ b/patches/server/0528-More-World-API.patch
diff --git a/patches/server/0532-Add-PlayerBedFailEnterEvent.patch b/patches/server/0529-Add-PlayerBedFailEnterEvent.patch
index df053f1523..feffef2aec 100644
--- a/patches/server/0532-Add-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0529-Add-PlayerBedFailEnterEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerBedFailEnterEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index 28689e333bb2ddb3c22e793b5c3d379233034840..c353643a9c9b400d351ef49e1b7d4f516ed0b0eb 100644
+index 4eb1a77e2a85a242dd5342a500763d87dbe7655e..18b9a62613c08eb5bf63ae26565b0e91e1f44d39 100644
 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
 @@ -118,14 +118,23 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
diff --git a/patches/server/0533-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0530-Implement-methods-to-convert-between-Component-and-B.patch
index fc7d02c151..fc7d02c151 100644
--- a/patches/server/0533-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0530-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0534-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0531-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index 26cdea3136..26cdea3136 100644
--- a/patches/server/0534-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
+++ b/patches/server/0531-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
diff --git a/patches/server/0535-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0532-Introduce-beacon-activation-deactivation-events.patch
index ba8abff209..ba8abff209 100644
--- a/patches/server/0535-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0532-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0536-Add-Channel-initialization-listeners.patch b/patches/server/0533-Add-Channel-initialization-listeners.patch
index 8b6d7c3c06..8b6d7c3c06 100644
--- a/patches/server/0536-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0533-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0537-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0534-Send-empty-commands-if-tab-completion-is-disabled.patch
index 3c45c05c10..3c45c05c10 100644
--- a/patches/server/0537-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0534-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0538-Add-more-WanderingTrader-API.patch b/patches/server/0535-Add-more-WanderingTrader-API.patch
index 07cdb98c54..07cdb98c54 100644
--- a/patches/server/0538-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0535-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0539-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0536-Add-EntityBlockStorage-clearEntities.patch
index e52d1c5e1c..e52d1c5e1c 100644
--- a/patches/server/0539-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0536-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0540-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0537-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 839c465c9c..839c465c9c 100644
--- a/patches/server/0540-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0537-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0541-Add-HiddenPotionEffect-API.patch b/patches/server/0538-Add-HiddenPotionEffect-API.patch
index 2d0b0d5b03..2d0b0d5b03 100644
--- a/patches/server/0541-Add-HiddenPotionEffect-API.patch
+++ b/patches/server/0538-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0542-Inventory-close.patch b/patches/server/0539-Inventory-close.patch
index 9ca8b717ab..9ca8b717ab 100644
--- a/patches/server/0542-Inventory-close.patch
+++ b/patches/server/0539-Inventory-close.patch
diff --git a/patches/server/0543-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0540-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 950600a9e0..950600a9e0 100644
--- a/patches/server/0543-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0540-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0544-Add-basic-Datapack-API.patch b/patches/server/0541-Add-basic-Datapack-API.patch
index 72a73c2861..5fe4cec9d3 100644
--- a/patches/server/0544-Add-basic-Datapack-API.patch
+++ b/patches/server/0541-Add-basic-Datapack-API.patch
@@ -92,10 +92,10 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 31602e41b9c5370f583cc8a22f15a4e999b58830..fb6f176e37583443c4f67121a46a52b17b7d625a 100644
+index 1f6218e580a2a0138d128940a709147c20354b39..c4e63ba96a54fb9e1353510f77d848bed3656405 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -306,6 +306,7 @@ public final class CraftServer implements Server {
+@@ -301,6 +301,7 @@ public final class CraftServer implements Server {
      public boolean ignoreVanillaPermissions = false;
      private final List<CraftPlayer> playerView;
      public int reloadCount;
@@ -103,7 +103,7 @@ index 31602e41b9c5370f583cc8a22f15a4e999b58830..fb6f176e37583443c4f67121a46a52b1
      public static Exception excessiveVelEx; // Paper - Velocity warnings
  
      static {
-@@ -388,6 +389,7 @@ public final class CraftServer implements Server {
+@@ -383,6 +384,7 @@ public final class CraftServer implements Server {
          if (this.configuration.getBoolean("settings.use-map-color-cache")) {
              MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
          }
@@ -111,7 +111,7 @@ index 31602e41b9c5370f583cc8a22f15a4e999b58830..fb6f176e37583443c4f67121a46a52b1
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -2976,5 +2978,11 @@ public final class CraftServer implements Server {
+@@ -2971,5 +2973,11 @@ public final class CraftServer implements Server {
      public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
          return mobGoals;
      }
diff --git a/patches/server/0545-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0542-Add-environment-variable-to-disable-server-gui.patch
index e4de8ec477..e4de8ec477 100644
--- a/patches/server/0545-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0542-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0546-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0543-Expand-PlayerGameModeChangeEvent.patch
index e4dd475a9f..e4dd475a9f 100644
--- a/patches/server/0546-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0543-Expand-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0547-ItemStack-repair-check-API.patch b/patches/server/0544-ItemStack-repair-check-API.patch
index bbd81a3f7b..395fa0fb11 100644
--- a/patches/server/0547-ItemStack-repair-check-API.patch
+++ b/patches/server/0544-ItemStack-repair-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 12446063a6c0f6c6f15a6a6500e76a99f5214001..df929851d75c9aafc4027a1b57732b660703561f 100644
+index 28f8a85c35c9c160bb223b8cd4245949b259dd5c..952a8147947fa0e2a960628fc760212d3d206ce6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -550,6 +550,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0548-More-Enchantment-API.patch b/patches/server/0545-More-Enchantment-API.patch
index 414f40fdb0..414f40fdb0 100644
--- a/patches/server/0548-More-Enchantment-API.patch
+++ b/patches/server/0545-More-Enchantment-API.patch
diff --git a/patches/server/0549-Move-range-check-for-block-placing-up.patch b/patches/server/0546-Move-range-check-for-block-placing-up.patch
index ecccee748f..44913b8c49 100644
--- a/patches/server/0549-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0546-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 3a6769fec9bae32209d2b126a10d99fd1b8dd4b7..a2a4f30ed2a524fc8b86e0ffbc9d6aa49e557e44 100644
+index 4a5553335cd6bbad8d3a05694710d95c96f62b9d..a04c7677ded862890e6e809db610817b4cfff56a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1734,6 +1734,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0550-Add-Mob-lookAt-API.patch b/patches/server/0547-Add-Mob-lookAt-API.patch
index 3139490a61..3139490a61 100644
--- a/patches/server/0550-Add-Mob-lookAt-API.patch
+++ b/patches/server/0547-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0551-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0548-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
index faa6d5c514..faa6d5c514 100644
--- a/patches/server/0551-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/server/0548-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0552-Add-Unix-domain-socket-support.patch b/patches/server/0549-Add-Unix-domain-socket-support.patch
index 054790699a..054790699a 100644
--- a/patches/server/0552-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0549-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0553-Add-EntityInsideBlockEvent.patch b/patches/server/0550-Add-EntityInsideBlockEvent.patch
index 26d32bc8bf..26d32bc8bf 100644
--- a/patches/server/0553-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0550-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0554-Fix-item-default-attributes-API.patch b/patches/server/0551-Fix-item-default-attributes-API.patch
index 88ba63397d..7bc3c4f579 100644
--- a/patches/server/0554-Fix-item-default-attributes-API.patch
+++ b/patches/server/0551-Fix-item-default-attributes-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix item default attributes API
 (previously added this API but upstream also added it)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index df929851d75c9aafc4027a1b57732b660703561f..0a6f78b5e08fffc782b51f19f42a53cad9287334 100644
+index 952a8147947fa0e2a960628fc760212d3d206ce6..27acc1965e16d697fa98f64cf64ecc6ecd775e86 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -399,9 +399,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0555-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0552-Add-cause-to-Weather-ThunderChangeEvents.patch
index d1e76737e3..d1900e480d 100644
--- a/patches/server/0555-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0552-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 714968021716fa7cee9ba0b47204d126fb8272fb..d4e73445f680a283cda9a1e4b823efcd389a84ed 100644
+index 3816b445279fcd562acc06f08b8cd04bffa49592..3e935df2de58bd57b061c33b00f9d2ea4134ca80 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -440,8 +440,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0556-More-Lidded-Block-API.patch b/patches/server/0553-More-Lidded-Block-API.patch
index 7e52e36425..7e52e36425 100644
--- a/patches/server/0556-More-Lidded-Block-API.patch
+++ b/patches/server/0553-More-Lidded-Block-API.patch
diff --git a/patches/server/0557-Limit-item-frame-cursors-on-maps.patch b/patches/server/0554-Limit-item-frame-cursors-on-maps.patch
index 6072cb5269..6072cb5269 100644
--- a/patches/server/0557-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0554-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0558-Add-PlayerKickEvent-causes.patch b/patches/server/0555-Add-PlayerKickEvent-causes.patch
index 4b24ab2ce3..bdba1e0e95 100644
--- a/patches/server/0558-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0555-Add-PlayerKickEvent-causes.patch
@@ -43,10 +43,10 @@ index dbcf183483766f39334d7f7e8336033906625f3f..300929a406905f5ff1ede664d5b99fb0
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e31b5775b00148b6e8ac9545e589a87987a8b377..718a455aa70999a339cccc51d6fc4bb689c2c27b 100644
+index 7353beeea3f1e02d62a4d2456124edcf723371f3..2986dc458ddbd642669c6c2c104df2a2446e5b11 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2269,7 +2269,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2266,7 +2266,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  ServerPlayer entityplayer = (ServerPlayer) iterator.next();
  
                  if (!whitelist.isWhiteListed(entityplayer.getGameProfile()) && !this.getPlayerList().isOp(entityplayer.getGameProfile())) { // Paper - Fix kicking ops when whitelist is reloaded (MC-171420)
diff --git a/patches/server/0559-Add-PufferFishStateChangeEvent.patch b/patches/server/0556-Add-PufferFishStateChangeEvent.patch
index 87e61bb2a3..87e61bb2a3 100644
--- a/patches/server/0559-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0556-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0560-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0557-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 6e70197163..6e70197163 100644
--- a/patches/server/0560-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0557-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0561-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0558-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 04a6d787b6..04a6d787b6 100644
--- a/patches/server/0561-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0558-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0562-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0559-Add-option-to-fix-items-merging-through-walls.patch
index 05969fb324..05969fb324 100644
--- a/patches/server/0562-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0559-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0563-Add-BellRevealRaiderEvent.patch b/patches/server/0560-Add-BellRevealRaiderEvent.patch
index 871aa2a198..871aa2a198 100644
--- a/patches/server/0563-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0560-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0564-Fix-invulnerable-end-crystals.patch b/patches/server/0561-Fix-invulnerable-end-crystals.patch
index bddc6ec149..bddc6ec149 100644
--- a/patches/server/0564-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0561-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0565-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0562-Add-ElderGuardianAppearanceEvent.patch
index d9bc14356d..d9bc14356d 100644
--- a/patches/server/0565-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0562-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0566-Fix-dangerous-end-portal-logic.patch b/patches/server/0563-Fix-dangerous-end-portal-logic.patch
index 94e78d0600..6ce6d9449a 100644
--- a/patches/server/0566-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0563-Fix-dangerous-end-portal-logic.patch
@@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was
 designed to happen in the first place.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 04581cd90272775208a0192ef36f9c7458ad3a0c..aac47d2de2825b46e54ad936a48c96ef7f6703e1 100644
+index eb5cc58e5b53407de5d2a0ddcbbfbc7cdd3bb072..99cdadb3c84f3b40eaec7ba5df6601a0454f3569 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -423,6 +423,36 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0567-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0564-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 3d03f4c4d2..3d03f4c4d2 100644
--- a/patches/server/0567-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0564-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0568-Line-Of-Sight-Changes.patch b/patches/server/0565-Line-Of-Sight-Changes.patch
index f0d5d6bd3e..92a0683ab9 100644
--- a/patches/server/0568-Line-Of-Sight-Changes.patch
+++ b/patches/server/0565-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 541debdee83cbef985aafa0c3cb344a5bee18625..5f9c39b18ab55c80e78ac578de6821fe282c04bb 100644
+index 3f375ec80357c3727092ce016d2697d17281976f..b4295448819271f5a651e3a3ae83c7ae4014d92f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3720,7 +3720,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0569-add-per-world-spawn-limits.patch b/patches/server/0566-add-per-world-spawn-limits.patch
index 8ff7b50013..8ff7b50013 100644
--- a/patches/server/0569-add-per-world-spawn-limits.patch
+++ b/patches/server/0566-add-per-world-spawn-limits.patch
diff --git a/patches/server/0570-Fix-potions-splash-events.patch b/patches/server/0567-Fix-potions-splash-events.patch
index 66e5ec5995..6bc3f4cd01 100644
--- a/patches/server/0570-Fix-potions-splash-events.patch
+++ b/patches/server/0567-Fix-potions-splash-events.patch
@@ -143,7 +143,7 @@ index d7fe99e55b64b66af7795c2d0aeca69023f93bae..bf627d66310f201172d3cd3ea12f1d32
  
      public boolean isLingering() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ea9a12ff01203072975bb2f22a077d1d2e46376f..11f9220c4a5d2481f3a52238b4d845bad1fd0867 100644
+index dbb7b8e93c1773058c78de71a3e6e3559eb0a46b..4bc21889a584add593a1ce092e5df161d8bb9d76 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -875,6 +875,32 @@ public class CraftEventFactory {
diff --git a/patches/server/0571-Add-more-LimitedRegion-API.patch b/patches/server/0568-Add-more-LimitedRegion-API.patch
index 6e183e954e..6e183e954e 100644
--- a/patches/server/0571-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0568-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0572-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0569-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 9880621068..2190b00711 100644
--- a/patches/server/0572-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0569-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -31,7 +31,7 @@ index c81fd3e1108fb0a02f9240263404af2b968c8494..0d9de4c61c7b26a6ff37c12fde629161
              }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ef24112c5360ec329dc8a89546f64bad68d7fd8e..1ac19a789bee22fe512a019e618e2b99bb07f183 100644
+index 538720cd256d6d5fc4bf1800106c53b6a3116db9..0887166af854bf924bd8eb528503a0e1e28e8e99 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2434,7 +2434,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0573-Missing-Entity-API.patch b/patches/server/0570-Missing-Entity-API.patch
index 325a5709e6..325a5709e6 100644
--- a/patches/server/0573-Missing-Entity-API.patch
+++ b/patches/server/0570-Missing-Entity-API.patch
diff --git a/patches/server/0574-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0571-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index ef18db22e4..09e73af027 100644
--- a/patches/server/0574-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0571-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 972c7304f8623e4162dc805577106bdf9dac9928..cbcec968874cccf2488fdefa179a7b1ed0607c10 100644
+index 1f6e123fbd146129e5460631fdd88de9dd60bdca..66d6bd361edfb04eeed4076feb20cb8861d48874 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1115,7 +1115,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0575-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0572-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index a5c4eefb9a..a5c4eefb9a 100644
--- a/patches/server/0575-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0572-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0576-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0573-Use-getChunkIfLoadedImmediately-in-places.patch
index 0a393f84af..c72ab8a129 100644
--- a/patches/server/0576-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0573-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 d4e73445f680a283cda9a1e4b823efcd389a84ed..6d7b006525068f32549c8f9cccafd821e5a587ce 100644
+index 3e935df2de58bd57b061c33b00f9d2ea4134ca80..eecc5704582ce7c9a45adee8057d8297eae03a86 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -230,7 +230,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0577-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0574-Fix-commands-from-signs-not-firing-command-events.patch
index b86e341359..b86e341359 100644
--- a/patches/server/0577-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0574-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0578-Add-PlayerArmSwingEvent.patch b/patches/server/0575-Add-PlayerArmSwingEvent.patch
index a6cc51d98f..0c66804f9a 100644
--- a/patches/server/0578-Add-PlayerArmSwingEvent.patch
+++ b/patches/server/0575-Add-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cbcec968874cccf2488fdefa179a7b1ed0607c10..23e3df2eaecde15cf4726a5adc25c883cc0dca11 100644
+index 66d6bd361edfb04eeed4076feb20cb8861d48874..dd3767f482929d7d8105a4164c27651099935a89 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2396,7 +2396,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0579-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0576-Fix-kick-event-leave-message-not-being-sent.patch
index 2be09dd881..1bc1afc37c 100644
--- a/patches/server/0579-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0576-Fix-kick-event-leave-message-not-being-sent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix 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 1ac19a789bee22fe512a019e618e2b99bb07f183..d3f3eed67557b362c0f51a83967f60276283d3ea 100644
+index 0887166af854bf924bd8eb528503a0e1e28e8e99..25e4521676e55a876ac27d8cbe4fdb2ddc9bf5e5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -285,7 +285,6 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 1ac19a789bee22fe512a019e618e2b99bb07f183..d3f3eed67557b362c0f51a83967f6027
      public boolean isRealPlayer; // Paper
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index dde1d3850af610241e1f76a194efe1a58dc96bd5..8ac5d8ccf731100a1be690cb2ed1be82cadba8ed 100644
+index 7659a3f50f5a90814dc7331ea00d6251dcf32600..308aef9c4933b2bcdd622a34b68efab4a220fe4d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -109,6 +109,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -50,7 +50,7 @@ index dde1d3850af610241e1f76a194efe1a58dc96bd5..8ac5d8ccf731100a1be690cb2ed1be82
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 23e3df2eaecde15cf4726a5adc25c883cc0dca11..f8a833ccae35db5e04871fa100ddc45044f4642a 100644
+index dd3767f482929d7d8105a4164c27651099935a89..5ba7340d3860975b826dc878385e0879a9f07957 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1878,6 +1878,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0580-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0577-Don-t-apply-cramming-damage-to-players.patch
index 8a1b8eb465..4fc24e4549 100644
--- a/patches/server/0580-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0577-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/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d3f3eed67557b362c0f51a83967f60276283d3ea..ff5d24f6afd224496dd1902497497483ec7fc24d 100644
+index 25e4521676e55a876ac27d8cbe4fdb2ddc9bf5e5..1be3c03022f8fb14d536981d4dc688c541f528ad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -98,6 +98,7 @@ import net.minecraft.util.Mth;
diff --git a/patches/server/0581-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0578-Rate-options-and-timings-for-sensors-and-behaviors.patch
index d74af14524..d74af14524 100644
--- a/patches/server/0581-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0578-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0582-Add-missing-forceDrop-toggles.patch b/patches/server/0579-Add-missing-forceDrop-toggles.patch
index b89de7428a..b89de7428a 100644
--- a/patches/server/0582-Add-missing-forceDrop-toggles.patch
+++ b/patches/server/0579-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0583-Stinger-API.patch b/patches/server/0580-Stinger-API.patch
index 3abe3d922a..3abe3d922a 100644
--- a/patches/server/0583-Stinger-API.patch
+++ b/patches/server/0580-Stinger-API.patch
diff --git a/patches/server/0584-Add-System.out-err-catcher.patch b/patches/server/0581-Add-System.out-err-catcher.patch
index 7ebe01fa1d..e4d4fc106a 100644
--- a/patches/server/0584-Add-System.out-err-catcher.patch
+++ b/patches/server/0581-Add-System.out-err-catcher.patch
@@ -105,10 +105,10 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fb6f176e37583443c4f67121a46a52b17b7d625a..2260ce0e705d8ba5b4d2c2ebaac09deb43ec9af0 100644
+index c4e63ba96a54fb9e1353510f77d848bed3656405..ceb18ee56a99f56997f09e9d6dd01b8b58194430 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -308,6 +308,7 @@ public final class CraftServer implements Server {
+@@ -303,6 +303,7 @@ public final class CraftServer implements Server {
      public int reloadCount;
      private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
      public static Exception excessiveVelEx; // Paper - Velocity warnings
diff --git a/patches/server/0585-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0582-Prevent-AFK-kick-while-watching-end-credits.patch
index c0ffba11ed..92d95bf1df 100644
--- a/patches/server/0585-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0582-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 f8a833ccae35db5e04871fa100ddc45044f4642a..8c44644a9118ef0a5013fb71031de82a43831911 100644
+index 5ba7340d3860975b826dc878385e0879a9f07957..40d2c7bfc8ba8b8b366f23e53cf37f331e19ccf7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -397,7 +397,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0586-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0583-Allow-skipping-writing-of-comments-to-server.propert.patch
index 1fce522892..1fce522892 100644
--- a/patches/server/0586-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0583-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0587-Add-PlayerSetSpawnEvent.patch b/patches/server/0584-Add-PlayerSetSpawnEvent.patch
index 1bc05bf134..95276bf07f 100644
--- a/patches/server/0587-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0584-Add-PlayerSetSpawnEvent.patch
@@ -49,7 +49,7 @@ index a2d0699e8427b2262a2396495111125eccafbb66..15db9368227dbc29d07d74e85bd126b3
      }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ff5d24f6afd224496dd1902497497483ec7fc24d..22f9b40e2c9a71f8944b1738e91ee2e189a77cec 100644
+index 1be3c03022f8fb14d536981d4dc688c541f528ad..093cfac173d35ab8b7b459edad9be7c3d6e5b340 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1384,7 +1384,7 @@ public class ServerPlayer extends Player {
@@ -167,7 +167,7 @@ index 2b7ad2b9cd525814c9f91d22606c42aa82ce9f94..d7bbdcc97745246718c92c9aba56d9f9
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-index 3cfe325f14b6b184517de7c6982f54e0895b1eb8..be85535767bc79875c38da78a209d33d4be87c8a 100644
+index ba22ad1e4253477572d10d71db6db0ebc14d6755..94d067e9eeee73183de25165d8c97043fe256103 100644
 --- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
 @@ -89,9 +89,14 @@ public class RespawnAnchorBlock extends Block {
@@ -187,7 +187,7 @@ index 3cfe325f14b6b184517de7c6982f54e0895b1eb8..be85535767bc79875c38da78a209d33d
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1cbf70e8f238a3e67f27d86b9f685d5303fa5527..cc6d0b713f839d482dfba8a1e83f927923c9c690 100644
+index 2d173370b69d4caf6b890115a2f7dabc733d0a58..f786981e0d07d116ba901e26ed7c3de34ee9d8ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1399,9 +1399,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0588-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0585-Make-hoppers-respect-inventory-max-stack-size.patch
index c5f669b979..c5f669b979 100644
--- a/patches/server/0588-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0585-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0589-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0586-Optimize-entity-tracker-passenger-checks.patch
index a764dcd8ab..a764dcd8ab 100644
--- a/patches/server/0589-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0586-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0590-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0587-Config-option-for-Piglins-guarding-chests.patch
index e1b0af28d0..e1b0af28d0 100644
--- a/patches/server/0590-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0587-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0591-Add-EntityDamageItemEvent.patch b/patches/server/0588-Add-EntityDamageItemEvent.patch
index e78be10457..e78be10457 100644
--- a/patches/server/0591-Add-EntityDamageItemEvent.patch
+++ b/patches/server/0588-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0592-Optimize-indirect-passenger-iteration.patch b/patches/server/0589-Optimize-indirect-passenger-iteration.patch
index f63dee44e9..a3cededc73 100644
--- a/patches/server/0592-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0589-Optimize-indirect-passenger-iteration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index aac47d2de2825b46e54ad936a48c96ef7f6703e1..66ddae628d8ccce62aa6937166d719911aef44a2 100644
+index 99cdadb3c84f3b40eaec7ba5df6601a0454f3569..95d5ad9517d57a319970375be37e44ef0e8fb79e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3870,20 +3870,34 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0593-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0590-Configurable-item-frame-map-cursor-update-interval.patch
index f06f3a327b..f06f3a327b 100644
--- a/patches/server/0593-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0590-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0594-Clear-bucket-NBT-after-dispense.patch b/patches/server/0591-Clear-bucket-NBT-after-dispense.patch
index ece5517a45..ece5517a45 100644
--- a/patches/server/0594-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0591-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0595-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0592-Change-EnderEye-target-without-changing-other-things.patch
index 53d06a36ec..53d06a36ec 100644
--- a/patches/server/0595-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0592-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0596-Add-BlockBreakBlockEvent.patch b/patches/server/0593-Add-BlockBreakBlockEvent.patch
index fbf1b1ea38..fbf1b1ea38 100644
--- a/patches/server/0596-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0593-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0597-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0594-Option-to-prevent-data-components-copy-in-smithing-r.patch
index c4e4b8be1b..c4e4b8be1b 100644
--- a/patches/server/0597-Option-to-prevent-data-components-copy-in-smithing-r.patch
+++ b/patches/server/0594-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/server/0598-More-CommandBlock-API.patch b/patches/server/0595-More-CommandBlock-API.patch
index 16cf3ee3d7..16cf3ee3d7 100644
--- a/patches/server/0598-More-CommandBlock-API.patch
+++ b/patches/server/0595-More-CommandBlock-API.patch
diff --git a/patches/server/0599-Add-missing-team-sidebar-display-slots.patch b/patches/server/0596-Add-missing-team-sidebar-display-slots.patch
index 3095722a10..3095722a10 100644
--- a/patches/server/0599-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0596-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0600-Add-back-EntityPortalExitEvent.patch b/patches/server/0597-Add-back-EntityPortalExitEvent.patch
index 02c52718f6..75fdede002 100644
--- a/patches/server/0600-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0597-Add-back-EntityPortalExitEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 66ddae628d8ccce62aa6937166d719911aef44a2..dd353bad7ddf7c1e4bbc37ed3724d73696f7b8a7 100644
+index 95d5ad9517d57a319970375be37e44ef0e8fb79e..541789139e9ccb0371a93da989b1f9701fceb034 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3307,6 +3307,28 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0601-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0598-Add-methods-to-find-targets-for-lightning-strikes.patch
index a6b0c9df56..fdc84ceea1 100644
--- a/patches/server/0601-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0598-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6d7b006525068f32549c8f9cccafd821e5a587ce..1f556e53c4fa70c2ecab2181a655020ba7669624 100644
+index eecc5704582ce7c9a45adee8057d8297eae03a86..5cb0281ea110a1ce3444f4392bccbb19ca3bbf09 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -763,6 +763,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0602-Get-entity-default-attributes.patch b/patches/server/0599-Get-entity-default-attributes.patch
index ad280f7dbc..197141cc8b 100644
--- a/patches/server/0602-Get-entity-default-attributes.patch
+++ b/patches/server/0599-Get-entity-default-attributes.patch
@@ -81,7 +81,7 @@ index 0000000000000000000000000000000000000000..ec9ebd2d539333293c51b7edfa18f18b
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 0a6f78b5e08fffc782b51f19f42a53cad9287334..85fa9ee443e5222551f3c1e9001833eecc2f6c5c 100644
+index 27acc1965e16d697fa98f64cf64ecc6ecd775e86..6bfd5fad899720c853fc4812f50893a6d81f7ea8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -563,6 +563,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0603-Left-handed-API.patch b/patches/server/0600-Left-handed-API.patch
index 643df451a4..643df451a4 100644
--- a/patches/server/0603-Left-handed-API.patch
+++ b/patches/server/0600-Left-handed-API.patch
diff --git a/patches/server/0604-Add-more-advancement-API.patch b/patches/server/0601-Add-more-advancement-API.patch
index 402274cff0..402274cff0 100644
--- a/patches/server/0604-Add-more-advancement-API.patch
+++ b/patches/server/0601-Add-more-advancement-API.patch
diff --git a/patches/server/0605-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0602-Add-ItemFactory-getSpawnEgg-API.patch
index a1ba12cd83..a1ba12cd83 100644
--- a/patches/server/0605-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0602-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0606-Add-critical-damage-API.patch b/patches/server/0603-Add-critical-damage-API.patch
index e0743975f1..e0743975f1 100644
--- a/patches/server/0606-Add-critical-damage-API.patch
+++ b/patches/server/0603-Add-critical-damage-API.patch
diff --git a/patches/server/0607-Fix-issues-with-mob-conversion.patch b/patches/server/0604-Fix-issues-with-mob-conversion.patch
index c714b6dda9..c714b6dda9 100644
--- a/patches/server/0607-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0604-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0608-Add-isCollidable-methods-to-various-places.patch b/patches/server/0605-Add-isCollidable-methods-to-various-places.patch
index 7e886726b7..52fd23cf92 100644
--- a/patches/server/0608-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0605-Add-isCollidable-methods-to-various-places.patch
@@ -39,7 +39,7 @@ index 1002123cd0c6f57cecc4e80f5f21cc6ff5886d37..e96023b71845526383288917e8d7c575
 +    // 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 85fa9ee443e5222551f3c1e9001833eecc2f6c5c..027825a41d09d40bdd80c9ac37f014f5b45763c9 100644
+index 6bfd5fad899720c853fc4812f50893a6d81f7ea8..3824a02431e3b1d82576937248f2a57f1a0414b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -575,6 +575,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0609-Goat-ram-API.patch b/patches/server/0606-Goat-ram-API.patch
index 2f5ccdfed4..2f5ccdfed4 100644
--- a/patches/server/0609-Goat-ram-API.patch
+++ b/patches/server/0606-Goat-ram-API.patch
diff --git a/patches/server/0610-Add-API-for-resetting-a-single-score.patch b/patches/server/0607-Add-API-for-resetting-a-single-score.patch
index b9dd1c2be3..b9dd1c2be3 100644
--- a/patches/server/0610-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0607-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0611-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0608-Add-Raw-Byte-Entity-Serialization.patch
index f19300b22e..b35e62fbc2 100644
--- a/patches/server/0611-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0608-Add-Raw-Byte-Entity-Serialization.patch
@@ -50,7 +50,7 @@ index 9edcdc71b28cf08e42fbe44723ba540e8d4f7808..a61638bc8200f6aa25d9c3254aea6c0c
      @Override
      public boolean isInvisible() {  // Paper - moved up from LivingEntity
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 027825a41d09d40bdd80c9ac37f014f5b45763c9..3e88b095260674a8383cc2646fc194c854bcf121 100644
+index 3824a02431e3b1d82576937248f2a57f1a0414b0..a2961166695e5fe4c607c82a490ce67c2e1b5fde 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -513,7 +513,33 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0612-Vanilla-command-permission-fixes.patch b/patches/server/0609-Vanilla-command-permission-fixes.patch
index ee87698d16..ee87698d16 100644
--- a/patches/server/0612-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0609-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0613-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0610-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 19d821b087..e556bcb3f1 100644
--- a/patches/server/0613-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0610-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1f556e53c4fa70c2ecab2181a655020ba7669624..efc246d405d58550104bb767a40d296e40b79d70 100644
+index 5cb0281ea110a1ce3444f4392bccbb19ca3bbf09..e611857d9d29e8532b4ea3e0634c8f24a396a190 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1276,9 +1276,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -28,7 +28,7 @@ index 1f556e53c4fa70c2ecab2181a655020ba7669624..efc246d405d58550104bb767a40d296e
          }
          // 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 22f9b40e2c9a71f8944b1738e91ee2e189a77cec..c3e8efd58c191ac8f479f8a979e73cc390e881a4 100644
+index 093cfac173d35ab8b7b459edad9be7c3d6e5b340..7ba28e1258006c8f897b7c94cbdf0b87ace12b5e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1675,6 +1675,18 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0614-Fix-GameProfileCache-concurrency.patch b/patches/server/0611-Fix-GameProfileCache-concurrency.patch
index 6cb7e5235f..6cb7e5235f 100644
--- a/patches/server/0614-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0611-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0615-Improve-and-expand-AsyncCatcher.patch b/patches/server/0612-Improve-and-expand-AsyncCatcher.patch
index f248ef7a0f..860e68a6e6 100644
--- a/patches/server/0615-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0612-Improve-and-expand-AsyncCatcher.patch
@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8c44644a9118ef0a5013fb71031de82a43831911..d5796e345b42c427e313130077092cf41c794eaa 100644
+index 40d2c7bfc8ba8b8b366f23e53cf37f331e19ccf7..795e65c7c98d50ff67953ccb1ff68dac0088116e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1565,6 +1565,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -29,7 +29,7 @@ index 8c44644a9118ef0a5013fb71031de82a43831911..d5796e345b42c427e313130077092cf4
          if (player.isRemoved()) {
              LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5f9c39b18ab55c80e78ac578de6821fe282c04bb..9cceee5f968d397f27b0618dcc5b5d97ac34b289 100644
+index b4295448819271f5a651e3a3ae83c7ae4014d92f..3f46ca2f03142c3a7bb5928ec092c21491c1fdef 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1147,7 +1147,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0616-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0613-Add-paper-mobcaps-and-paper-playermobcaps.patch
index c6b39416d0..51c5b07b0c 100644
--- a/patches/server/0616-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0613-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -278,10 +278,10 @@ index 58ea6a1f95a09c22125a8262b1b221004ebce0e4..ea6533c1ac218aa075da3401807a06fc
          BlockPos blockposition = NaturalSpawner.getRandomPosWithin(world, chunk);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2260ce0e705d8ba5b4d2c2ebaac09deb43ec9af0..d69037ce1d69b7f67587f9ab71cb9b9b2048f4d8 100644
+index ceb18ee56a99f56997f09e9d6dd01b8b58194430..2e7c206956ded65795f5f2d36acce97381cf80ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2298,6 +2298,11 @@ public final class CraftServer implements Server {
+@@ -2293,6 +2293,11 @@ public final class CraftServer implements Server {
  
      @Override
      public int getSpawnLimit(SpawnCategory spawnCategory) {
diff --git a/patches/server/0617-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0614-Sanitize-ResourceLocation-error-logging.patch
index 28ba1000d7..28ba1000d7 100644
--- a/patches/server/0617-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0614-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0618-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0615-Manually-inline-methods-in-BlockPosition.patch
index 630cd08862..630cd08862 100644
--- a/patches/server/0618-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0615-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0619-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0616-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 30f250f235..30f250f235 100644
--- a/patches/server/0619-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0616-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0620-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0617-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index ffee136c87..ffee136c87 100644
--- a/patches/server/0620-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0617-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0621-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0618-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 0c62fa92a6..0c62fa92a6 100644
--- a/patches/server/0621-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0618-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0622-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0619-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index 0ab3e48f48..0ab3e48f48 100644
--- a/patches/server/0622-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
+++ b/patches/server/0619-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0623-Time-scoreboard-search.patch b/patches/server/0620-Time-scoreboard-search.patch
index 8d15084758..8d15084758 100644
--- a/patches/server/0623-Time-scoreboard-search.patch
+++ b/patches/server/0620-Time-scoreboard-search.patch
diff --git a/patches/server/0624-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0621-Oprimise-map-impl-for-tracked-players.patch
index 05a08024ed..05a08024ed 100644
--- a/patches/server/0624-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0621-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0625-Add-missing-InventoryType.patch b/patches/server/0622-Add-missing-InventoryType.patch
index a49bdf073d..a49bdf073d 100644
--- a/patches/server/0625-Add-missing-InventoryType.patch
+++ b/patches/server/0622-Add-missing-InventoryType.patch
diff --git a/patches/server/0626-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0623-Optimise-BlockSoil-nearby-water-lookup.patch
index 81b199a243..81b199a243 100644
--- a/patches/server/0626-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0623-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0627-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0624-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index e17f65772c..11f85426c8 100644
--- a/patches/server/0627-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0624-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index efc246d405d58550104bb767a40d296e40b79d70..dd1f03109a7f8cd65f9e77de94a2a170652ce4ed 100644
+index e611857d9d29e8532b4ea3e0634c8f24a396a190..134df9ad4d5d5f85429f5e3ff6d879bc5f1fb13f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2277,6 +2277,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0628-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0625-Check-requirement-before-suggesting-root-nodes.patch
index fce5e326f9..fce5e326f9 100644
--- a/patches/server/0628-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0625-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0629-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0626-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 17cdc399d8..1049bf5495 100644
--- a/patches/server/0629-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0626-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 d5796e345b42c427e313130077092cf41c794eaa..6cd4acac1c89035ece14f07784a439960ffcfcf5 100644
+index 795e65c7c98d50ff67953ccb1ff68dac0088116e..4ac3e9cacc3c54a67da1547a319fd501ff375354 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -745,6 +745,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0630-Add-packet-limiter-config.patch b/patches/server/0627-Add-packet-limiter-config.patch
index 8315eb0598..8315eb0598 100644
--- a/patches/server/0630-Add-packet-limiter-config.patch
+++ b/patches/server/0627-Add-packet-limiter-config.patch
diff --git a/patches/server/0631-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0628-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index d9f19d0199..d9f19d0199 100644
--- a/patches/server/0631-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0628-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0632-Ensure-valid-vehicle-status.patch b/patches/server/0629-Ensure-valid-vehicle-status.patch
index 948908a5db..a46a2cb96a 100644
--- a/patches/server/0632-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0629-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 c3e8efd58c191ac8f479f8a979e73cc390e881a4..e96bd37366ec80cb62a1a4f82c218498b98c9ed9 100644
+index 7ba28e1258006c8f897b7c94cbdf0b87ace12b5e..3f4a881a69b47e99498d4c2e53c9a20367e3887f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -567,7 +567,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0633-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0630-Prevent-softlocked-end-exit-portal-generation.patch
index e2698e961b..e2698e961b 100644
--- a/patches/server/0633-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0630-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0634-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0631-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 4fac0c1ab3..4fac0c1ab3 100644
--- a/patches/server/0634-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0631-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0635-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0632-Don-t-log-debug-logging-being-disabled.patch
index eda86b69fc..eda86b69fc 100644
--- a/patches/server/0635-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0632-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0636-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0633-fix-various-menus-with-empty-level-accesses.patch
index efe5d1ddce..efe5d1ddce 100644
--- a/patches/server/0636-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0633-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0637-Preserve-overstacked-loot.patch b/patches/server/0634-Preserve-overstacked-loot.patch
index bd846768be..bd846768be 100644
--- a/patches/server/0637-Preserve-overstacked-loot.patch
+++ b/patches/server/0634-Preserve-overstacked-loot.patch
diff --git a/patches/server/0638-Update-head-rotation-in-missing-places.patch b/patches/server/0635-Update-head-rotation-in-missing-places.patch
index 88e0dccdcb..faed9c97c0 100644
--- a/patches/server/0638-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0635-Update-head-rotation-in-missing-places.patch
@@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cdb69f4d5d49a2459671fa86dc39d60fdfa62489..24e4db0e80b774e5681e031f56cb7da844656f8f 100644
+index 6b66a9732f8e8b23b8d00beb9822fbb46ac76cab..f6419fe840836c3ff3c577b246d58f820b79fae2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1814,6 +1814,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0639-prevent-unintended-light-block-manipulation.patch b/patches/server/0636-prevent-unintended-light-block-manipulation.patch
index bff44792dc..bff44792dc 100644
--- a/patches/server/0639-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0636-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0640-Fix-CraftCriteria-defaults-map.patch b/patches/server/0637-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0640-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0637-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0641-Fix-upstreams-block-state-factories.patch b/patches/server/0638-Fix-upstreams-block-state-factories.patch
index ab5883e950..2b35a7c6b3 100644
--- a/patches/server/0641-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0638-Fix-upstreams-block-state-factories.patch
@@ -56,7 +56,7 @@ index 92133f16c192f5caf9962a08401ff914550747f8..397eb1a101bd60f49dbb2fa8eddf28f6
      // Paper start
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
-index 83ac5fc6cbbd249b5865ab203b150f53f01c9f05..6a25916aec7c8e0bc5cc18e3e06c6e07e0804380 100644
+index e40973b65ece11d9c5a76abad51f72e610bf02ab..411c2de93c71e480f95229c882cdf43b8801edc8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
 @@ -22,6 +22,7 @@ import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
diff --git a/patches/server/0642-Configurable-feature-seeds.patch b/patches/server/0639-Configurable-feature-seeds.patch
index 44d7b04076..44d7b04076 100644
--- a/patches/server/0642-Configurable-feature-seeds.patch
+++ b/patches/server/0639-Configurable-feature-seeds.patch
diff --git a/patches/server/0643-Add-root-admin-user-detection.patch b/patches/server/0640-Add-root-admin-user-detection.patch
index 5b81dcd09a..5b81dcd09a 100644
--- a/patches/server/0643-Add-root-admin-user-detection.patch
+++ b/patches/server/0640-Add-root-admin-user-detection.patch
diff --git a/patches/server/0644-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0641-don-t-attempt-to-teleport-dead-entities.patch
index 0a5f77989b..a48c577460 100644
--- a/patches/server/0644-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0641-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 24e4db0e80b774e5681e031f56cb7da844656f8f..555202937152abaabf4b7a6e637c9a290d180ea8 100644
+index f6419fe840836c3ff3c577b246d58f820b79fae2..e4885d1fd68955107e871dd4457df7e468348e15 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -731,7 +731,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0645-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0642-Prevent-excessive-velocity-through-repeated-crits.patch
index c26ce6b90a..1cd854d74a 100644
--- a/patches/server/0645-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0642-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 9cceee5f968d397f27b0618dcc5b5d97ac34b289..b73601d2903f327b4e7b82ccc6774731c832e941 100644
+index 3f46ca2f03142c3a7bb5928ec092c21491c1fdef..dff6e07de4d447f7d7fe0107928ea0749714ba3e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2754,16 +2754,28 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0646-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0643-Remove-client-side-code-using-deprecated-for-removal.patch
index 77ffcc7ddc..77ffcc7ddc 100644
--- a/patches/server/0646-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0643-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0647-Fix-Spigot-growth-modifiers.patch b/patches/server/0644-Fix-Spigot-growth-modifiers.patch
index 245729c1f4..245729c1f4 100644
--- a/patches/server/0647-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0644-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0648-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0645-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index b017de75d1..b017de75d1 100644
--- a/patches/server/0648-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0645-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0649-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0646-Add-PlayerItemFrameChangeEvent.patch
index 37c616b0a1..37c616b0a1 100644
--- a/patches/server/0649-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0646-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0650-Optimize-HashMapPalette.patch b/patches/server/0647-Optimize-HashMapPalette.patch
index d50159b901..d50159b901 100644
--- a/patches/server/0650-Optimize-HashMapPalette.patch
+++ b/patches/server/0647-Optimize-HashMapPalette.patch
diff --git a/patches/server/0651-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0648-Allow-delegation-to-vanilla-chunk-gen.patch
index 092085084a..8a1e49766b 100644
--- a/patches/server/0651-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0648-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,10 +5,10 @@ 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 d69037ce1d69b7f67587f9ab71cb9b9b2048f4d8..75d7293f27d617f6c096d87eb4eb0c7f8de8a0e2 100644
+index 2e7c206956ded65795f5f2d36acce97381cf80ea..1eb46f3ef17f61d887d972e71a982b2ec216ef05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2483,6 +2483,90 @@ public final class CraftServer implements Server {
+@@ -2478,6 +2478,90 @@ public final class CraftServer implements Server {
          return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registries.BIOME));
      }
  
diff --git a/patches/server/0652-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0649-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 239a0c56cc..239a0c56cc 100644
--- a/patches/server/0652-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0649-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0653-Add-more-Campfire-API.patch b/patches/server/0650-Add-more-Campfire-API.patch
index c47758fa53..c47758fa53 100644
--- a/patches/server/0653-Add-more-Campfire-API.patch
+++ b/patches/server/0650-Add-more-Campfire-API.patch
diff --git a/patches/server/0654-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0651-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 82e383fc34..82e383fc34 100644
--- a/patches/server/0654-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0651-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0655-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0652-Forward-CraftEntity-in-teleport-command.patch
index fed3943910..72ab28f06a 100644
--- a/patches/server/0655-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0652-Forward-CraftEntity-in-teleport-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 555202937152abaabf4b7a6e637c9a290d180ea8..2e0dc24bf6732637b29e21c8817f0d3502a2a89a 100644
+index e4885d1fd68955107e871dd4457df7e468348e15..b488fe4ddc8a4fad42f45b2a7158766df3a85de4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3279,6 +3279,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0656-Improve-scoreboard-entries.patch b/patches/server/0653-Improve-scoreboard-entries.patch
index 8acac86ce3..8acac86ce3 100644
--- a/patches/server/0656-Improve-scoreboard-entries.patch
+++ b/patches/server/0653-Improve-scoreboard-entries.patch
diff --git a/patches/server/0657-Entity-powdered-snow-API.patch b/patches/server/0654-Entity-powdered-snow-API.patch
index 84af920e2a..84af920e2a 100644
--- a/patches/server/0657-Entity-powdered-snow-API.patch
+++ b/patches/server/0654-Entity-powdered-snow-API.patch
diff --git a/patches/server/0658-Add-API-for-item-entity-health.patch b/patches/server/0655-Add-API-for-item-entity-health.patch
index cd2757b544..cd2757b544 100644
--- a/patches/server/0658-Add-API-for-item-entity-health.patch
+++ b/patches/server/0655-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0659-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0656-Configurable-max-block-light-for-monster-spawning.patch
index 421d176050..421d176050 100644
--- a/patches/server/0659-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0656-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0660-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0657-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 2ee001a77a..2ee001a77a 100644
--- a/patches/server/0660-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0657-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0661-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0658-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..d7ccde8439 100644
--- a/patches/server/0661-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0658-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0662-Bucketable-API.patch b/patches/server/0659-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0662-Bucketable-API.patch
+++ b/patches/server/0659-Bucketable-API.patch
diff --git a/patches/server/0663-Validate-usernames.patch b/patches/server/0660-Validate-usernames.patch
index d3b04f3950..d3b04f3950 100644
--- a/patches/server/0663-Validate-usernames.patch
+++ b/patches/server/0660-Validate-usernames.patch
diff --git a/patches/server/0664-Make-water-animal-spawn-height-configurable.patch b/patches/server/0661-Make-water-animal-spawn-height-configurable.patch
index 36a83d9116..36a83d9116 100644
--- a/patches/server/0664-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0661-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0665-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0662-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 33d3178f63..0cc3bb1e2b 100644
--- a/patches/server/0665-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0662-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 718a455aa70999a339cccc51d6fc4bb689c2c27b..0a206b9ff1ad235fa0805ad635c1a6caa1d3eafb 100644
+index 2986dc458ddbd642669c6c2c104df2a2446e5b11..533e1225b863ef314b7defebc4787304fd19f5a1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -608,7 +608,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -605,7 +605,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(iworlddataserver));
              LevelStem worlddimension = (LevelStem) dimensions.get(dimensionKey);
  
@@ -18,10 +18,10 @@ index 718a455aa70999a339cccc51d6fc4bb689c2c27b..0a206b9ff1ad235fa0805ad635c1a6ca
                  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 75d7293f27d617f6c096d87eb4eb0c7f8de8a0e2..cae178b0b4046815ab64cd4c7c0a48f3eb430aba 100644
+index 1eb46f3ef17f61d887d972e71a982b2ec216ef05..32338b8fa891262801ed45c7b64b306591e060fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1275,7 +1275,7 @@ public final class CraftServer implements Server {
+@@ -1270,7 +1270,7 @@ public final class CraftServer implements Server {
          List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata));
          LevelStem worlddimension = iregistry.get(actualDimension);
  
diff --git a/patches/server/0666-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0663-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0666-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0663-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0667-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0664-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
index be0eedab93..be0eedab93 100644
--- a/patches/server/0667-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/server/0664-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0668-Multiple-Entries-with-Scoreboards.patch b/patches/server/0665-Multiple-Entries-with-Scoreboards.patch
index c286ca9e4b..c286ca9e4b 100644
--- a/patches/server/0668-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0665-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0669-Reset-placed-block-on-exception.patch b/patches/server/0666-Reset-placed-block-on-exception.patch
index c5b6f9f135..c5b6f9f135 100644
--- a/patches/server/0669-Reset-placed-block-on-exception.patch
+++ b/patches/server/0666-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0670-Add-configurable-height-for-slime-spawn.patch b/patches/server/0667-Add-configurable-height-for-slime-spawn.patch
index 04458eb176..04458eb176 100644
--- a/patches/server/0670-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0667-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0671-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0668-Fix-xp-reward-for-baby-zombies.patch
index 67fe48ec26..67fe48ec26 100644
--- a/patches/server/0671-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0668-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0672-Multi-Block-Change-API-Implementation.patch b/patches/server/0669-Multi-Block-Change-API-Implementation.patch
index 3eee7a872a..14aac72dbe 100644
--- a/patches/server/0672-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0669-Multi-Block-Change-API-Implementation.patch
@@ -24,7 +24,7 @@ index 926ff9be3d9e3f5d620e4c7ccb22b9f64865ff8c..1a37654aff9a9c86c9f7af10a1cf7213
          buf.writeLong(this.sectionPos.asLong());
          buf.writeVarInt(this.positions.length);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cc6d0b713f839d482dfba8a1e83f927923c9c690..ee31c18ae530cb064ae9d1cc3f3d68312c1f854c 100644
+index f786981e0d07d116ba901e26ed7c3de34ee9d8ea..a7c03ca87bb0d38552ea7a80b97a0ef0af394190 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -928,6 +928,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0673-Fix-NotePlayEvent.patch b/patches/server/0670-Fix-NotePlayEvent.patch
index 4a601d8f1b..4a601d8f1b 100644
--- a/patches/server/0673-Fix-NotePlayEvent.patch
+++ b/patches/server/0670-Fix-NotePlayEvent.patch
diff --git a/patches/server/0674-Freeze-Tick-Lock-API.patch b/patches/server/0671-Freeze-Tick-Lock-API.patch
index 80171b8e78..064ef7f8fc 100644
--- a/patches/server/0674-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0671-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2e0dc24bf6732637b29e21c8817f0d3502a2a89a..8e09bfb7c1b4fb34e6615b0cf774bc8e6cae29fa 100644
+index b488fe4ddc8a4fad42f45b2a7158766df3a85de4..ce21885281a2bca8f363ebc6423ca65df7c13c6d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -407,6 +407,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -46,7 +46,7 @@ index 2e0dc24bf6732637b29e21c8817f0d3502a2a89a..8e09bfb7c1b4fb34e6615b0cf774bc8e
  
          } 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 b73601d2903f327b4e7b82ccc6774731c832e941..9e5d1ebcec91c036ab176161b13766ef44f41d59 100644
+index dff6e07de4d447f7d7fe0107928ea0749714ba3e..4444e25adf854f2efdd8b29dba151d03070c3e8c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3464,7 +3464,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0675-More-PotionEffectType-API.patch b/patches/server/0672-More-PotionEffectType-API.patch
index 07a0ef6777..07a0ef6777 100644
--- a/patches/server/0675-More-PotionEffectType-API.patch
+++ b/patches/server/0672-More-PotionEffectType-API.patch
diff --git a/patches/server/0676-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0673-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index b19bb65d35..b19bb65d35 100644
--- a/patches/server/0676-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0673-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0677-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0674-API-for-creating-command-sender-which-forwards-feedb.patch
index 1b3cb28843..3f3181fdc7 100644
--- a/patches/server/0677-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0674-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,10 +122,10 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cae178b0b4046815ab64cd4c7c0a48f3eb430aba..b90428ec620dbaea4207f39e7a44a84f34c24385 100644
+index 32338b8fa891262801ed45c7b64b306591e060fc..0796d35e5fb3fb3fac3f4f8b33624638727a55e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2129,6 +2129,13 @@ public final class CraftServer implements Server {
+@@ -2124,6 +2124,13 @@ public final class CraftServer implements Server {
          return this.console.console;
      }
  
@@ -153,7 +153,7 @@ index 7f22950ae61436e91a59cd29a345809c42bbe739..1e3091687735b461d3b6a313ab876112
  
      protected ServerCommandSender() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index bda9a0b99184adce28bb7851612ed7f4e324826d..61115db85b81e627d11a0de21691a2ca69aafe2c 100644
+index 98d314cd293d462ef109e952f3239e08e14dda59..2ee33c55890fa659f6d251e486264c85d9e89802 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 @@ -81,6 +81,11 @@ public final class VanillaCommandWrapper extends BukkitCommand {
diff --git a/patches/server/0678-Add-missing-structure-set-seed-configs.patch b/patches/server/0675-Add-missing-structure-set-seed-configs.patch
index 0c160b7c1c..0c160b7c1c 100644
--- a/patches/server/0678-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0675-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0679-Implement-regenerateChunk.patch b/patches/server/0676-Implement-regenerateChunk.patch
index c6a6c8eb34..c6a6c8eb34 100644
--- a/patches/server/0679-Implement-regenerateChunk.patch
+++ b/patches/server/0676-Implement-regenerateChunk.patch
diff --git a/patches/server/0680-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0677-Fix-cancelled-powdered-snow-bucket-placement.patch
index e46654952c..e46654952c 100644
--- a/patches/server/0680-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0677-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0681-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0678-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 5a0a90ce86..8f5932e5ad 100644
--- a/patches/server/0681-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0678-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,10 +6,10 @@ 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 b90428ec620dbaea4207f39e7a44a84f34c24385..432b711b47108a7100be31c492d151ac1eb95294 100644
+index 0796d35e5fb3fb3fac3f4f8b33624638727a55e1..7a812e65fb6a8ea9345a8e67b4a2dd033637d580 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2306,6 +2306,8 @@ public final class CraftServer implements Server {
+@@ -2301,6 +2301,8 @@ public final class CraftServer implements Server {
      @Override
      public int getSpawnLimit(SpawnCategory spawnCategory) {
          // Paper start - Add mobcaps commands
diff --git a/patches/server/0682-Add-GameEvent-tags.patch b/patches/server/0679-Add-GameEvent-tags.patch
index 3f94a012ff..d2891f7398 100644
--- a/patches/server/0682-Add-GameEvent-tags.patch
+++ b/patches/server/0679-Add-GameEvent-tags.patch
@@ -46,10 +46,10 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 432b711b47108a7100be31c492d151ac1eb95294..e8c90b60c0a17e11c5bb10fb4a501fdbf619533b 100644
+index 7a812e65fb6a8ea9345a8e67b4a2dd033637d580..3adf411927a168ca1fdf68bc60f894548e2fc1e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2734,6 +2734,15 @@ public final class CraftServer implements Server {
+@@ -2729,6 +2729,15 @@ public final class CraftServer implements Server {
                      return (org.bukkit.Tag<T>) new CraftEntityTag(BuiltInRegistries.ENTITY_TYPE, entityTagKey);
                  }
              }
@@ -65,7 +65,7 @@ index 432b711b47108a7100be31c492d151ac1eb95294..e8c90b60c0a17e11c5bb10fb4a501fdb
              default -> throw new IllegalArgumentException();
          }
  
-@@ -2766,6 +2775,13 @@ public final class CraftServer implements Server {
+@@ -2761,6 +2770,13 @@ public final class CraftServer implements Server {
                  net.minecraft.core.Registry<EntityType<?>> entityTags = BuiltInRegistries.ENTITY_TYPE;
                  return entityTags.getTags().map(pair -> (org.bukkit.Tag<T>) new CraftEntityTag(entityTags, pair.getFirst())).collect(ImmutableList.toImmutableList());
              }
diff --git a/patches/server/0683-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0680-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 3d074b30b4..74e1372a47 100644
--- a/patches/server/0683-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0680-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,10 +9,10 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0a206b9ff1ad235fa0805ad635c1a6caa1d3eafb..ff1f1233a73b4fa8ab793e7c2bac0bab704fb60e 100644
+index 533e1225b863ef314b7defebc4787304fd19f5a1..6d80102287f3976ea7f0912bcbd5ff0a2088a0e1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1346,6 +1346,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1343,6 +1343,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (super.pollTask()) {
              return true;
          } else {
@@ -20,7 +20,7 @@ index 0a206b9ff1ad235fa0805ad635c1a6caa1d3eafb..ff1f1233a73b4fa8ab793e7c2bac0bab
              if (this.tickRateManager.isSprinting() || this.haveTime()) {
                  Iterator iterator = this.getAllLevels().iterator();
  
-@@ -1353,12 +1354,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1350,12 +1351,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      ServerLevel worldserver = (ServerLevel) iterator.next();
  
                      if (worldserver.getChunkSource().pollTask()) {
diff --git a/patches/server/0684-Furnace-RecipesUsed-API.patch b/patches/server/0681-Furnace-RecipesUsed-API.patch
index d8224fe839..d8224fe839 100644
--- a/patches/server/0684-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0681-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0685-Configurable-sculk-sensor-listener-range.patch b/patches/server/0682-Configurable-sculk-sensor-listener-range.patch
index f2d79796cb..f2d79796cb 100644
--- a/patches/server/0685-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0682-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0686-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0683-Add-missing-block-data-mins-and-maxes.patch
index fe8170196d..fe8170196d 100644
--- a/patches/server/0686-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0683-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0687-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0684-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 22d038e185..db238fea90 100644
--- a/patches/server/0687-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0684-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,10 +10,10 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ff1f1233a73b4fa8ab793e7c2bac0bab704fb60e..afa1b531620fe15e76a48b39b830c199a8a0e702 100644
+index 6d80102287f3976ea7f0912bcbd5ff0a2088a0e1..b72b5fb2fa1d372f914ad1084e43b21b14f4fffb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -628,7 +628,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -625,7 +625,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  this.commandStorage = new CommandStorage(worldpersistentdata);
              } else {
                  ChunkProgressListener worldloadlistener = this.progressListenerFactory.create(this.worldData.getGameRules().getInt(GameRules.RULE_SPAWN_CHUNK_RADIUS));
diff --git a/patches/server/0688-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0685-Put-world-into-worldlist-before-initing-the-world.patch
index 57e80522ca..91052e9547 100644
--- a/patches/server/0688-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0685-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,10 +7,10 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index afa1b531620fe15e76a48b39b830c199a8a0e702..af5c6893859530f65724869d18b6677e6f556dc2 100644
+index b72b5fb2fa1d372f914ad1084e43b21b14f4fffb..f9a4b5558bacff9c478f407c2656cb08588f421f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -640,9 +640,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -637,9 +637,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
  
              worlddata.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());
@@ -23,10 +23,10 @@ index afa1b531620fe15e76a48b39b830c199a8a0e702..af5c6893859530f65724869d18b6677e
  
              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 e8c90b60c0a17e11c5bb10fb4a501fdbf619533b..d6a0e7eb9ee643fa42e1f568eb76041ddd43871e 100644
+index 3adf411927a168ca1fdf68bc60f894548e2fc1e7..9790cff70cf006c35dbfe95653a1bacdea33607d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1301,10 +1301,11 @@ public final class CraftServer implements Server {
+@@ -1296,10 +1296,11 @@ public final class CraftServer implements Server {
              return null;
          }
  
diff --git a/patches/server/0689-Fix-Entity-Position-Desync.patch b/patches/server/0686-Fix-Entity-Position-Desync.patch
index fb9d587df1..fb9d587df1 100644
--- a/patches/server/0689-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0686-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0690-Custom-Potion-Mixes.patch b/patches/server/0687-Custom-Potion-Mixes.patch
index cb0745a1a0..39634cf1c9 100644
--- a/patches/server/0690-Custom-Potion-Mixes.patch
+++ b/patches/server/0687-Custom-Potion-Mixes.patch
@@ -96,10 +96,10 @@ index 0000000000000000000000000000000000000000..7ea357ac2f3a93db4ebdf24b5072be7d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index af5c6893859530f65724869d18b6677e6f556dc2..18a73cc12615ecc7e61e8f96e6d8a3aa2ffe6e1f 100644
+index f9a4b5558bacff9c478f407c2656cb08588f421f..6f72020fab6e4e175a265f85ec9efc31811bdbfd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2141,6 +2141,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2138,6 +2138,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.worldData.setDataConfiguration(worlddataconfiguration);
              this.resources.managers.updateRegistryTags();
@@ -282,10 +282,10 @@ index 3ebfd564d4bbf00da5919e966f3d047285845640..887957ce1ddc2f32569405642f35df46
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d6a0e7eb9ee643fa42e1f568eb76041ddd43871e..9b0cabd9fdcaab31f291894e370a7cc2d8e24825 100644
+index 9790cff70cf006c35dbfe95653a1bacdea33607d..0ed2d510918cc14ce3d7e5def2021e07f7ad378f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -309,6 +309,7 @@ public final class CraftServer implements Server {
+@@ -304,6 +304,7 @@ public final class CraftServer implements Server {
      private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
      public static Exception excessiveVelEx; // Paper - Velocity warnings
      private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
@@ -293,7 +293,7 @@ index d6a0e7eb9ee643fa42e1f568eb76041ddd43871e..9b0cabd9fdcaab31f291894e370a7cc2
  
      static {
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
-@@ -390,6 +391,7 @@ public final class CraftServer implements Server {
+@@ -385,6 +386,7 @@ public final class CraftServer implements Server {
          if (this.configuration.getBoolean("settings.use-map-color-cache")) {
              MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
          }
@@ -301,7 +301,7 @@ index d6a0e7eb9ee643fa42e1f568eb76041ddd43871e..9b0cabd9fdcaab31f291894e370a7cc2
          datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
      }
  
-@@ -3100,5 +3102,9 @@ public final class CraftServer implements Server {
+@@ -3095,5 +3097,9 @@ public final class CraftServer implements Server {
          return datapackManager;
      }
  
diff --git a/patches/server/0691-Force-close-world-loading-screen.patch b/patches/server/0688-Force-close-world-loading-screen.patch
index a90bc669b4..a90bc669b4 100644
--- a/patches/server/0691-Force-close-world-loading-screen.patch
+++ b/patches/server/0688-Force-close-world-loading-screen.patch
diff --git a/patches/server/0692-Fix-falling-block-spawn-methods.patch b/patches/server/0689-Fix-falling-block-spawn-methods.patch
index 1f5d0c19cc..1f5d0c19cc 100644
--- a/patches/server/0692-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0689-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0693-Expose-furnace-minecart-push-values.patch b/patches/server/0690-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0693-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0690-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0694-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0691-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 2d524b390b..2d524b390b 100644
--- a/patches/server/0694-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0691-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0695-More-Projectile-API.patch b/patches/server/0692-More-Projectile-API.patch
index bccb9ad23b..cee81d8671 100644
--- a/patches/server/0695-More-Projectile-API.patch
+++ b/patches/server/0692-More-Projectile-API.patch
@@ -204,7 +204,7 @@ index 98f46fadd60ea688fefa8d83dbd6fe9b61b6a96f..d4e0170694409e674d488f913e61c205
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
-index 3815b68e139702f3f97c4fa2a77a0314d83fa758..939a0713c74dd92273190017d3976d894f002d95 100644
+index 3c22799d36f07e349df207ce8a39236bbf6c17bf..2124b31ca4d994ad159556d47a315004b7246265 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
 @@ -32,20 +32,7 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
@@ -469,7 +469,7 @@ index d685d09cae5f862c0004f148298c800736d2139e..636c4481e3afdf20197e502cf221f5d3
      public String toString() {
          return "CraftShulkerBullet";
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
-index a7443a61e796e8b8f4b480085a77e098d1b134e5..7c872f6a214d3d361aa63b06b001bde31fa54e96 100644
+index d67a80161b3e7c1fe02a6ed9d341c00dc7c2847a..408a0a0433b97d7f97d758fd1dfa7975dbf8eccd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
 @@ -36,11 +36,31 @@ public class CraftThrownPotion extends CraftThrowableProjectile implements Throw
@@ -526,7 +526,7 @@ index e374b9f40eddca13b30855d25a2030f8df98138f..4fc893378fb0568ddcffc7593d66df6b
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 28d371e59d8780bf6e154bac56ee189b3b43b201..dd092e44a18e238e4a8b4d8a791ef4267af01c04 100644
+index 5c31c652a3b956dd638137307d1a8b2ee4c3f675..90696beb3ca48fc28c9842589bc3ea398af7d422 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -832,19 +832,19 @@ public class CraftEventFactory {
diff --git a/patches/server/0696-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0693-Fix-swamp-hut-cat-generation-deadlock.patch
index 1b0f7d0ed5..1b0f7d0ed5 100644
--- a/patches/server/0696-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0693-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0697-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0694-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index f3a8cad2df..64325ae484 100644
--- a/patches/server/0697-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0694-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 6cd4acac1c89035ece14f07784a439960ffcfcf5..2eb69c7600a6a5e84b8f2a9bd9cc207c57459251 100644
+index 4ac3e9cacc3c54a67da1547a319fd501ff375354..eec6765f0885994791e6b09cd731bb275ceb286b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -484,6 +484,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0698-Implement-getComputedBiome-API.patch b/patches/server/0695-Implement-getComputedBiome-API.patch
index 57a6b3a7c5..57a6b3a7c5 100644
--- a/patches/server/0698-Implement-getComputedBiome-API.patch
+++ b/patches/server/0695-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0699-Make-some-itemstacks-nonnull.patch b/patches/server/0696-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0699-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0696-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0700-Implement-enchantWithLevels-API.patch b/patches/server/0697-Implement-enchantWithLevels-API.patch
index 7031b197b7..7031b197b7 100644
--- a/patches/server/0700-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0697-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0701-Fix-saving-in-unloadWorld.patch b/patches/server/0698-Fix-saving-in-unloadWorld.patch
index 3a5f0978a9..de62ca2257 100644
--- a/patches/server/0701-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0698-Fix-saving-in-unloadWorld.patch
@@ -6,10 +6,10 @@ 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 9b0cabd9fdcaab31f291894e370a7cc2d8e24825..591b490179c283c17e59a13ee1a0ad315f69f905 100644
+index 0ed2d510918cc14ce3d7e5def2021e07f7ad378f..3d7427e17211cf80dd512e3b312f2e95d9c33bf6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1350,7 +1350,7 @@ public final class CraftServer implements Server {
+@@ -1345,7 +1345,7 @@ public final class CraftServer implements Server {
  
          try {
              if (save) {
diff --git a/patches/server/0702-Buffer-OOB-setBlock-calls.patch b/patches/server/0699-Buffer-OOB-setBlock-calls.patch
index d0e56ca766..d0e56ca766 100644
--- a/patches/server/0702-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0699-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0703-Add-TameableDeathMessageEvent.patch b/patches/server/0700-Add-TameableDeathMessageEvent.patch
index 355d8192ca..355d8192ca 100644
--- a/patches/server/0703-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0700-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0704-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0701-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index f1e6097f9a..f1e6097f9a 100644
--- a/patches/server/0704-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0701-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0705-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0702-fix-player-loottables-running-when-mob-loot-gamerule.patch
index c0f0ba62ab..e154a821bb 100644
--- a/patches/server/0705-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0702-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 e96bd37366ec80cb62a1a4f82c218498b98c9ed9..00114ada4ad98e355e6c182fe49b6852bd9cf0c7 100644
+index 3f4a881a69b47e99498d4c2e53c9a20367e3887f..bbd5cbdae03dd3b81d5eca275c81801bd32e46ae 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -952,12 +952,14 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0706-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0703-Ensure-entity-passenger-world-matches-ridden-entity.patch
index b656e4e0e3..1eae2e3629 100644
--- a/patches/server/0706-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0703-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8e09bfb7c1b4fb34e6615b0cf774bc8e6cae29fa..3bd13975934e8f61b41c4c08b73ead6e0f45ffac 100644
+index ce21885281a2bca8f363ebc6423ca65df7c13c6d..d689f02150fa55ffcfb03adb5955f190ffdcc0de 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2611,7 +2611,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0707-cache-resource-keys.patch b/patches/server/0704-cache-resource-keys.patch
index 7f3b6ce992..7f3b6ce992 100644
--- a/patches/server/0707-cache-resource-keys.patch
+++ b/patches/server/0704-cache-resource-keys.patch
diff --git a/patches/server/0708-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0705-Allow-changing-the-EnderDragon-podium.patch
index 623c4b9689..623c4b9689 100644
--- a/patches/server/0708-Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/server/0705-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0709-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0706-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 05d5b9189b..05d5b9189b 100644
--- a/patches/server/0709-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0706-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0710-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0707-Prevent-tile-entity-copies-loading-chunks.patch
index 850db8e7b0..850db8e7b0 100644
--- a/patches/server/0710-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0707-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0711-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0708-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 9eed66c5cf..9eed66c5cf 100644
--- a/patches/server/0711-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0708-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0712-Expand-PlayerItemDamageEvent.patch b/patches/server/0709-Expand-PlayerItemDamageEvent.patch
index bb07753eca..bb07753eca 100644
--- a/patches/server/0712-Expand-PlayerItemDamageEvent.patch
+++ b/patches/server/0709-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0713-WorldCreator-keepSpawnLoaded.patch b/patches/server/0710-WorldCreator-keepSpawnLoaded.patch
index 9e860a12cf..90c8001ad7 100644
--- a/patches/server/0713-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0710-WorldCreator-keepSpawnLoaded.patch
@@ -5,10 +5,10 @@ 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 591b490179c283c17e59a13ee1a0ad315f69f905..d9b33e5892317370be8c129a3e54a13722967942 100644
+index 3d7427e17211cf80dd512e3b312f2e95d9c33bf6..41865320f9eeb94dbbdefb863c0f14e0b3c006f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1293,7 +1293,7 @@ public final class CraftServer implements Server {
+@@ -1288,7 +1288,7 @@ public final class CraftServer implements Server {
          }
  
          // If set to not keep spawn in memory (changed from default) then adjust rule accordingly
diff --git a/patches/server/0714-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0711-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index ed8adb4503..ed8adb4503 100644
--- a/patches/server/0714-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0711-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0715-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0712-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index d6e979b4fa..d6e979b4fa 100644
--- a/patches/server/0715-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0712-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0716-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0713-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 7c31e2a5df..190a5b5de8 100644
--- a/patches/server/0716-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0713-Add-EntityDyeEvent-and-CollarColorable-interface.patch
@@ -23,7 +23,7 @@ index b5f13d1bf1cccb9a15d8956f68c960e25098dc98..118be62539bb0266c2e89bd68abbc4a9
                              this.setCollarColor(enumcolor);
                              itemstack.consume(1, player);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 11f4a2e15d42a029406fe8399b8d93ae136f0295..b5ee82e5abfecc59e2362628f288b76881855f36 100644
+index 5ebf49a565af4ab3bead60a83bca2e6561e6a29c..cebbb7341f86b13dcbfc3a41cbe264e9d4b68d60 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -447,6 +447,14 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
diff --git a/patches/server/0717-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0714-Fire-CauldronLevelChange-on-initial-fill.patch
index 4f5e70f836..4f5e70f836 100644
--- a/patches/server/0717-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0714-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0718-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0715-fix-powder-snow-cauldrons-not-turning-to-water.patch
index f277b93aa1..f277b93aa1 100644
--- a/patches/server/0718-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0715-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0719-Add-PlayerStopUsingItemEvent.patch b/patches/server/0716-Add-PlayerStopUsingItemEvent.patch
index fa87839c01..4424b580ac 100644
--- a/patches/server/0719-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0716-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 9e5d1ebcec91c036ab176161b13766ef44f41d59..44ce7ffd8304f0f295f632211931f5b9f6c72d17 100644
+index 4444e25adf854f2efdd8b29dba151d03070c3e8c..0c737b3c0a7645fddf157e1f12af14b8da34d09e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -4033,6 +4033,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0720-Don-t-tick-markers.patch b/patches/server/0717-Don-t-tick-markers.patch
index 429927b2bf..c78f41d43b 100644
--- a/patches/server/0720-Don-t-tick-markers.patch
+++ b/patches/server/0717-Don-t-tick-markers.patch
@@ -23,7 +23,7 @@ index ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8..5e5a018433414af76eaa1e781f61612d
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index dd1f03109a7f8cd65f9e77de94a2a170652ce4ed..376a03b48db954479dd3d8bdbe7f1b7c956e322b 100644
+index 134df9ad4d5d5f85429f5e3ff6d879bc5f1fb13f..452dfcce367470711e12ee174518359dc916a10d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2192,6 +2192,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0721-Expand-FallingBlock-API.patch b/patches/server/0718-Expand-FallingBlock-API.patch
index 861e7e87f2..861e7e87f2 100644
--- a/patches/server/0721-Expand-FallingBlock-API.patch
+++ b/patches/server/0718-Expand-FallingBlock-API.patch
diff --git a/patches/server/0722-Add-support-for-Proxy-Protocol.patch b/patches/server/0719-Add-support-for-Proxy-Protocol.patch
index fa64d53a92..1a5592988a 100644
--- a/patches/server/0722-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0719-Add-support-for-Proxy-Protocol.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add support for Proxy Protocol
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 4f8b8839f4d345f448d30de21ad9f3ad7422f98b..1ed8d1ba75fa3a31469a6e8e3b661328b0debf12 100644
+index 69b5d39f57a63130c0b83f6238898bdf68fa1e9a..48b8db6d5fdf9b2f7155b9356418178f5594ddcb 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -27,6 +27,7 @@ dependencies {
+@@ -28,6 +28,7 @@ dependencies {
      log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
      runtimeOnly(log4jPlugins.output)
      alsoShade(log4jPlugins.output)
diff --git a/patches/server/0723-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0720-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 61c9b7dd07..61c9b7dd07 100644
--- a/patches/server/0723-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0720-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0724-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0721-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 7158b83635..7158b83635 100644
--- a/patches/server/0724-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0721-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0725-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0722-Sanitize-sent-BlockEntity-NBT.patch
index 08938ddd13..08938ddd13 100644
--- a/patches/server/0725-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/server/0722-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0726-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0723-Disable-component-selector-resolving-in-books-by-def.patch
index 796fcc7f2a..796fcc7f2a 100644
--- a/patches/server/0726-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0723-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0727-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0724-Prevent-entity-loading-causing-async-lookups.patch
index 06bfec3f5f..06bfec3f5f 100644
--- a/patches/server/0727-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0724-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0728-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0725-Throw-exception-on-world-create-while-being-ticked.patch
index 4a0d4b038d..f5f18c1913 100644
--- a/patches/server/0728-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0725-Throw-exception-on-world-create-while-being-ticked.patch
@@ -7,10 +7,10 @@ There are no plans to support creating worlds while worlds are
 being ticked themselvess.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 18a73cc12615ecc7e61e8f96e6d8a3aa2ffe6e1f..0775e9259c5b465306adf6b9d7ffc404da14be54 100644
+index 6f72020fab6e4e175a265f85ec9efc31811bdbfd..803c234ec23147ed317ae4639438141462dfbd80 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -314,6 +314,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -311,6 +311,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
      public static long currentTickLong = 0L; // Paper - track current tick as a long
@@ -18,7 +18,7 @@ index 18a73cc12615ecc7e61e8f96e6d8a3aa2ffe6e1f..0775e9259c5b465306adf6b9d7ffc404
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -1558,7 +1559,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1555,7 +1556,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.getFunctions().tick();
          MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper
          this.profiler.popPush("levels");
@@ -27,7 +27,7 @@ index 18a73cc12615ecc7e61e8f96e6d8a3aa2ffe6e1f..0775e9259c5b465306adf6b9d7ffc404
  
          // CraftBukkit start
          // Run tasks that are waiting on processing
-@@ -1590,6 +1591,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1587,6 +1588,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end - Perf: Optimize time updates
          MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
  
@@ -36,7 +36,7 @@ index 18a73cc12615ecc7e61e8f96e6d8a3aa2ffe6e1f..0775e9259c5b465306adf6b9d7ffc404
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
-@@ -1630,6 +1633,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1627,6 +1630,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.profiler.pop();
              worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
          }
@@ -45,10 +45,10 @@ index 18a73cc12615ecc7e61e8f96e6d8a3aa2ffe6e1f..0775e9259c5b465306adf6b9d7ffc404
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d9b33e5892317370be8c129a3e54a13722967942..271b103aa0fc84ac051619ff94abbeeaa1b276c1 100644
+index 41865320f9eeb94dbbdefb863c0f14e0b3c006f3..2dfa5c1d0ee75056383e52be0f55cf924f0828f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -887,6 +887,11 @@ public final class CraftServer implements Server {
+@@ -882,6 +882,11 @@ public final class CraftServer implements Server {
          return new ArrayList<World>(this.worlds.values());
      }
  
@@ -60,7 +60,7 @@ index d9b33e5892317370be8c129a3e54a13722967942..271b103aa0fc84ac051619ff94abbeea
      public DedicatedPlayerList getHandle() {
          return this.playerList;
      }
-@@ -1147,6 +1152,7 @@ public final class CraftServer implements Server {
+@@ -1142,6 +1147,7 @@ public final class CraftServer implements Server {
      @Override
      public World createWorld(WorldCreator creator) {
          Preconditions.checkState(this.console.getAllLevels().iterator().hasNext(), "Cannot create additional worlds on STARTUP");
@@ -68,7 +68,7 @@ index d9b33e5892317370be8c129a3e54a13722967942..271b103aa0fc84ac051619ff94abbeea
          Preconditions.checkArgument(creator != null, "WorldCreator cannot be null");
  
          String name = creator.name();
-@@ -1323,6 +1329,7 @@ public final class CraftServer implements Server {
+@@ -1318,6 +1324,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean unloadWorld(World world, boolean save) {
diff --git a/patches/server/0729-Dont-resent-entity-on-art-update.patch b/patches/server/0726-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0729-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0726-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0730-Add-WardenAngerChangeEvent.patch b/patches/server/0727-Add-WardenAngerChangeEvent.patch
index 38df99e752..38df99e752 100644
--- a/patches/server/0730-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0727-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0731-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0728-Add-option-for-strict-advancement-dimension-checks.patch
index a6ef3a78f3..ff7a351ea1 100644
--- a/patches/server/0731-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0728-Add-option-for-strict-advancement-dimension-checks.patch
@@ -24,7 +24,7 @@ index 5be2d877162922d6f29592e723b7d5aff14e1515..37174de2319e353b2f989d8321758a08
          } else {
              BlockPos blockPos = BlockPos.containing(x, y, z);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 00114ada4ad98e355e6c182fe49b6852bd9cf0c7..269c0f53d37e968ae25e38ef81a11c9d5284c494 100644
+index bbd5cbdae03dd3b81d5eca275c81801bd32e46ae..a11aa87cc0bcd829dc2b52d49599eb4cd2c43f3c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1349,6 +1349,12 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0732-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0729-Add-missing-important-BlockStateListPopulator-method.patch
index ecf565ebf6..ecf565ebf6 100644
--- a/patches/server/0732-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0729-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0733-Nameable-Banner-API.patch b/patches/server/0730-Nameable-Banner-API.patch
index 21ca7151b4..21ca7151b4 100644
--- a/patches/server/0733-Nameable-Banner-API.patch
+++ b/patches/server/0730-Nameable-Banner-API.patch
diff --git a/patches/server/0734-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0731-Don-t-broadcast-messages-to-command-blocks.patch
index 855a217d4c..5d9c6c3963 100644
--- a/patches/server/0734-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0731-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,10 +20,10 @@ index 8c2dcc4134d96351cee75773214f3f47e71533e9..e6bfcc50cdf728216084bc00a5bb8b6b
              Date date = new Date();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 271b103aa0fc84ac051619ff94abbeeaa1b276c1..d9390854adf0009a5b8ccd4ff2d6175987918a0e 100644
+index 2dfa5c1d0ee75056383e52be0f55cf924f0828f0..865d330d4c707c4b649650730a66a43e3cb01936 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1892,7 +1892,7 @@ public final class CraftServer implements Server {
+@@ -1887,7 +1887,7 @@ public final class CraftServer implements Server {
          // Paper end
          Set<CommandSender> recipients = new HashSet<>();
          for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) {
diff --git a/patches/server/0735-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0732-Prevent-empty-items-from-being-added-to-world.patch
index f3d82c1fbd..6515705f6a 100644
--- a/patches/server/0735-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0732-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,7 +7,7 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca
 Just simply prevent them from being added to the world instead.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 376a03b48db954479dd3d8bdbe7f1b7c956e322b..23c9aca7c05a4457e357699c67c7780894ebe3de 100644
+index 452dfcce367470711e12ee174518359dc916a10d..e42dd32e277d8071a2c1b4411bc222a62023102d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1237,6 +1237,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0736-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0733-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 2c104c79c4..56d5a7ad9e 100644
--- a/patches/server/0736-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0733-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
@@ -7,7 +7,7 @@ Remove in 1.19 along with the SplashPotion and
 LingeringPotion interfaces
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
-index 7c872f6a214d3d361aa63b06b001bde31fa54e96..93b42b970b174b800cf89cb0d12cf3d2574323bd 100644
+index 408a0a0433b97d7f97d758fd1dfa7975dbf8eccd..42462fac097aeb1cfd367f8c240da63f513ec5a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
 @@ -14,7 +14,7 @@ import org.bukkit.entity.ThrownPotion;
diff --git a/patches/server/0737-Add-Player-getFishHook.patch b/patches/server/0734-Add-Player-getFishHook.patch
index d87fa21619..d87fa21619 100644
--- a/patches/server/0737-Add-Player-getFishHook.patch
+++ b/patches/server/0734-Add-Player-getFishHook.patch
diff --git a/patches/server/0738-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0735-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 32aaf6dc6e..32aaf6dc6e 100644
--- a/patches/server/0738-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0735-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0739-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0736-Add-various-missing-EntityDropItemEvent-calls.patch
index bafd157cd1..74cdba593c 100644
--- a/patches/server/0739-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0736-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bcf4e77ed17fa35d509b33568793a38278e2b718..3f2293ae7b84c9ec8455f41121adbaf7dbd7da71 100644
+index 5a6041ca0a787a945629066477f94d48ea1f1f19..e6c0dbe34790351f847a9a44aa6c733b71775318 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2519,6 +2519,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0740-Fix-Bee-flower-NPE.patch b/patches/server/0737-Fix-Bee-flower-NPE.patch
index 13dcee533d..13dcee533d 100644
--- a/patches/server/0740-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0737-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0741-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0738-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 8d111565f9..dabe57eadf 100644
--- a/patches/server/0741-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0738-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 28c140d641244454d754770c06bc22d650cfcbfa..552220359917a8dfe77337122d65a3a43cfbdce5 100644
+index 535f6478453e61fa37c5e6f887d27f25ca82269b..841e9ff72bf48f9273afc14dfa636232be2c955c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2367,7 +2367,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0742-More-Teleport-API.patch b/patches/server/0739-More-Teleport-API.patch
index 2f7a16ac49..56d40e9b11 100644
--- a/patches/server/0742-More-Teleport-API.patch
+++ b/patches/server/0739-More-Teleport-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More Teleport API
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 552220359917a8dfe77337122d65a3a43cfbdce5..0f7a9ffe56150b29867b9ca32ea6de5a1689a0f1 100644
+index 841e9ff72bf48f9273afc14dfa636232be2c955c..01905f6db49ffe578998f4cf6d24311400a3d92b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1553,11 +1553,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -112,7 +112,7 @@ index 113ca1d16cb7650d72f488cdaa9e670d51dc85f0..b6fef2ca5b564c293cb602cb8e300d35
      private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot()
      {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ee31c18ae530cb064ae9d1cc3f3d68312c1f854c..cfcba16427d9c562bae987abc995775c4ee2956d 100644
+index a7c03ca87bb0d38552ea7a80b97a0ef0af394190..d5d8fd34f3cbd18b2b956792ec07838b9c5e572d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1273,13 +1273,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0743-Add-EntityPortalReadyEvent.patch b/patches/server/0740-Add-EntityPortalReadyEvent.patch
index 50d3716266..5d1ceeb656 100644
--- a/patches/server/0743-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0740-Add-EntityPortalReadyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3f2293ae7b84c9ec8455f41121adbaf7dbd7da71..4b54b3e121508fb1590654123e86c6c5de54a755 100644
+index e6c0dbe34790351f847a9a44aa6c733b71775318..8d80018d7bd1cdce2dafa4d0be5499f1d86c75fe 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2862,6 +2862,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0744-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0741-Don-t-use-level-random-in-entity-constructors.patch
index 4d7c249601..4d7c249601 100644
--- a/patches/server/0744-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0741-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0745-Send-block-entities-after-destroy-prediction.patch b/patches/server/0742-Send-block-entities-after-destroy-prediction.patch
index 4516d3139c..e5845bc0c1 100644
--- a/patches/server/0745-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0742-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index d8c5f8e584976a97bd909bfa20023993ab776952..77e78808171daac78502ef3fcc70f035
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0f7a9ffe56150b29867b9ca32ea6de5a1689a0f1..c010d36d91066cb333f3360f278b775bacddd857 100644
+index 01905f6db49ffe578998f4cf6d24311400a3d92b..e711e3ab336b879664a885c4ec9b9e46cf71331d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1700,8 +1700,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0746-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0743-Warn-on-plugins-accessing-faraway-chunks.patch
index 2f60387b5d..2f60387b5d 100644
--- a/patches/server/0746-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0743-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0747-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0744-Custom-Chat-Completion-Suggestions-API.patch
index 52d9d632bf..9358628d81 100644
--- a/patches/server/0747-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0744-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cfcba16427d9c562bae987abc995775c4ee2956d..a5b87aaa0b5ae437a44c5576ff6f7c28e07e36bf 100644
+index d5d8fd34f3cbd18b2b956792ec07838b9c5e572d..b99dc0fee6c23707785ee155c69d013facf2bc96 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -689,6 +689,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0748-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0745-Add-and-fix-missing-BlockFadeEvents.patch
index 18f8fbe87f..18f8fbe87f 100644
--- a/patches/server/0748-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0745-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0749-Collision-API.patch b/patches/server/0746-Collision-API.patch
index b4840d04ac..b4840d04ac 100644
--- a/patches/server/0749-Collision-API.patch
+++ b/patches/server/0746-Collision-API.patch
diff --git a/patches/server/0750-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0747-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index c145128551..c145128551 100644
--- a/patches/server/0750-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0747-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0751-Block-Ticking-API.patch b/patches/server/0748-Block-Ticking-API.patch
index f1b51ee5b1..f9900a3d65 100644
--- a/patches/server/0751-Block-Ticking-API.patch
+++ b/patches/server/0748-Block-Ticking-API.patch
@@ -46,7 +46,7 @@ index 6d10396347b69d9243ab902ecc68ede93fa17b7d..af219df5267589300f0ad1d30fa5c81a
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index 3fe60f5ee38ecb704194a8c2dd6e40c5bb57d9cc..784daa5e6c9a940966a32b6251a810e6f9664936 100644
+index 21ad2f461a5a578a2bf7fec1deeb421071245e6d..de4bbb73a78d037b99d662df130c7e122fda6cee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -736,4 +736,11 @@ public class CraftBlockData implements BlockData {
diff --git a/patches/server/0752-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0749-Add-Velocity-IP-Forwarding-Support.patch
index 87a1f24b99..b1064130c8 100644
--- a/patches/server/0752-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0749-Add-Velocity-IP-Forwarding-Support.patch
@@ -228,10 +228,10 @@ index 9bcded0466f3b10fafd709edc44c60f85cb48b7f..cb006ae0e5be2f1d31261bdd36964229
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d9390854adf0009a5b8ccd4ff2d6175987918a0e..99823b061d6c580336cc27be834018f9d2156a72 100644
+index 865d330d4c707c4b649650730a66a43e3cb01936..d0f4657a89c6fad5dda556ddec543bb9024952e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -816,7 +816,7 @@ public final class CraftServer implements Server {
+@@ -811,7 +811,7 @@ public final class CraftServer implements Server {
      @Override
      public long getConnectionThrottle() {
          // Spigot Start - Automatically set connection throttle for bungee configurations
diff --git a/patches/server/0753-Add-NamespacedKey-biome-methods.patch b/patches/server/0750-Add-NamespacedKey-biome-methods.patch
index 90058446ee..4ef9794eac 100644
--- a/patches/server/0753-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0750-Add-NamespacedKey-biome-methods.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add NamespacedKey biome methods
 Co-authored-by: Thonk <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 3e88b095260674a8383cc2646fc194c854bcf121..230ef9f3619cb3d2e750f5217df2ea19f61e25be 100644
+index a2961166695e5fe4c607c82a490ce67c2e1b5fde..77cc32eb8b3e835af229fcb78229bfc09bd0da70 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -607,6 +607,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0754-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0751-Fix-plugin-loggers-on-server-shutdown.patch
index c0da2d76a6..8a41141be3 100644
--- a/patches/server/0754-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0751-Fix-plugin-loggers-on-server-shutdown.patch
@@ -37,10 +37,10 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0775e9259c5b465306adf6b9d7ffc404da14be54..b8f2ad2541ef5d9c9c81a92460d7d4896efad335 100644
+index 803c234ec23147ed317ae4639438141462dfbd80..f67b48131ec7e18177f5daeda19389641f00193a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1235,6 +1235,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1232,6 +1232,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  } catch (Exception ignored) {
                  }
                  // CraftBukkit end
@@ -49,10 +49,10 @@ index 0775e9259c5b465306adf6b9d7ffc404da14be54..b8f2ad2541ef5d9c9c81a92460d7d489
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 90911cd3ba86e02baf8684099f0762fab563581c..3b8a2de79c79302626f43f320b15bae52416cc37 100644
+index 02243b69cca7255588b43dab57e1c9ca4c3ca87f..6e1f92b45504cef0c4dcbbebf3df339ef4cad0a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -18,6 +18,12 @@ public class Main {
+@@ -19,6 +19,12 @@ public class Main {
      public static boolean useJline = true;
      public static boolean useConsole = true;
  
diff --git a/patches/server/0755-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0752-Stop-large-look-changes-from-crashing-the-server.patch
index fdc94d50a1..7f3e95c5fc 100644
--- a/patches/server/0755-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0752-Stop-large-look-changes-from-crashing-the-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server
 Co-authored-by: Jaren Knodel <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 44ce7ffd8304f0f295f632211931f5b9f6c72d17..33506e82025656df4a13aeacb788d73e5e5a4929 100644
+index 0c737b3c0a7645fddf157e1f12af14b8da34d09e..8e56fdb91fdf006e99a1464568b0d87e9e8daee1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3142,37 +3142,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0756-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0753-Fire-EntityChangeBlockEvent-in-more-places.patch
index d21cfe9e22..d21cfe9e22 100644
--- a/patches/server/0756-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0753-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0757-Missing-eating-regain-reason.patch b/patches/server/0754-Missing-eating-regain-reason.patch
index 7c26c6d752..7c26c6d752 100644
--- a/patches/server/0757-Missing-eating-regain-reason.patch
+++ b/patches/server/0754-Missing-eating-regain-reason.patch
diff --git a/patches/server/0758-Missing-effect-cause.patch b/patches/server/0755-Missing-effect-cause.patch
index 17172c3b36..17172c3b36 100644
--- a/patches/server/0758-Missing-effect-cause.patch
+++ b/patches/server/0755-Missing-effect-cause.patch
diff --git a/patches/server/0759-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0756-Added-byte-array-serialization-deserialization-for-P.patch
index f2a4d437f0..f2a4d437f0 100644
--- a/patches/server/0759-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0756-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0760-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0757-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index c6ff862ed6..c6ff862ed6 100644
--- a/patches/server/0760-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0757-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0761-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0758-Call-BlockPhysicsEvent-more-often.patch
index 1839fbe711..1839fbe711 100644
--- a/patches/server/0761-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0758-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0762-Configurable-chat-thread-limit.patch b/patches/server/0759-Configurable-chat-thread-limit.patch
index 255381bd14..fa5e60fd33 100644
--- a/patches/server/0762-Configurable-chat-thread-limit.patch
+++ b/patches/server/0759-Configurable-chat-thread-limit.patch
@@ -22,7 +22,7 @@ is actually processed, this is honestly really just exposed for the misnomers or
 who just wanna ensure that this won't grow over a specific size if chat gets stupidly active
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 4a34a49f12b106976ba19436f96f74ebb068249c..d12fd313730c44dcec3c73fcd8c99c0c84f46743 100644
+index 892351c3b6397b3cde6a31a6594c0e16bbe1252b..ab5089781b8866cd6ad1b9570634ba84d936cfe7 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -285,7 +285,18 @@ public class GlobalConfiguration extends ConfigurationPart {
diff --git a/patches/server/0763-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0760-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 351cbaeb38..351cbaeb38 100644
--- a/patches/server/0763-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0760-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0764-fix-Jigsaw-block-kicking-user.patch b/patches/server/0761-fix-Jigsaw-block-kicking-user.patch
index 0c52c47ce9..0c52c47ce9 100644
--- a/patches/server/0764-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0761-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0765-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0762-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 8653ffd786..8653ffd786 100644
--- a/patches/server/0765-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0762-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0766-Add-getDrops-to-BlockState.patch b/patches/server/0763-Add-getDrops-to-BlockState.patch
index ea12f69bde..ea12f69bde 100644
--- a/patches/server/0766-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0763-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0764-Fix-a-bunch-of-vanilla-bugs.patch
index c15e6fbe0a..5145bc1511 100644
--- a/patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0764-Fix-a-bunch-of-vanilla-bugs.patch
@@ -117,7 +117,7 @@ index 3532febc8e34c8436a69a4c4b472b1776f21ee48..de19a5ea96fa38621513e970e04d1535
          return this.anyPlayerCloseEnoughForSpawning(pos, false);
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 23c9aca7c05a4457e357699c67c7780894ebe3de..ab31102de7c43a4fc923b26d9072242453a3f199 100644
+index e42dd32e277d8071a2c1b4411bc222a62023102d..5a1493a981ba99f287fc70193bfdf04f9a01ff89 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -776,7 +776,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -130,7 +130,7 @@ index 23c9aca7c05a4457e357699c67c7780894ebe3de..ab31102de7c43a4fc923b26d90722424
  
              if (!list.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 269c0f53d37e968ae25e38ef81a11c9d5284c494..a1636e09a7b46c333029bfdb7d1823d5dec83bbf 100644
+index a11aa87cc0bcd829dc2b52d49599eb4cd2c43f3c..9b62135df9be88b1981d2d330449d42870aaba01 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -445,14 +445,14 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0768-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0765-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 73e5958d98..c764e834e8 100644
--- a/patches/server/0768-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0765-Remove-unnecessary-onTrackingStart-during-navigation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ab31102de7c43a4fc923b26d9072242453a3f199..93f6864c69761b70735795186cf118d1f091d092 100644
+index 5a1493a981ba99f287fc70193bfdf04f9a01ff89..9f7088691c3ab848c5095b6109d14eae947ace99 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2216,7 +2216,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0769-Fix-custom-piglin-loved-items.patch b/patches/server/0766-Fix-custom-piglin-loved-items.patch
index 043217eed5..043217eed5 100644
--- a/patches/server/0769-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0766-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0770-EntityPickupItemEvent-fixes.patch b/patches/server/0767-EntityPickupItemEvent-fixes.patch
index 5780237591..5780237591 100644
--- a/patches/server/0770-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0767-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0771-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0768-Correctly-handle-interactions-with-items-on-cooldown.patch
index abeca5857c..e9996dba57 100644
--- a/patches/server/0771-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0768-Correctly-handle-interactions-with-items-on-cooldown.patch
@@ -30,7 +30,7 @@ index 0cfdd01778fb4f2150a4dea2d9dc6b3b830af987..ee7f36700863b9f504a70a56c5f28c8e
          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 70489085763475d29ddddc0bd3279974d0eb73cf..c52cb55cd1da988ec646e4e1484ec1a72513291d 100644
+index a40e6a19459cb5853f72708a0e7b8cc7334dca51..43759af5c1ddb49926cdf49b95acd65e68cffd60 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -545,6 +545,12 @@ public class CraftEventFactory {
diff --git a/patches/server/0772-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0769-Add-PlayerInventorySlotChangeEvent.patch
index 40015b3b36..292fb5ad41 100644
--- a/patches/server/0772-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0769-Add-PlayerInventorySlotChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a1636e09a7b46c333029bfdb7d1823d5dec83bbf..d139e9e8b83ee4f075228ef0d42786c470012c2d 100644
+index 9b62135df9be88b1981d2d330449d42870aaba01..535c176eb1d7141e7f46ec2380c3ae0f012a69b3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -347,6 +347,25 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0773-Elder-Guardian-appearance-API.patch b/patches/server/0770-Elder-Guardian-appearance-API.patch
index 660b7c3b7e..660b7c3b7e 100644
--- a/patches/server/0773-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0770-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0774-Allow-changing-bed-s-occupied-property.patch b/patches/server/0771-Allow-changing-bed-s-occupied-property.patch
index d8b51d7f0b..d8b51d7f0b 100644
--- a/patches/server/0774-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0771-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0775-Add-entity-knockback-API.patch b/patches/server/0772-Add-entity-knockback-API.patch
index c5c8da6eb6..c5c8da6eb6 100644
--- a/patches/server/0775-Add-entity-knockback-API.patch
+++ b/patches/server/0772-Add-entity-knockback-API.patch
diff --git a/patches/server/0776-Detect-headless-JREs.patch b/patches/server/0773-Detect-headless-JREs.patch
index 5ba28913a8..5ba28913a8 100644
--- a/patches/server/0776-Detect-headless-JREs.patch
+++ b/patches/server/0773-Detect-headless-JREs.patch
diff --git a/patches/server/0777-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0774-fix-entity-vehicle-collision-event-not-called.patch
index fdb817e0f7..fdb817e0f7 100644
--- a/patches/server/0777-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0774-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0778-Add-EntityToggleSitEvent.patch b/patches/server/0775-Add-EntityToggleSitEvent.patch
index 6430c3e7f9..6430c3e7f9 100644
--- a/patches/server/0778-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0775-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0779-Add-fire-tick-delay-option.patch b/patches/server/0776-Add-fire-tick-delay-option.patch
index 848f831f0e..848f831f0e 100644
--- a/patches/server/0779-Add-fire-tick-delay-option.patch
+++ b/patches/server/0776-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0780-Add-Moving-Piston-API.patch b/patches/server/0777-Add-Moving-Piston-API.patch
index e3d3955822..e3d3955822 100644
--- a/patches/server/0780-Add-Moving-Piston-API.patch
+++ b/patches/server/0777-Add-Moving-Piston-API.patch
diff --git a/patches/server/0781-Ignore-impossible-spawn-tick.patch b/patches/server/0778-Ignore-impossible-spawn-tick.patch
index f046102ceb..f046102ceb 100644
--- a/patches/server/0781-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0778-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0782-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0779-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index c42422ceca..c42422ceca 100644
--- a/patches/server/0782-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0779-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0783-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 5def430ee3..038fdcd4fa 100644
--- a/patches/server/0783-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4b54b3e121508fb1590654123e86c6c5de54a755..0a4069e6c544deb0ad576350ec371fe1ec5de8f4 100644
+index 8d80018d7bd1cdce2dafa4d0be5499f1d86c75fe..b49efb6f5f106396894831f28841d5a14d5a8c00 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3127,6 +3127,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0784-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0781-Add-PrePlayerAttackEntityEvent.patch
index 2c7c8105ab..2c7c8105ab 100644
--- a/patches/server/0784-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0781-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0785-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0782-ensure-reset-EnderDragon-boss-event-name.patch
index 854c391fc5..854c391fc5 100644
--- a/patches/server/0785-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0782-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0786-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0783-fix-MC-252817-green-map-markers-do-not-disappear.patch
index a5e8df272b..a5e8df272b 100644
--- a/patches/server/0786-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0783-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0787-Add-Player-Warden-Warning-API.patch b/patches/server/0784-Add-Player-Warden-Warning-API.patch
index a049f08c9f..a049f08c9f 100644
--- a/patches/server/0787-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0784-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0788-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0785-More-vanilla-friendly-methods-to-update-trades.patch
index 5280c03219..5280c03219 100644
--- a/patches/server/0788-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0785-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0789-Add-paper-dumplisteners-command.patch b/patches/server/0786-Add-paper-dumplisteners-command.patch
index ba293d1dad..ba293d1dad 100644
--- a/patches/server/0789-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0786-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0790-check-global-player-list-where-appropriate.patch b/patches/server/0787-check-global-player-list-where-appropriate.patch
index 56ca131550..beebaacc34 100644
--- a/patches/server/0790-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0787-check-global-player-list-where-appropriate.patch
@@ -7,7 +7,7 @@ Makes certain entities check all players when searching for a player
 instead of just checking players in their world.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 93f6864c69761b70735795186cf118d1f091d092..3ce6604a74d7ab0b045901261d58736ca4c543a7 100644
+index 9f7088691c3ab848c5095b6109d14eae947ace99..1e122d5b49aa7f6a626e781e53de53be18afc346 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2332,4 +2332,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -24,7 +24,7 @@ index 93f6864c69761b70735795186cf118d1f091d092..3ce6604a74d7ab0b045901261d58736c
 +    // Paper end - check global player list where appropriate
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 33506e82025656df4a13aeacb788d73e5e5a4929..1a88c22e6f2e85e2cb87ae20a849ac594e9be1e0 100644
+index 8e56fdb91fdf006e99a1464568b0d87e9e8daee1..f725d1f797733f7a4871aa1f84e7353fc3c3f948 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3688,7 +3688,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0791-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0788-Fix-async-entity-add-due-to-fungus-trees.patch
index a5f4531c29..a5f4531c29 100644
--- a/patches/server/0791-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0788-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0792-ItemStack-damage-API.patch b/patches/server/0789-ItemStack-damage-API.patch
index 807a916f44..807a916f44 100644
--- a/patches/server/0792-ItemStack-damage-API.patch
+++ b/patches/server/0789-ItemStack-damage-API.patch
diff --git a/patches/server/0793-Friction-API.patch b/patches/server/0790-Friction-API.patch
index 8818e0e61b..c713bd2c3a 100644
--- a/patches/server/0793-Friction-API.patch
+++ b/patches/server/0790-Friction-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Friction API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1a88c22e6f2e85e2cb87ae20a849ac594e9be1e0..c5ebe3aec4f7ba484194c75f94600ba926b10abb 100644
+index f725d1f797733f7a4871aa1f84e7353fc3c3f948..205c7bdc03c86229a100bd535db16b502d99ba24 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -273,6 +273,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0794-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0791-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 5bc45a7af4..5bc45a7af4 100644
--- a/patches/server/0794-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0791-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0795-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0792-Fix-premature-player-kicks-on-shutdown.patch
index d824af1bd8..7cdccaff49 100644
--- a/patches/server/0795-Fix-premature-player-kicks-on-shutdown.patch
+++ b/patches/server/0792-Fix-premature-player-kicks-on-shutdown.patch
@@ -47,10 +47,10 @@ index fd2a5c829899d45641a5b5d30116f4f368953c15..f57679d88cd015caa8996d44b486da69
                          this.disconnect(Component.translatable("multiplayer.disconnect.server_shutdown"));
                      } catch (ClassCastException classcastexception) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b8f2ad2541ef5d9c9c81a92460d7d4896efad335..28b68ddc343059fdd98419930a8b75cca54487d0 100644
+index f67b48131ec7e18177f5daeda19389641f00193a..e463727cccc6931de822f62309090241c7abada4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2074,7 +2074,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2071,7 +2071,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      @Override
      public void executeIfPossible(Runnable runnable) {
          if (this.isStopped()) {
diff --git a/patches/server/0796-Sync-offhand-slot-in-menus.patch b/patches/server/0793-Sync-offhand-slot-in-menus.patch
index 2c88b798a8..38a66ea248 100644
--- a/patches/server/0796-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0793-Sync-offhand-slot-in-menus.patch
@@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th
 by pressing the offhand swap item
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d139e9e8b83ee4f075228ef0d42786c470012c2d..992032821110fc658fecc09530097a526f20d74d 100644
+index 535c176eb1d7141e7f46ec2380c3ae0f012a69b3..d59225c63aa4d3df9f8e87a1b3527d044fd2c410 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -316,6 +316,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0797-Player-Entity-Tracking-Events.patch b/patches/server/0794-Player-Entity-Tracking-Events.patch
index 4a5f62d874..8441aa032f 100644
--- a/patches/server/0797-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0794-Player-Entity-Tracking-Events.patch
@@ -21,7 +21,7 @@ index de19a5ea96fa38621513e970e04d153576f4f6ae..bff776f07bcc7841acc5757c1f53bde1
                  } else if (this.seenBy.remove(player.connection)) {
                      this.serverEntity.removePairing(player);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0a4069e6c544deb0ad576350ec371fe1ec5de8f4..63e4fa54c6931a3fc33b081662823f5b736d8496 100644
+index b49efb6f5f106396894831f28841d5a14d5a8c00..1cb763e6a33d16ecfb5322f9c78115344eef7249 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3853,7 +3853,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0798-Limit-pet-look-distance.patch b/patches/server/0795-Limit-pet-look-distance.patch
index 7a9fe7cf5c..7a9fe7cf5c 100644
--- a/patches/server/0798-Limit-pet-look-distance.patch
+++ b/patches/server/0795-Limit-pet-look-distance.patch
diff --git a/patches/server/0799-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0796-Fixes-and-additions-to-the-SpawnReason-API.patch
index d758b37206..d758b37206 100644
--- a/patches/server/0799-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0796-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0800-fix-Instruments.patch b/patches/server/0797-fix-Instruments.patch
index 610a880852..c6f5f590e8 100644
--- a/patches/server/0800-fix-Instruments.patch
+++ b/patches/server/0797-fix-Instruments.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 02420c94c4efc2fb201bfcfd95867aced9f14da9..0d2b87257f797de02f1dd68f1eb740a3d99dad22 100644
+index cceaeda61af0db282c94bf306c34979100f050df..f2d862671df42706e8d36db458f58cb51acd8efa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -766,7 +766,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0801-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0798-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 2f86713e06..2f86713e06 100644
--- a/patches/server/0801-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0798-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0802-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0799-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 5b38409d1f..5b38409d1f 100644
--- a/patches/server/0802-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0799-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0803-Add-BlockLockCheckEvent.patch b/patches/server/0800-Add-BlockLockCheckEvent.patch
index 7e9746e1ed..7e9746e1ed 100644
--- a/patches/server/0803-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0800-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0804-Add-Sneaking-API-for-Entities.patch b/patches/server/0801-Add-Sneaking-API-for-Entities.patch
index 47d08328f7..47d08328f7 100644
--- a/patches/server/0804-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0801-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0805-Improve-logging-and-errors.patch b/patches/server/0802-Improve-logging-and-errors.patch
index e5bcd5c0f7..e5bcd5c0f7 100644
--- a/patches/server/0805-Improve-logging-and-errors.patch
+++ b/patches/server/0802-Improve-logging-and-errors.patch
diff --git a/patches/server/0806-Improve-PortalEvents.patch b/patches/server/0803-Improve-PortalEvents.patch
index 680471754c..b555c50423 100644
--- a/patches/server/0806-Improve-PortalEvents.patch
+++ b/patches/server/0803-Improve-PortalEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 63e4fa54c6931a3fc33b081662823f5b736d8496..48103cefacf75a51619f7a3ebeb7731956a65a4f 100644
+index 1cb763e6a33d16ecfb5322f9c78115344eef7249..f256bd908a9683085fa47d2a84cbdee78a7ba20b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3513,7 +3513,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0807-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0804-Add-config-option-for-spider-worldborder-climbing.patch
index b10bcacd3c..b10bcacd3c 100644
--- a/patches/server/0807-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0804-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0808-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0805-Add-missing-SpigotConfig-logCommands-check.patch
index 2075c990a4..e4ad80f75d 100644
--- a/patches/server/0808-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0805-Add-missing-SpigotConfig-logCommands-check.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 Co-authored-by: david <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f8bfc87b044e538e068c021cfc3f8de43b15e84d..f55255a6bab7524d37688b9fa5c9ca238fcd2656 100644
+index cb9b46ed5ff2f9aa0d322be75659c0046f38c663..b35365fce1233214a0dd7f1cf86d940f47c860d3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2041,7 +2041,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0809-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0806-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0809-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0806-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0810-Flying-Fall-Damage.patch b/patches/server/0807-Flying-Fall-Damage.patch
index 2e5344a36c..2e5344a36c 100644
--- a/patches/server/0810-Flying-Fall-Damage.patch
+++ b/patches/server/0807-Flying-Fall-Damage.patch
diff --git a/patches/server/0811-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0808-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 214bb65165..8245b3b968 100644
--- a/patches/server/0811-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0808-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 48103cefacf75a51619f7a3ebeb7731956a65a4f..09defe4a20c7b0794cba358c177e787f1c0273c1 100644
+index f256bd908a9683085fa47d2a84cbdee78a7ba20b..d074b9f859f6ed9ce0137c8e238de188c290fa4d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -968,6 +968,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0812-config-for-disabling-entity-tag-tags.patch b/patches/server/0809-config-for-disabling-entity-tag-tags.patch
index 79f922d624..79f922d624 100644
--- a/patches/server/0812-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0809-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0813-Use-single-player-info-update-packet-on-join.patch b/patches/server/0810-Use-single-player-info-update-packet-on-join.patch
index f8e74ba432..f8e74ba432 100644
--- a/patches/server/0813-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0810-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0814-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0811-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 98f6d365c0..98f6d365c0 100644
--- a/patches/server/0814-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0811-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0815-Win-Screen-API.patch b/patches/server/0812-Win-Screen-API.patch
index 0bc7c9aa44..0bc7c9aa44 100644
--- a/patches/server/0815-Win-Screen-API.patch
+++ b/patches/server/0812-Win-Screen-API.patch
diff --git a/patches/server/0816-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0813-Remove-CraftItemStack-setAmount-null-assignment.patch
index 83f46bb0c6..83f46bb0c6 100644
--- a/patches/server/0816-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0813-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0817-Fix-force-opening-enchantment-tables.patch b/patches/server/0814-Fix-force-opening-enchantment-tables.patch
index eac3ab63ee..eac3ab63ee 100644
--- a/patches/server/0817-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0814-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0818-Add-Entity-Body-Yaw-API.patch b/patches/server/0815-Add-Entity-Body-Yaw-API.patch
index 47d59d5783..47d59d5783 100644
--- a/patches/server/0818-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0815-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0819-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0816-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 962917dab8..962917dab8 100644
--- a/patches/server/0819-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0816-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0820-Add-EntityFertilizeEggEvent.patch b/patches/server/0817-Add-EntityFertilizeEggEvent.patch
index e002e6919d..e002e6919d 100644
--- a/patches/server/0820-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0817-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0821-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0818-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index a3e0925b49..a3e0925b49 100644
--- a/patches/server/0821-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0818-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0822-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0819-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 85321a4a5b..85321a4a5b 100644
--- a/patches/server/0822-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0819-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0823-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0820-Correctly-handle-ArmorStand-invisibility.patch
index ea22d29006..ea22d29006 100644
--- a/patches/server/0823-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0820-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0824-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0821-Fix-advancement-triggers-for-entity-damage.patch
index 6d0a71ca45..6d0a71ca45 100644
--- a/patches/server/0824-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0821-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0825-Fix-text-display-error-on-spawn.patch b/patches/server/0822-Fix-text-display-error-on-spawn.patch
index 7f64cfe6d9..7f64cfe6d9 100644
--- a/patches/server/0825-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0822-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0826-Fix-inventories-returning-null-Locations.patch b/patches/server/0823-Fix-inventories-returning-null-Locations.patch
index eabfae28c5..eabfae28c5 100644
--- a/patches/server/0826-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0823-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0827-Add-Shearable-API.patch b/patches/server/0824-Add-Shearable-API.patch
index 34eb025e6b..34eb025e6b 100644
--- a/patches/server/0827-Add-Shearable-API.patch
+++ b/patches/server/0824-Add-Shearable-API.patch
diff --git a/patches/server/0828-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0825-Fix-SpawnEggMeta-get-setSpawnedType.patch
index af809bf2b4..af809bf2b4 100644
--- a/patches/server/0828-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0825-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0829-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0826-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index c51be7e3ac..c51be7e3ac 100644
--- a/patches/server/0829-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0826-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0830-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0827-Treat-sequence-violations-like-they-should-be.patch
index b60e6de65d..b60e6de65d 100644
--- a/patches/server/0830-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0827-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0831-remove-duplicate-animate-packet-for-records.patch b/patches/server/0828-remove-duplicate-animate-packet-for-records.patch
index 47fc3e8c30..47fc3e8c30 100644
--- a/patches/server/0831-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0828-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0832-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0829-Prevent-causing-expired-keys-from-impacting-new-join.patch
index d71981b357..d71981b357 100644
--- a/patches/server/0832-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0829-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0833-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0830-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index e2e9fd9b35..e2e9fd9b35 100644
--- a/patches/server/0833-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0830-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0834-Use-array-for-gamerule-storage.patch b/patches/server/0831-Use-array-for-gamerule-storage.patch
index 194ff8f15b..194ff8f15b 100644
--- a/patches/server/0834-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0831-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0835-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0832-Fix-a-couple-of-upstream-bed-issues.patch
index 665db524c5..665db524c5 100644
--- a/patches/server/0835-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0832-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0836-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0833-Fix-demo-flag-not-enabling-demo-mode.patch
index d64dd23e37..d64dd23e37 100644
--- a/patches/server/0836-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0833-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0837-Add-Mob-Experience-reward-API.patch b/patches/server/0834-Add-Mob-Experience-reward-API.patch
index 487fe9e567..487fe9e567 100644
--- a/patches/server/0837-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0834-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0838-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0835-Break-redstone-on-top-of-trap-doors-early.patch
index 2f89b7d780..2f89b7d780 100644
--- a/patches/server/0838-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0835-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0839-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0836-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index becde16ce8..becde16ce8 100644
--- a/patches/server/0839-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0836-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0840-More-accurate-isInOpenWater-impl.patch b/patches/server/0837-More-accurate-isInOpenWater-impl.patch
index ca26fd9045..ca26fd9045 100644
--- a/patches/server/0840-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0837-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0841-Expand-PlayerItemMendEvent.patch b/patches/server/0838-Expand-PlayerItemMendEvent.patch
index fac31424c0..fac31424c0 100644
--- a/patches/server/0841-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0838-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0842-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0839-Refresh-ProjectileSource-for-projectiles.patch
index 836a0882ad..836a0882ad 100644
--- a/patches/server/0842-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0839-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0843-Add-transient-modifier-API.patch b/patches/server/0840-Add-transient-modifier-API.patch
index 5614f73626..5614f73626 100644
--- a/patches/server/0843-Add-transient-modifier-API.patch
+++ b/patches/server/0840-Add-transient-modifier-API.patch
diff --git a/patches/server/0844-Fix-block-place-logic.patch b/patches/server/0841-Fix-block-place-logic.patch
index 6438856b91..6438856b91 100644
--- a/patches/server/0844-Fix-block-place-logic.patch
+++ b/patches/server/0841-Fix-block-place-logic.patch
diff --git a/patches/server/0845-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0842-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index c2c946f528..c2c946f528 100644
--- a/patches/server/0845-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0842-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0846-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0843-Call-BlockGrowEvent-for-missing-blocks.patch
index 895a528de8..895a528de8 100644
--- a/patches/server/0846-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0843-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0847-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0844-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index c99da23d4c..77e4fe6394 100644
--- a/patches/server/0847-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0844-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ddc1d66ae6a292e4aaa0bdd1088dfa0f7efc1ad3..83449758a2613076d6bbd61813a9d8cd4e2c2ed4 100644
+index d0f4657a89c6fad5dda556ddec543bb9024952e2..72b9b8f0e06ced33ac76af162fff52442decb2cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -355,7 +355,11 @@ public final class CraftServer implements Server {
+@@ -350,7 +350,11 @@ public final class CraftServer implements Server {
          }
          this.commandsConfiguration = YamlConfiguration.loadConfiguration(this.getCommandsConfigFile());
          this.commandsConfiguration.options().copyDefaults(true);
diff --git a/patches/server/0848-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0845-fix-MapLike-spam-for-missing-key-selector.patch
index 2bd3b889f1..2bd3b889f1 100644
--- a/patches/server/0848-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0845-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0849-Fix-sniffer-removeExploredLocation.patch b/patches/server/0846-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0849-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0846-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0850-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0847-Add-method-to-remove-all-active-potion-effects.patch
index a3bf117ed3..a3bf117ed3 100644
--- a/patches/server/0850-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0847-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0851-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0848-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index 702619dd05..702619dd05 100644
--- a/patches/server/0851-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0848-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0852-Add-event-for-player-editing-sign.patch b/patches/server/0849-Add-event-for-player-editing-sign.patch
index ec1df39aea..ec1df39aea 100644
--- a/patches/server/0852-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0849-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0853-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0850-Only-tick-item-frames-if-players-can-see-it.patch
index dbf1486052..dbf1486052 100644
--- a/patches/server/0853-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0850-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0854-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0851-Fix-cmd-permission-levels-for-command-blocks.patch
index 1f86b6a789..1f86b6a789 100644
--- a/patches/server/0854-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0851-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0855-Add-option-to-disable-block-updates.patch b/patches/server/0852-Add-option-to-disable-block-updates.patch
index 8fe599472e..8fe599472e 100644
--- a/patches/server/0855-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0852-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0856-Call-missing-BlockDispenseEvent.patch b/patches/server/0853-Call-missing-BlockDispenseEvent.patch
index a4fb5e7017..a4fb5e7017 100644
--- a/patches/server/0856-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0853-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0857-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0854-Don-t-load-chunks-for-supporting-block-checks.patch
index 4637d4573c..4637d4573c 100644
--- a/patches/server/0857-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0854-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0858-Optimize-player-lookups-for-beacons.patch b/patches/server/0855-Optimize-player-lookups-for-beacons.patch
index c6e0cae5ab..c6e0cae5ab 100644
--- a/patches/server/0858-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0855-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0859-Add-Sign-getInteractableSideFor.patch b/patches/server/0856-Add-Sign-getInteractableSideFor.patch
index 2833829ce4..2833829ce4 100644
--- a/patches/server/0859-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0856-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0860-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0857-fix-item-meta-for-tadpole-buckets.patch
index 6022692c57..6022692c57 100644
--- a/patches/server/0860-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0857-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0861-Fix-BanList-API.patch b/patches/server/0858-Fix-BanList-API.patch
index 76483f04b0..76483f04b0 100644
--- a/patches/server/0861-Fix-BanList-API.patch
+++ b/patches/server/0858-Fix-BanList-API.patch
diff --git a/patches/server/0862-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0859-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 5f51eb317c..5f51eb317c 100644
--- a/patches/server/0862-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0859-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0863-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0860-Fix-possible-NPE-on-painting-creation.patch
index cf51e817de..cf51e817de 100644
--- a/patches/server/0863-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0860-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0864-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0861-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 32b71969c8..32b71969c8 100644
--- a/patches/server/0864-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0861-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0865-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0862-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 2beca46925..2beca46925 100644
--- a/patches/server/0865-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0862-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0866-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0863-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 301b345fb9..301b345fb9 100644
--- a/patches/server/0866-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0863-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0867-Add-whitelist-events.patch b/patches/server/0864-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0867-Add-whitelist-events.patch
+++ b/patches/server/0864-Add-whitelist-events.patch
diff --git a/patches/server/0868-Implement-PlayerFailMoveEvent.patch b/patches/server/0865-Implement-PlayerFailMoveEvent.patch
index 9a127a050d..9a127a050d 100644
--- a/patches/server/0868-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0865-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0869-Folia-scheduler-and-owned-region-API.patch b/patches/server/0866-Folia-scheduler-and-owned-region-API.patch
index b84601a478..9b99127069 100644
--- a/patches/server/0869-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0866-Folia-scheduler-and-owned-region-API.patch
@@ -1148,10 +1148,10 @@ index 0000000000000000000000000000000000000000..d306f911757a4d556c82c0070d4837db
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index dbffff0e30713f769aa8e0fe747b8fe599442e49..1f41b2298e98d40c0419ba8220654d65174414c2 100644
+index e463727cccc6931de822f62309090241c7abada4..187421d19a6d3422612edad650ef15b40ba8c9b9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1554,6 +1554,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1551,6 +1551,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          MinecraftTimings.bukkitSchedulerTimer.startTiming(); // Spigot // Paper
          this.server.getScheduler().mainThreadHeartbeat(this.tickCount); // CraftBukkit
          MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Spigot // Paper
@@ -1251,10 +1251,10 @@ index 51032754e62b9e5da3f1c1adffbae4168cfbb0d1..b2c2d45bf390b9968dbb20c150b1fac2
      public void setLevelCallback(EntityInLevelCallback changeListener) {
          this.levelCallback = changeListener;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 83449758a2613076d6bbd61813a9d8cd4e2c2ed4..f6f5b8e1a0614827c47df024ee6ae13335b83520 100644
+index 72b9b8f0e06ced33ac76af162fff52442decb2cf..dc2201ff1a1a95c30b050e58703d78098c8daea8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -311,6 +311,76 @@ public final class CraftServer implements Server {
+@@ -306,6 +306,76 @@ public final class CraftServer implements Server {
      private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
      private final io.papermc.paper.potion.PaperPotionBrewer potionBrewer; // Paper - Custom Potion Mixes
  
diff --git a/patches/server/0870-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0867-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0870-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0867-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0871-API-for-updating-recipes-on-clients.patch b/patches/server/0868-API-for-updating-recipes-on-clients.patch
index 3eefefb0f9..62171423d0 100644
--- a/patches/server/0871-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0868-API-for-updating-recipes-on-clients.patch
@@ -39,10 +39,10 @@ index 0246db4a1f6eb168fa88260282311fee2ebb6014..ea04eb049e16d1027d15f9863d1fcd16
          Iterator iterator1 = this.players.iterator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f6f5b8e1a0614827c47df024ee6ae13335b83520..b823f5879e54bc425ca252c37fe08d469c81a8ca 100644
+index dc2201ff1a1a95c30b050e58703d78098c8daea8..fab25844aca60c9da96ab160a3aa445800789e7d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1143,6 +1143,18 @@ public final class CraftServer implements Server {
+@@ -1138,6 +1138,18 @@ public final class CraftServer implements Server {
          ReloadCommand.reload(this.console);
      }
  
@@ -61,7 +61,7 @@ index f6f5b8e1a0614827c47df024ee6ae13335b83520..b823f5879e54bc425ca252c37fe08d46
      private void loadIcon() {
          this.icon = new CraftIconCache(null);
          try {
-@@ -1522,6 +1534,13 @@ public final class CraftServer implements Server {
+@@ -1517,6 +1529,13 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean addRecipe(Recipe recipe) {
@@ -75,7 +75,7 @@ index f6f5b8e1a0614827c47df024ee6ae13335b83520..b823f5879e54bc425ca252c37fe08d46
          CraftRecipe toAdd;
          if (recipe instanceof CraftRecipe) {
              toAdd = (CraftRecipe) recipe;
-@@ -1551,6 +1570,11 @@ public final class CraftServer implements Server {
+@@ -1546,6 +1565,11 @@ public final class CraftServer implements Server {
              }
          }
          toAdd.addToCraftingManager();
@@ -87,7 +87,7 @@ index f6f5b8e1a0614827c47df024ee6ae13335b83520..b823f5879e54bc425ca252c37fe08d46
          return true;
      }
  
-@@ -1731,10 +1755,23 @@ public final class CraftServer implements Server {
+@@ -1726,10 +1750,23 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean removeRecipe(NamespacedKey recipeKey) {
diff --git a/patches/server/0872-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0869-Fix-rotation-when-spawning-display-entities.patch
index a027b8b8bb..a027b8b8bb 100644
--- a/patches/server/0872-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0869-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0873-Only-capture-actual-tree-growth.patch b/patches/server/0870-Only-capture-actual-tree-growth.patch
index 9f209c027a..9f209c027a 100644
--- a/patches/server/0873-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0870-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0874-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0871-Use-correct-source-for-mushroom-block-spread-event.patch
index a295e29bcb..a295e29bcb 100644
--- a/patches/server/0874-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0871-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0875-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0872-Respect-randomizeData-on-more-entities-when-spawning.patch
index 777f9a2e5a..777f9a2e5a 100644
--- a/patches/server/0875-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0872-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0876-Use-correct-seed-on-api-world-load.patch b/patches/server/0873-Use-correct-seed-on-api-world-load.patch
index dadaa95bdf..ce1c4328a1 100644
--- a/patches/server/0876-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0873-Use-correct-seed-on-api-world-load.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use correct seed on api world load
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b823f5879e54bc425ca252c37fe08d469c81a8ca..89b7dfcb22c2e59aa5723551f881b975544a0ab5 100644
+index fab25844aca60c9da96ab160a3aa445800789e7d..d17909ec98aff3222600862fe67fe866ee87e9de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1365,7 +1365,7 @@ public final class CraftServer implements Server {
+@@ -1360,7 +1360,7 @@ public final class CraftServer implements Server {
              net.minecraft.server.Main.forceUpgrade(worldSession, DataFixers.getDataFixer(), this.console.options.has("eraseCache"), () -> true, iregistrycustom_dimension, this.console.options.has("recreateRegionFiles"));
          }
  
diff --git a/patches/server/0877-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0874-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 2f19c9d94a..2f19c9d94a 100644
--- a/patches/server/0877-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0874-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0878-Cache-map-ids-on-item-frames.patch b/patches/server/0875-Cache-map-ids-on-item-frames.patch
index 4294f88d3c..4294f88d3c 100644
--- a/patches/server/0878-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0875-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0879-Fix-custom-statistic-criteria-creation.patch b/patches/server/0876-Fix-custom-statistic-criteria-creation.patch
index 479f3f99ff..a6bd598bff 100644
--- a/patches/server/0879-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0876-Fix-custom-statistic-criteria-creation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix custom statistic criteria creation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 230ef9f3619cb3d2e750f5217df2ea19f61e25be..72e86de0d3e9448b5689790b054b5a672ee26311 100644
+index 77cc32eb8b3e835af229fcb78229bfc09bd0da70..2d51418612e4df40b9536ac72ba0a070d59f32d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -620,6 +620,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0880-Bandaid-fix-for-Effect.patch b/patches/server/0877-Bandaid-fix-for-Effect.patch
index 890c0c308e..890c0c308e 100644
--- a/patches/server/0880-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0877-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0881-SculkCatalyst-bloom-API.patch b/patches/server/0878-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0881-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0878-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0882-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0879-API-for-an-entity-s-scoreboard-name.patch
index c44b023d7d..c44b023d7d 100644
--- a/patches/server/0882-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0879-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0883-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0880-Deprecate-and-replace-methods-with-old-StructureType.patch
index 1241b20fbb..9929841a73 100644
--- a/patches/server/0883-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0880-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 89b7dfcb22c2e59aa5723551f881b975544a0ab5..58c0778741a14c252ee01536b6fd9a3c5bcbc58f 100644
+index d17909ec98aff3222600862fe67fe866ee87e9de..d7178155e548eb027e75bb8e7f03d077cae6831e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1970,6 +1970,11 @@ public final class CraftServer implements Server {
+@@ -1965,6 +1965,11 @@ public final class CraftServer implements Server {
  
          ServerLevel worldServer = ((CraftWorld) world).getHandle();
          Location structureLocation = world.locateNearestStructure(location, structureType, radius, findUnexplored);
@@ -20,7 +20,7 @@ index 89b7dfcb22c2e59aa5723551f881b975544a0ab5..58c0778741a14c252ee01536b6fd9a3c
          BlockPos structurePosition = CraftLocation.toBlockPosition(structureLocation);
  
          // Create map with trackPlayer = true, unlimitedTracking = true
-@@ -1980,6 +1985,31 @@ public final class CraftServer implements Server {
+@@ -1975,6 +1980,31 @@ public final class CraftServer implements Server {
  
          return CraftItemStack.asBukkitCopy(stack);
      }
diff --git a/patches/server/0884-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0881-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 83a253acb9..83a253acb9 100644
--- a/patches/server/0884-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0881-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0885-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0882-Properly-handle-BlockBreakEvent-isDropItems.patch
index aa3f1c73c8..aa3f1c73c8 100644
--- a/patches/server/0885-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0882-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0886-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0883-Fire-entity-death-event-for-ender-dragon.patch
index 28897505d4..28897505d4 100644
--- a/patches/server/0886-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0883-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0887-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0884-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 1cf3f3d9a6..1cf3f3d9a6 100644
--- a/patches/server/0887-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0884-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0888-Add-Listing-API-for-Player.patch b/patches/server/0885-Add-Listing-API-for-Player.patch
index c5a9538763..c5a9538763 100644
--- a/patches/server/0888-Add-Listing-API-for-Player.patch
+++ b/patches/server/0885-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0889-Configurable-Region-Compression-Format.patch b/patches/server/0886-Configurable-Region-Compression-Format.patch
index 64a52a4ea2..64a52a4ea2 100644
--- a/patches/server/0889-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0886-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0890-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0887-Add-BlockFace-to-BlockDamageEvent.patch
index 2fcc02db1b..2fcc02db1b 100644
--- a/patches/server/0890-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0887-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0891-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0888-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0891-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0888-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0892-Expand-Pose-API.patch b/patches/server/0889-Expand-Pose-API.patch
index 21ecedeaeb..21ecedeaeb 100644
--- a/patches/server/0892-Expand-Pose-API.patch
+++ b/patches/server/0889-Expand-Pose-API.patch
diff --git a/patches/server/0893-More-DragonBattle-API.patch b/patches/server/0890-More-DragonBattle-API.patch
index a6e0c111c0..a6e0c111c0 100644
--- a/patches/server/0893-More-DragonBattle-API.patch
+++ b/patches/server/0890-More-DragonBattle-API.patch
diff --git a/patches/server/0894-Add-PlayerPickItemEvent.patch b/patches/server/0891-Add-PlayerPickItemEvent.patch
index 010e85d01a..010e85d01a 100644
--- a/patches/server/0894-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0891-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0895-Allow-trident-custom-damage.patch b/patches/server/0892-Allow-trident-custom-damage.patch
index eaa126da9c..eaa126da9c 100644
--- a/patches/server/0895-Allow-trident-custom-damage.patch
+++ b/patches/server/0892-Allow-trident-custom-damage.patch
diff --git a/patches/server/0896-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0893-Expose-hand-in-BlockCanBuildEvent.patch
index 4abc7e9fc5..4abc7e9fc5 100644
--- a/patches/server/0896-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0893-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0897-Optimize-nearest-structure-border-iteration.patch b/patches/server/0894-Optimize-nearest-structure-border-iteration.patch
index 805af0f26c..805af0f26c 100644
--- a/patches/server/0897-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0894-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0898-Implement-OfflinePlayer-isConnected.patch b/patches/server/0895-Implement-OfflinePlayer-isConnected.patch
index 5eade7d5b4..5eade7d5b4 100644
--- a/patches/server/0898-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0895-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0899-Fix-inventory-desync.patch b/patches/server/0896-Fix-inventory-desync.patch
index fce9f49abd..fce9f49abd 100644
--- a/patches/server/0899-Fix-inventory-desync.patch
+++ b/patches/server/0896-Fix-inventory-desync.patch
diff --git a/patches/server/0900-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0897-Add-titleOverride-to-InventoryOpenEvent.patch
index cbe6fb67df..cbe6fb67df 100644
--- a/patches/server/0900-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0897-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0901-Configure-sniffer-egg-hatch-time.patch b/patches/server/0898-Configure-sniffer-egg-hatch-time.patch
index 7def55b1f7..7def55b1f7 100644
--- a/patches/server/0901-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0898-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0902-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0899-Do-crystal-portal-proximity-check-before-entity-look.patch
index c83b2614f9..c83b2614f9 100644
--- a/patches/server/0902-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0899-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0903-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0900-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0903-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0900-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0904-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0901-Add-slot-sanity-checks-in-container-clicks.patch
index b049da07fe..b049da07fe 100644
--- a/patches/server/0904-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0901-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0905-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0902-Call-BlockRedstoneEvents-for-lecterns.patch
index bafd87afad..bafd87afad 100644
--- a/patches/server/0905-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0902-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0906-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0903-Allow-proper-checking-of-empty-item-stacks.patch
index 906d0184e4..906d0184e4 100644
--- a/patches/server/0906-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0903-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0907-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0904-Fix-silent-equipment-change-for-mobs.patch
index 3ec68fbdbd..3ec68fbdbd 100644
--- a/patches/server/0907-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0904-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0908-Fix-spigot-s-Forced-Stats.patch b/patches/server/0905-Fix-spigot-s-Forced-Stats.patch
index a138a58b79..a138a58b79 100644
--- a/patches/server/0908-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0905-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0909-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0906-Add-missing-InventoryHolders-to-inventories.patch
index 7f32a639b2..7f32a639b2 100644
--- a/patches/server/0909-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0906-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0910-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0907-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index 21515b5dba..21515b5dba 100644
--- a/patches/server/0910-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0907-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0911-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0908-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0911-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0908-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0912-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0909-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e1f2934daa..e1f2934daa 100644
--- a/patches/server/0912-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0909-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0913-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0910-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0913-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0910-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0914-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0911-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0914-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0911-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0915-Fix-missing-map-initialize-event-call.patch b/patches/server/0912-Fix-missing-map-initialize-event-call.patch
index fd2193a41f..fd2193a41f 100644
--- a/patches/server/0915-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0912-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0916-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0913-Update-entity-data-when-attaching-firework-to-entity.patch
index 8cbc0f974a..8cbc0f974a 100644
--- a/patches/server/0916-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0913-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0917-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0914-Fix-UnsafeValues-loadAdvancement.patch
index e79bc2f38e..4bf2224704 100644
--- a/patches/server/0917-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0914-Fix-UnsafeValues-loadAdvancement.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix UnsafeValues#loadAdvancement
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 72e86de0d3e9448b5689790b054b5a672ee26311..8c7ab4612bd5a86ad1c722663f4831769b86b564 100644
+index 2d51418612e4df40b9536ac72ba0a070d59f32d1..34208c749621003ba3ad74894ca25e01469b66f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -323,7 +323,27 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0918-Add-player-idle-duration-API.patch b/patches/server/0915-Add-player-idle-duration-API.patch
index 6c4c560343..6c4c560343 100644
--- a/patches/server/0918-Add-player-idle-duration-API.patch
+++ b/patches/server/0915-Add-player-idle-duration-API.patch
diff --git a/patches/server/0919-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0916-Don-t-check-if-we-can-see-non-visible-entities.patch
index a63a8d3cb7..a63a8d3cb7 100644
--- a/patches/server/0919-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0916-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0920-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0917-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 3f575aef28..3f575aef28 100644
--- a/patches/server/0920-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0917-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0921-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0918-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index bb8021000e..bb8021000e 100644
--- a/patches/server/0921-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0918-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0922-Optimize-VarInts.patch b/patches/server/0919-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0922-Optimize-VarInts.patch
+++ b/patches/server/0919-Optimize-VarInts.patch
diff --git a/patches/server/0923-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0920-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 48e81c5809..48e81c5809 100644
--- a/patches/server/0923-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0920-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0924-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0921-Add-predicate-for-blocks-when-raytracing.patch
index 712ca7a8c8..712ca7a8c8 100644
--- a/patches/server/0924-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0921-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0925-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0922-Broadcast-take-item-packets-with-collector-as-source.patch
index c1b5abaf2a..c1b5abaf2a 100644
--- a/patches/server/0925-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0922-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0926-Expand-LingeringPotion-API.patch b/patches/server/0923-Expand-LingeringPotion-API.patch
index b203b03355..b203b03355 100644
--- a/patches/server/0926-Expand-LingeringPotion-API.patch
+++ b/patches/server/0923-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0927-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0924-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index 3d51508d96..3d51508d96 100644
--- a/patches/server/0927-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0924-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0928-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0925-Add-hand-to-fish-event-for-all-player-interactions.patch
index 3bc8cd9b24..3bc8cd9b24 100644
--- a/patches/server/0928-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0925-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0929-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0926-Fix-several-issues-with-EntityBreedEvent.patch
index 872b3ba687..872b3ba687 100644
--- a/patches/server/0929-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0926-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0930-Add-UUID-attribute-modifier-API.patch b/patches/server/0927-Add-UUID-attribute-modifier-API.patch
index c9666b4f31..c9666b4f31 100644
--- a/patches/server/0930-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0927-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0931-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0928-Fix-missing-event-call-for-entity-teleport-API.patch
index ac77e45fa2..ac77e45fa2 100644
--- a/patches/server/0931-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0928-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0932-Lazily-create-LootContext-for-criterions.patch b/patches/server/0929-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0932-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0929-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0933-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0930-Don-t-fire-sync-events-during-worldgen.patch
index 9b99893450..9b99893450 100644
--- a/patches/server/0933-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0930-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0934-Add-Structure-check-API.patch b/patches/server/0931-Add-Structure-check-API.patch
index b1501eb55b..b1501eb55b 100644
--- a/patches/server/0934-Add-Structure-check-API.patch
+++ b/patches/server/0931-Add-Structure-check-API.patch
diff --git a/patches/server/0935-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0932-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index 32337c9ace..32337c9ace 100644
--- a/patches/server/0935-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0932-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0936-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0933-Restore-vanilla-entity-drops-behavior.patch
index d855bfb740..d855bfb740 100644
--- a/patches/server/0936-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0933-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0937-Dont-resend-blocks-on-interactions.patch b/patches/server/0934-Dont-resend-blocks-on-interactions.patch
index 9afb1ffa5b..9afb1ffa5b 100644
--- a/patches/server/0937-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0934-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0938-add-more-scoreboard-API.patch b/patches/server/0935-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0938-add-more-scoreboard-API.patch
+++ b/patches/server/0935-add-more-scoreboard-API.patch
diff --git a/patches/server/0939-Improve-Registry.patch b/patches/server/0936-Improve-Registry.patch
index 966048fae0..966048fae0 100644
--- a/patches/server/0939-Improve-Registry.patch
+++ b/patches/server/0936-Improve-Registry.patch
diff --git a/patches/server/0940-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0937-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 20238b3ebf..20238b3ebf 100644
--- a/patches/server/0940-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0937-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0941-Add-experience-points-API.patch b/patches/server/0938-Add-experience-points-API.patch
index f0ca6dbcf9..f0ca6dbcf9 100644
--- a/patches/server/0941-Add-experience-points-API.patch
+++ b/patches/server/0938-Add-experience-points-API.patch
diff --git a/patches/server/0942-Add-drops-to-shear-events.patch b/patches/server/0939-Add-drops-to-shear-events.patch
index 8c729c0f48..8c729c0f48 100644
--- a/patches/server/0942-Add-drops-to-shear-events.patch
+++ b/patches/server/0939-Add-drops-to-shear-events.patch
diff --git a/patches/server/0943-Add-PlayerShieldDisableEvent.patch b/patches/server/0940-Add-PlayerShieldDisableEvent.patch
index e4fddcc8e5..e4fddcc8e5 100644
--- a/patches/server/0943-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0940-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0944-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0941-Validate-ResourceLocation-in-NBT-reading.patch
index fbf7709b9c..fbf7709b9c 100644
--- a/patches/server/0944-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0941-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0945-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0942-Properly-handle-experience-dropping-on-block-break.patch
index 3ee724786e..3ee724786e 100644
--- a/patches/server/0945-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0942-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0946-Fixup-NamespacedKey-handling.patch b/patches/server/0943-Fixup-NamespacedKey-handling.patch
index 08f6980461..08f6980461 100644
--- a/patches/server/0946-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0943-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0947-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0944-Expose-LootTable-of-DecoratedPot.patch
index 6b5fd029f3..6b5fd029f3 100644
--- a/patches/server/0947-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0944-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0948-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0945-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index dc2cbd7a08..dc2cbd7a08 100644
--- a/patches/server/0948-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0945-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0949-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0946-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 7d75e1147a..7d75e1147a 100644
--- a/patches/server/0949-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0946-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0950-Add-ShulkerDuplicateEvent.patch b/patches/server/0947-Add-ShulkerDuplicateEvent.patch
index 22315c9908..22315c9908 100644
--- a/patches/server/0950-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/0947-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0951-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0948-Add-api-for-spawn-egg-texture-colors.patch
index b7957271cb..8d65e8e614 100644
--- a/patches/server/0951-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0948-Add-api-for-spawn-egg-texture-colors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add api for spawn egg texture colors
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 8c7ab4612bd5a86ad1c722663f4831769b86b564..f45604d9193e7f1a646ff98b2e110f4e334a4368 100644
+index 34208c749621003ba3ad74894ca25e01469b66f2..0e23219206d94308e0d5d1519d7f80678ffa4f73 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -663,6 +663,15 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0952-Add-Lifecycle-Event-system.patch b/patches/server/0949-Add-Lifecycle-Event-system.patch
index 62b493a87f..fb9a2d78c8 100644
--- a/patches/server/0952-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0949-Add-Lifecycle-Event-system.patch
@@ -707,10 +707,10 @@ index 2e96308696e131f3f013469a395e5ddda2c5d529..65a66e484c1c39c5f41d97db52f31c67
                  } catch (Throwable e) {
                      LOGGER.error("Failed to run bootstrapper for %s. This plugin will not be loaded.".formatted(provider.getSource()), e);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 58c0778741a14c252ee01536b6fd9a3c5bcbc58f..2e026aca8e545b857b3ed0eaf3c57acc3657635c 100644
+index d7178155e548eb027e75bb8e7f03d077cae6831e..34242fa907bb87ef78cf96ca81ae224de750956f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1018,6 +1018,11 @@ public final class CraftServer implements Server {
+@@ -1013,6 +1013,11 @@ public final class CraftServer implements Server {
  
      @Override
      public void reload() {
@@ -739,7 +739,7 @@ index d96399e9bf1a58db5a4a22e58abb99e7660e0694..66bdac50130f523f9dc4379b103b7a46
 +    // Paper end - lifecycle events
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index f45604d9193e7f1a646ff98b2e110f4e334a4368..5688847458dde4cd9371e465ba73b2794639fa4d 100644
+index 0e23219206d94308e0d5d1519d7f80678ffa4f73..89e4f53598c14ea2ca2b6678edc97366649d0145 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -672,6 +672,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0953-ItemStack-Tooltip-API.patch b/patches/server/0950-ItemStack-Tooltip-API.patch
index 99c3106c3d..19ecf1997e 100644
--- a/patches/server/0953-ItemStack-Tooltip-API.patch
+++ b/patches/server/0950-ItemStack-Tooltip-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack Tooltip API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 5688847458dde4cd9371e465ba73b2794639fa4d..a9ab74da54cdec04e2df12ab3c3332bb675ccae1 100644
+index 89e4f53598c14ea2ca2b6678edc97366649d0145..9bd51aeedf2556e714960b081029f48afbc0f3f5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -647,6 +647,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0954-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0951-Add-getChunkSnapshot-includeLightData-parameter.patch
index 70efa7282a..70efa7282a 100644
--- a/patches/server/0954-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/0951-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0955-Add-FluidState-API.patch b/patches/server/0952-Add-FluidState-API.patch
index de7b959ccc..de7b959ccc 100644
--- a/patches/server/0955-Add-FluidState-API.patch
+++ b/patches/server/0952-Add-FluidState-API.patch
diff --git a/patches/server/0956-add-number-format-api.patch b/patches/server/0953-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0956-add-number-format-api.patch
+++ b/patches/server/0953-add-number-format-api.patch
diff --git a/patches/server/0957-improve-BanList-types.patch b/patches/server/0954-improve-BanList-types.patch
index e4c96f87eb..b9db6bb6e6 100644
--- a/patches/server/0957-improve-BanList-types.patch
+++ b/patches/server/0954-improve-BanList-types.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] improve BanList types
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2e026aca8e545b857b3ed0eaf3c57acc3657635c..767bbe5e6e558a3e8913740a8016037356b8ede2 100644
+index 34242fa907bb87ef78cf96ca81ae224de750956f..927c3110a64cfab665137a6f0c8b72075168f2bf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2223,6 +2223,21 @@ public final class CraftServer implements Server {
+@@ -2218,6 +2218,21 @@ public final class CraftServer implements Server {
          };
      }
  
diff --git a/patches/server/0958-Expanded-Hopper-API.patch b/patches/server/0955-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0958-Expanded-Hopper-API.patch
+++ b/patches/server/0955-Expanded-Hopper-API.patch
diff --git a/patches/server/0959-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0956-Add-BlockBreakProgressUpdateEvent.patch
index a5a136f346..a5a136f346 100644
--- a/patches/server/0959-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0956-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0960-Deprecate-ItemStack-setType.patch b/patches/server/0957-Deprecate-ItemStack-setType.patch
index 03fe55cb8b..03fe55cb8b 100644
--- a/patches/server/0960-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0957-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0961-Add-CartographyItemEvent.patch b/patches/server/0958-Add-CartographyItemEvent.patch
index c867a928b3..c867a928b3 100644
--- a/patches/server/0961-Add-CartographyItemEvent.patch
+++ b/patches/server/0958-Add-CartographyItemEvent.patch
diff --git a/patches/server/0962-More-Raid-API.patch b/patches/server/0959-More-Raid-API.patch
index 14fcb7449a..14fcb7449a 100644
--- a/patches/server/0962-More-Raid-API.patch
+++ b/patches/server/0959-More-Raid-API.patch
diff --git a/patches/server/0963-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0960-Add-onboarding-message-for-initial-server-start.patch
index f208eae1d5..a409b84b72 100644
--- a/patches/server/0963-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0960-Add-onboarding-message-for-initial-server-start.patch
@@ -29,10 +29,10 @@ index ab5089781b8866cd6ad1b9570634ba84d936cfe7..4de88f74182bb596c6b5ad0351cc0dac
          return instance;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1f41b2298e98d40c0419ba8220654d65174414c2..f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5 100644
+index 187421d19a6d3422612edad650ef15b40ba8c9b9..093a5d49d1a001b3ad5b4a880c60c0cb18874531 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1132,6 +1132,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1129,6 +1129,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              long tickSection = Util.getNanos();
              long currentTime;
              // Paper end - further improve server tick loop
diff --git a/patches/server/0964-Configurable-max-block-fluid-ticks.patch b/patches/server/0961-Configurable-max-block-fluid-ticks.patch
index f5f77d679f..f5f77d679f 100644
--- a/patches/server/0964-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0961-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0965-Fix-bees-aging-inside-hives.patch b/patches/server/0962-Fix-bees-aging-inside-hives.patch
index ae6a0ff63d..ae6a0ff63d 100644
--- a/patches/server/0965-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0962-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0966-Disable-memory-reserve-allocating.patch b/patches/server/0963-Disable-memory-reserve-allocating.patch
index 30eabae9e8..30eabae9e8 100644
--- a/patches/server/0966-Disable-memory-reserve-allocating.patch
+++ b/patches/server/0963-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0967-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0964-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index 5c5bb40964..5c5bb40964 100644
--- a/patches/server/0967-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/0964-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0968-Fix-DamageSource-API.patch b/patches/server/0965-Fix-DamageSource-API.patch
index 57a27fd86f..57a27fd86f 100644
--- a/patches/server/0968-Fix-DamageSource-API.patch
+++ b/patches/server/0965-Fix-DamageSource-API.patch
diff --git a/patches/server/0969-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0966-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index a745081446..a745081446 100644
--- a/patches/server/0969-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/server/0966-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0970-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0967-Fix-possible-StackOverflowError-for-some-dispenses.patch
index 21910b922f..21910b922f 100644
--- a/patches/server/0970-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/0967-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0971-Improve-tag-parser-handling.patch b/patches/server/0968-Improve-tag-parser-handling.patch
index 702d71c5bd..702d71c5bd 100644
--- a/patches/server/0971-Improve-tag-parser-handling.patch
+++ b/patches/server/0968-Improve-tag-parser-handling.patch
diff --git a/patches/server/0972-Item-Mutation-Fixes.patch b/patches/server/0969-Item-Mutation-Fixes.patch
index 1a3a62c7da..1a3a62c7da 100644
--- a/patches/server/0972-Item-Mutation-Fixes.patch
+++ b/patches/server/0969-Item-Mutation-Fixes.patch
diff --git a/patches/server/0973-Per-world-ticks-per-spawn-settings.patch b/patches/server/0970-Per-world-ticks-per-spawn-settings.patch
index ebdf89762d..ebdf89762d 100644
--- a/patches/server/0973-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0970-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0974-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0971-Properly-track-the-changed-item-from-dispense-events.patch
index 9957c97ca3..9957c97ca3 100644
--- a/patches/server/0974-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/0971-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0975-Rewrite-dataconverter-system.patch b/patches/server/0972-Rewrite-dataconverter-system.patch
index dbf83932c0..a03c357308 100644
--- a/patches/server/0975-Rewrite-dataconverter-system.patch
+++ b/patches/server/0972-Rewrite-dataconverter-system.patch
@@ -28981,7 +28981,7 @@ index 1d287dd7379e56f7fd4b425880b850cd843f5789..8ab7ca373a885fbe658013c9c6a2e38d
              return nbttagcompound;
          });
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index a9ab74da54cdec04e2df12ab3c3332bb675ccae1..74c5c0e63a3c41174967c1be1da01e60e458f12f 100644
+index 9bd51aeedf2556e714960b081029f48afbc0f3f5..5a382907285a288f2a223189e690d3dbdf45594c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -529,7 +529,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0976-Suspicious-Effect-Entry-API.patch b/patches/server/0973-Suspicious-Effect-Entry-API.patch
index 2ff782764f..2ff782764f 100644
--- a/patches/server/0976-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/0973-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0977-check-if-itemstack-is-stackable-first.patch b/patches/server/0974-check-if-itemstack-is-stackable-first.patch
index 6143642997..6143642997 100644
--- a/patches/server/0977-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/0974-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0978-disable-forced-empty-world-ticks.patch b/patches/server/0975-disable-forced-empty-world-ticks.patch
index c6a2989ea0..c6a2989ea0 100644
--- a/patches/server/0978-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0975-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0979-Starlight.patch b/patches/server/0976-Starlight.patch
index 72b56b3d53..72b56b3d53 100644
--- a/patches/server/0979-Starlight.patch
+++ b/patches/server/0976-Starlight.patch
diff --git a/patches/server/0980-Rewrite-chunk-system.patch b/patches/server/0977-Rewrite-chunk-system.patch
index 50c0bd1815..eea1dbc7f3 100644
--- a/patches/server/0980-Rewrite-chunk-system.patch
+++ b/patches/server/0977-Rewrite-chunk-system.patch
@@ -15684,10 +15684,10 @@ index c33f85b570f159ab465b5a10a8044a81f2797f43..244a19ecd0234fa1d7a6ecfea2075159
                  DedicatedServer dedicatedserver1 = new DedicatedServer(optionset, worldLoader.get(), thread, convertable_conversionsession, resourcepackrepository, worldstem, dedicatedserversettings, DataFixers.getDataFixer(), services, LoggerChunkProgressListener::createFromGameruleRadius);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5..81dd728d7193acb6cc87a7f54c7d7a2088e5f853 100644
+index 093a5d49d1a001b3ad5b4a880c60c0cb18874531..99e5b663b7cded44164b7b4e2ccb0f7a063b8bf9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -318,7 +318,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -315,7 +315,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
@@ -15696,7 +15696,7 @@ index f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5..81dd728d7193acb6cc87a7f54c7d7a20
              ((MinecraftServer) atomicreference.get()).runServer();
          }, "Server thread");
  
-@@ -654,7 +654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -651,7 +651,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.forceDifficulty();
          for (ServerLevel worldserver : this.getAllLevels()) {
              this.prepareLevels(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
@@ -15705,7 +15705,7 @@ index f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5..81dd728d7193acb6cc87a7f54c7d7a20
              this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
          }
  
-@@ -864,6 +864,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -861,6 +861,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public abstract boolean shouldRconBroadcast();
  
      public boolean saveAllChunks(boolean suppressLogs, boolean flush, boolean force) {
@@ -15718,7 +15718,7 @@ index f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5..81dd728d7193acb6cc87a7f54c7d7a20
          boolean flag3 = false;
  
          for (Iterator iterator = this.getAllLevels().iterator(); iterator.hasNext(); flag3 = true) {
-@@ -872,8 +878,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -869,8 +875,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              if (!suppressLogs) {
                  MinecraftServer.LOGGER.info("Saving chunks for level '{}'/{}", worldserver, worldserver.dimension().location());
              }
@@ -15733,7 +15733,7 @@ index f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5..81dd728d7193acb6cc87a7f54c7d7a20
          }
  
          // CraftBukkit start - moved to WorldServer.save
-@@ -892,7 +902,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -889,7 +899,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              while (iterator1.hasNext()) {
                  ServerLevel worldserver2 = (ServerLevel) iterator1.next();
  
@@ -15742,7 +15742,7 @@ index f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5..81dd728d7193acb6cc87a7f54c7d7a20
              }
  
              MinecraftServer.LOGGER.info("ThreadedAnvilChunkStorage: All dimensions are saved");
-@@ -974,36 +984,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -971,36 +981,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
  
@@ -15780,7 +15780,7 @@ index f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5..81dd728d7193acb6cc87a7f54c7d7a20
  
          this.isSaving = false;
          this.resources.close();
-@@ -1023,6 +1004,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1020,6 +1001,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          // Spigot end
  
@@ -15788,7 +15788,7 @@ index f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5..81dd728d7193acb6cc87a7f54c7d7a20
      }
  
      public String getLocalIp() {
-@@ -1115,6 +1097,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1112,6 +1094,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // Paper end
      // Spigot End
  
@@ -15797,7 +15797,7 @@ index f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5..81dd728d7193acb6cc87a7f54c7d7a20
      protected void runServer() {
          try {
              if (!this.initServer()) {
-@@ -1143,6 +1127,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1140,6 +1124,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              // Paper end - Add onboarding message for initial server start
  
              while (this.running) {
@@ -15810,7 +15810,7 @@ index f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5..81dd728d7193acb6cc87a7f54c7d7a20
                  long i;
  
                  if (!this.isPaused() && this.tickRateManager.isSprinting() && this.tickRateManager.checkShouldSprintThisTick()) {
-@@ -1305,6 +1295,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1302,6 +1292,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      private boolean haveTime() {
@@ -15822,7 +15822,7 @@ index f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5..81dd728d7193acb6cc87a7f54c7d7a20
          // CraftBukkit start
          if (isOversleep) return canOversleep(); // Paper - because of our changes, this logic is broken
          return this.forceTicks || this.runningTask() || Util.getNanos() < (this.mayHaveDelayedTasks ? this.delayedTasksMaxNextTickTimeNanos : this.nextTickTimeNanos);
-@@ -1567,7 +1562,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1564,7 +1559,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper start - Folia scheduler API
          ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
          getAllLevels().forEach(level -> {
@@ -15831,7 +15831,7 @@ index f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5..81dd728d7193acb6cc87a7f54c7d7a20
                  if (entity.isRemoved()) {
                      continue;
                  }
-@@ -2625,6 +2620,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2622,6 +2617,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      }
  
@@ -21607,10 +21607,10 @@ index 7dae8d91b74cc7df0745f0c121e3bea09b8d0b6d..1e2530c9e5212b6d2bdbc94817beddb4
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 767bbe5e6e558a3e8913740a8016037356b8ede2..045e625c789e8c53228fccb0f3a6769aa5a93fb5 100644
+index 927c3110a64cfab665137a6f0c8b72075168f2bf..52a8eaa84a22c5cfc30a4e8a4c15d41bd58caef6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1407,7 +1407,6 @@ public final class CraftServer implements Server {
+@@ -1402,7 +1402,6 @@ public final class CraftServer implements Server {
          // Paper - Put world into worldlist before initing the world; move up
  
          this.getServer().prepareLevels(internal.getChunkSource().chunkMap.progressListener, internal);
@@ -21618,7 +21618,7 @@ index 767bbe5e6e558a3e8913740a8016037356b8ede2..045e625c789e8c53228fccb0f3a6769a
  
          this.pluginManager.callEvent(new WorldLoadEvent(internal.getWorld()));
          return internal.getWorld();
-@@ -1452,7 +1451,7 @@ public final class CraftServer implements Server {
+@@ -1447,7 +1446,7 @@ public final class CraftServer implements Server {
              }
  
              handle.getChunkSource().close(save);
@@ -21627,7 +21627,7 @@ index 767bbe5e6e558a3e8913740a8016037356b8ede2..045e625c789e8c53228fccb0f3a6769a
              handle.convertable.close();
          } catch (Exception ex) {
              this.getLogger().log(Level.SEVERE, null, ex);
-@@ -2488,7 +2487,7 @@ public final class CraftServer implements Server {
+@@ -2483,7 +2482,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
diff --git a/patches/server/0981-incremental-chunk-and-player-saving.patch b/patches/server/0978-incremental-chunk-and-player-saving.patch
index 05b0bf6ec2..c30ee17c0d 100644
--- a/patches/server/0981-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0978-incremental-chunk-and-player-saving.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] incremental chunk and player saving
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 81dd728d7193acb6cc87a7f54c7d7a2088e5f853..c0d5190ee653bf2bbe2858b1a142d5409ed322ee 100644
+index 99e5b663b7cded44164b7b4e2ccb0f7a063b8bf9..e0eb0ab848273cd4f3f4468d5912ca9186c158bd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -916,7 +916,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -913,7 +913,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          try {
              this.isSaving = true;
@@ -17,7 +17,7 @@ index 81dd728d7193acb6cc87a7f54c7d7a2088e5f853..c0d5190ee653bf2bbe2858b1a142d540
              flag3 = this.saveAllChunks(suppressLogs, flush, force);
          } finally {
              this.isSaving = false;
-@@ -1448,16 +1448,28 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1445,16 +1445,28 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
  
          --this.ticksUntilAutosave;
diff --git a/patches/server/0982-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0979-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 474f3d6165..474f3d6165 100644
--- a/patches/server/0982-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0979-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0983-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0980-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 38bfb4ac90..38bfb4ac90 100644
--- a/patches/server/0983-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0980-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0984-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0981-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index e558120a95..e558120a95 100644
--- a/patches/server/0984-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0981-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0985-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0982-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 84396ba635..84396ba635 100644
--- a/patches/server/0985-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0982-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0986-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0983-Allow-Saving-of-Oversized-Chunks.patch
index c190834bbb..c190834bbb 100644
--- a/patches/server/0986-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0983-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0987-Fix-World-isChunkGenerated-calls.patch b/patches/server/0984-Fix-World-isChunkGenerated-calls.patch
index 85cc5c81aa..85cc5c81aa 100644
--- a/patches/server/0987-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0984-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0988-Flat-bedrock-generator-settings.patch b/patches/server/0985-Flat-bedrock-generator-settings.patch
index b973a4d233..b973a4d233 100644
--- a/patches/server/0988-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0985-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0989-Entity-Activation-Range-2.0.patch b/patches/server/0986-Entity-Activation-Range-2.0.patch
index b11e48c679..b11e48c679 100644
--- a/patches/server/0989-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0986-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0990-Optional-per-player-mob-spawns.patch b/patches/server/0987-Optional-per-player-mob-spawns.patch
index b8fd54cd56..b8fd54cd56 100644
--- a/patches/server/0990-Optional-per-player-mob-spawns.patch
+++ b/patches/server/0987-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/0991-Anti-Xray.patch b/patches/server/0988-Anti-Xray.patch
index b614f89a1c..476cc4aff9 100644
--- a/patches/server/0991-Anti-Xray.patch
+++ b/patches/server/0988-Anti-Xray.patch
@@ -1573,10 +1573,10 @@ index 1e2530c9e5212b6d2bdbc94817beddb4247dac73..82b4bd669c57b18fb0b443bcd9449502
      private static final byte[] EMPTY_LIGHT = new byte[2048];
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 045e625c789e8c53228fccb0f3a6769aa5a93fb5..508c1e662e14693e0af3a68079d811d1583b94f0 100644
+index 52a8eaa84a22c5cfc30a4e8a4c15d41bd58caef6..8e0b0e4b177f1bcf23e174dfca6eaa0f7203a95a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2659,7 +2659,7 @@ public final class CraftServer implements Server {
+@@ -2654,7 +2654,7 @@ public final class CraftServer implements Server {
      public ChunkGenerator.ChunkData createChunkData(World world) {
          Preconditions.checkArgument(world != null, "World cannot be null");
          ServerLevel handle = ((CraftWorld) world).getHandle();
diff --git a/patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0989-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 4415e66df9..4415e66df9 100644
--- a/patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0989-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0993-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0990-Optimize-Collision-to-not-load-chunks.patch
index 17286aaa99..17286aaa99 100644
--- a/patches/server/0993-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0990-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0994-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0991-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 1f46712639..1f46712639 100644
--- a/patches/server/0994-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0991-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0995-Entity-load-save-limit-per-chunk.patch b/patches/server/0992-Entity-load-save-limit-per-chunk.patch
index 1dbf729bda..1dbf729bda 100644
--- a/patches/server/0995-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0992-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0996-Improved-Watchdog-Support.patch b/patches/server/0993-Improved-Watchdog-Support.patch
index c7f4927009..3fe8cd817b 100644
--- a/patches/server/0996-Improved-Watchdog-Support.patch
+++ b/patches/server/0993-Improved-Watchdog-Support.patch
@@ -71,10 +71,10 @@ index bcb6a3b3cd17ce5db9aaf6bd3ec7a0ec1b44b979..4f3cc14d48690bb183d09bb7a5ba1e23
              cause = cause.getCause();
          }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c0d5190ee653bf2bbe2858b1a142d5409ed322ee..4213f8424fa19eead42a307a3a33ab25ead86613 100644
+index e0eb0ab848273cd4f3f4468d5912ca9186c158bd..478d238c8d8d41a1d27f305849bd216ec2e894f5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -303,7 +303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -300,7 +300,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
      public Commands vanillaCommandDispatcher;
@@ -83,7 +83,7 @@ index c0d5190ee653bf2bbe2858b1a142d5409ed322ee..4213f8424fa19eead42a307a3a33ab25
      // CraftBukkit end
      // Spigot start
      public static final int TPS = 20;
-@@ -316,6 +316,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -313,6 +313,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static long currentTickLong = 0L; // Paper - track current tick as a long
      public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
@@ -93,7 +93,7 @@ index c0d5190ee653bf2bbe2858b1a142d5409ed322ee..4213f8424fa19eead42a307a3a33ab25
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
          Thread thread = new io.papermc.paper.util.TickThread(() -> { // Paper - rewrite chunk system
-@@ -933,6 +936,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -930,6 +933,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // CraftBukkit start
      private boolean hasStopped = false;
      private boolean hasLoggedStop = false; // Paper - Debugging
@@ -101,7 +101,7 @@ index c0d5190ee653bf2bbe2858b1a142d5409ed322ee..4213f8424fa19eead42a307a3a33ab25
      private final Object stopLock = new Object();
      public final boolean hasStopped() {
          synchronized (this.stopLock) {
-@@ -948,6 +952,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -945,6 +949,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.hasStopped = true;
          }
          if (!hasLoggedStop && isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
@@ -121,7 +121,7 @@ index c0d5190ee653bf2bbe2858b1a142d5409ed322ee..4213f8424fa19eead42a307a3a33ab25
          // CraftBukkit end
          if (this.metricsRecorder.isRecording()) {
              this.cancelRecordingMetrics();
-@@ -1004,7 +1021,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1001,7 +1018,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          // Spigot end
  
@@ -143,7 +143,7 @@ index c0d5190ee653bf2bbe2858b1a142d5409ed322ee..4213f8424fa19eead42a307a3a33ab25
      }
  
      public String getLocalIp() {
-@@ -1101,6 +1132,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1098,6 +1129,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      protected void runServer() {
          try {
@@ -151,7 +151,7 @@ index c0d5190ee653bf2bbe2858b1a142d5409ed322ee..4213f8424fa19eead42a307a3a33ab25
              if (!this.initServer()) {
                  throw new IllegalStateException("Failed to initialize server");
              }
-@@ -1110,6 +1142,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1107,6 +1139,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.status = this.buildServerStatus();
  
              // Spigot start
@@ -170,7 +170,7 @@ index c0d5190ee653bf2bbe2858b1a142d5409ed322ee..4213f8424fa19eead42a307a3a33ab25
              org.spigotmc.WatchdogThread.hasStarted = true; // Paper
              Arrays.fill( this.recentTps, 20 );
              // Paper start - further improve server tick loop
-@@ -1204,6 +1248,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1201,6 +1245,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  JvmProfiler.INSTANCE.onServerTick(this.smoothedTickTimeMillis);
              }
          } catch (Throwable throwable) {
@@ -183,7 +183,7 @@ index c0d5190ee653bf2bbe2858b1a142d5409ed322ee..4213f8424fa19eead42a307a3a33ab25
              MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);
              CrashReport crashreport = MinecraftServer.constructOrExtractCrashReport(throwable);
  
-@@ -1228,15 +1278,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1225,15 +1275,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.services.profileCache().clearExecutor();
                  }
  
@@ -203,7 +203,7 @@ index c0d5190ee653bf2bbe2858b1a142d5409ed322ee..4213f8424fa19eead42a307a3a33ab25
              }
  
          }
-@@ -1343,6 +1393,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1340,6 +1390,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @Override
      public TickTask wrapRunnable(Runnable runnable) {
@@ -216,7 +216,7 @@ index c0d5190ee653bf2bbe2858b1a142d5409ed322ee..4213f8424fa19eead42a307a3a33ab25
          return new TickTask(this.tickCount, runnable);
      }
  
-@@ -2178,7 +2234,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2175,7 +2231,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.worldData.setDataConfiguration(worlddataconfiguration);
              this.resources.managers.updateRegistryTags();
              this.potionBrewing = this.potionBrewing.reload(this.worldData.enabledFeatures()); // Paper - Custom Potion Mixes
@@ -315,10 +315,10 @@ index 424c4613e202c6ba50fa0de65d2526d400a8e299..2a8609e33716949ff1877b6d10f64a9d
                          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/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 013dbe120c9c9e9394083d4dc2f31db7c5961aa1..c988afa496d25314451435eedd64079a0d87cef0 100644
+index 6e1f92b45504cef0c4dcbbebf3df339ef4cad0a1..e02102280ed1dc300191d19bbca8f00e17701753 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -187,6 +187,36 @@ public class Main {
+@@ -188,6 +188,36 @@ public class Main {
  
          OptionSet options = null;
  
@@ -355,7 +355,7 @@ index 013dbe120c9c9e9394083d4dc2f31db7c5961aa1..c988afa496d25314451435eedd64079a
          try {
              options = parser.parse(args);
          } catch (joptsimple.OptionException ex) {
-@@ -298,8 +328,65 @@ public class Main {
+@@ -299,8 +329,65 @@ public class Main {
              } catch (Throwable t) {
                  t.printStackTrace();
              }
diff --git a/patches/server/0997-Optimize-Voxel-Shape-Merging.patch b/patches/server/0994-Optimize-Voxel-Shape-Merging.patch
index 4ec779560c..4ec779560c 100644
--- a/patches/server/0997-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/0994-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0998-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0995-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 648e4a4818..648e4a4818 100644
--- a/patches/server/0998-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0995-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0999-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0996-Use-distance-map-to-optimise-entity-tracker.patch
index 22535d896b..22535d896b 100644
--- a/patches/server/0999-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0996-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/1000-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0997-Optimize-Bit-Operations-by-inlining.patch
index a1f24dd8dc..a1f24dd8dc 100644
--- a/patches/server/1000-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0997-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1001-Remove-streams-from-hot-code.patch b/patches/server/0998-Remove-streams-from-hot-code.patch
index 4c6d94f7bf..4c6d94f7bf 100644
--- a/patches/server/1001-Remove-streams-from-hot-code.patch
+++ b/patches/server/0998-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1002-Eigencraft-redstone-implementation.patch b/patches/server/0999-Eigencraft-redstone-implementation.patch
index b3e3db6504..b3e3db6504 100644
--- a/patches/server/1002-Eigencraft-redstone-implementation.patch
+++ b/patches/server/0999-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1003-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1000-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 6fc4445bbf..6fc4445bbf 100644
--- a/patches/server/1003-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/1000-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1004-Improve-boat-collision-performance.patch b/patches/server/1001-Improve-boat-collision-performance.patch
index 32c6ddbca3..32c6ddbca3 100644
--- a/patches/server/1004-Improve-boat-collision-performance.patch
+++ b/patches/server/1001-Improve-boat-collision-performance.patch
diff --git a/patches/server/1005-Optimise-general-POI-access.patch b/patches/server/1002-Optimise-general-POI-access.patch
index 118734c246..118734c246 100644
--- a/patches/server/1005-Optimise-general-POI-access.patch
+++ b/patches/server/1002-Optimise-general-POI-access.patch
diff --git a/patches/server/1006-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1003-Custom-table-implementation-for-blockstate-state-loo.patch
index 96d90abea3..96d90abea3 100644
--- a/patches/server/1006-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1003-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1007-Execute-chunk-tasks-mid-tick.patch b/patches/server/1004-Execute-chunk-tasks-mid-tick.patch
index f6c18e97a5..6ee2d94ec9 100644
--- a/patches/server/1007-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/1004-Execute-chunk-tasks-mid-tick.patch
@@ -19,10 +19,10 @@ index 6b3cde6d4d1e63bec01f502f2027ee9fddac08aa..46449728f69ee7d4f78470f8da23c055
  
      private MinecraftTimings() {}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4213f8424fa19eead42a307a3a33ab25ead86613..8b73a58de97335774411c361a8defd971c1a45b0 100644
+index 478d238c8d8d41a1d27f305849bd216ec2e894f5..4f076eae3a9c597e41f4520dae8378ec429d9f69 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1414,8 +1414,79 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1411,8 +1411,79 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return flag;
      }
  
diff --git a/patches/server/1008-Optimise-random-block-ticking.patch b/patches/server/1005-Optimise-random-block-ticking.patch
index 36af1b75bf..36af1b75bf 100644
--- a/patches/server/1008-Optimise-random-block-ticking.patch
+++ b/patches/server/1005-Optimise-random-block-ticking.patch
diff --git a/patches/server/1009-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1006-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index de14ae28a6..de14ae28a6 100644
--- a/patches/server/1009-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1006-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1010-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1007-Use-Velocity-compression-and-cipher-natives.patch
index 713ad85d36..c83372d4cd 100644
--- a/patches/server/1010-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/1007-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1ed8d1ba75fa3a31469a6e8e3b661328b0debf12..87bb3fd9b97506f61734ae7f2e6860610ba794e7 100644
+index 48b8db6d5fdf9b2f7155b9356418178f5594ddcb..4998aff0b7cb084dcda15c6a18bbe45e99b6000a 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -36,6 +36,11 @@ dependencies {
+@@ -37,6 +37,11 @@ dependencies {
      runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")
      runtimeOnly("com.mysql:mysql-connector-j:8.3.0")
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
diff --git a/patches/server/1011-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1008-Detail-more-information-in-watchdog-dumps.patch
index 1f68e8d565..1f68e8d565 100644
--- a/patches/server/1011-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1008-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/1012-Collision-optimisations.patch b/patches/server/1009-Collision-optimisations.patch
index dca1e4f54f..dca1e4f54f 100644
--- a/patches/server/1012-Collision-optimisations.patch
+++ b/patches/server/1009-Collision-optimisations.patch
diff --git a/patches/server/1013-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1010-Optimise-collision-checking-in-player-move-packet-ha.patch
index 7faeede880..7faeede880 100644
--- a/patches/server/1013-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1010-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1014-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1011-Fix-tripwire-disarming-not-working-as-intended.patch
index fa7f6bde06..fa7f6bde06 100644
--- a/patches/server/1014-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/server/1011-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/1015-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1012-Fix-entity-type-tags-suggestions-in-selectors.patch
index d24e7d583c..d24e7d583c 100644
--- a/patches/server/1015-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1012-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1016-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1013-Add-Alternate-Current-redstone-implementation.patch
index 2e914661d3..2e914661d3 100644
--- a/patches/server/1016-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1013-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1017-optimize-dirt-and-snow-spreading.patch b/patches/server/1014-optimize-dirt-and-snow-spreading.patch
index 49de7fcab9..49de7fcab9 100644
--- a/patches/server/1017-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/1014-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1018-Properly-resend-entities.patch b/patches/server/1015-Properly-resend-entities.patch
index 512dc2372a..512dc2372a 100644
--- a/patches/server/1018-Properly-resend-entities.patch
+++ b/patches/server/1015-Properly-resend-entities.patch
diff --git a/patches/server/1019-Optimize-Hoppers.patch b/patches/server/1016-Optimize-Hoppers.patch
index 3d2b309289..494310eb1b 100644
--- a/patches/server/1019-Optimize-Hoppers.patch
+++ b/patches/server/1016-Optimize-Hoppers.patch
@@ -50,10 +50,10 @@ index 0000000000000000000000000000000000000000..5c42823726e70ce6c9d0121d07431548
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8b73a58de97335774411c361a8defd971c1a45b0..7f18dfcf3e8edfceaa4dfd96e3b70945693b1c3e 100644
+index 4f076eae3a9c597e41f4520dae8378ec429d9f69..810b6099e734a5524e696beb3f25d6ca686625ea 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1756,6 +1756,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1753,6 +1753,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
              worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
diff --git a/patches/server/1020-Improve-performance-of-mass-crafts.patch b/patches/server/1017-Improve-performance-of-mass-crafts.patch
index f9839d9135..f9839d9135 100644
--- a/patches/server/1020-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1017-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1021-Actually-optimise-explosions.patch b/patches/server/1018-Actually-optimise-explosions.patch
index 8885f7e533..8885f7e533 100644
--- a/patches/server/1021-Actually-optimise-explosions.patch
+++ b/patches/server/1018-Actually-optimise-explosions.patch
diff --git a/patches/server/1022-Optimise-chunk-tick-iteration.patch b/patches/server/1019-Optimise-chunk-tick-iteration.patch
index 4b4ea50dfe..4b4ea50dfe 100644
--- a/patches/server/1022-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1019-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1023-Lag-compensation-ticks.patch b/patches/server/1020-Lag-compensation-ticks.patch
index dffba28e9e..8b870b4b4f 100644
--- a/patches/server/1023-Lag-compensation-ticks.patch
+++ b/patches/server/1020-Lag-compensation-ticks.patch
@@ -8,10 +8,10 @@ Areas affected by lag comepnsation:
  - Eating food items
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7f18dfcf3e8edfceaa4dfd96e3b70945693b1c3e..9c3de11be9f655d97d63ec8c535cabf04d9db0b5 100644
+index 810b6099e734a5524e696beb3f25d6ca686625ea..0408d5d54fef7767ecf70e70686ad520d890ff26 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -318,6 +318,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -315,6 +315,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
@@ -19,7 +19,7 @@ index 7f18dfcf3e8edfceaa4dfd96e3b70945693b1c3e..9c3de11be9f655d97d63ec8c535cabf0
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -1757,6 +1758,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1754,6 +1755,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
              worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
diff --git a/patches/server/1024-Optimise-nearby-player-retrieval.patch b/patches/server/1021-Optimise-nearby-player-retrieval.patch
index eae5d781cc..eae5d781cc 100644
--- a/patches/server/1024-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1021-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1025-Distance-manager-tick-timings.patch b/patches/server/1022-Distance-manager-tick-timings.patch
index f946d92596..f946d92596 100644
--- a/patches/server/1025-Distance-manager-tick-timings.patch
+++ b/patches/server/1022-Distance-manager-tick-timings.patch
diff --git a/patches/server/1026-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1023-Handle-Oversized-block-entities-in-chunks.patch
index b9ea4832bd..b9ea4832bd 100644
--- a/patches/server/1026-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1023-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1027-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1024-Send-full-pos-packets-for-hard-colliding-entities.patch
index 6a98c63b52..6a98c63b52 100644
--- a/patches/server/1027-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/1024-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/1028-Fix-and-optimise-world-force-upgrading.patch b/patches/server/1025-Fix-and-optimise-world-force-upgrading.patch
index c00097bdf4..ce0b75bfbb 100644
--- a/patches/server/1028-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/1025-Fix-and-optimise-world-force-upgrading.patch
@@ -280,10 +280,10 @@ index 244a19ecd0234fa1d7a6ecfea20751595688605d..5443013060b62e3bfcc51cddca96d1c0
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, dynamicRegistryManager, eraseCache, recreateRegionFiles);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9c3de11be9f655d97d63ec8c535cabf04d9db0b5..cac41b5cea8c6362946c6bd5e50b449d033ab6a9 100644
+index 0408d5d54fef7767ecf70e70686ad520d890ff26..f525a8735e5cf5eb1278e2a3002ac81d9fff7b1a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -599,11 +599,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -596,11 +596,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  worlddata = new PrimaryLevelData(worldsettings, worldoptions, worlddimensions_b.specialWorldProperty(), lifecycle);
              }
              worlddata.checkName(name); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end)
@@ -296,7 +296,7 @@ index 9c3de11be9f655d97d63ec8c535cabf04d9db0b5..cac41b5cea8c6362946c6bd5e50b449d
  
              PrimaryLevelData iworlddataserver = worlddata;
              boolean flag = worlddata.isDebugWorld();
-@@ -618,6 +614,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -615,6 +611,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
  
@@ -365,10 +365,10 @@ index 249705ec1b8b692ef1d7fec34a04918afe6486bc..f6e3b745fc417354380d4a969f83aee4
          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 508c1e662e14693e0af3a68079d811d1583b94f0..85d4e561930367918f3c5c4216cadbb970626599 100644
+index 8e0b0e4b177f1bcf23e174dfca6eaa0f7203a95a..b63dc96d2b387bd0a6bd3c703853b40a337bb33f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1366,9 +1366,7 @@ public final class CraftServer implements Server {
+@@ -1361,9 +1361,7 @@ public final class CraftServer implements Server {
          worlddata.checkName(name);
          worlddata.setModdedInfo(this.console.getServerModName(), this.console.getModdedStatus().shouldReportAsModified());
  
@@ -379,7 +379,7 @@ index 508c1e662e14693e0af3a68079d811d1583b94f0..85d4e561930367918f3c5c4216cadbb9
  
          long j = BiomeManager.obfuscateSeed(worlddata.worldGenOptions().seed()); // Paper - use world seed
          List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata));
-@@ -1379,6 +1377,13 @@ public final class CraftServer implements Server {
+@@ -1374,6 +1372,13 @@ public final class CraftServer implements Server {
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
  
diff --git a/patches/server/1029-API-for-checking-sent-chunks.patch b/patches/server/1026-API-for-checking-sent-chunks.patch
index a08ada1670..a08ada1670 100644
--- a/patches/server/1029-API-for-checking-sent-chunks.patch
+++ b/patches/server/1026-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1030-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/1027-Add-config-for-mobs-immune-to-default-effects.patch
index 7bf145751f..7bf145751f 100644
--- a/patches/server/1030-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/1027-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/1031-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/1028-Deep-clone-nbt-tags-in-PDC.patch
index 96cc14f9db..96cc14f9db 100644
--- a/patches/server/1031-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/server/1028-Deep-clone-nbt-tags-in-PDC.patch
diff --git a/patches/server/1032-Support-old-UUID-format-for-NBT.patch b/patches/server/1029-Support-old-UUID-format-for-NBT.patch
index a38c2a7f7b..a38c2a7f7b 100644
--- a/patches/server/1032-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/1029-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/1033-Fix-shield-disable-inconsistency.patch b/patches/server/1030-Fix-shield-disable-inconsistency.patch
index 757be91657..757be91657 100644
--- a/patches/server/1033-Fix-shield-disable-inconsistency.patch
+++ b/patches/server/1030-Fix-shield-disable-inconsistency.patch
diff --git a/patches/server/1034-Write-SavedData-IO-async.patch b/patches/server/1031-Write-SavedData-IO-async.patch
index 365011d581..365011d581 100644
--- a/patches/server/1034-Write-SavedData-IO-async.patch
+++ b/patches/server/1031-Write-SavedData-IO-async.patch
diff --git a/patches/server/1035-Don-t-lose-removed-data-components-in-ItemMeta.patch b/patches/server/1032-Don-t-lose-removed-data-components-in-ItemMeta.patch
index d64eaac093..d64eaac093 100644
--- a/patches/server/1035-Don-t-lose-removed-data-components-in-ItemMeta.patch
+++ b/patches/server/1032-Don-t-lose-removed-data-components-in-ItemMeta.patch
diff --git a/patches/server/1036-Add-experimental-improved-give-command.patch b/patches/server/1033-Add-experimental-improved-give-command.patch
index fd226dcb27..fd226dcb27 100644
--- a/patches/server/1036-Add-experimental-improved-give-command.patch
+++ b/patches/server/1033-Add-experimental-improved-give-command.patch
diff --git a/patches/server/1037-Handle-Large-Packets-disconnecting-client.patch b/patches/server/1034-Handle-Large-Packets-disconnecting-client.patch
index 49f2553189..49f2553189 100644
--- a/patches/server/1037-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/1034-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/1038-Fix-ItemFlags.patch b/patches/server/1035-Fix-ItemFlags.patch
index df5328f3a8..df5328f3a8 100644
--- a/patches/server/1038-Fix-ItemFlags.patch
+++ b/patches/server/1035-Fix-ItemFlags.patch
diff --git a/patches/server/1039-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/1036-Fix-helmet-damage-reduction-inconsistencies.patch
index af975bb004..af975bb004 100644
--- a/patches/server/1039-Fix-helmet-damage-reduction-inconsistencies.patch
+++ b/patches/server/1036-Fix-helmet-damage-reduction-inconsistencies.patch
diff --git a/patches/server/1040-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/1037-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index e471865c85..e471865c85 100644
--- a/patches/server/1040-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/1037-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/patches/server/1041-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/1038-improve-checking-handled-tags-in-itemmeta.patch
index 72204e0a32..72204e0a32 100644
--- a/patches/server/1041-improve-checking-handled-tags-in-itemmeta.patch
+++ b/patches/server/1038-improve-checking-handled-tags-in-itemmeta.patch
diff --git a/patches/server/1042-General-ItemMeta-fixes.patch b/patches/server/1039-General-ItemMeta-fixes.patch
index a91feb64de..a91feb64de 100644
--- a/patches/server/1042-General-ItemMeta-fixes.patch
+++ b/patches/server/1039-General-ItemMeta-fixes.patch
diff --git a/patches/server/1043-Expose-hasColor-to-leather-armor.patch b/patches/server/1040-Expose-hasColor-to-leather-armor.patch
index df08de2a92..df08de2a92 100644
--- a/patches/server/1043-Expose-hasColor-to-leather-armor.patch
+++ b/patches/server/1040-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/server/1044-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/1041-Added-API-to-get-player-ha-proxy-address.patch
index 364197b03e..364197b03e 100644
--- a/patches/server/1044-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/server/1041-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/server/1045-More-Chest-Block-API.patch b/patches/server/1042-More-Chest-Block-API.patch
index 7a9542665a..7a9542665a 100644
--- a/patches/server/1045-More-Chest-Block-API.patch
+++ b/patches/server/1042-More-Chest-Block-API.patch
diff --git a/patches/server/1046-Print-data-component-type-on-encoding-error.patch b/patches/server/1043-Print-data-component-type-on-encoding-error.patch
index 78cb82fa00..78cb82fa00 100644
--- a/patches/server/1046-Print-data-component-type-on-encoding-error.patch
+++ b/patches/server/1043-Print-data-component-type-on-encoding-error.patch
diff --git a/patches/server/1047-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1044-Fix-entity-tracker-desync-when-new-players-are-added.patch
index a39b2bf46f..a39b2bf46f 100644
--- a/patches/server/1047-Fix-entity-tracker-desync-when-new-players-are-added.patch
+++ b/patches/server/1044-Fix-entity-tracker-desync-when-new-players-are-added.patch
diff --git a/patches/server/1048-Brigadier-based-command-API.patch b/patches/server/1045-Brigadier-based-command-API.patch
index b3aa5f1dc0..638a5b18f4 100644
--- a/patches/server/1048-Brigadier-based-command-API.patch
+++ b/patches/server/1045-Brigadier-based-command-API.patch
@@ -2154,10 +2154,10 @@ index 982b2bab27e3d55d0ba07060862c0c3183ad91b0..5fa8a3343ffc11e82c20b78a73205fd8
          Component component = message.resolveComponent(commandSourceStack);
          CommandSigningContext commandSigningContext = commandSourceStack.getSigningContext();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cac41b5cea8c6362946c6bd5e50b449d033ab6a9..39303bb4e336732db0ab19dee0c1f8b609bbb134 100644
+index f525a8735e5cf5eb1278e2a3002ac81d9fff7b1a..dbc86b8d4d2af6e5f7e678f2bb77fd39b85c04c5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -302,7 +302,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -299,7 +299,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static int currentTick; // Paper - improve tick loop
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
@@ -2166,7 +2166,7 @@ index cac41b5cea8c6362946c6bd5e50b449d033ab6a9..39303bb4e336732db0ab19dee0c1f8b6
      public boolean forceTicks; // Paper
      // CraftBukkit end
      // Spigot start
-@@ -393,7 +393,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -390,7 +390,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // CraftBukkit start
          this.options = options;
          this.worldLoader = worldLoader;
@@ -2174,7 +2174,7 @@ index cac41b5cea8c6362946c6bd5e50b449d033ab6a9..39303bb4e336732db0ab19dee0c1f8b6
          // Paper start - Handled by TerminalConsoleAppender
          // Try to see if we're actually running in a terminal, disable jline if not
          /*
-@@ -681,6 +680,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -678,6 +677,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
          if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
@@ -2184,7 +2184,7 @@ index cac41b5cea8c6362946c6bd5e50b449d033ab6a9..39303bb4e336732db0ab19dee0c1f8b6
          this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
          this.connection.acceptConnections();
      }
-@@ -2302,9 +2304,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2299,9 +2301,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  return new MinecraftServer.ReloadableResources(resourcemanager, datapackresources);
              });
          }).thenAcceptAsync((minecraftserver_reloadableresources) -> {
@@ -2195,7 +2195,7 @@ index cac41b5cea8c6362946c6bd5e50b449d033ab6a9..39303bb4e336732db0ab19dee0c1f8b6
              this.packRepository.setSelected(dataPacks);
              WorldDataConfiguration worlddataconfiguration = new WorldDataConfiguration(MinecraftServer.getSelectedPacks(this.packRepository, true), this.worldData.enabledFeatures());
  
-@@ -2323,8 +2325,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2320,8 +2322,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.getPlayerList().reloadResources();
              this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
              this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
@@ -2318,10 +2318,10 @@ index 3faf80fca51d66480265eaf3cc89149e53ceb215..b9b3277c8ed94e0cd30b20b9c00a33ea
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 85d4e561930367918f3c5c4216cadbb970626599..da1aed63af837b193900bb85393611edbd56c363 100644
+index b63dc96d2b387bd0a6bd3c703853b40a337bb33f..2fa5507aa2153a05208077f9547c165a1099b5bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -275,11 +275,11 @@ public final class CraftServer implements Server {
+@@ -270,11 +270,11 @@ public final class CraftServer implements Server {
      private final Logger logger = Logger.getLogger("Minecraft");
      private final ServicesManager servicesManager = new SimpleServicesManager();
      private final CraftScheduler scheduler = new CraftScheduler();
@@ -2336,7 +2336,7 @@ index 85d4e561930367918f3c5c4216cadbb970626599..da1aed63af837b193900bb85393611ed
      private final StructureManager structureManager;
      protected final DedicatedServer console;
      protected final DedicatedPlayerList playerList;
-@@ -404,6 +404,12 @@ public final class CraftServer implements Server {
+@@ -399,6 +399,12 @@ public final class CraftServer implements Server {
          this.serverTickManager = new CraftServerTickManager(console.tickRateManager());
  
          Bukkit.setServer(this);
@@ -2349,7 +2349,7 @@ index 85d4e561930367918f3c5c4216cadbb970626599..da1aed63af837b193900bb85393611ed
  
          CraftRegistry.setMinecraftRegistry(console.registryAccess());
  
-@@ -573,48 +579,11 @@ public final class CraftServer implements Server {
+@@ -568,48 +574,11 @@ public final class CraftServer implements Server {
      }
  
      private void setVanillaCommands(boolean first) { // Spigot
@@ -2400,7 +2400,7 @@ index 85d4e561930367918f3c5c4216cadbb970626599..da1aed63af837b193900bb85393611ed
  
          // Refresh commands
          for (ServerPlayer player : this.getHandle().players) {
-@@ -1001,17 +970,31 @@ public final class CraftServer implements Server {
+@@ -996,17 +965,31 @@ public final class CraftServer implements Server {
              return true;
          }
  
@@ -2442,7 +2442,7 @@ index 85d4e561930367918f3c5c4216cadbb970626599..da1aed63af837b193900bb85393611ed
  
          return false;
      }
-@@ -1020,7 +1003,7 @@ public final class CraftServer implements Server {
+@@ -1015,7 +998,7 @@ public final class CraftServer implements Server {
      public void reload() {
          // Paper start - lifecycle events
          if (io.papermc.paper.plugin.lifecycle.event.LifecycleEventRunner.INSTANCE.blocksPluginReloading()) {
@@ -2451,7 +2451,7 @@ index 85d4e561930367918f3c5c4216cadbb970626599..da1aed63af837b193900bb85393611ed
          }
          // Paper end - lifecycle events
          org.spigotmc.WatchdogThread.hasStarted = false; // Paper - Disable watchdog early timeout on reload
-@@ -1073,8 +1056,9 @@ public final class CraftServer implements Server {
+@@ -1068,8 +1051,9 @@ public final class CraftServer implements Server {
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -2462,7 +2462,7 @@ index 85d4e561930367918f3c5c4216cadbb970626599..da1aed63af837b193900bb85393611ed
          // Paper start
          for (Plugin plugin : pluginClone) {
              entityMetadata.removeAll(plugin);
-@@ -1114,6 +1098,12 @@ public final class CraftServer implements Server {
+@@ -1109,6 +1093,12 @@ public final class CraftServer implements Server {
          this.enablePlugins(PluginLoadOrder.STARTUP);
          this.enablePlugins(PluginLoadOrder.POSTWORLD);
          if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins