remove api that was scheduled for removal

1196 files changed, 442 insertions, 1665 deletions

diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch
index c9e666738c..9e9943a174 100644
--- a/patches/api/0006-Adventure.patch
+++ b/patches/api/0006-Adventure.patch
@@ -374,10 +374,10 @@ index 0000000000000000000000000000000000000000..01cf89d3558132912c4d0eb48c98cd8c
 +}
 diff --git a/src/main/java/io/papermc/paper/event/player/AsyncChatDecorateEvent.java b/src/main/java/io/papermc/paper/event/player/AsyncChatDecorateEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d4c01e4d332b46f0b129dd5f9e9737ba19923562
+index 0000000000000000000000000000000000000000..2e492f4cd179135bd40ad951ab23acb562be2f06
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/event/player/AsyncChatDecorateEvent.java
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,105 @@
 +package io.papermc.paper.event.player;
 +
 +import net.kyori.adventure.text.Component;
@@ -459,19 +459,6 @@ index 0000000000000000000000000000000000000000..d4c01e4d332b46f0b129dd5f9e9737ba
 +        this.result = result;
 +    }
 +
-+    /**
-+     * If this decorating is part of a preview request/response.
-+     *
-+     * @return {@code true} if part of previewing
-+     * @deprecated chat preview was removed in 1.19.3
-+     */
-+    @Deprecated(forRemoval = true, since = "1.19.3")
-+    @ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    @Contract(value = "-> false", pure = true)
-+    public boolean isPreview() {
-+        return false;
-+    }
-+
 +    @Override
 +    public boolean isCancelled() {
 +        return this.cancelled;
diff --git a/patches/api/0017-Add-PlayerLocaleChangeEvent.patch b/patches/api/0017-Add-PlayerLocaleChangeEvent.patch
deleted file mode 100644
index b843aa4fc7..0000000000
--- a/patches/api/0017-Add-PlayerLocaleChangeEvent.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Isaac Moore <[email protected]>
-Date: Mon, 29 Feb 2016 18:02:25 -0600
-Subject: [PATCH] Add PlayerLocaleChangeEvent
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..57f6c47e4e759abf0af9aa8962551225cc12246c
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java
-@@ -0,0 +1,60 @@
-+package com.destroystokyo.paper.event.player;
-+
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.player.PlayerEvent;
-+import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * Called when the locale of the player is changed.
-+ *
-+ * @deprecated Replaced by {@link org.bukkit.event.player.PlayerLocaleChangeEvent} upstream
-+ */
-+@Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+public class PlayerLocaleChangeEvent extends PlayerEvent {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
-+    private final String oldLocale;
-+    private final String newLocale;
-+
-+    @ApiStatus.Internal
-+    public PlayerLocaleChangeEvent(final @NotNull Player player, final @Nullable String oldLocale, final @NotNull String newLocale) {
-+        super(player);
-+        this.oldLocale = oldLocale;
-+        this.newLocale = newLocale;
-+    }
-+
-+    /**
-+     * Gets the locale the player switched from.
-+     *
-+     * @return player's old locale
-+     */
-+    @Nullable
-+    public String getOldLocale() {
-+        return this.oldLocale;
-+    }
-+
-+    /**
-+     * Gets the locale the player is changed to.
-+     *
-+     * @return player's new locale
-+     */
-+    @NotNull
-+    public String getNewLocale() {
-+        return this.newLocale;
-+    }
-+
-+    @Override
-+    @NotNull
-+    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
-+    }
-+}
diff --git a/patches/api/0018-Add-view-distance-API.patch b/patches/api/0017-Add-view-distance-API.patch
index aff8f375d8..aff8f375d8 100644
--- a/patches/api/0018-Add-view-distance-API.patch
+++ b/patches/api/0017-Add-view-distance-API.patch
diff --git a/patches/api/0019-Add-BeaconEffectEvent.patch b/patches/api/0018-Add-BeaconEffectEvent.patch
index 26277cd04d..26277cd04d 100644
--- a/patches/api/0019-Add-BeaconEffectEvent.patch
+++ b/patches/api/0018-Add-BeaconEffectEvent.patch
diff --git a/patches/api/0021-Expose-server-CommandMap.patch b/patches/api/0019-Expose-server-CommandMap.patch
index 55786e0ffb..55786e0ffb 100644
--- a/patches/api/0021-Expose-server-CommandMap.patch
+++ b/patches/api/0019-Expose-server-CommandMap.patch
diff --git a/patches/api/0020-Add-PlayerInitialSpawnEvent.patch b/patches/api/0020-Add-PlayerInitialSpawnEvent.patch
deleted file mode 100644
index 65ac9f92bd..0000000000
--- a/patches/api/0020-Add-PlayerInitialSpawnEvent.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Steve Anton <[email protected]>
-Date: Mon, 29 Feb 2016 18:13:58 -0600
-Subject: [PATCH] Add PlayerInitialSpawnEvent
-
-For modifying a player's initial spawn location as they join the server
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..49e97ae79facceca5fc44c84c3d5f342d64cabc2
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
-@@ -0,0 +1,19 @@
-+package com.destroystokyo.paper.event.player;
-+
-+import org.bukkit.Location;
-+import org.bukkit.entity.Player;
-+import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
-+import org.spigotmc.event.player.PlayerSpawnLocationEvent;
-+
-+/**
-+ * @deprecated Use {@link PlayerSpawnLocationEvent}, Duplicate API
-+ */
-+@Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+public class PlayerInitialSpawnEvent extends PlayerSpawnLocationEvent {
-+
-+    @ApiStatus.Internal
-+    public PlayerInitialSpawnEvent(@NotNull Player player, @NotNull Location spawnLocation) {
-+        super(player, spawnLocation);
-+    }
-+}
diff --git a/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0020-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index d88bd2a236..d88bd2a236 100644
--- a/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/patches/api/0020-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
diff --git a/patches/api/0023-Add-exception-reporting-event.patch b/patches/api/0021-Add-exception-reporting-event.patch
index 7d46942622..7d46942622 100644
--- a/patches/api/0023-Add-exception-reporting-event.patch
+++ b/patches/api/0021-Add-exception-reporting-event.patch
diff --git a/patches/api/0024-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/patches/api/0022-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
index 02e7138c10..02e7138c10 100644
--- a/patches/api/0024-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/patches/api/0022-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
diff --git a/patches/api/0025-Fix-ServerListPingEvent-flagging-as-Async.patch b/patches/api/0023-Fix-ServerListPingEvent-flagging-as-Async.patch
index 87d3369578..87d3369578 100644
--- a/patches/api/0025-Fix-ServerListPingEvent-flagging-as-Async.patch
+++ b/patches/api/0023-Fix-ServerListPingEvent-flagging-as-Async.patch
diff --git a/patches/api/0026-Player-Tab-List-and-Title-APIs.patch b/patches/api/0024-Player-Tab-List-and-Title-APIs.patch
index 33be050ecf..33be050ecf 100644
--- a/patches/api/0026-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/api/0024-Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/api/0025-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 471ee35ff8..471ee35ff8 100644
--- a/patches/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/api/0025-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/api/0028-Complete-resource-pack-API.patch b/patches/api/0026-Complete-resource-pack-API.patch
index 22c24d7cc1..22c24d7cc1 100644
--- a/patches/api/0028-Complete-resource-pack-API.patch
+++ b/patches/api/0026-Complete-resource-pack-API.patch
diff --git a/patches/api/0029-Add-a-call-helper-to-Event.patch b/patches/api/0027-Add-a-call-helper-to-Event.patch
index 4b287bfa56..4b287bfa56 100644
--- a/patches/api/0029-Add-a-call-helper-to-Event.patch
+++ b/patches/api/0027-Add-a-call-helper-to-Event.patch
diff --git a/patches/api/0030-Add-sender-name-to-commands.yml-replacement.patch b/patches/api/0028-Add-sender-name-to-commands.yml-replacement.patch
index 7122fed4a2..7122fed4a2 100644
--- a/patches/api/0030-Add-sender-name-to-commands.yml-replacement.patch
+++ b/patches/api/0028-Add-sender-name-to-commands.yml-replacement.patch
diff --git a/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch
index b7ff894867..b7ff894867 100644
--- a/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch
diff --git a/patches/api/0032-Custom-replacement-for-eaten-items.patch b/patches/api/0030-Custom-replacement-for-eaten-items.patch
index f7a9207fb3..f7a9207fb3 100644
--- a/patches/api/0032-Custom-replacement-for-eaten-items.patch
+++ b/patches/api/0030-Custom-replacement-for-eaten-items.patch
diff --git a/patches/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/api/0031-Entity-AddTo-RemoveFrom-World-Events.patch
index 4d41106879..4d41106879 100644
--- a/patches/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/api/0031-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/api/0034-EntityPathfindEvent.patch b/patches/api/0032-EntityPathfindEvent.patch
index 3586652e5c..3586652e5c 100644
--- a/patches/api/0034-EntityPathfindEvent.patch
+++ b/patches/api/0032-EntityPathfindEvent.patch
diff --git a/patches/api/0035-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/patches/api/0033-Reduce-thread-synchronization-in-MetadataStoreBase.patch
index 9bc7e49e8d..9bc7e49e8d 100644
--- a/patches/api/0035-Reduce-thread-synchronization-in-MetadataStoreBase.patch
+++ b/patches/api/0033-Reduce-thread-synchronization-in-MetadataStoreBase.patch
diff --git a/patches/api/0036-Add-MetadataStoreBase.removeAll-Plugin.patch b/patches/api/0034-Add-MetadataStoreBase.removeAll-Plugin.patch
index 2496de7423..2496de7423 100644
--- a/patches/api/0036-Add-MetadataStoreBase.removeAll-Plugin.patch
+++ b/patches/api/0034-Add-MetadataStoreBase.removeAll-Plugin.patch
diff --git a/patches/api/0037-Add-PlayerUseUnknownEntityEvent.patch b/patches/api/0035-Add-PlayerUseUnknownEntityEvent.patch
index e0d410dc6e..e0d410dc6e 100644
--- a/patches/api/0037-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/api/0035-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/api/0038-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/api/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 93c9571afc..93c9571afc 100644
--- a/patches/api/0038-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/api/0036-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/api/0039-Arrow-pickup-rule-API.patch b/patches/api/0037-Arrow-pickup-rule-API.patch
index 6bbf58b3d0..6bbf58b3d0 100644
--- a/patches/api/0039-Arrow-pickup-rule-API.patch
+++ b/patches/api/0037-Arrow-pickup-rule-API.patch
diff --git a/patches/api/0040-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/api/0038-EntityRegainHealthEvent-isFastRegen-API.patch
index f06ee13d15..f06ee13d15 100644
--- a/patches/api/0040-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/api/0038-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/api/0041-LootTable-API.patch b/patches/api/0039-LootTable-API.patch
index e1252ab848..e1252ab848 100644
--- a/patches/api/0041-LootTable-API.patch
+++ b/patches/api/0039-LootTable-API.patch
diff --git a/patches/api/0042-Add-EntityZapEvent.patch b/patches/api/0040-Add-EntityZapEvent.patch
index 08fe17b28a..08fe17b28a 100644
--- a/patches/api/0042-Add-EntityZapEvent.patch
+++ b/patches/api/0040-Add-EntityZapEvent.patch
diff --git a/patches/api/0043-Misc-Utils.patch b/patches/api/0041-Misc-Utils.patch
index fac858b16c..fac858b16c 100644
--- a/patches/api/0043-Misc-Utils.patch
+++ b/patches/api/0041-Misc-Utils.patch
diff --git a/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch
index b5f012ce42..b5f012ce42 100644
--- a/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/api/0045-Add-source-to-PlayerExpChangeEvent.patch b/patches/api/0043-Add-source-to-PlayerExpChangeEvent.patch
index 675b2be839..675b2be839 100644
--- a/patches/api/0045-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/api/0043-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/api/0046-Add-ProjectileCollideEvent.patch b/patches/api/0044-Add-ProjectileCollideEvent.patch
index 9eaf9308b3..9eaf9308b3 100644
--- a/patches/api/0046-Add-ProjectileCollideEvent.patch
+++ b/patches/api/0044-Add-ProjectileCollideEvent.patch
diff --git a/patches/api/0047-Add-String-based-Action-Bar-API.patch b/patches/api/0045-Add-String-based-Action-Bar-API.patch
index 8107305c07..8107305c07 100644
--- a/patches/api/0047-Add-String-based-Action-Bar-API.patch
+++ b/patches/api/0045-Add-String-based-Action-Bar-API.patch
diff --git a/patches/api/0048-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 5253041ed0..5253041ed0 100644
--- a/patches/api/0048-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/api/0046-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/api/0049-IllegalPacketEvent.patch b/patches/api/0047-IllegalPacketEvent.patch
index 44c4a83198..44c4a83198 100644
--- a/patches/api/0049-IllegalPacketEvent.patch
+++ b/patches/api/0047-IllegalPacketEvent.patch
diff --git a/patches/api/0050-Fireworks-API-s.patch b/patches/api/0048-Fireworks-API-s.patch
index 126f0b838d..126f0b838d 100644
--- a/patches/api/0050-Fireworks-API-s.patch
+++ b/patches/api/0048-Fireworks-API-s.patch
diff --git a/patches/api/0051-PlayerTeleportEndGatewayEvent.patch b/patches/api/0049-PlayerTeleportEndGatewayEvent.patch
index b964a35e5d..b964a35e5d 100644
--- a/patches/api/0051-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/api/0049-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch
index c5d20165c6..c5d20165c6 100644
--- a/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/api/0053-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/api/0051-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 5dadaf640f..5dadaf640f 100644
--- a/patches/api/0053-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/api/0051-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
index 37fcf69d8e..37fcf69d8e 100644
--- a/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/api/0056-Fix-upstream-javadocs.patch b/patches/api/0053-Fix-upstream-javadocs.patch
index c59299edc2..c59299edc2 100644
--- a/patches/api/0056-Fix-upstream-javadocs.patch
+++ b/patches/api/0053-Fix-upstream-javadocs.patch
diff --git a/patches/api/0054-Expose-WorldBorder-isInBounds-Location-check.patch b/patches/api/0054-Expose-WorldBorder-isInBounds-Location-check.patch
deleted file mode 100644
index 95db493acf..0000000000
--- a/patches/api/0054-Expose-WorldBorder-isInBounds-Location-check.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <[email protected]>
-Date: Sat, 21 Jan 2017 17:03:10 -0600
-Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check
-
-
-diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java
-index b1c08a7fc5856bcc29ee64d0a87b95a8ac940ddc..3ab5700b0b13fbfbf7c5b0b2c4a90bcc1e0a2d9c 100644
---- a/src/main/java/org/bukkit/WorldBorder.java
-+++ b/src/main/java/org/bukkit/WorldBorder.java
-@@ -162,4 +162,18 @@ public interface WorldBorder {
-      * @return The absolute maximum center coordinate of the WorldBorder
-      */
-     public double getMaxCenterCoordinate();
-+
-+    // Paper start
-+    /**
-+     * Checks if the location is within the boundaries of this border.
-+     * 
-+     * @param location specific location to check
-+     * @return true if the location is within the bounds of this border, false otherwise.
-+     * @deprecated use {@link #isInside(Location)} for an upstream compatible replacement
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    public default boolean isInBounds(@NotNull Location location) {
-+        return this.isInside(location);
-+    }
-+    // Paper end
- }
diff --git a/patches/api/0057-Item-canEntityPickup.patch b/patches/api/0054-Item-canEntityPickup.patch
index fc22e74079..fc22e74079 100644
--- a/patches/api/0057-Item-canEntityPickup.patch
+++ b/patches/api/0054-Item-canEntityPickup.patch
diff --git a/patches/api/0058-PlayerAttemptPickupItemEvent.patch b/patches/api/0055-PlayerAttemptPickupItemEvent.patch
index e688f92976..e688f92976 100644
--- a/patches/api/0058-PlayerAttemptPickupItemEvent.patch
+++ b/patches/api/0055-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/api/0059-Add-UnknownCommandEvent.patch b/patches/api/0056-Add-UnknownCommandEvent.patch
index fb53ee7d60..fb53ee7d60 100644
--- a/patches/api/0059-Add-UnknownCommandEvent.patch
+++ b/patches/api/0056-Add-UnknownCommandEvent.patch
diff --git a/patches/api/0060-Basic-PlayerProfile-API.patch b/patches/api/0057-Basic-PlayerProfile-API.patch
index ffeb611221..ffeb611221 100644
--- a/patches/api/0060-Basic-PlayerProfile-API.patch
+++ b/patches/api/0057-Basic-PlayerProfile-API.patch
diff --git a/patches/api/0061-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 7d21cf10f7..7d21cf10f7 100644
--- a/patches/api/0061-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/api/0062-Shoulder-Entities-Release-API.patch b/patches/api/0059-Shoulder-Entities-Release-API.patch
index d02f2a3521..d02f2a3521 100644
--- a/patches/api/0062-Shoulder-Entities-Release-API.patch
+++ b/patches/api/0059-Shoulder-Entities-Release-API.patch
diff --git a/patches/api/0063-Entity-fromMobSpawner.patch b/patches/api/0060-Entity-fromMobSpawner.patch
index 83bd17a96e..83bd17a96e 100644
--- a/patches/api/0063-Entity-fromMobSpawner.patch
+++ b/patches/api/0060-Entity-fromMobSpawner.patch
diff --git a/patches/api/0064-Profile-Lookup-Events.patch b/patches/api/0061-Profile-Lookup-Events.patch
index cc0b655b89..cc0b655b89 100644
--- a/patches/api/0064-Profile-Lookup-Events.patch
+++ b/patches/api/0061-Profile-Lookup-Events.patch
diff --git a/patches/api/0065-Improve-the-Saddle-API-for-Horses.patch b/patches/api/0062-Improve-the-Saddle-API-for-Horses.patch
index 85814456bf..85814456bf 100644
--- a/patches/api/0065-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/api/0062-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/api/0066-Add-getI18NDisplayName-API.patch b/patches/api/0063-Add-getI18NDisplayName-API.patch
index dd788d0c27..dd788d0c27 100644
--- a/patches/api/0066-Add-getI18NDisplayName-API.patch
+++ b/patches/api/0063-Add-getI18NDisplayName-API.patch
diff --git a/patches/api/0067-ensureServerConversions-API.patch b/patches/api/0064-ensureServerConversions-API.patch
index 8fa95dd9cb..8fa95dd9cb 100644
--- a/patches/api/0067-ensureServerConversions-API.patch
+++ b/patches/api/0064-ensureServerConversions-API.patch
diff --git a/patches/api/0068-LivingEntity-setKiller.patch b/patches/api/0065-LivingEntity-setKiller.patch
index fb3719a679..fb3719a679 100644
--- a/patches/api/0068-LivingEntity-setKiller.patch
+++ b/patches/api/0065-LivingEntity-setKiller.patch
diff --git a/patches/api/0069-ProfileWhitelistVerifyEvent.patch b/patches/api/0066-ProfileWhitelistVerifyEvent.patch
index 8c653d95af..8c653d95af 100644
--- a/patches/api/0069-ProfileWhitelistVerifyEvent.patch
+++ b/patches/api/0066-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
index 6a30f58e99..6a30f58e99 100644
--- a/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
diff --git a/patches/api/0071-Handle-plugin-prefixes-in-implementation-logging-con.patch b/patches/api/0068-Handle-plugin-prefixes-in-implementation-logging-con.patch
index f80ceb6cb7..f80ceb6cb7 100644
--- a/patches/api/0071-Handle-plugin-prefixes-in-implementation-logging-con.patch
+++ b/patches/api/0068-Handle-plugin-prefixes-in-implementation-logging-con.patch
diff --git a/patches/api/0072-Add-PlayerJumpEvent.patch b/patches/api/0069-Add-PlayerJumpEvent.patch
index fef1ccd347..fef1ccd347 100644
--- a/patches/api/0072-Add-PlayerJumpEvent.patch
+++ b/patches/api/0069-Add-PlayerJumpEvent.patch
diff --git a/patches/api/0073-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/patches/api/0070-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
index 12d008b482..12d008b482 100644
--- a/patches/api/0073-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+++ b/patches/api/0070-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
diff --git a/patches/api/0074-Add-PlayerArmorChangeEvent.patch b/patches/api/0071-Add-PlayerArmorChangeEvent.patch
index d0fc3edb36..d0fc3edb36 100644
--- a/patches/api/0074-Add-PlayerArmorChangeEvent.patch
+++ b/patches/api/0071-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/api/0075-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/api/0072-API-to-get-a-BlockState-without-a-snapshot.patch
index 6e95f52cbd..6e95f52cbd 100644
--- a/patches/api/0075-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/api/0072-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/api/0076-AsyncTabCompleteEvent.patch b/patches/api/0073-AsyncTabCompleteEvent.patch
index b88930e4dc..b88930e4dc 100644
--- a/patches/api/0076-AsyncTabCompleteEvent.patch
+++ b/patches/api/0073-AsyncTabCompleteEvent.patch
diff --git a/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0074-Expose-client-protocol-version-and-virtual-host.patch
index c6ce0e9872..c6ce0e9872 100644
--- a/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/api/0074-Expose-client-protocol-version-and-virtual-host.patch
diff --git a/patches/api/0078-Display-warning-on-deprecated-recipe-API.patch b/patches/api/0075-Display-warning-on-deprecated-recipe-API.patch
index 94f1cdd1f2..94f1cdd1f2 100644
--- a/patches/api/0078-Display-warning-on-deprecated-recipe-API.patch
+++ b/patches/api/0075-Display-warning-on-deprecated-recipe-API.patch
diff --git a/patches/api/0079-PlayerPickupExperienceEvent.patch b/patches/api/0076-PlayerPickupExperienceEvent.patch
index 9f4dfd145c..9f4dfd145c 100644
--- a/patches/api/0079-PlayerPickupExperienceEvent.patch
+++ b/patches/api/0076-PlayerPickupExperienceEvent.patch
diff --git a/patches/api/0080-ExperienceOrb-merging-stacking-API.patch b/patches/api/0077-ExperienceOrb-merging-stacking-API.patch
index 88367f383e..88367f383e 100644
--- a/patches/api/0080-ExperienceOrb-merging-stacking-API.patch
+++ b/patches/api/0077-ExperienceOrb-merging-stacking-API.patch
diff --git a/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0078-Ability-to-apply-mending-to-XP-API.patch
index bb3d96e6f1..bb3d96e6f1 100644
--- a/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/api/0078-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/api/0082-PreCreatureSpawnEvent.patch b/patches/api/0079-PreCreatureSpawnEvent.patch
index 60f65dc98d..60f65dc98d 100644
--- a/patches/api/0082-PreCreatureSpawnEvent.patch
+++ b/patches/api/0079-PreCreatureSpawnEvent.patch
diff --git a/patches/api/0083-PlayerNaturallySpawnCreaturesEvent.patch b/patches/api/0080-PlayerNaturallySpawnCreaturesEvent.patch
index 817c6f25e1..817c6f25e1 100644
--- a/patches/api/0083-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/api/0080-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/api/0084-Add-setPlayerProfile-API-for-Skulls.patch b/patches/api/0081-Add-setPlayerProfile-API-for-Skulls.patch
index 62d576949f..62d576949f 100644
--- a/patches/api/0084-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/api/0081-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/api/0085-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/api/0082-Add-PlayerAdvancementCriterionGrantEvent.patch
index acab81b457..acab81b457 100644
--- a/patches/api/0085-Add-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/api/0082-Add-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/api/0086-Fill-Profile-Property-Events.patch b/patches/api/0083-Fill-Profile-Property-Events.patch
index 28d3b1fa04..28d3b1fa04 100644
--- a/patches/api/0086-Fill-Profile-Property-Events.patch
+++ b/patches/api/0083-Fill-Profile-Property-Events.patch
diff --git a/patches/api/0087-Add-ArmorStand-Item-Meta.patch b/patches/api/0084-Add-ArmorStand-Item-Meta.patch
index aed15d7522..aed15d7522 100644
--- a/patches/api/0087-Add-ArmorStand-Item-Meta.patch
+++ b/patches/api/0084-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/api/0088-Optimize-Hoppers.patch b/patches/api/0085-Optimize-Hoppers.patch
index 3cf0268664..3cf0268664 100644
--- a/patches/api/0088-Optimize-Hoppers.patch
+++ b/patches/api/0085-Optimize-Hoppers.patch
diff --git a/patches/api/0089-Tameable-getOwnerUniqueId-API.patch b/patches/api/0086-Tameable-getOwnerUniqueId-API.patch
index b911542a60..b911542a60 100644
--- a/patches/api/0089-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/api/0086-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/api/0087-Add-more-fields-to-AsyncPreLoginEvent.patch
index 5159a46def..5159a46def 100644
--- a/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch
+++ b/patches/api/0087-Add-more-fields-to-AsyncPreLoginEvent.patch
diff --git a/patches/api/0091-Add-extended-PaperServerListPingEvent.patch b/patches/api/0088-Add-extended-PaperServerListPingEvent.patch
index b3c41b89b9..b3c41b89b9 100644
--- a/patches/api/0091-Add-extended-PaperServerListPingEvent.patch
+++ b/patches/api/0088-Add-extended-PaperServerListPingEvent.patch
diff --git a/patches/api/0092-Player.setPlayerProfile-API.patch b/patches/api/0089-Player.setPlayerProfile-API.patch
index a12782792e..a12782792e 100644
--- a/patches/api/0092-Player.setPlayerProfile-API.patch
+++ b/patches/api/0089-Player.setPlayerProfile-API.patch
diff --git a/patches/api/0093-getPlayerUniqueId-API.patch b/patches/api/0090-getPlayerUniqueId-API.patch
index 2715d60c2b..2715d60c2b 100644
--- a/patches/api/0093-getPlayerUniqueId-API.patch
+++ b/patches/api/0090-getPlayerUniqueId-API.patch
diff --git a/patches/api/0094-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/patches/api/0091-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
index f21c766148..f21c766148 100644
--- a/patches/api/0094-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
+++ b/patches/api/0091-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
diff --git a/patches/api/0095-Add-openSign-method-to-HumanEntity.patch b/patches/api/0092-Add-openSign-method-to-HumanEntity.patch
index 125fad56ad..125fad56ad 100644
--- a/patches/api/0095-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/api/0092-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0093-Add-Ban-Methods-to-Player-Objects.patch
index 8508d5aa31..8508d5aa31 100644
--- a/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch
+++ b/patches/api/0093-Add-Ban-Methods-to-Player-Objects.patch
diff --git a/patches/api/0097-EndermanEscapeEvent.patch b/patches/api/0094-EndermanEscapeEvent.patch
index 49f4fe70d2..49f4fe70d2 100644
--- a/patches/api/0097-EndermanEscapeEvent.patch
+++ b/patches/api/0094-EndermanEscapeEvent.patch
diff --git a/patches/api/0098-Enderman.teleportRandomly.patch b/patches/api/0095-Enderman.teleportRandomly.patch
index 5fedcbb746..5fedcbb746 100644
--- a/patches/api/0098-Enderman.teleportRandomly.patch
+++ b/patches/api/0095-Enderman.teleportRandomly.patch
diff --git a/patches/api/0099-Additional-world.getNearbyEntities-API-s.patch b/patches/api/0096-Additional-world.getNearbyEntities-API-s.patch
index 22aac2ff5b..22aac2ff5b 100644
--- a/patches/api/0099-Additional-world.getNearbyEntities-API-s.patch
+++ b/patches/api/0096-Additional-world.getNearbyEntities-API-s.patch
diff --git a/patches/api/0100-Location.isChunkLoaded-API.patch b/patches/api/0097-Location.isChunkLoaded-API.patch
index e1a043b2b4..e1a043b2b4 100644
--- a/patches/api/0100-Location.isChunkLoaded-API.patch
+++ b/patches/api/0097-Location.isChunkLoaded-API.patch
diff --git a/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
index a35e975da3..a35e975da3 100644
--- a/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/api/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/api/0102-EndermanAttackPlayerEvent.patch b/patches/api/0099-EndermanAttackPlayerEvent.patch
index e634beaedd..e634beaedd 100644
--- a/patches/api/0102-EndermanAttackPlayerEvent.patch
+++ b/patches/api/0099-EndermanAttackPlayerEvent.patch
diff --git a/patches/api/0103-WitchConsumePotionEvent.patch b/patches/api/0100-WitchConsumePotionEvent.patch
index 299e82181f..299e82181f 100644
--- a/patches/api/0103-WitchConsumePotionEvent.patch
+++ b/patches/api/0100-WitchConsumePotionEvent.patch
diff --git a/patches/api/0104-WitchThrowPotionEvent.patch b/patches/api/0101-WitchThrowPotionEvent.patch
index 6cdc1812bf..6cdc1812bf 100644
--- a/patches/api/0104-WitchThrowPotionEvent.patch
+++ b/patches/api/0101-WitchThrowPotionEvent.patch
diff --git a/patches/api/0105-Location.toBlockLocation-toCenterLocation.patch b/patches/api/0102-Location.toBlockLocation-toCenterLocation.patch
index c86b874f5f..c86b874f5f 100644
--- a/patches/api/0105-Location.toBlockLocation-toCenterLocation.patch
+++ b/patches/api/0102-Location.toBlockLocation-toCenterLocation.patch
diff --git a/patches/api/0106-PotionEffect-clone-methods.patch b/patches/api/0103-PotionEffect-clone-methods.patch
index d1fac16047..d1fac16047 100644
--- a/patches/api/0106-PotionEffect-clone-methods.patch
+++ b/patches/api/0103-PotionEffect-clone-methods.patch
diff --git a/patches/api/0107-WitchReadyPotionEvent.patch b/patches/api/0104-WitchReadyPotionEvent.patch
index e33270f804..e33270f804 100644
--- a/patches/api/0107-WitchReadyPotionEvent.patch
+++ b/patches/api/0104-WitchReadyPotionEvent.patch
diff --git a/patches/api/0108-ItemStack-getMaxItemUseDuration.patch b/patches/api/0105-ItemStack-getMaxItemUseDuration.patch
index bb9d57e4e1..bb9d57e4e1 100644
--- a/patches/api/0108-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/api/0105-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/api/0109-Add-EntityTeleportEndGatewayEvent.patch b/patches/api/0106-Add-EntityTeleportEndGatewayEvent.patch
index 995b2328f6..995b2328f6 100644
--- a/patches/api/0109-Add-EntityTeleportEndGatewayEvent.patch
+++ b/patches/api/0106-Add-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/api/0110-Make-shield-blocking-delay-configurable.patch b/patches/api/0107-Make-shield-blocking-delay-configurable.patch
index e6c6e635ca..e6c6e635ca 100644
--- a/patches/api/0110-Make-shield-blocking-delay-configurable.patch
+++ b/patches/api/0107-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/api/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 420b0ca896..420b0ca896 100644
--- a/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/patches/api/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
diff --git a/patches/api/0112-Add-getNearbyXXX-methods-to-Location.patch b/patches/api/0109-Add-getNearbyXXX-methods-to-Location.patch
index 1898cc3ed6..1898cc3ed6 100644
--- a/patches/api/0112-Add-getNearbyXXX-methods-to-Location.patch
+++ b/patches/api/0109-Add-getNearbyXXX-methods-to-Location.patch
diff --git a/patches/api/0113-PlayerReadyArrowEvent.patch b/patches/api/0110-PlayerReadyArrowEvent.patch
index 95ee02ac10..95ee02ac10 100644
--- a/patches/api/0113-PlayerReadyArrowEvent.patch
+++ b/patches/api/0110-PlayerReadyArrowEvent.patch
diff --git a/patches/api/0114-Add-entity-knockback-events.patch b/patches/api/0111-Add-entity-knockback-events.patch
index ccd0f2850d..ccd0f2850d 100644
--- a/patches/api/0114-Add-entity-knockback-events.patch
+++ b/patches/api/0111-Add-entity-knockback-events.patch
diff --git a/patches/api/0115-Expand-Explosions-API.patch b/patches/api/0112-Expand-Explosions-API.patch
index 081f96fab3..081f96fab3 100644
--- a/patches/api/0115-Expand-Explosions-API.patch
+++ b/patches/api/0112-Expand-Explosions-API.patch
diff --git a/patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/api/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
index 0bfbef94ea..0bfbef94ea 100644
--- a/patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/patches/api/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
diff --git a/patches/api/0117-LivingEntity-Active-Item-API.patch b/patches/api/0114-LivingEntity-Active-Item-API.patch
index 268d315eb2..268d315eb2 100644
--- a/patches/api/0117-LivingEntity-Active-Item-API.patch
+++ b/patches/api/0114-LivingEntity-Active-Item-API.patch
diff --git a/patches/api/0118-RangedEntity-API.patch b/patches/api/0115-RangedEntity-API.patch
index db1b32cc95..db1b32cc95 100644
--- a/patches/api/0118-RangedEntity-API.patch
+++ b/patches/api/0115-RangedEntity-API.patch
diff --git a/patches/api/0119-Add-World.getEntity-UUID-API.patch b/patches/api/0116-Add-World.getEntity-UUID-API.patch
index 93e1d998ed..93e1d998ed 100644
--- a/patches/api/0119-Add-World.getEntity-UUID-API.patch
+++ b/patches/api/0116-Add-World.getEntity-UUID-API.patch
diff --git a/patches/api/0120-InventoryCloseEvent-Reason-API.patch b/patches/api/0117-InventoryCloseEvent-Reason-API.patch
index 6c7189a322..6c7189a322 100644
--- a/patches/api/0120-InventoryCloseEvent-Reason-API.patch
+++ b/patches/api/0117-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/api/0121-Allow-setting-the-vex-s-summoner.patch b/patches/api/0118-Allow-setting-the-vex-s-summoner.patch
index 1e6b3abb27..1e6b3abb27 100644
--- a/patches/api/0121-Allow-setting-the-vex-s-summoner.patch
+++ b/patches/api/0118-Allow-setting-the-vex-s-summoner.patch
diff --git a/patches/api/0122-Entity-getChunk-API.patch b/patches/api/0119-Entity-getChunk-API.patch
index e0cdc1ee1f..e0cdc1ee1f 100644
--- a/patches/api/0122-Entity-getChunk-API.patch
+++ b/patches/api/0119-Entity-getChunk-API.patch
diff --git a/patches/api/0123-EnderDragon-Events.patch b/patches/api/0120-EnderDragon-Events.patch
index df5b4bae8b..df5b4bae8b 100644
--- a/patches/api/0123-EnderDragon-Events.patch
+++ b/patches/api/0120-EnderDragon-Events.patch
diff --git a/patches/api/0124-PlayerElytraBoostEvent.patch b/patches/api/0121-PlayerElytraBoostEvent.patch
index fb24f9dbbf..fb24f9dbbf 100644
--- a/patches/api/0124-PlayerElytraBoostEvent.patch
+++ b/patches/api/0121-PlayerElytraBoostEvent.patch
diff --git a/patches/api/0125-PlayerLaunchProjectileEvent.patch b/patches/api/0122-PlayerLaunchProjectileEvent.patch
index f284a611d1..f284a611d1 100644
--- a/patches/api/0125-PlayerLaunchProjectileEvent.patch
+++ b/patches/api/0122-PlayerLaunchProjectileEvent.patch
diff --git a/patches/api/0127-Allow-disabling-armour-stand-ticking.patch b/patches/api/0123-Allow-disabling-armour-stand-ticking.patch
index 1bb68e268b..1bb68e268b 100644
--- a/patches/api/0127-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/api/0123-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/api/0128-SkeletonHorse-Additions.patch b/patches/api/0124-SkeletonHorse-Additions.patch
index 5f8d93ef32..5f8d93ef32 100644
--- a/patches/api/0128-SkeletonHorse-Additions.patch
+++ b/patches/api/0124-SkeletonHorse-Additions.patch
diff --git a/patches/api/0129-Expand-Location-Manipulation-API.patch b/patches/api/0125-Expand-Location-Manipulation-API.patch
index e345f50d62..e345f50d62 100644
--- a/patches/api/0129-Expand-Location-Manipulation-API.patch
+++ b/patches/api/0125-Expand-Location-Manipulation-API.patch
diff --git a/patches/api/0126-EntityTransformedEvent.patch b/patches/api/0126-EntityTransformedEvent.patch
deleted file mode 100644
index ee2983e6b3..0000000000
--- a/patches/api/0126-EntityTransformedEvent.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Anthony MacAllister <[email protected]>
-Date: Thu, 26 Jul 2018 15:28:53 -0400
-Subject: [PATCH] EntityTransformedEvent
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..9ce2638aeec5745f1a2b88e1cc125f57f8c8debe
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
-@@ -0,0 +1,95 @@
-+package com.destroystokyo.paper.event.entity;
-+
-+import org.bukkit.entity.Entity;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.entity.EntityEvent;
-+import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Fired when an entity transforms into another entity
-+ * <p>
-+ * If the event is cancelled, the entity will not transform
-+ *
-+ * @deprecated Bukkit has added {@link org.bukkit.event.entity.EntityTransformEvent}, you should start using that
-+ */
-+@Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+public class EntityTransformedEvent extends EntityEvent implements Cancellable {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
-+    private final Entity transformed;
-+    private final TransformedReason reason;
-+
-+    private boolean cancelled;
-+
-+    @ApiStatus.Internal
-+    public EntityTransformedEvent(@NotNull Entity entity, @NotNull Entity transformed, @NotNull TransformedReason reason) {
-+        super(entity);
-+        this.transformed = transformed;
-+        this.reason = reason;
-+    }
-+
-+    /**
-+     * The entity after it has transformed
-+     *
-+     * @return Transformed entity
-+     */
-+    @NotNull
-+    public Entity getTransformed() {
-+        return this.transformed;
-+    }
-+
-+    /**
-+     * @return The reason for the transformation
-+     */
-+    @NotNull
-+    public TransformedReason getReason() {
-+        return this.reason;
-+    }
-+
-+    @Override
-+    public boolean isCancelled(){
-+        return this.cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel){
-+        this.cancelled = cancel;
-+    }
-+
-+    @Override
-+    @NotNull
-+    public HandlerList getHandlers(){
-+        return HANDLER_LIST;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList(){
-+        return HANDLER_LIST;
-+    }
-+
-+    public enum TransformedReason {
-+        /**
-+         * When a zombie drowns
-+         */
-+        DROWNED,
-+        /**
-+         * When a zombie villager is cured
-+         */
-+        CURED,
-+        /**
-+         * When a villager turns to a zombie villager
-+         */
-+        INFECTED,
-+        /**
-+         * When a mooshroom turns to a cow
-+         */
-+        SHEARED,
-+        /**
-+         * When a pig turns to a zombified piglin
-+         */
-+        LIGHTNING
-+    }
-+}
diff --git a/patches/api/0130-Expand-ArmorStand-API.patch b/patches/api/0126-Expand-ArmorStand-API.patch
index 7df27326f1..7df27326f1 100644
--- a/patches/api/0130-Expand-ArmorStand-API.patch
+++ b/patches/api/0126-Expand-ArmorStand-API.patch
diff --git a/patches/api/0131-AnvilDamageEvent.patch b/patches/api/0127-AnvilDamageEvent.patch
index ed69e49e57..ed69e49e57 100644
--- a/patches/api/0131-AnvilDamageEvent.patch
+++ b/patches/api/0127-AnvilDamageEvent.patch
diff --git a/patches/api/0132-Add-TNTPrimeEvent.patch b/patches/api/0128-Add-TNTPrimeEvent.patch
index 20d4d46dcc..20d4d46dcc 100644
--- a/patches/api/0132-Add-TNTPrimeEvent.patch
+++ b/patches/api/0128-Add-TNTPrimeEvent.patch
diff --git a/patches/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/0129-Provide-Chunk-Coordinates-as-a-Long-API.patch
index eb66322fb8..eb66322fb8 100644
--- a/patches/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/patches/api/0129-Provide-Chunk-Coordinates-as-a-Long-API.patch
diff --git a/patches/api/0134-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/api/0130-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index d229aad879..d229aad879 100644
--- a/patches/api/0134-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/api/0130-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/api/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/api/0131-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
index b018ea41d9..b018ea41d9 100644
--- a/patches/api/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
+++ b/patches/api/0131-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
diff --git a/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0132-Allow-Blocks-to-be-accessed-via-a-long-key.patch
index 5204a8d4db..5204a8d4db 100644
--- a/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/patches/api/0132-Allow-Blocks-to-be-accessed-via-a-long-key.patch
diff --git a/patches/api/0137-Slime-Pathfinder-Events.patch b/patches/api/0133-Slime-Pathfinder-Events.patch
index a569c5bdda..a569c5bdda 100644
--- a/patches/api/0137-Slime-Pathfinder-Events.patch
+++ b/patches/api/0133-Slime-Pathfinder-Events.patch
diff --git a/patches/api/0138-Add-PhantomPreSpawnEvent.patch b/patches/api/0134-Add-PhantomPreSpawnEvent.patch
index 943f1561db..943f1561db 100644
--- a/patches/api/0138-Add-PhantomPreSpawnEvent.patch
+++ b/patches/api/0134-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/api/0139-Add-More-Creeper-API.patch b/patches/api/0135-Add-More-Creeper-API.patch
index 2ea104b552..2ea104b552 100644
--- a/patches/api/0139-Add-More-Creeper-API.patch
+++ b/patches/api/0135-Add-More-Creeper-API.patch
diff --git a/patches/api/0140-Inventory-removeItemAnySlot.patch b/patches/api/0136-Inventory-removeItemAnySlot.patch
index 25b79cf6bd..25b79cf6bd 100644
--- a/patches/api/0140-Inventory-removeItemAnySlot.patch
+++ b/patches/api/0136-Inventory-removeItemAnySlot.patch
diff --git a/patches/api/0141-isChunkGenerated-API.patch b/patches/api/0137-isChunkGenerated-API.patch
index a1d9b815f9..a1d9b815f9 100644
--- a/patches/api/0141-isChunkGenerated-API.patch
+++ b/patches/api/0137-isChunkGenerated-API.patch
diff --git a/patches/api/0142-Add-source-block-constructor-and-getChangedBlockData.patch b/patches/api/0138-Add-source-block-constructor-and-getChangedBlockData.patch
index f12e6ac1f5..f12e6ac1f5 100644
--- a/patches/api/0142-Add-source-block-constructor-and-getChangedBlockData.patch
+++ b/patches/api/0138-Add-source-block-constructor-and-getChangedBlockData.patch
diff --git a/patches/api/0143-Async-Chunks-API.patch b/patches/api/0139-Async-Chunks-API.patch
index 037378415a..037378415a 100644
--- a/patches/api/0143-Async-Chunks-API.patch
+++ b/patches/api/0139-Async-Chunks-API.patch
diff --git a/patches/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/0140-Add-ray-tracing-methods-to-LivingEntity.patch
index 3001f15899..3001f15899 100644
--- a/patches/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/api/0140-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0141-Expose-attack-cooldown-methods-for-Player.patch
index 53aad00d93..53aad00d93 100644
--- a/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/api/0141-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/api/0146-Improve-death-events.patch b/patches/api/0142-Improve-death-events.patch
index 3f91458a84..3f91458a84 100644
--- a/patches/api/0146-Improve-death-events.patch
+++ b/patches/api/0142-Improve-death-events.patch
diff --git a/patches/api/0147-Mob-Pathfinding-API.patch b/patches/api/0143-Mob-Pathfinding-API.patch
index 1c0b6088a4..1c0b6088a4 100644
--- a/patches/api/0147-Mob-Pathfinding-API.patch
+++ b/patches/api/0143-Mob-Pathfinding-API.patch
diff --git a/patches/api/0148-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/0144-Performance-Concurrency-Improvements-to-Permissions.patch
index 503eb3cf50..503eb3cf50 100644
--- a/patches/api/0148-Performance-Concurrency-Improvements-to-Permissions.patch
+++ b/patches/api/0144-Performance-Concurrency-Improvements-to-Permissions.patch
diff --git a/patches/api/0150-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0145-Implement-furnace-cook-speed-multiplier-API.patch
index 6e836a844d..6e836a844d 100644
--- a/patches/api/0150-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/api/0145-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/api/0151-Material-API-additions.patch b/patches/api/0146-Material-API-additions.patch
index 2b4bfbc34d..2b4bfbc34d 100644
--- a/patches/api/0151-Material-API-additions.patch
+++ b/patches/api/0146-Material-API-additions.patch
diff --git a/patches/api/0152-Add-Material-Tags.patch b/patches/api/0147-Add-Material-Tags.patch
index 87df8a1b1e..87df8a1b1e 100644
--- a/patches/api/0152-Add-Material-Tags.patch
+++ b/patches/api/0147-Add-Material-Tags.patch
diff --git a/patches/api/0153-PreSpawnerSpawnEvent.patch b/patches/api/0148-PreSpawnerSpawnEvent.patch
index 4b6bbe6f7a..4b6bbe6f7a 100644
--- a/patches/api/0153-PreSpawnerSpawnEvent.patch
+++ b/patches/api/0148-PreSpawnerSpawnEvent.patch
diff --git a/patches/api/0149-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/0149-Add-ItemStackRecipeChoice-Draft-API.patch
deleted file mode 100644
index 4cfddc6f59..0000000000
--- a/patches/api/0149-Add-ItemStackRecipeChoice-Draft-API.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Thu, 13 Sep 2018 21:39:26 -0400
-Subject: [PATCH] Add ItemStackRecipeChoice Draft API
-
-This is based on Spigots Draft API. This is subject to change
-
-Allows creating recipes that must match isSimilar to full item stack.
-
-diff --git a/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..18c96aeef00dc11e5083001adfba4204f0de4e2b
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
-@@ -0,0 +1,52 @@
-+package com.destroystokyo.paper.inventory;
-+
-+import org.bukkit.inventory.ItemStack;
-+import org.bukkit.inventory.RecipeChoice;
-+
-+import java.util.ArrayList;
-+import java.util.List;
-+import org.jetbrains.annotations.ApiStatus;
-+
-+/**
-+ * Allows crafting Items that require full matching itemstacks to complete the recipe for custom items
-+ * @deprecated Draft API
-+ */
-+@Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+public class ItemStackRecipeChoice implements RecipeChoice {
-+
-+    protected final List<ItemStack> choices = new ArrayList<>();
-+
-+    public ItemStackRecipeChoice(ItemStack choices) {
-+        this.choices.add(choices);
-+    }
-+
-+    public ItemStackRecipeChoice(List<ItemStack> choices) {
-+        this.choices.addAll(choices);
-+    }
-+
-+    @Override
-+    public ItemStack getItemStack() {
-+        return choices.isEmpty() ? null : choices.get(0);
-+    }
-+
-+    @Override
-+    public RecipeChoice clone() {
-+        try {
-+            ItemStackRecipeChoice clone = (ItemStackRecipeChoice) super.clone();
-+            clone.choices.addAll(this.choices);
-+            return clone;
-+        } catch (CloneNotSupportedException ex) {
-+            throw new AssertionError(ex);
-+        }
-+    }
-+
-+    @Override
-+    public boolean test(ItemStack itemStack) {
-+        for (ItemStack stack : choices) {
-+            if (stack.isSimilar(itemStack)) {
-+                return true;
-+            }
-+        }
-+        return false;
-+    }
-+}
diff --git a/patches/api/0154-Add-LivingEntity-getTargetEntity.patch b/patches/api/0149-Add-LivingEntity-getTargetEntity.patch
index 27bc531965..27bc531965 100644
--- a/patches/api/0154-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/api/0149-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/api/0155-Add-sun-related-API.patch b/patches/api/0150-Add-sun-related-API.patch
index 640a7df744..640a7df744 100644
--- a/patches/api/0155-Add-sun-related-API.patch
+++ b/patches/api/0150-Add-sun-related-API.patch
diff --git a/patches/api/0156-Turtle-API.patch b/patches/api/0151-Turtle-API.patch
index 3ec867d360..3ec867d360 100644
--- a/patches/api/0156-Turtle-API.patch
+++ b/patches/api/0151-Turtle-API.patch
diff --git a/patches/api/0157-Add-spectator-target-events.patch b/patches/api/0152-Add-spectator-target-events.patch
index 90f65b5fc8..90f65b5fc8 100644
--- a/patches/api/0157-Add-spectator-target-events.patch
+++ b/patches/api/0152-Add-spectator-target-events.patch
diff --git a/patches/api/0158-Add-more-Witch-API.patch b/patches/api/0153-Add-more-Witch-API.patch
index 0da75bb9b7..0da75bb9b7 100644
--- a/patches/api/0158-Add-more-Witch-API.patch
+++ b/patches/api/0153-Add-more-Witch-API.patch
diff --git a/patches/api/0159-Make-the-default-permission-message-configurable.patch b/patches/api/0154-Make-the-default-permission-message-configurable.patch
index 10b063f125..10b063f125 100644
--- a/patches/api/0159-Make-the-default-permission-message-configurable.patch
+++ b/patches/api/0154-Make-the-default-permission-message-configurable.patch
diff --git a/patches/api/0160-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0155-Support-cancellation-supression-of-EntityDismount-Ve.patch
index 420a97487d..420a97487d 100644
--- a/patches/api/0160-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/patches/api/0155-Support-cancellation-supression-of-EntityDismount-Ve.patch
diff --git a/patches/api/0161-Add-more-Zombie-API.patch b/patches/api/0156-Add-more-Zombie-API.patch
index 38efc859d8..38efc859d8 100644
--- a/patches/api/0161-Add-more-Zombie-API.patch
+++ b/patches/api/0156-Add-more-Zombie-API.patch
diff --git a/patches/api/0162-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0157-Change-the-reserved-channel-check-to-be-sensible.patch
index 8975ff3c43..8975ff3c43 100644
--- a/patches/api/0162-Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/patches/api/0157-Change-the-reserved-channel-check-to-be-sensible.patch
diff --git a/patches/api/0163-Add-PlayerConnectionCloseEvent.patch b/patches/api/0158-Add-PlayerConnectionCloseEvent.patch
index 6264223dd9..6264223dd9 100644
--- a/patches/api/0163-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/api/0158-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/api/0164-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0159-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 28494eb9d4..28494eb9d4 100644
--- a/patches/api/0164-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/api/0159-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/api/0165-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0160-Add-ItemStack-Recipe-API-helper-methods.patch
index 817b9a2a62..817b9a2a62 100644
--- a/patches/api/0165-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/patches/api/0160-Add-ItemStack-Recipe-API-helper-methods.patch
diff --git a/patches/api/0166-BlockDestroyEvent.patch b/patches/api/0161-BlockDestroyEvent.patch
index d6ac7bfb8d..d6ac7bfb8d 100644
--- a/patches/api/0166-BlockDestroyEvent.patch
+++ b/patches/api/0161-BlockDestroyEvent.patch
diff --git a/patches/api/0167-Add-WhitelistToggleEvent.patch b/patches/api/0162-Add-WhitelistToggleEvent.patch
index 1e26aba2a3..1e26aba2a3 100644
--- a/patches/api/0167-Add-WhitelistToggleEvent.patch
+++ b/patches/api/0162-Add-WhitelistToggleEvent.patch
diff --git a/patches/api/0168-Add-GS4-Query-event.patch b/patches/api/0163-Add-GS4-Query-event.patch
index a153279317..a153279317 100644
--- a/patches/api/0168-Add-GS4-Query-event.patch
+++ b/patches/api/0163-Add-GS4-Query-event.patch
diff --git a/patches/api/0169-Add-PlayerPostRespawnEvent.patch b/patches/api/0164-Add-PlayerPostRespawnEvent.patch
index c261fc7375..c261fc7375 100644
--- a/patches/api/0169-Add-PlayerPostRespawnEvent.patch
+++ b/patches/api/0164-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/api/0170-Entity-getEntitySpawnReason.patch b/patches/api/0165-Entity-getEntitySpawnReason.patch
index 3b9f0bedd1..3b9f0bedd1 100644
--- a/patches/api/0170-Entity-getEntitySpawnReason.patch
+++ b/patches/api/0165-Entity-getEntitySpawnReason.patch
diff --git a/patches/api/0171-Fix-Spigot-annotation-mistakes.patch b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
index 0f7be3c617..0f7be3c617 100644
--- a/patches/api/0171-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
diff --git a/patches/api/0172-Server-Tick-Events.patch b/patches/api/0167-Server-Tick-Events.patch
index cc46a9f29a..cc46a9f29a 100644
--- a/patches/api/0172-Server-Tick-Events.patch
+++ b/patches/api/0167-Server-Tick-Events.patch
diff --git a/patches/api/0173-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0168-PlayerDeathEvent-getItemsToKeep.patch
index 4d28221bcd..4d28221bcd 100644
--- a/patches/api/0173-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/api/0168-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/api/0169-Add-Heightmap-API.patch b/patches/api/0169-Add-Heightmap-API.patch
new file mode 100644
index 0000000000..b5d70f803f
--- /dev/null
+++ b/patches/api/0169-Add-Heightmap-API.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <[email protected]>
+Date: Sat, 1 Dec 2018 19:00:36 -0800
+Subject: [PATCH] Add Heightmap API
+
+Changed to use upstream's heightmap API - Machine_Maker
+
+diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
+index eec6c9cd7da6938351905129bb5a66f49a257d01..65618b6b3c950fb27707f243a766511d6cd3aab4 100644
+--- a/src/main/java/org/bukkit/Location.java
++++ b/src/main/java/org/bukkit/Location.java
+@@ -649,6 +649,30 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
+     }
+     // Paper end - expand Location API
+ 
++    // Paper start - Add heightmap api
++    /**
++     * Returns a copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ())
++     * @return A copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ())
++     * @throws NullPointerException if {{@link #getWorld()}} is {@code null}
++     */
++    @NotNull
++    public Location toHighestLocation() {
++        return this.toHighestLocation(HeightMap.WORLD_SURFACE);
++    }
++
++    /**
++     * Returns a copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ(), heightMap)
++     * @param heightMap The heightmap to use for finding the highest y location.
++     * @return A copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ(), heightMap)
++     */
++    @NotNull
++    public Location toHighestLocation(@NotNull final HeightMap heightMap) {
++        final Location ret = this.clone();
++        ret.setY(this.getWorld().getHighestBlockYAt(this, heightMap));
++        return ret;
++    }
++    // Paper end - Add heightmap api
++
+     // Paper start - Expand Explosions API
+     /**
+      * Creates explosion at this location with given power
diff --git a/patches/api/0175-Mob-Spawner-API-Enhancements.patch b/patches/api/0170-Mob-Spawner-API-Enhancements.patch
index 4607e8b4bf..4607e8b4bf 100644
--- a/patches/api/0175-Mob-Spawner-API-Enhancements.patch
+++ b/patches/api/0170-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/api/0176-Add-BlockSoundGroup-interface.patch b/patches/api/0171-Add-BlockSoundGroup-interface.patch
index 76ed1fa86d..76ed1fa86d 100644
--- a/patches/api/0176-Add-BlockSoundGroup-interface.patch
+++ b/patches/api/0171-Add-BlockSoundGroup-interface.patch
diff --git a/patches/api/0177-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/0172-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
index b5148c5574..b5148c5574 100644
--- a/patches/api/0177-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
+++ b/patches/api/0172-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
diff --git a/patches/api/0178-Set-true-custom-payload-channel-size-limit.patch b/patches/api/0173-Set-true-custom-payload-channel-size-limit.patch
index c524e2aaa0..c524e2aaa0 100644
--- a/patches/api/0178-Set-true-custom-payload-channel-size-limit.patch
+++ b/patches/api/0173-Set-true-custom-payload-channel-size-limit.patch
diff --git a/patches/api/0174-Add-Heightmap-API.patch b/patches/api/0174-Add-Heightmap-API.patch
deleted file mode 100644
index c069ec6536..0000000000
--- a/patches/api/0174-Add-Heightmap-API.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <[email protected]>
-Date: Sat, 1 Dec 2018 19:00:36 -0800
-Subject: [PATCH] Add Heightmap API
-
-Changed to use upstream's heightmap API - Machine_Maker
-
-diff --git a/src/main/java/com/destroystokyo/paper/HeightmapType.java b/src/main/java/com/destroystokyo/paper/HeightmapType.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..1c832d69bb3717dcfccf21e45f6f060a64eb4f11
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/HeightmapType.java
-@@ -0,0 +1,39 @@
-+package com.destroystokyo.paper;
-+
-+import org.jetbrains.annotations.ApiStatus;
-+
-+/**
-+ * Enumeration of different heightmap types maintained by the server. Generally using these maps is much faster
-+ * than using an iterative search for a block in a given x, z coordinate.
-+ *
-+ * @deprecated Upstream has added their own API for using the game heightmaps. See {@link org.bukkit.HeightMap} and the
-+ * non-deprecated getHighestBlock methods on World such as {@link org.bukkit.World#getHighestBlockAt(org.bukkit.Location, org.bukkit.HeightMap)}.
-+ */
-+@Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+public enum HeightmapType {
-+
-+    /**
-+     * The highest block used for lighting in the world. Also the block returned by {@link org.bukkit.World#getHighestBlockYAt(int, int)}}
-+     */
-+    LIGHT_BLOCKING,
-+
-+    /**
-+     * References the highest block in the world.
-+     */
-+    ANY,
-+
-+    /**
-+     * References the highest solid block in a world.
-+     */
-+    SOLID,
-+
-+    /**
-+     * References the highest solid or liquid block in a world.
-+     */
-+    SOLID_OR_LIQUID,
-+
-+    /**
-+     * References the highest solid or liquid block in a world, excluding leaves.
-+     */
-+    SOLID_OR_LIQUID_NO_LEAVES;
-+}
-diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index eec6c9cd7da6938351905129bb5a66f49a257d01..a104efba13133ce2bc397e32af53da8889218e11 100644
---- a/src/main/java/org/bukkit/Location.java
-+++ b/src/main/java/org/bukkit/Location.java
-@@ -649,6 +649,46 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
-     }
-     // Paper end - expand Location API
- 
-+    // Paper start - Add heightmap api
-+    /**
-+     * Returns a copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ())
-+     * @return A copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ())
-+     * @throws NullPointerException if {{@link #getWorld()}} is {@code null}
-+     */
-+    @NotNull
-+    public Location toHighestLocation() {
-+        return this.toHighestLocation(HeightMap.WORLD_SURFACE);
-+    }
-+
-+    /**
-+     * Returns a copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ(), heightmap)
-+     * @param heightmap The heightmap to use for finding the highest y location.
-+     * @return A copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ(), heightmap)
-+     * @throws NullPointerException if {{@link #getWorld()}} is {@code null}
-+     * @throws UnsupportedOperationException if {@link World#getHighestBlockYAt(int, int, com.destroystokyo.paper.HeightmapType)} does not support the specified heightmap
-+     * @deprecated Use {@link org.bukkit.Location#toHighestLocation(HeightMap)}
-+     */
-+    @NotNull
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    public Location toHighestLocation(@NotNull final com.destroystokyo.paper.HeightmapType heightmap) {
-+        final Location ret = this.clone();
-+        ret.setY(this.getWorld().getHighestBlockYAt(this, heightmap));
-+        return ret;
-+    }
-+
-+    /**
-+     * Returns a copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ(), heightMap)
-+     * @param heightMap The heightmap to use for finding the highest y location.
-+     * @return A copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ(), heightMap)
-+     */
-+    @NotNull
-+    public Location toHighestLocation(@NotNull final HeightMap heightMap) {
-+        final Location ret = this.clone();
-+        ret.setY(this.getWorld().getHighestBlockYAt(this, heightMap));
-+        return ret;
-+    }
-+    // Paper end - Add heightmap api
-+
-     // Paper start - Expand Explosions API
-     /**
-      * Creates explosion at this location with given power
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 216995288f6b8b407ef8240411b5ed4713379a7a..c1fd76e1b8d0f326f985662a2845f76c1cdf5d40 100644
---- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -153,6 +153,87 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
-     @NotNull
-     public Block getHighestBlockAt(@NotNull Location location);
- 
-+    // Paper start - Add heightmap API
-+    /**
-+     * Returns the highest block's y-coordinate at the specified block coordinates that match the specified heightmap's conditions.
-+     * <p>
-+     * <b>implNote:</b> Implementations are recommended to use an iterative search as a fallback before resorting to
-+     * throwing an {@code UnsupportedOperationException}.
-+     * </p>
-+     *
-+     * @param x The block's x-coordinate.
-+     * @param z The block's z-coordinate.
-+     * @param heightmap The specified heightmap to use. See {@link com.destroystokyo.paper.HeightmapType}
-+     * @return The highest block's y-coordinate at (x, z) that matches the specified heightmap's conditions.
-+     * @throws UnsupportedOperationException If the heightmap type is not supported.
-+     * @deprecated Upstream has added support for this, use {@link World#getHighestBlockYAt(int, int, HeightMap)}
-+     *
-+     * @see com.destroystokyo.paper.HeightmapType
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    public int getHighestBlockYAt(int x, int z, @NotNull com.destroystokyo.paper.HeightmapType heightmap) throws UnsupportedOperationException;
-+
-+    /**
-+     * Returns the highest block's y-coordinate at the specified block coordinates that match the specified heightmap's conditions.
-+     * Note that the y-coordinate of the specified location is ignored.
-+     * <p>
-+     * <b>implNote:</b> Implementations are recommended to use an iterative search as a fallback before resorting to
-+     * throwing an {@code UnsupportedOperationException}.
-+     * </p>
-+     *
-+     * @param location The specified block coordinates.
-+     * @param heightmap The specified heightmap to use. See {@link com.destroystokyo.paper.HeightmapType}
-+     * @return The highest block's y-coordinate at {@code location} that matches the specified heightmap's conditions.
-+     * @throws UnsupportedOperationException If the heightmap type is not supported.
-+     * @deprecated Upstream has added support for this, use {@link World#getHighestBlockYAt(Location, HeightMap)}
-+     * @see com.destroystokyo.paper.HeightmapType
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    default int getHighestBlockYAt(@NotNull Location location, @NotNull com.destroystokyo.paper.HeightmapType heightmap) throws UnsupportedOperationException {
-+        return this.getHighestBlockYAt(location.getBlockX(), location.getBlockZ(), heightmap);
-+    }
-+
-+    /**
-+     * Returns the highest {@link Block} at the specified block coordinates that match the specified heightmap's conditions.
-+     * <p>
-+     * <b>implNote:</b> Implementations are recommended to use an iterative search as a fallback before resorting to
-+     * throwing an {@code UnsupportedOperationException}.
-+     * </p>
-+     * @param x The block's x-coordinate.
-+     * @param z The block's z-coordinate.
-+     * @param heightmap The specified heightmap to use. See {@link com.destroystokyo.paper.HeightmapType}
-+     * @return The highest {@link Block} at (x, z) that matches the specified heightmap's conditions.
-+     * @throws UnsupportedOperationException If the heightmap type is not supported.
-+     * @deprecated Upstream has added support for this, use {@link World#getHighestBlockAt(int, int, HeightMap)}
-+     * @see com.destroystokyo.paper.HeightmapType
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    @NotNull
-+    default Block getHighestBlockAt(int x, int z, @NotNull com.destroystokyo.paper.HeightmapType heightmap) throws UnsupportedOperationException {
-+        return this.getBlockAt(x, this.getHighestBlockYAt(x, z, heightmap), z);
-+    }
-+
-+    /**
-+     * Returns the highest {@link Block} at the specified block coordinates that match the specified heightmap's conditions.
-+     * Note that the y-coordinate of the specified location is ignored.
-+     * <p>
-+     * <b>implNote:</b> Implementations are recommended to use an iterative search as a fallback before resorting to
-+     * throwing an {@code UnsupportedOperationException}.
-+     * </p>
-+     * @param location The specified block coordinates.
-+     * @param heightmap The specified heightmap to use. See {@link com.destroystokyo.paper.HeightmapType}
-+     * @return The highest {@link Block} at {@code location} that matches the specified heightmap's conditions.
-+     * @throws UnsupportedOperationException If the heightmap type is not supported.
-+     * @deprecated Upstream has added support for this, use {@link World#getHighestBlockAt(Location, HeightMap)}
-+     * @see com.destroystokyo.paper.HeightmapType
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    @NotNull
-+    default Block getHighestBlockAt(@NotNull Location location, @NotNull com.destroystokyo.paper.HeightmapType heightmap) throws UnsupportedOperationException {
-+        return this.getHighestBlockAt(location.getBlockX(), location.getBlockZ(), heightmap);
-+    }
-+    // Paper end
-+
-     /**
-      * Gets the highest block corresponding to the {@link HeightMap} at the
-      * given coordinates.
diff --git a/patches/api/0179-Expose-the-internal-current-tick.patch b/patches/api/0174-Expose-the-internal-current-tick.patch
index f080acd155..f080acd155 100644
--- a/patches/api/0179-Expose-the-internal-current-tick.patch
+++ b/patches/api/0174-Expose-the-internal-current-tick.patch
diff --git a/patches/api/0180-Improve-Block-breakNaturally-API.patch b/patches/api/0175-Improve-Block-breakNaturally-API.patch
index 2b4f718585..2b4f718585 100644
--- a/patches/api/0180-Improve-Block-breakNaturally-API.patch
+++ b/patches/api/0175-Improve-Block-breakNaturally-API.patch
diff --git a/patches/api/0181-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0176-PlayerDeathEvent-shouldDropExperience.patch
index 9f043baab6..9f043baab6 100644
--- a/patches/api/0181-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/api/0176-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/api/0182-Add-ThrownEggHatchEvent.patch b/patches/api/0177-Add-ThrownEggHatchEvent.patch
index 8636b6d6df..8636b6d6df 100644
--- a/patches/api/0182-Add-ThrownEggHatchEvent.patch
+++ b/patches/api/0177-Add-ThrownEggHatchEvent.patch
diff --git a/patches/api/0183-Entity-Jump-API.patch b/patches/api/0178-Entity-Jump-API.patch
index 2360a174f5..2360a174f5 100644
--- a/patches/api/0183-Entity-Jump-API.patch
+++ b/patches/api/0178-Entity-Jump-API.patch
diff --git a/patches/api/0184-add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/0179-add-hand-to-BlockMultiPlaceEvent.patch
index f15b482d62..f15b482d62 100644
--- a/patches/api/0184-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/api/0179-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/api/0185-Add-tick-times-API.patch b/patches/api/0180-Add-tick-times-API.patch
index 29301f813d..29301f813d 100644
--- a/patches/api/0185-Add-tick-times-API.patch
+++ b/patches/api/0180-Add-tick-times-API.patch
diff --git a/patches/api/0186-Expose-MinecraftServer-isRunning.patch b/patches/api/0181-Expose-MinecraftServer-isRunning.patch
index 4523ddefdc..4523ddefdc 100644
--- a/patches/api/0186-Expose-MinecraftServer-isRunning.patch
+++ b/patches/api/0181-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/api/0187-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0182-Add-Raw-Byte-ItemStack-Serialization.patch
index 2d931c5392..2d931c5392 100644
--- a/patches/api/0187-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/api/0182-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/api/0188-Add-Player-Client-Options-API.patch b/patches/api/0183-Add-Player-Client-Options-API.patch
index 485335d7ee..485335d7ee 100644
--- a/patches/api/0188-Add-Player-Client-Options-API.patch
+++ b/patches/api/0183-Add-Player-Client-Options-API.patch
diff --git a/patches/api/0189-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/0184-Add-PlayerAttackEntityCooldownResetEvent.patch
index c3cfd0642b..c3cfd0642b 100644
--- a/patches/api/0189-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/api/0184-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/api/0190-Add-item-slot-convenience-methods.patch b/patches/api/0185-Add-item-slot-convenience-methods.patch
index 20638212e8..20638212e8 100644
--- a/patches/api/0190-Add-item-slot-convenience-methods.patch
+++ b/patches/api/0185-Add-item-slot-convenience-methods.patch
diff --git a/patches/api/0191-Villager-Restocks-API.patch b/patches/api/0186-Villager-Restocks-API.patch
index 5b3898429d..5b3898429d 100644
--- a/patches/api/0191-Villager-Restocks-API.patch
+++ b/patches/api/0186-Villager-Restocks-API.patch
diff --git a/patches/api/0192-Add-Mob-Goal-API.patch b/patches/api/0187-Add-Mob-Goal-API.patch
index c3cd7426b8..c3cd7426b8 100644
--- a/patches/api/0192-Add-Mob-Goal-API.patch
+++ b/patches/api/0187-Add-Mob-Goal-API.patch
diff --git a/patches/api/0193-Add-villager-reputation-API.patch b/patches/api/0188-Add-villager-reputation-API.patch
index 4a2093aab9..4a2093aab9 100644
--- a/patches/api/0193-Add-villager-reputation-API.patch
+++ b/patches/api/0188-Add-villager-reputation-API.patch
diff --git a/patches/api/0194-Spawn-Reason-API.patch b/patches/api/0189-Spawn-Reason-API.patch
index 97edb6ab3f..97edb6ab3f 100644
--- a/patches/api/0194-Spawn-Reason-API.patch
+++ b/patches/api/0189-Spawn-Reason-API.patch
diff --git a/patches/api/0195-Potential-bed-API.patch b/patches/api/0190-Potential-bed-API.patch
index a842554f35..a842554f35 100644
--- a/patches/api/0195-Potential-bed-API.patch
+++ b/patches/api/0190-Potential-bed-API.patch
diff --git a/patches/api/0196-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0191-Inventory-getHolder-method-without-block-snapshot.patch
index d834d6cdb3..d834d6cdb3 100644
--- a/patches/api/0196-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/api/0191-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/api/0197-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0192-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 4fe75c486c..4fe75c486c 100644
--- a/patches/api/0197-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/api/0192-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/api/0198-Support-components-in-ItemMeta.patch b/patches/api/0193-Support-components-in-ItemMeta.patch
index 09fb2309cf..09fb2309cf 100644
--- a/patches/api/0198-Support-components-in-ItemMeta.patch
+++ b/patches/api/0193-Support-components-in-ItemMeta.patch
diff --git a/patches/api/0199-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0194-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
index 6c725bc833..6c725bc833 100644
--- a/patches/api/0199-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
+++ b/patches/api/0194-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
diff --git a/patches/api/0200-Add-entity-liquid-API.patch b/patches/api/0195-Add-entity-liquid-API.patch
index 60621425e7..60621425e7 100644
--- a/patches/api/0200-Add-entity-liquid-API.patch
+++ b/patches/api/0195-Add-entity-liquid-API.patch
diff --git a/patches/api/0201-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0196-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
index 95fb3a46ed..95fb3a46ed 100644
--- a/patches/api/0201-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
+++ b/patches/api/0196-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
diff --git a/patches/api/0202-Add-BellRingEvent.patch b/patches/api/0197-Add-BellRingEvent.patch
index 07b7fc2c6c..07b7fc2c6c 100644
--- a/patches/api/0202-Add-BellRingEvent.patch
+++ b/patches/api/0197-Add-BellRingEvent.patch
diff --git a/patches/api/0203-Brand-support.patch b/patches/api/0198-Brand-support.patch
index 64e9c90fb4..64e9c90fb4 100644
--- a/patches/api/0203-Brand-support.patch
+++ b/patches/api/0198-Brand-support.patch
diff --git a/patches/api/0204-Add-moon-phase-API.patch b/patches/api/0199-Add-moon-phase-API.patch
index d949b274a6..d949b274a6 100644
--- a/patches/api/0204-Add-moon-phase-API.patch
+++ b/patches/api/0199-Add-moon-phase-API.patch
diff --git a/patches/api/0205-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0200-Add-playPickupItemAnimation-to-LivingEntity.patch
index 28bd4b6872..28bd4b6872 100644
--- a/patches/api/0205-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/api/0200-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/api/0206-Add-more-Evoker-API.patch b/patches/api/0201-Add-more-Evoker-API.patch
index 0d6f0f7328..0d6f0f7328 100644
--- a/patches/api/0206-Add-more-Evoker-API.patch
+++ b/patches/api/0201-Add-more-Evoker-API.patch
diff --git a/patches/api/0207-Add-methods-to-get-translation-keys.patch b/patches/api/0202-Add-methods-to-get-translation-keys.patch
index 292116000a..292116000a 100644
--- a/patches/api/0207-Add-methods-to-get-translation-keys.patch
+++ b/patches/api/0202-Add-methods-to-get-translation-keys.patch
diff --git a/patches/api/0208-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0203-Create-HoverEvent-from-ItemStack-Entity.patch
index 8722000ff7..8722000ff7 100644
--- a/patches/api/0208-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/api/0203-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/api/0209-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0204-Add-additional-open-container-api-to-HumanEntity.patch
index 43e6937d05..43e6937d05 100644
--- a/patches/api/0209-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/api/0204-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/api/0210-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0205-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 01127fef5b..01127fef5b 100644
--- a/patches/api/0210-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/api/0205-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/api/0211-Entity-isTicking.patch b/patches/api/0206-Entity-isTicking.patch
index 29ed59961e..29ed59961e 100644
--- a/patches/api/0211-Entity-isTicking.patch
+++ b/patches/api/0206-Entity-isTicking.patch
diff --git a/patches/api/0212-Villager-resetOffers.patch b/patches/api/0207-Villager-resetOffers.patch
index 60fedfba0f..60fedfba0f 100644
--- a/patches/api/0212-Villager-resetOffers.patch
+++ b/patches/api/0207-Villager-resetOffers.patch
diff --git a/patches/api/0213-Player-elytra-boost-API.patch b/patches/api/0208-Player-elytra-boost-API.patch
index 5567832274..5567832274 100644
--- a/patches/api/0213-Player-elytra-boost-API.patch
+++ b/patches/api/0208-Player-elytra-boost-API.patch
diff --git a/patches/api/0214-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0209-Add-getOfflinePlayerIfCached-String.patch
index 52181f0970..52181f0970 100644
--- a/patches/api/0214-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0209-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/api/0215-Add-ignore-discounts-API.patch b/patches/api/0210-Add-ignore-discounts-API.patch
index 89655ddef8..89655ddef8 100644
--- a/patches/api/0215-Add-ignore-discounts-API.patch
+++ b/patches/api/0210-Add-ignore-discounts-API.patch
diff --git a/patches/api/0216-Item-no-age-no-player-pickup.patch b/patches/api/0211-Item-no-age-no-player-pickup.patch
index d3be2301af..d3be2301af 100644
--- a/patches/api/0216-Item-no-age-no-player-pickup.patch
+++ b/patches/api/0211-Item-no-age-no-player-pickup.patch
diff --git a/patches/api/0217-Beacon-API-custom-effect-ranges.patch b/patches/api/0212-Beacon-API-custom-effect-ranges.patch
index effd7b3ae9..effd7b3ae9 100644
--- a/patches/api/0217-Beacon-API-custom-effect-ranges.patch
+++ b/patches/api/0212-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/api/0218-Add-API-for-quit-reason.patch b/patches/api/0213-Add-API-for-quit-reason.patch
index 0350afaf92..0350afaf92 100644
--- a/patches/api/0218-Add-API-for-quit-reason.patch
+++ b/patches/api/0213-Add-API-for-quit-reason.patch
diff --git a/patches/api/0219-Add-Destroy-Speed-API.patch b/patches/api/0214-Add-Destroy-Speed-API.patch
index 4fb7eb4c7b..4fb7eb4c7b 100644
--- a/patches/api/0219-Add-Destroy-Speed-API.patch
+++ b/patches/api/0214-Add-Destroy-Speed-API.patch
diff --git a/patches/api/0220-Add-LivingEntity-clearActiveItem.patch b/patches/api/0215-Add-LivingEntity-clearActiveItem.patch
index 64de25a82d..64de25a82d 100644
--- a/patches/api/0220-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/api/0215-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/api/0221-Add-PlayerItemCooldownEvent.patch b/patches/api/0216-Add-PlayerItemCooldownEvent.patch
index ae5118c7da..ae5118c7da 100644
--- a/patches/api/0221-Add-PlayerItemCooldownEvent.patch
+++ b/patches/api/0216-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/0222-More-lightning-API.patch b/patches/api/0217-More-lightning-API.patch
index c4924dcdf2..c4924dcdf2 100644
--- a/patches/api/0222-More-lightning-API.patch
+++ b/patches/api/0217-More-lightning-API.patch
diff --git a/patches/api/0223-Add-PlayerShearBlockEvent.patch b/patches/api/0218-Add-PlayerShearBlockEvent.patch
index 1506924937..1506924937 100644
--- a/patches/api/0223-Add-PlayerShearBlockEvent.patch
+++ b/patches/api/0218-Add-PlayerShearBlockEvent.patch
diff --git a/patches/api/0224-Player-Chunk-Load-Unload-Events.patch b/patches/api/0219-Player-Chunk-Load-Unload-Events.patch
index c1779bb840..c1779bb840 100644
--- a/patches/api/0224-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/api/0219-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/api/0225-Expose-LivingEntity-hurt-direction.patch b/patches/api/0220-Expose-LivingEntity-hurt-direction.patch
index 2dc78a669d..2dc78a669d 100644
--- a/patches/api/0225-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/api/0220-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/api/0226-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0221-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 00552e9137..00552e9137 100644
--- a/patches/api/0226-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/api/0221-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/api/0227-Added-PlayerTradeEvent.patch b/patches/api/0222-Added-PlayerTradeEvent.patch
index 11ad019021..11ad019021 100644
--- a/patches/api/0227-Added-PlayerTradeEvent.patch
+++ b/patches/api/0222-Added-PlayerTradeEvent.patch
diff --git a/patches/api/0228-Add-TargetHitEvent-API.patch b/patches/api/0223-Add-TargetHitEvent-API.patch
index 6c68224363..6c68224363 100644
--- a/patches/api/0228-Add-TargetHitEvent-API.patch
+++ b/patches/api/0223-Add-TargetHitEvent-API.patch
diff --git a/patches/api/0229-Additional-Block-Material-API-s.patch b/patches/api/0224-Additional-Block-Material-API-s.patch
index 98a66a166c..98a66a166c 100644
--- a/patches/api/0229-Additional-Block-Material-API-s.patch
+++ b/patches/api/0224-Additional-Block-Material-API-s.patch
diff --git a/patches/api/0230-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0225-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
index d297dd5c24..d297dd5c24 100644
--- a/patches/api/0230-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/api/0225-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/api/0231-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0226-Add-PlayerFlowerPotManipulateEvent.patch
index cb08fd1404..cb08fd1404 100644
--- a/patches/api/0231-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/api/0226-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/api/0232-Zombie-API-breaking-doors.patch b/patches/api/0227-Zombie-API-breaking-doors.patch
index 24118c13ee..24118c13ee 100644
--- a/patches/api/0232-Zombie-API-breaking-doors.patch
+++ b/patches/api/0227-Zombie-API-breaking-doors.patch
diff --git a/patches/api/0233-Add-EntityLoadCrossbowEvent.patch b/patches/api/0228-Add-EntityLoadCrossbowEvent.patch
index 2a60c84538..2a60c84538 100644
--- a/patches/api/0233-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/api/0228-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/api/0234-Added-WorldGameRuleChangeEvent.patch b/patches/api/0229-Added-WorldGameRuleChangeEvent.patch
index 348efda0ca..348efda0ca 100644
--- a/patches/api/0234-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/api/0229-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/api/0235-Added-ServerResourcesReloadedEvent.patch b/patches/api/0230-Added-ServerResourcesReloadedEvent.patch
index 150b70e6cc..150b70e6cc 100644
--- a/patches/api/0235-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/api/0230-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/api/0236-Add-BlockFailedDispenseEvent.patch b/patches/api/0231-Add-BlockFailedDispenseEvent.patch
index 4f480e7417..4f480e7417 100644
--- a/patches/api/0236-Add-BlockFailedDispenseEvent.patch
+++ b/patches/api/0231-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/api/0237-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0232-Added-PlayerLecternPageChangeEvent.patch
index 3c9f223aa5..3c9f223aa5 100644
--- a/patches/api/0237-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/api/0232-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/api/0238-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0233-Added-PlayerLoomPatternSelectEvent.patch
index 766e838ec8..766e838ec8 100644
--- a/patches/api/0238-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/api/0233-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/api/0239-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0234-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
index c25fbd796f..c25fbd796f 100644
--- a/patches/api/0239-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
+++ b/patches/api/0234-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/0240-Add-sendOpLevel-API.patch b/patches/api/0235-Add-sendOpLevel-API.patch
index 360c197b18..360c197b18 100644
--- a/patches/api/0240-Add-sendOpLevel-API.patch
+++ b/patches/api/0235-Add-sendOpLevel-API.patch
diff --git a/patches/api/0241-Add-RegistryAccess-for-managing-registries.patch b/patches/api/0236-Add-RegistryAccess-for-managing-registries.patch
index 9740622000..9740622000 100644
--- a/patches/api/0241-Add-RegistryAccess-for-managing-registries.patch
+++ b/patches/api/0236-Add-RegistryAccess-for-managing-registries.patch
diff --git a/patches/api/0237-Add-StructuresLocateEvent.patch b/patches/api/0237-Add-StructuresLocateEvent.patch
new file mode 100644
index 0000000000..4f5120e852
--- /dev/null
+++ b/patches/api/0237-Add-StructuresLocateEvent.patch
@@ -0,0 +1,189 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: dfsek <[email protected]>
+Date: Tue, 15 Sep 2020 21:59:16 -0700
+Subject: [PATCH] Add StructuresLocateEvent
+
+Co-authored-by: Jake Potrebic <[email protected]>
+
+diff --git a/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java b/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..41ea65c9ecf6339bb50864a6d28e53c7e8d1edf7
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java
+@@ -0,0 +1,176 @@
++package io.papermc.paper.event.world;
++
++import io.papermc.paper.math.Position;
++import java.util.Collections;
++import java.util.List;
++import org.bukkit.Location;
++import org.bukkit.World;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.world.WorldEvent;
++import org.bukkit.generator.structure.Structure;
++import org.bukkit.generator.structure.StructureType;
++import org.jetbrains.annotations.ApiStatus;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++import org.jetbrains.annotations.UnmodifiableView;
++
++/**
++ * Called <b>before</b> a set of configured structures is located.
++ * This happens when:
++ * <ul>
++ *     <li>The /locate command is used.<br></li>
++ *     <li>An Eye of Ender is used.</li>
++ *     <li>An Explorer/Treasure Map is activated.</li>
++ *     <li>A dolphin swims to a treasure location.</li>
++ *     <li>A trade is done with a villager for a map.</li>
++ *     <li>{@link World#locateNearestStructure(Location, StructureType, int, boolean)} is invoked.</li>
++ *     <li>{@link World#locateNearestStructure(Location, Structure, int, boolean)} is invoked.</li>
++ * </ul>
++ */
++public class StructuresLocateEvent extends WorldEvent implements Cancellable {
++
++    private static final HandlerList HANDLER_LIST = new HandlerList();
++
++    private final Location origin;
++    private Result result;
++    private List<Structure> structures;
++    private int radius;
++    private boolean findUnexplored;
++
++    private boolean cancelled;
++
++    @ApiStatus.Internal
++    public StructuresLocateEvent(@NotNull World world, @NotNull Location origin, @NotNull List<Structure> structures, int radius, boolean findUnexplored) {
++        super(world);
++        this.origin = origin;
++        this.structures = structures;
++        this.radius = radius;
++        this.findUnexplored = findUnexplored;
++    }
++
++    /**
++     * Gets the {@link Location} from which the search is to be conducted.
++     *
++     * @return {@link Location} where search begins
++     */
++    public @NotNull Location getOrigin() {
++        return this.origin.clone();
++    }
++
++    /**
++     * Gets the {@link Location} and {@link Structure} set as the result, if it was defined.
++     * <p>
++     * Returns {@code null} if it has not been set by {@link StructuresLocateEvent#setResult(Result)}.
++     * Since this event fires <i>before</i> the search is done, the actual result is unknown at this point.
++     *
++     * @return The result location and structure, if it has been set. {@code null} if it has not.
++     * @see World#locateNearestStructure(Location, StructureType, int, boolean)
++     */
++    public @Nullable Result getResult() {
++        return this.result;
++    }
++
++    /**
++     * Sets the result {@link Location} and {@link Structure}. This causes the search to be
++     * skipped, and the result object passed here to be used as the result.
++     *
++     * @param result the {@link Location} and {@link Structure} of the search.
++     */
++    public void setResult(@Nullable Result result) {
++        this.result = result;
++    }
++
++    /**
++     * Gets an unmodifiable list of Structures that are valid targets for the search.
++     *
++     * @return an unmodifiable list of Structures
++     */
++    public @NotNull @UnmodifiableView List<Structure> getStructures() {
++        return Collections.unmodifiableList(this.structures);
++    }
++
++    /**
++     * Sets the list of Structures that are valid targets for the search.
++     *
++     * @param structures a list of Structures targets
++     */
++    public void setStructures(final @NotNull List<Structure> structures) {
++        this.structures = structures;
++    }
++
++    /**
++     * Gets the search radius in which to attempt locating the structure.
++     * <p>
++     * This radius may not always be obeyed during the structure search!
++     *
++     * @return the search radius (in chunks)
++     */
++    public int getRadius() {
++        return this.radius;
++    }
++
++    /**
++     * Sets the search radius in which to attempt locating the structure.
++     * <p>
++     * This radius may not always be obeyed during the structure search!
++     *
++     * @param radius the search radius (in chunks)
++     */
++    public void setRadius(int radius) {
++        this.radius = radius;
++    }
++
++    /**
++     * Gets whether to search exclusively for unexplored structures.
++     * <p>
++     * As with the search radius, this value is not always obeyed.
++     *
++     * @return Whether to search for only unexplored structures.
++     */
++    public boolean shouldFindUnexplored() {
++        return this.findUnexplored;
++    }
++
++    /**
++     * Sets whether to search exclusively for unexplored structures.
++     * <p>
++     * As with the search radius, this value is not always obeyed.
++     *
++     * @param findUnexplored Whether to search for only unexplored structures.
++     */
++    public void setFindUnexplored(boolean findUnexplored) {
++        this.findUnexplored = findUnexplored;
++    }
++
++    @Override
++    public boolean isCancelled() {
++        return this.cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        this.cancelled = cancel;
++    }
++
++    @Override
++    public @NotNull HandlerList getHandlers() {
++        return HANDLER_LIST;
++    }
++
++    public static @NotNull HandlerList getHandlerList() {
++        return HANDLER_LIST;
++    }
++
++    /**
++     * Result for {@link StructuresLocateEvent}.
++     */
++    public record Result(@NotNull Position pos, @NotNull Structure structure) {
++
++        @Deprecated(forRemoval = true)
++        public @NotNull Location position() {
++            //noinspection DataFlowIssue
++            return this.pos.toLocation(null);
++        }
++    }
++}
diff --git a/patches/api/0243-Add-BlockPreDispenseEvent.patch b/patches/api/0238-Add-BlockPreDispenseEvent.patch
index 6a8e491828..6a8e491828 100644
--- a/patches/api/0243-Add-BlockPreDispenseEvent.patch
+++ b/patches/api/0238-Add-BlockPreDispenseEvent.patch
diff --git a/patches/api/0244-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0239-Added-PlayerChangeBeaconEffectEvent.patch
index 4d84c9e1b1..4d84c9e1b1 100644
--- a/patches/api/0244-Added-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/api/0239-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0245-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0240-Added-PlayerStonecutterRecipeSelectEvent.patch
index 46377a6798..46377a6798 100644
--- a/patches/api/0245-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/api/0240-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0246-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0241-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index f85f2a4f26..f85f2a4f26 100644
--- a/patches/api/0246-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/api/0241-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/0242-Add-StructuresLocateEvent.patch b/patches/api/0242-Add-StructuresLocateEvent.patch
deleted file mode 100644
index a4edf0a695..0000000000
--- a/patches/api/0242-Add-StructuresLocateEvent.patch
+++ /dev/null
@@ -1,534 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: dfsek <[email protected]>
-Date: Tue, 15 Sep 2020 21:59:16 -0700
-Subject: [PATCH] Add StructuresLocateEvent
-
-Co-authored-by: Jake Potrebic <[email protected]>
-
-diff --git a/src/main/java/io/papermc/paper/event/world/StructureLocateEvent.java b/src/main/java/io/papermc/paper/event/world/StructureLocateEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..1ac3369455972aeb1ade5dc023d1f818cd3535fa
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/event/world/StructureLocateEvent.java
-@@ -0,0 +1,163 @@
-+package io.papermc.paper.event.world;
-+
-+import org.bukkit.Location;
-+import org.bukkit.StructureType;
-+import org.bukkit.World;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.world.WorldEvent;
-+import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * Called <b>before</b> a structure/feature is located.
-+ * This happens when:
-+ * <ul>
-+ *     <li>The /locate command is used.<br></li>
-+ *     <li>An Eye of Ender is used.</li>
-+ *     <li>An Explorer/Treasure Map is activated.</li>
-+ *     <li>{@link World#locateNearestStructure(Location, StructureType, int, boolean)} is invoked.</li>
-+ * </ul>
-+ *
-+ * @deprecated no longer used, see {@link StructuresLocateEvent}
-+ */
-+@Deprecated(forRemoval = true) @ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+public class StructureLocateEvent extends WorldEvent implements Cancellable {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
-+    private final Location origin;
-+    private Location result = null;
-+    private StructureType type;
-+    private int radius;
-+    private boolean findUnexplored;
-+
-+    private boolean cancelled;
-+
-+    @ApiStatus.Internal
-+    public StructureLocateEvent(@NotNull World world, @NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored) {
-+        super(world);
-+        this.origin = origin;
-+        this.type = structureType;
-+        this.radius = radius;
-+        this.findUnexplored = findUnexplored;
-+    }
-+
-+    /**
-+     * Gets the location set as the structure location, if it was defined.
-+     * <p>
-+     * Returns {@code null} if it has not been set by {@link StructureLocateEvent#setResult(Location)}.
-+     * Since this event fires <i>before</i> the search is done, the actual location is unknown at this point.
-+     *
-+     * @return The result location, if it has been set. {@code null} if it has not.
-+     * @see World#locateNearestStructure(Location, StructureType, int, boolean)
-+     */
-+    @Nullable
-+    public Location getResult() {
-+        return this.result;
-+    }
-+
-+    /**
-+     * Sets the result {@link Location}. This causes the search to be skipped, and the location passed here to be used as the result.
-+     *
-+     * @param result the {@link Location} of the structure.
-+     */
-+    public void setResult(@Nullable Location result) {
-+        this.result = result;
-+    }
-+
-+    /**
-+     * Gets the {@link StructureType} that is to be located.
-+     *
-+     * @return the structure type.
-+     */
-+    @NotNull
-+    public StructureType getType() {
-+        return this.type;
-+    }
-+
-+    /**
-+     * Sets the {@link StructureType} that is to be located.
-+     *
-+     * @param type the structure type.
-+     */
-+    public void setType(@NotNull StructureType type) {
-+        this.type = type;
-+    }
-+
-+    /**
-+     * Gets the {@link Location} from which the search is to be conducted.
-+     *
-+     * @return {@link Location} where search begins
-+     */
-+    @NotNull
-+    public Location getOrigin() {
-+        return this.origin;
-+    }
-+
-+    /**
-+     * Gets the search radius in which to attempt locating the structure.
-+     * <p>
-+     * This radius may not always be obeyed during the structure search!
-+     *
-+     * @return the search radius.
-+     */
-+    public int getRadius() {
-+        return this.radius;
-+    }
-+
-+    /**
-+     * Sets the search radius in which to attempt locating the structure.
-+     * <p>
-+     * This radius may not always be obeyed during the structure search!
-+     *
-+     * @param radius the search radius.
-+     */
-+    public void setRadius(int radius) {
-+        this.radius = radius;
-+    }
-+
-+    /**
-+     * Gets whether to search exclusively for unexplored structures.
-+     * <p>
-+     * As with the search radius, this value is not always obeyed.
-+     *
-+     * @return Whether to search for only unexplored structures.
-+     */
-+    public boolean shouldFindUnexplored() {
-+        return this.findUnexplored;
-+    }
-+
-+    /**
-+     * Sets whether to search exclusively for unexplored structures.
-+     * <p>
-+     * As with the search radius, this value is not always obeyed.
-+     *
-+     * @param findUnexplored Whether to search for only unexplored structures.
-+     */
-+    public void setFindUnexplored(boolean findUnexplored) {
-+        this.findUnexplored = findUnexplored;
-+    }
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return this.cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return HANDLER_LIST;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return HANDLER_LIST;
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java b/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..582af444b058708638683e7d6f9b79685c04c061
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java
-@@ -0,0 +1,213 @@
-+package io.papermc.paper.event.world;
-+
-+import io.papermc.paper.math.Position;
-+import io.papermc.paper.util.TransformingRandomAccessList;
-+import io.papermc.paper.world.structure.ConfiguredStructure;
-+import java.util.Collections;
-+import java.util.List;
-+import java.util.Objects;
-+import org.bukkit.Location;
-+import org.bukkit.World;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.world.WorldEvent;
-+import org.bukkit.generator.structure.Structure;
-+import org.bukkit.generator.structure.StructureType;
-+import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+import org.jetbrains.annotations.UnmodifiableView;
-+
-+/**
-+ * Called <b>before</b> a set of configured structures is located.
-+ * This happens when:
-+ * <ul>
-+ *     <li>The /locate command is used.<br></li>
-+ *     <li>An Eye of Ender is used.</li>
-+ *     <li>An Explorer/Treasure Map is activated.</li>
-+ *     <li>A dolphin swims to a treasure location.</li>
-+ *     <li>A trade is done with a villager for a map.</li>
-+ *     <li>{@link World#locateNearestStructure(Location, StructureType, int, boolean)} is invoked.</li>
-+ *     <li>{@link World#locateNearestStructure(Location, Structure, int, boolean)} is invoked.</li>
-+ * </ul>
-+ */
-+public class StructuresLocateEvent extends WorldEvent implements Cancellable {
-+
-+    private static final HandlerList HANDLER_LIST = new HandlerList();
-+
-+    private final Location origin;
-+    private Result result;
-+    private List<Structure> structures;
-+    private List<ConfiguredStructure> legacy$structures;
-+    private int radius;
-+    private boolean findUnexplored;
-+
-+    private boolean cancelled;
-+
-+    @ApiStatus.Internal
-+    public StructuresLocateEvent(@NotNull World world, @NotNull Location origin, @NotNull List<Structure> structures, int radius, boolean findUnexplored) {
-+        super(world);
-+        this.origin = origin;
-+        this.setStructures(structures);
-+        this.radius = radius;
-+        this.findUnexplored = findUnexplored;
-+    }
-+
-+    /**
-+     * Gets the {@link Location} from which the search is to be conducted.
-+     *
-+     * @return {@link Location} where search begins
-+     */
-+    public @NotNull Location getOrigin() {
-+        return this.origin.clone();
-+    }
-+
-+    /**
-+     * Gets the {@link Location} and {@link Structure} set as the result, if it was defined.
-+     * <p>
-+     * Returns {@code null} if it has not been set by {@link StructuresLocateEvent#setResult(Result)}.
-+     * Since this event fires <i>before</i> the search is done, the actual result is unknown at this point.
-+     *
-+     * @return The result location and structure, if it has been set. {@code null} if it has not.
-+     * @see World#locateNearestStructure(Location, StructureType, int, boolean)
-+     */
-+    public @Nullable Result getResult() {
-+        return this.result;
-+    }
-+
-+    /**
-+     * Sets the result {@link Location} and {@link Structure}. This causes the search to be
-+     * skipped, and the result object passed here to be used as the result.
-+     *
-+     * @param result the {@link Location} and {@link Structure} of the search.
-+     */
-+    public void setResult(@Nullable Result result) {
-+        this.result = result;
-+    }
-+
-+    /**
-+     * Gets a mutable list of ConfiguredStructures that are valid targets for the search.
-+     *
-+     * @return a mutable list of ConfiguredStructures
-+     * @deprecated use {@link #getStructures()}
-+     */
-+    @Deprecated(forRemoval = true)
-+    public @NotNull List<ConfiguredStructure> getConfiguredStructures() {
-+        return this.legacy$structures;
-+    }
-+
-+    /**
-+     * Sets the list of ConfiguredStructures that are valid targets for the search.
-+     *
-+     * @param configuredStructures a list of ConfiguredStructure targets
-+     * @deprecated use {@link #setStructures(List)}
-+     */
-+    @Deprecated(forRemoval = true)
-+    public void setConfiguredStructures(@NotNull List<ConfiguredStructure> configuredStructures) {
-+        this.setStructures(configuredStructures.stream().map(ConfiguredStructure::toModern).toList());
-+    }
-+
-+    /**
-+     * Gets an unmodifiable list of Structures that are valid targets for the search.
-+     *
-+     * @return an unmodifiable list of Structures
-+     */
-+    public @NotNull @UnmodifiableView List<Structure> getStructures() {
-+        return Collections.unmodifiableList(this.structures);
-+    }
-+
-+    /**
-+     * Sets the list of Structures that are valid targets for the search.
-+     *
-+     * @param structures a list of Structures targets
-+     */
-+    public void setStructures(final @NotNull List<Structure> structures) {
-+        this.structures = structures;
-+        this.legacy$structures = new TransformingRandomAccessList<>(this.structures, ConfiguredStructure::fromModern, ConfiguredStructure::toModern);
-+    }
-+
-+    /**
-+     * Gets the search radius in which to attempt locating the structure.
-+     * <p>
-+     * This radius may not always be obeyed during the structure search!
-+     *
-+     * @return the search radius (in chunks)
-+     */
-+    public int getRadius() {
-+        return this.radius;
-+    }
-+
-+    /**
-+     * Sets the search radius in which to attempt locating the structure.
-+     * <p>
-+     * This radius may not always be obeyed during the structure search!
-+     *
-+     * @param radius the search radius (in chunks)
-+     */
-+    public void setRadius(int radius) {
-+        this.radius = radius;
-+    }
-+
-+    /**
-+     * Gets whether to search exclusively for unexplored structures.
-+     * <p>
-+     * As with the search radius, this value is not always obeyed.
-+     *
-+     * @return Whether to search for only unexplored structures.
-+     */
-+    public boolean shouldFindUnexplored() {
-+        return this.findUnexplored;
-+    }
-+
-+    /**
-+     * Sets whether to search exclusively for unexplored structures.
-+     * <p>
-+     * As with the search radius, this value is not always obeyed.
-+     *
-+     * @param findUnexplored Whether to search for only unexplored structures.
-+     */
-+    public void setFindUnexplored(boolean findUnexplored) {
-+        this.findUnexplored = findUnexplored;
-+    }
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return this.cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
-+    }
-+
-+    @Override
-+    public @NotNull HandlerList getHandlers() {
-+        return HANDLER_LIST;
-+    }
-+
-+    public static @NotNull HandlerList getHandlerList() {
-+        return HANDLER_LIST;
-+    }
-+
-+    /**
-+     * Result for {@link StructuresLocateEvent}.
-+     */
-+    public record Result(@NotNull Position pos, @NotNull Structure structure) {
-+
-+        @Deprecated(forRemoval = true)
-+        public Result(final @NotNull Location position, @NotNull ConfiguredStructure configuredStructure) {
-+            this(position, configuredStructure.toModern());
-+        }
-+
-+        @Deprecated(forRemoval = true)
-+        public @NotNull ConfiguredStructure configuredStructure() {
-+            return Objects.requireNonNull(ConfiguredStructure.fromModern(this.structure), "Please use the newer Structure API");
-+        }
-+
-+        @Deprecated(forRemoval = true)
-+        public @NotNull Location position() {
-+            //noinspection DataFlowIssue
-+            return this.pos.toLocation(null);
-+        }
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/world/structure/ConfiguredStructure.java b/src/main/java/io/papermc/paper/world/structure/ConfiguredStructure.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..1e7b53f9bc13dcd5a0a4a40004591e4f850496a0
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/world/structure/ConfiguredStructure.java
-@@ -0,0 +1,113 @@
-+package io.papermc.paper.world.structure;
-+
-+import io.papermc.paper.registry.Reference;
-+import java.util.Objects;
-+import org.bukkit.Keyed;
-+import org.bukkit.NamespacedKey;
-+import org.bukkit.Registry;
-+import org.bukkit.StructureType;
-+import org.bukkit.generator.structure.Structure;
-+import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * Represents a configured structure each with a
-+ * {@link StructureType}. Multiple ConfiguredStructures can have
-+ * the same {@link StructureType}.
-+ * @deprecated use {@link Structure}
-+ */
-+@Deprecated(forRemoval = true)
[email protected](inVersion = "1.21")
-+public final class ConfiguredStructure implements Keyed {
-+
-+    public static final Reference<ConfiguredStructure> PILLAGER_OUTPOST = create("pillager_outpost");
-+    public static final Reference<ConfiguredStructure> MINESHAFT = create("mineshaft");
-+    public static final Reference<ConfiguredStructure> MINESHAFT_MESA = create("mineshaft_mesa");
-+    public static final Reference<ConfiguredStructure> WOODLAND_MANSION = create("mansion");
-+    public static final Reference<ConfiguredStructure> JUNGLE_TEMPLE = create("jungle_pyramid");
-+    public static final Reference<ConfiguredStructure> DESERT_PYRAMID = create("desert_pyramid");
-+    public static final Reference<ConfiguredStructure> IGLOO = create("igloo");
-+    public static final Reference<ConfiguredStructure> SHIPWRECK = create("shipwreck");
-+    public static final Reference<ConfiguredStructure> SHIPWRECK_BEACHED = create("shipwreck_beached");
-+    public static final Reference<ConfiguredStructure> SWAMP_HUT = create("swamp_hut");
-+    public static final Reference<ConfiguredStructure> STRONGHOLD = create("stronghold");
-+    public static final Reference<ConfiguredStructure> OCEAN_MONUMENT = create("monument");
-+    public static final Reference<ConfiguredStructure> OCEAN_RUIN_COLD = create("ocean_ruin_cold");
-+    public static final Reference<ConfiguredStructure> OCEAN_RUIN_WARM = create("ocean_ruin_warm");
-+    public static final Reference<ConfiguredStructure> FORTRESS = create("fortress");
-+    public static final Reference<ConfiguredStructure> NETHER_FOSSIL = create("nether_fossil");
-+    public static final Reference<ConfiguredStructure> END_CITY = create("end_city");
-+    public static final Reference<ConfiguredStructure> BURIED_TREASURE = create("buried_treasure");
-+    public static final Reference<ConfiguredStructure> BASTION_REMNANT = create("bastion_remnant");
-+    public static final Reference<ConfiguredStructure> VILLAGE_PLAINS = create("village_plains");
-+    public static final Reference<ConfiguredStructure> VILLAGE_DESERT = create("village_desert");
-+    public static final Reference<ConfiguredStructure> VILLAGE_SAVANNA = create("village_savanna");
-+    public static final Reference<ConfiguredStructure> VILLAGE_SNOWY = create("village_snowy");
-+    public static final Reference<ConfiguredStructure> VILLAGE_TAIGA = create("village_taiga");
-+    public static final Reference<ConfiguredStructure> RUINED_PORTAL_STANDARD = create("ruined_portal");
-+    public static final Reference<ConfiguredStructure> RUINED_PORTAL_DESERT = create("ruined_portal_desert");
-+    public static final Reference<ConfiguredStructure> RUINED_PORTAL_JUNGLE = create("ruined_portal_jungle");
-+    public static final Reference<ConfiguredStructure> RUINED_PORTAL_SWAMP = create("ruined_portal_swamp");
-+    public static final Reference<ConfiguredStructure> RUINED_PORTAL_MOUNTAIN = create("ruined_portal_mountain");
-+    public static final Reference<ConfiguredStructure> RUINED_PORTAL_OCEAN = create("ruined_portal_ocean");
-+    public static final Reference<ConfiguredStructure> RUINED_PORTAL_NETHER = create("ruined_portal_nether");
-+    // public static final Reference<ConfiguredStructure> ANCIENT_CITY = create("ancient_city"); // TODO remove when upstream adds "jigsaw" StructureType
-+
-+    private final NamespacedKey key;
-+    private final StructureType structureType;
-+
-+    ConfiguredStructure(@NotNull NamespacedKey key, @NotNull StructureType structureType) {
-+        this.key = key;
-+        this.structureType = structureType;
-+    }
-+
-+    @Override
-+    public @NotNull NamespacedKey getKey() {
-+        return this.key;
-+    }
-+
-+    /**
-+     * Gets the structure type for this configure structure.
-+     *
-+     * @return the structure type
-+     */
-+    public @NotNull StructureType getStructureType() {
-+        return this.structureType;
-+    }
-+
-+    @Override
-+    public boolean equals(Object o) {
-+        if (this == o) return true;
-+        if (o == null || getClass() != o.getClass()) return false;
-+        ConfiguredStructure structure = (ConfiguredStructure) o;
-+        return this.key.equals(structure.key) && this.structureType.equals(structure.structureType);
-+    }
-+
-+    @Override
-+    public int hashCode() {
-+        return Objects.hash(this.key, this.structureType);
-+    }
-+
-+    @Override
-+    public String toString() {
-+        return "ConfiguredStructure{" +
-+            "key=" + this.key +
-+            ", structureType=" + this.structureType +
-+            '}';
-+    }
-+
-+    private static @NotNull Reference<ConfiguredStructure> create(@NotNull String name) {
-+        return Reference.create(Registry.CONFIGURED_STRUCTURE, NamespacedKey.minecraft(name));
-+    }
-+
-+    @ApiStatus.Internal
-+    public @NotNull Structure toModern() {
-+        return Objects.requireNonNull(Registry.STRUCTURE.get(this.key));
-+    }
-+
-+    @ApiStatus.Internal
-+    public static @Nullable ConfiguredStructure fromModern(@NotNull Structure structure) {
-+        return Registry.CONFIGURED_STRUCTURE.get(structure.getKey());
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index d40c2b492a2be6ce87105ce910a05c7c344ddf84..c5001f4d54ec05a416b357538b94ea5ec4a17849 100644
---- a/src/main/java/org/bukkit/Registry.java
-+++ b/src/main/java/org/bukkit/Registry.java
-@@ -318,6 +318,15 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
-      * @see GameEvent
-      */
-     Registry<GameEvent> GAME_EVENT = io.papermc.paper.registry.RegistryAccess.registryAccess().getRegistry(io.papermc.paper.registry.RegistryKey.GAME_EVENT); // Paper
-+    // Paper start
-+    /**
-+     * Configured structures.
-+     * @see io.papermc.paper.world.structure.ConfiguredStructure
-+     * @deprecated use {@link io.papermc.paper.registry.RegistryAccess#getRegistry(io.papermc.paper.registry.RegistryKey)} with {@link io.papermc.paper.registry.RegistryKey#STRUCTURE}
-+     */
-+    @Deprecated(forRemoval = true)
-+    Registry<io.papermc.paper.world.structure.ConfiguredStructure> CONFIGURED_STRUCTURE = Objects.requireNonNull(io.papermc.paper.registry.RegistryAccess.registryAccess().getRegistry(io.papermc.paper.world.structure.ConfiguredStructure.class), "No registry present for ConfiguredStructure. This is a bug.");
-+    // Paper end
-     /**
-      * Get the object by its key.
-      *
diff --git a/patches/api/0247-add-DragonEggFormEvent.patch b/patches/api/0242-add-DragonEggFormEvent.patch
index 3b40a9f99d..3b40a9f99d 100644
--- a/patches/api/0247-add-DragonEggFormEvent.patch
+++ b/patches/api/0242-add-DragonEggFormEvent.patch
diff --git a/patches/api/0248-EntityMoveEvent.patch b/patches/api/0243-EntityMoveEvent.patch
index d9e828eb8c..d9e828eb8c 100644
--- a/patches/api/0248-EntityMoveEvent.patch
+++ b/patches/api/0243-EntityMoveEvent.patch
diff --git a/patches/api/0249-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0244-Allow-adding-items-to-BlockDropItemEvent.patch
index c6b7565fe4..c6b7565fe4 100644
--- a/patches/api/0249-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/api/0244-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0250-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0245-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 7cc686da5a..7cc686da5a 100644
--- a/patches/api/0250-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/api/0245-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/0251-living-entity-allow-attribute-registration.patch b/patches/api/0246-living-entity-allow-attribute-registration.patch
index e7ded6dabb..e7ded6dabb 100644
--- a/patches/api/0251-living-entity-allow-attribute-registration.patch
+++ b/patches/api/0246-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0252-Add-missing-effects.patch b/patches/api/0247-Add-missing-effects.patch
index 8db72d8762..0e0f224064 100644
--- a/patches/api/0252-Add-missing-effects.patch
+++ b/patches/api/0247-Add-missing-effects.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing effects
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
-index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..d98612cad7f7477f6d4fe496f4d87b139aa3c681 100644
+index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..f0e595c754afbbf2729ff093262459ac8010ce85 100644
 --- a/src/main/java/org/bukkit/Effect.java
 +++ b/src/main/java/org/bukkit/Effect.java
 @@ -131,9 +131,9 @@ public enum Effect {
@@ -41,7 +41,7 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..d98612cad7f7477f6d4fe496f4d87b13
      VILLAGER_PLANT_GROW(2005, Type.VISUAL, Integer.class),
      /**
       * The sound/particles used by the enderdragon's breath
-@@ -336,21 +340,199 @@ public enum Effect {
+@@ -336,21 +340,121 @@ public enum Effect {
       * block.
       */
      OXIDISED_COPPER_SCRAPE(3005, Type.VISUAL),
@@ -58,84 +58,6 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..d98612cad7f7477f6d4fe496f4d87b13
 +     * The sound of an ender portal being created in the overworld
 +     */
 +    END_PORTAL_CREATED_IN_OVERWORLD(1038, Type.SOUND),
-+    /**
-+     * The sound of phantom's bites
-+     *
-+     * @deprecated use {@link #PHANTOM_BITE}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    PHANTOM_BITES(1039, Type.SOUND),
-+    /**
-+     * The sound of zombie converting to drowned zombie
-+     *
-+     * @deprecated use {@link #ZOMBIE_CONVERTED_TO_DROWNED}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    ZOMBIE_CONVERTS_TO_DROWNED(1040, Type.SOUND),
-+    /**
-+     * The sound of a husk converting to zombie by drowning
-+     *
-+     * @deprecated use {@link #HUSK_CONVERTED_TO_ZOMBIE}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    HUSK_CONVERTS_TO_ZOMBIE(1041, Type.SOUND),
-+    /**
-+     * The sound of a grindstone being used
-+     *
-+     * @deprecated use {@link #GRINDSTONE_USE}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    GRINDSTONE_USED(1042, Type.SOUND),
-+    /**
-+     * The sound of a book page being turned
-+     *
-+     * @deprecated use {@link #BOOK_PAGE_TURN}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    BOOK_PAGE_TURNED(1043, Type.SOUND),
-+    /**
-+     * Particles displayed when a composter composts
-+     *
-+     * @deprecated use {@link #COMPOSTER_FILL_ATTEMPT}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    COMPOSTER_COMPOSTS(1500, Type.VISUAL),
-+    /**
-+     * Particles displayed when lava converts a block (either water to stone, or
-+     * removing existing blocks such as torches)
-+     *
-+     * @deprecated use {@link #LAVA_INTERACT}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    LAVA_CONVERTS_BLOCK(1501, Type.VISUAL),
-+    /**
-+     * Particles displayd when a redstone torch burns out
-+     *
-+     * @deprecated use {@link #REDSTONE_TORCH_BURNOUT}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    REDSTONE_TORCH_BURNS_OUT(1502, Type.VISUAL),
-+    /**
-+     * Particles displayed when an ender eye is placed
-+     *
-+     * @deprecated use {@link #END_PORTAL_FRAME_FILL}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    ENDER_EYE_PLACED(1503, Type.VISUAL),
-+    /**
-+     * Particles displayed when an ender dragon destroys block
-+     *
-+     * @deprecated use {@link #ENDER_DRAGON_DESTROY_BLOCK}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    ENDER_DRAGON_DESTROYS_BLOCK(2008, Type.VISUAL),
-+    /**
-+     * Particles displayed when a wet sponge vaporizes in nether.
-+     *
-+     * @deprecated use {@link #SPONGE_DRY}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    WET_SPONGE_VAPORIZES_IN_NETHER(2009, Type.VISUAL),
 +
 +    SOUND_STOP_JUKEBOX_SONG(1011, Type.SOUND),
 +
@@ -245,7 +167,7 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..d98612cad7f7477f6d4fe496f4d87b13
      }
  
      /**
-@@ -366,8 +548,10 @@ public enum Effect {
+@@ -366,8 +470,10 @@ public enum Effect {
  
      /**
       * @return The type of the effect.
@@ -256,25 +178,24 @@ index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..d98612cad7f7477f6d4fe496f4d87b13
      public Type getType() {
          return this.type;
      }
-@@ -378,9 +562,16 @@ public enum Effect {
+@@ -378,8 +484,15 @@ public enum Effect {
       */
      @Nullable
      public Class<?> getData() {
 -        return this.data;
 +        return this.data == null ? null : this.data.get(0); // Paper
-     }
- 
++    }
++
 +    // Paper start - support deprecated data types
 +    @org.jetbrains.annotations.ApiStatus.Internal
 +    public boolean isApplicable(Object obj) {
 +        return this.data != null && com.google.common.collect.Iterables.any(this.data, aClass -> aClass.isAssignableFrom(obj.getClass()));
-+    }
+     }
 +    // Paper end - support deprecated data types
-+
+ 
      /**
       * Gets the Effect associated with the given ID.
-      *
-@@ -396,12 +587,26 @@ public enum Effect {
+@@ -396,12 +509,26 @@ public enum Effect {
  
      static {
          for (Effect effect : values()) {
diff --git a/patches/api/0253-Expose-Tracked-Players.patch b/patches/api/0248-Expose-Tracked-Players.patch
index 5648d1402c..5648d1402c 100644
--- a/patches/api/0253-Expose-Tracked-Players.patch
+++ b/patches/api/0248-Expose-Tracked-Players.patch
diff --git a/patches/api/0254-Add-worldborder-events.patch b/patches/api/0249-Add-worldborder-events.patch
index 9f3ae70435..9f3ae70435 100644
--- a/patches/api/0254-Add-worldborder-events.patch
+++ b/patches/api/0249-Add-worldborder-events.patch
diff --git a/patches/api/0255-added-PlayerNameEntityEvent.patch b/patches/api/0250-added-PlayerNameEntityEvent.patch
index 69bd20d13e..69bd20d13e 100644
--- a/patches/api/0255-added-PlayerNameEntityEvent.patch
+++ b/patches/api/0250-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0256-Add-recipe-to-cook-events.patch b/patches/api/0251-Add-recipe-to-cook-events.patch
index 8c8712541e..8c8712541e 100644
--- a/patches/api/0256-Add-recipe-to-cook-events.patch
+++ b/patches/api/0251-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0257-Add-Block-isValidTool.patch b/patches/api/0252-Add-Block-isValidTool.patch
index 9e96f95354..9e96f95354 100644
--- a/patches/api/0257-Add-Block-isValidTool.patch
+++ b/patches/api/0252-Add-Block-isValidTool.patch
diff --git a/patches/api/0258-Expand-world-key-API.patch b/patches/api/0253-Expand-world-key-API.patch
index b43164495f..b43164495f 100644
--- a/patches/api/0258-Expand-world-key-API.patch
+++ b/patches/api/0253-Expand-world-key-API.patch
diff --git a/patches/api/0259-Improve-Item-Rarity-API.patch b/patches/api/0254-Improve-Item-Rarity-API.patch
index f945efb2fe..f945efb2fe 100644
--- a/patches/api/0259-Improve-Item-Rarity-API.patch
+++ b/patches/api/0254-Improve-Item-Rarity-API.patch
diff --git a/patches/api/0260-Expose-protocol-version.patch b/patches/api/0255-Expose-protocol-version.patch
index ac67e3a922..ac67e3a922 100644
--- a/patches/api/0260-Expose-protocol-version.patch
+++ b/patches/api/0255-Expose-protocol-version.patch
diff --git a/patches/api/0261-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0256-add-isDeeplySleeping-to-HumanEntity.patch
index 45207a6064..45207a6064 100644
--- a/patches/api/0261-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/api/0256-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0262-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0257-add-consumeFuel-to-FurnaceBurnEvent.patch
index 07036efb43..07036efb43 100644
--- a/patches/api/0262-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/api/0257-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0263-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0258-add-get-set-drop-chance-to-EntityEquipment.patch
index d75f180c94..d75f180c94 100644
--- a/patches/api/0263-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/api/0258-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/api/0264-Added-PlayerDeepSleepEvent.patch b/patches/api/0259-Added-PlayerDeepSleepEvent.patch
index b333894788..b333894788 100644
--- a/patches/api/0264-Added-PlayerDeepSleepEvent.patch
+++ b/patches/api/0259-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0265-More-World-API.patch b/patches/api/0260-More-World-API.patch
index f146d17f9e..cd64788d2f 100644
--- a/patches/api/0265-More-World-API.patch
+++ b/patches/api/0260-More-World-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c1fd76e1b8d0f326f985662a2845f76c1cdf5d40..50d27a6096f0da98db80ce28eab21a004de8a20a 100644
+index 216995288f6b8b407ef8240411b5ed4713379a7a..d3fc033aba36c5fd99846e9200ed0071fddd6045 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3876,6 +3876,122 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -3795,6 +3795,72 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
  
@@ -47,20 +47,6 @@ index c1fd76e1b8d0f326f985662a2845f76c1cdf5d40..50d27a6096f0da98db80ce28eab21a00
 +    }
 +
 +    /**
-+     * Checks if the world:
-+     * <ul>
-+     *     <li>evaporates water</li>
-+     *     <li>dries sponges</li>
-+     *     <li>has lava spread faster and further</li>
-+     * </ul>
-+     *
-+     * @return true if ultrawarm, false if not
-+     * @deprecated use {@link #isUltraWarm()}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    boolean isUltrawarm();
-+
-+    /**
 +     * Gets the coordinate scaling of this world.
 +     *
 +     * @return the coordinate scale
@@ -68,42 +54,6 @@ index c1fd76e1b8d0f326f985662a2845f76c1cdf5d40..50d27a6096f0da98db80ce28eab21a00
 +    double getCoordinateScale();
 +
 +    /**
-+     * Checks if the world has skylight access
-+     *
-+     * @return whether there is skylight
-+     * @deprecated use {@link #hasSkyLight()}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    boolean hasSkylight();
-+
-+    /**
-+     * Checks if the world has a bedrock ceiling
-+     *
-+     * @return whether the world has a bedrock ceiling
-+     * @deprecated use {@link #hasCeiling()}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    boolean hasBedrockCeiling();
-+
-+    /**
-+     * Checks if beds work
-+     *
-+     * @return whether beds work
-+     * @deprecated use {@link #isBedWorks()}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    boolean doesBedWork();
-+
-+    /**
-+     * Checks if respawn anchors work
-+     *
-+     * @return whether respawn anchors work
-+     * @deprecated use {@link #isRespawnAnchorWorks()}
-+     */
-+    @Deprecated(forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.21")
-+    boolean doesRespawnAnchorWork();
-+
-+    /**
 +     * Checks if this world has a fixed time
 +     *
 +     * @return whether this world has fixed time
diff --git a/patches/api/0266-Added-PlayerBedFailEnterEvent.patch b/patches/api/0261-Added-PlayerBedFailEnterEvent.patch
index 6f9decf5fc..6f9decf5fc 100644
--- a/patches/api/0266-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/api/0261-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0267-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0262-Introduce-beacon-activation-deactivation-events.patch
index 4e173b3d6c..4e173b3d6c 100644
--- a/patches/api/0267-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/api/0262-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0268-PlayerMoveEvent-Improvements.patch b/patches/api/0263-PlayerMoveEvent-Improvements.patch
index 33cf16e54b..33cf16e54b 100644
--- a/patches/api/0268-PlayerMoveEvent-Improvements.patch
+++ b/patches/api/0263-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0269-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0264-add-RespawnFlags-to-PlayerRespawnEvent.patch
index c596be8b98..c596be8b98 100644
--- a/patches/api/0269-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/api/0264-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0270-Add-more-WanderingTrader-API.patch b/patches/api/0265-Add-more-WanderingTrader-API.patch
index 99045d4949..99045d4949 100644
--- a/patches/api/0270-Add-more-WanderingTrader-API.patch
+++ b/patches/api/0265-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0271-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0266-Add-EntityBlockStorage-clearEntities.patch
index 7032ba6155..7032ba6155 100644
--- a/patches/api/0271-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/api/0266-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0272-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0267-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 16af3a7728..16af3a7728 100644
--- a/patches/api/0272-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/api/0267-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0273-Inventory-close.patch b/patches/api/0268-Inventory-close.patch
index 87dfa1a083..87dfa1a083 100644
--- a/patches/api/0273-Inventory-close.patch
+++ b/patches/api/0268-Inventory-close.patch
diff --git a/patches/api/0274-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0269-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 3103f1ce2c..3103f1ce2c 100644
--- a/patches/api/0274-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/api/0269-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0275-Add-basic-Datapack-API.patch b/patches/api/0270-Add-basic-Datapack-API.patch
index f8efe8e60c..f8efe8e60c 100644
--- a/patches/api/0275-Add-basic-Datapack-API.patch
+++ b/patches/api/0270-Add-basic-Datapack-API.patch
diff --git a/patches/api/0276-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0271-additions-to-PlayerGameModeChangeEvent.patch
index b2e65ae490..b2e65ae490 100644
--- a/patches/api/0276-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/api/0271-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0277-ItemStack-repair-check-API.patch b/patches/api/0272-ItemStack-repair-check-API.patch
index b918edcf35..b918edcf35 100644
--- a/patches/api/0277-ItemStack-repair-check-API.patch
+++ b/patches/api/0272-ItemStack-repair-check-API.patch
diff --git a/patches/api/0278-More-Enchantment-API.patch b/patches/api/0273-More-Enchantment-API.patch
index 14f5473ccb..14f5473ccb 100644
--- a/patches/api/0278-More-Enchantment-API.patch
+++ b/patches/api/0273-More-Enchantment-API.patch
diff --git a/patches/api/0279-Add-Mob-lookAt-API.patch b/patches/api/0274-Add-Mob-lookAt-API.patch
index e1164a0f3e..e1164a0f3e 100644
--- a/patches/api/0279-Add-Mob-lookAt-API.patch
+++ b/patches/api/0274-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0280-ItemStack-editMeta.patch b/patches/api/0275-ItemStack-editMeta.patch
index a50fabf48e..a50fabf48e 100644
--- a/patches/api/0280-ItemStack-editMeta.patch
+++ b/patches/api/0275-ItemStack-editMeta.patch
diff --git a/patches/api/0281-Add-EntityInsideBlockEvent.patch b/patches/api/0276-Add-EntityInsideBlockEvent.patch
index b055847730..b055847730 100644
--- a/patches/api/0281-Add-EntityInsideBlockEvent.patch
+++ b/patches/api/0276-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0282-Improve-item-default-attribute-API.patch b/patches/api/0277-Improve-item-default-attribute-API.patch
index e7c6fb4cd2..e7c6fb4cd2 100644
--- a/patches/api/0282-Improve-item-default-attribute-API.patch
+++ b/patches/api/0277-Improve-item-default-attribute-API.patch
diff --git a/patches/api/0283-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0278-Add-cause-to-Weather-ThunderChangeEvents.patch
index 8e5d45d87b..8e5d45d87b 100644
--- a/patches/api/0283-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/api/0278-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0284-More-Lidded-Block-API.patch b/patches/api/0279-More-Lidded-Block-API.patch
index a89f206f9a..a89f206f9a 100644
--- a/patches/api/0284-More-Lidded-Block-API.patch
+++ b/patches/api/0279-More-Lidded-Block-API.patch
diff --git a/patches/api/0285-Add-PlayerKickEvent-causes.patch b/patches/api/0280-Add-PlayerKickEvent-causes.patch
index aa55ace2fe..aa55ace2fe 100644
--- a/patches/api/0285-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0280-Add-PlayerKickEvent-causes.patch
diff --git a/patches/api/0286-Add-PufferFishStateChangeEvent.patch b/patches/api/0281-Add-PufferFishStateChangeEvent.patch
index 7a719777e3..7a719777e3 100644
--- a/patches/api/0286-Add-PufferFishStateChangeEvent.patch
+++ b/patches/api/0281-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0287-Add-BellRevealRaiderEvent.patch b/patches/api/0282-Add-BellRevealRaiderEvent.patch
index 28a1acab60..28a1acab60 100644
--- a/patches/api/0287-Add-BellRevealRaiderEvent.patch
+++ b/patches/api/0282-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0288-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0283-Add-ElderGuardianAppearanceEvent.patch
index 23897b7390..23897b7390 100644
--- a/patches/api/0288-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/api/0283-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0289-Add-more-line-of-sight-methods.patch b/patches/api/0284-Add-more-line-of-sight-methods.patch
index 1515545500..1515545500 100644
--- a/patches/api/0289-Add-more-line-of-sight-methods.patch
+++ b/patches/api/0284-Add-more-line-of-sight-methods.patch
diff --git a/patches/api/0290-Add-WaterBottleSplashEvent.patch b/patches/api/0285-Add-WaterBottleSplashEvent.patch
index b486914fb4..b486914fb4 100644
--- a/patches/api/0290-Add-WaterBottleSplashEvent.patch
+++ b/patches/api/0285-Add-WaterBottleSplashEvent.patch
diff --git a/patches/api/0291-Add-more-LimitedRegion-API.patch b/patches/api/0286-Add-more-LimitedRegion-API.patch
index 292f95c890..292f95c890 100644
--- a/patches/api/0291-Add-more-LimitedRegion-API.patch
+++ b/patches/api/0286-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0292-Missing-Entity-API.patch b/patches/api/0287-Missing-Entity-API.patch
index aa0734a526..aa0734a526 100644
--- a/patches/api/0292-Missing-Entity-API.patch
+++ b/patches/api/0287-Missing-Entity-API.patch
diff --git a/patches/api/0293-Adds-PlayerArmSwingEvent.patch b/patches/api/0288-Adds-PlayerArmSwingEvent.patch
index 48e43517eb..48e43517eb 100644
--- a/patches/api/0293-Adds-PlayerArmSwingEvent.patch
+++ b/patches/api/0288-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/0294-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0289-Add-PlayerSignCommandPreprocessEvent.patch
index 8882c35337..8882c35337 100644
--- a/patches/api/0294-Add-PlayerSignCommandPreprocessEvent.patch
+++ b/patches/api/0289-Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/0295-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0290-fix-empty-array-elements-in-command-arguments.patch
index 83bcf0fec0..83bcf0fec0 100644
--- a/patches/api/0295-fix-empty-array-elements-in-command-arguments.patch
+++ b/patches/api/0290-fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/0296-Stinger-API.patch b/patches/api/0291-Stinger-API.patch
index 84fe8f4c22..84fe8f4c22 100644
--- a/patches/api/0296-Stinger-API.patch
+++ b/patches/api/0291-Stinger-API.patch
diff --git a/patches/api/0297-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0292-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index aefa20a2d9..aefa20a2d9 100644
--- a/patches/api/0297-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/api/0292-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/0298-Add-PlayerSetSpawnEvent.patch b/patches/api/0293-Add-PlayerSetSpawnEvent.patch
index 69443add9f..69443add9f 100644
--- a/patches/api/0298-Add-PlayerSetSpawnEvent.patch
+++ b/patches/api/0293-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/0299-Added-EntityDamageItemEvent.patch b/patches/api/0294-Added-EntityDamageItemEvent.patch
index 60513a1cbd..60513a1cbd 100644
--- a/patches/api/0299-Added-EntityDamageItemEvent.patch
+++ b/patches/api/0294-Added-EntityDamageItemEvent.patch
diff --git a/patches/api/0300-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0295-Make-EntityUnleashEvent-cancellable.patch
index e99584c277..e99584c277 100644
--- a/patches/api/0300-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/api/0295-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/0301-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0296-Change-EnderEye-target-without-changing-other-things.patch
index d8e53593ae..d8e53593ae 100644
--- a/patches/api/0301-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/api/0296-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/0302-Add-BlockBreakBlockEvent.patch b/patches/api/0297-Add-BlockBreakBlockEvent.patch
index dd02c33432..dd02c33432 100644
--- a/patches/api/0302-Add-BlockBreakBlockEvent.patch
+++ b/patches/api/0297-Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/0303-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0298-Add-helpers-for-left-right-click-to-Action.patch
index 9dac2fe612..9dac2fe612 100644
--- a/patches/api/0303-Add-helpers-for-left-right-click-to-Action.patch
+++ b/patches/api/0298-Add-helpers-for-left-right-click-to-Action.patch
diff --git a/patches/api/0304-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/api/0299-Option-to-prevent-data-components-copy-in-smithing-r.patch
index fa4ad55705..fa4ad55705 100644
--- a/patches/api/0304-Option-to-prevent-data-components-copy-in-smithing-r.patch
+++ b/patches/api/0299-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/api/0305-More-CommandBlock-API.patch b/patches/api/0300-More-CommandBlock-API.patch
index c8c52c7587..c8c52c7587 100644
--- a/patches/api/0305-More-CommandBlock-API.patch
+++ b/patches/api/0300-More-CommandBlock-API.patch
diff --git a/patches/api/0306-Add-missing-team-sidebar-display-slots.patch b/patches/api/0301-Add-missing-team-sidebar-display-slots.patch
index cdecbd1764..cdecbd1764 100644
--- a/patches/api/0306-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/api/0301-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/0307-add-back-EntityPortalExitEvent.patch b/patches/api/0302-add-back-EntityPortalExitEvent.patch
index 5a153e2345..5a153e2345 100644
--- a/patches/api/0307-add-back-EntityPortalExitEvent.patch
+++ b/patches/api/0302-add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/0308-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0303-Add-methods-to-find-targets-for-lightning-strikes.patch
index 7a82b186bf..b045b2afc9 100644
--- a/patches/api/0308-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/api/0303-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 50d27a6096f0da98db80ce28eab21a004de8a20a..d3c524bbfe08d2118b0e093b2340620644d60d19 100644
+index d3fc033aba36c5fd99846e9200ed0071fddd6045..637480c622bdb170456baabe71d84e446ebd7b13 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -773,6 +773,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -692,6 +692,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @NotNull
      public LightningStrike strikeLightningEffect(@NotNull Location loc);
  
diff --git a/patches/api/0309-Get-entity-default-attributes.patch b/patches/api/0304-Get-entity-default-attributes.patch
index 3085faf18c..3085faf18c 100644
--- a/patches/api/0309-Get-entity-default-attributes.patch
+++ b/patches/api/0304-Get-entity-default-attributes.patch
diff --git a/patches/api/0310-Left-handed-API.patch b/patches/api/0305-Left-handed-API.patch
index ea746f73d4..ea746f73d4 100644
--- a/patches/api/0310-Left-handed-API.patch
+++ b/patches/api/0305-Left-handed-API.patch
diff --git a/patches/api/0311-Add-critical-damage-API.patch b/patches/api/0306-Add-critical-damage-API.patch
index f04ac65ac5..f04ac65ac5 100644
--- a/patches/api/0311-Add-critical-damage-API.patch
+++ b/patches/api/0306-Add-critical-damage-API.patch
diff --git a/patches/api/0312-Add-more-advancement-API.patch b/patches/api/0307-Add-more-advancement-API.patch
index 179dbdc225..179dbdc225 100644
--- a/patches/api/0312-Add-more-advancement-API.patch
+++ b/patches/api/0307-Add-more-advancement-API.patch
diff --git a/patches/api/0313-Fix-issues-with-mob-conversion.patch b/patches/api/0308-Fix-issues-with-mob-conversion.patch
index f451d967b6..f451d967b6 100644
--- a/patches/api/0313-Fix-issues-with-mob-conversion.patch
+++ b/patches/api/0308-Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/0314-Add-hasCollision-methods-to-various-places.patch b/patches/api/0309-Add-hasCollision-methods-to-various-places.patch
index ad022302d0..ad022302d0 100644
--- a/patches/api/0314-Add-hasCollision-methods-to-various-places.patch
+++ b/patches/api/0309-Add-hasCollision-methods-to-various-places.patch
diff --git a/patches/api/0315-Goat-ram-API.patch b/patches/api/0310-Goat-ram-API.patch
index 06d426a786..06d426a786 100644
--- a/patches/api/0315-Goat-ram-API.patch
+++ b/patches/api/0310-Goat-ram-API.patch
diff --git a/patches/api/0316-Add-API-for-resetting-a-single-score.patch b/patches/api/0311-Add-API-for-resetting-a-single-score.patch
index 14142e8f6c..14142e8f6c 100644
--- a/patches/api/0316-Add-API-for-resetting-a-single-score.patch
+++ b/patches/api/0311-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/api/0317-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0312-Add-Raw-Byte-Entity-Serialization.patch
index b90e495870..b90e495870 100644
--- a/patches/api/0317-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/api/0312-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/api/0318-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0313-Add-PlayerItemFrameChangeEvent.patch
index b5d6cf7bd1..b5d6cf7bd1 100644
--- a/patches/api/0318-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/api/0313-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/api/0319-Add-more-Campfire-API.patch b/patches/api/0314-Add-more-Campfire-API.patch
index 80cdc0bb39..80cdc0bb39 100644
--- a/patches/api/0319-Add-more-Campfire-API.patch
+++ b/patches/api/0314-Add-more-Campfire-API.patch
diff --git a/patches/api/0320-Extend-VehicleCollisionEvent-move-HandlerList-up.patch b/patches/api/0315-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
index 5f5a4f4140..5f5a4f4140 100644
--- a/patches/api/0320-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
+++ b/patches/api/0315-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
diff --git a/patches/api/0321-Improve-scoreboard-entries.patch b/patches/api/0316-Improve-scoreboard-entries.patch
index d6e077bd86..d6e077bd86 100644
--- a/patches/api/0321-Improve-scoreboard-entries.patch
+++ b/patches/api/0316-Improve-scoreboard-entries.patch
diff --git a/patches/api/0322-Entity-powdered-snow-API.patch b/patches/api/0317-Entity-powdered-snow-API.patch
index 648ddec205..648ddec205 100644
--- a/patches/api/0322-Entity-powdered-snow-API.patch
+++ b/patches/api/0317-Entity-powdered-snow-API.patch
diff --git a/patches/api/0323-Add-API-for-item-entity-health.patch b/patches/api/0318-Add-API-for-item-entity-health.patch
index 572034e557..572034e557 100644
--- a/patches/api/0323-Add-API-for-item-entity-health.patch
+++ b/patches/api/0318-Add-API-for-item-entity-health.patch
diff --git a/patches/api/0324-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0319-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index f094cdc255..f094cdc255 100644
--- a/patches/api/0324-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/api/0319-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0325-Bucketable-API.patch b/patches/api/0320-Bucketable-API.patch
index 26dbdc9f5d..26dbdc9f5d 100644
--- a/patches/api/0325-Bucketable-API.patch
+++ b/patches/api/0320-Bucketable-API.patch
diff --git a/patches/api/0326-System-prop-for-default-config-comment-parsing.patch b/patches/api/0321-System-prop-for-default-config-comment-parsing.patch
index 632f71e519..632f71e519 100644
--- a/patches/api/0326-System-prop-for-default-config-comment-parsing.patch
+++ b/patches/api/0321-System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/api/0327-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0322-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 9b189fc918..9b189fc918 100644
--- a/patches/api/0327-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/api/0322-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/api/0328-Multiple-Entries-with-Scoreboards.patch b/patches/api/0323-Multiple-Entries-with-Scoreboards.patch
index 920c2f117e..920c2f117e 100644
--- a/patches/api/0328-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/api/0323-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/api/0329-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0324-Warn-on-strange-EventHandler-return-types.patch
index c7807b823b..c7807b823b 100644
--- a/patches/api/0329-Warn-on-strange-EventHandler-return-types.patch
+++ b/patches/api/0324-Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/api/0330-Multi-Block-Change-API.patch b/patches/api/0325-Multi-Block-Change-API.patch
index 9d93df8706..9d93df8706 100644
--- a/patches/api/0330-Multi-Block-Change-API.patch
+++ b/patches/api/0325-Multi-Block-Change-API.patch
diff --git a/patches/api/0331-Fix-NotePlayEvent.patch b/patches/api/0326-Fix-NotePlayEvent.patch
index d3f827bfd8..d3f827bfd8 100644
--- a/patches/api/0331-Fix-NotePlayEvent.patch
+++ b/patches/api/0326-Fix-NotePlayEvent.patch
diff --git a/patches/api/0332-Freeze-Tick-Lock-API.patch b/patches/api/0327-Freeze-Tick-Lock-API.patch
index c40323bc40..c40323bc40 100644
--- a/patches/api/0332-Freeze-Tick-Lock-API.patch
+++ b/patches/api/0327-Freeze-Tick-Lock-API.patch
diff --git a/patches/api/0333-Dolphin-API.patch b/patches/api/0328-Dolphin-API.patch
index 73beed437b..73beed437b 100644
--- a/patches/api/0333-Dolphin-API.patch
+++ b/patches/api/0328-Dolphin-API.patch
diff --git a/patches/api/0334-More-PotionEffectType-API.patch b/patches/api/0329-More-PotionEffectType-API.patch
index e247835a90..9c8d856b06 100644
--- a/patches/api/0334-More-PotionEffectType-API.patch
+++ b/patches/api/0329-More-PotionEffectType-API.patch
@@ -5,14 +5,15 @@ Subject: [PATCH] More PotionEffectType API
 
 
 diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index c5001f4d54ec05a416b357538b94ea5ec4a17849..afd132dab5eb2826b600592429b9e4a8d1fe0b73 100644
+index d40c2b492a2be6ce87105ce910a05c7c344ddf84..5ba5cf06bf12fc2e81500e09209e26047e683fa9 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
-@@ -326,6 +326,31 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+@@ -318,6 +318,33 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+      * @see GameEvent
       */
-     @Deprecated(forRemoval = true)
-     Registry<io.papermc.paper.world.structure.ConfiguredStructure> CONFIGURED_STRUCTURE = Objects.requireNonNull(io.papermc.paper.registry.RegistryAccess.registryAccess().getRegistry(io.papermc.paper.world.structure.ConfiguredStructure.class), "No registry present for ConfiguredStructure. This is a bug.");
+     Registry<GameEvent> GAME_EVENT = io.papermc.paper.registry.RegistryAccess.registryAccess().getRegistry(io.papermc.paper.registry.RegistryKey.GAME_EVENT); // Paper
 +
++    // Paper start - potion effect type registry
 +    /**
 +     * Potion effect types.
 +     *
@@ -37,9 +38,10 @@ index c5001f4d54ec05a416b357538b94ea5ec4a17849..afd132dab5eb2826b600592429b9e4a8
 +            return StreamSupport.stream(this.spliterator(), false);
 +        }
 +    };
-     // Paper end
++    // Paper end - potion effect type registry
      /**
       * Get the object by its key.
+      *
 diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
 index 42d893ce75a75fe46a4e52b17dc405f5b609ab86..10fa51d116b40450b51af9110d5637f3505ebf65 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffectType.java
diff --git a/patches/api/0335-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0330-API-for-creating-command-sender-which-forwards-feedb.patch
index bca3814ad8..bca3814ad8 100644
--- a/patches/api/0335-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0330-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/api/0336-Implement-regenerateChunk.patch b/patches/api/0331-Implement-regenerateChunk.patch
index 429edcb2d7..480af4b747 100644
--- a/patches/api/0336-Implement-regenerateChunk.patch
+++ b/patches/api/0331-Implement-regenerateChunk.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement regenerateChunk
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index d3c524bbfe08d2118b0e093b2340620644d60d19..36deaae317cd9ac0455bc1daef22b7f1e1b73c62 100644
+index 637480c622bdb170456baabe71d84e446ebd7b13..8e9ab00503167799c6c929d00e48c07cb328848c 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -486,8 +486,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -405,8 +405,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return Whether the chunk was actually regenerated
       *
       * @deprecated regenerating a single chunk is not likely to produce the same
diff --git a/patches/api/0337-Add-GameEvent-tags.patch b/patches/api/0332-Add-GameEvent-tags.patch
index 8af580d84b..8af580d84b 100644
--- a/patches/api/0337-Add-GameEvent-tags.patch
+++ b/patches/api/0332-Add-GameEvent-tags.patch
diff --git a/patches/api/0338-Furnace-RecipesUsed-API.patch b/patches/api/0333-Furnace-RecipesUsed-API.patch
index 7fed82db21..7fed82db21 100644
--- a/patches/api/0338-Furnace-RecipesUsed-API.patch
+++ b/patches/api/0333-Furnace-RecipesUsed-API.patch
diff --git a/patches/api/0339-Configurable-sculk-sensor-listener-range.patch b/patches/api/0334-Configurable-sculk-sensor-listener-range.patch
index b1ad0cdb5b..b1ad0cdb5b 100644
--- a/patches/api/0339-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/api/0334-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/api/0340-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0335-Add-missing-block-data-mins-and-maxes.patch
index 63a647706a..63a647706a 100644
--- a/patches/api/0340-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/api/0335-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0341-Custom-Potion-Mixes.patch b/patches/api/0336-Custom-Potion-Mixes.patch
index 0d3feb9f09..0d3feb9f09 100644
--- a/patches/api/0341-Custom-Potion-Mixes.patch
+++ b/patches/api/0336-Custom-Potion-Mixes.patch
diff --git a/patches/api/0342-Expose-furnace-minecart-push-values.patch b/patches/api/0337-Expose-furnace-minecart-push-values.patch
index 3d8c2336e7..3d8c2336e7 100644
--- a/patches/api/0342-Expose-furnace-minecart-push-values.patch
+++ b/patches/api/0337-Expose-furnace-minecart-push-values.patch
diff --git a/patches/api/0343-More-Projectile-API.patch b/patches/api/0338-More-Projectile-API.patch
index fdec1b8add..fdec1b8add 100644
--- a/patches/api/0343-More-Projectile-API.patch
+++ b/patches/api/0338-More-Projectile-API.patch
diff --git a/patches/api/0344-Add-getComputedBiome-API.patch b/patches/api/0339-Add-getComputedBiome-API.patch
index fecc34acdf..fecc34acdf 100644
--- a/patches/api/0344-Add-getComputedBiome-API.patch
+++ b/patches/api/0339-Add-getComputedBiome-API.patch
diff --git a/patches/api/0345-Add-enchantWithLevels-API.patch b/patches/api/0340-Add-enchantWithLevels-API.patch
index 8dbe2d7555..8dbe2d7555 100644
--- a/patches/api/0345-Add-enchantWithLevels-API.patch
+++ b/patches/api/0340-Add-enchantWithLevels-API.patch
diff --git a/patches/api/0346-Add-TameableDeathMessageEvent.patch b/patches/api/0341-Add-TameableDeathMessageEvent.patch
index aec53f13ba..aec53f13ba 100644
--- a/patches/api/0346-Add-TameableDeathMessageEvent.patch
+++ b/patches/api/0341-Add-TameableDeathMessageEvent.patch
diff --git a/patches/api/0347-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0342-Allow-to-change-the-podium-of-the-EnderDragon.patch
index 08ffa1fdde..08ffa1fdde 100644
--- a/patches/api/0347-Allow-to-change-the-podium-of-the-EnderDragon.patch
+++ b/patches/api/0342-Allow-to-change-the-podium-of-the-EnderDragon.patch
diff --git a/patches/api/0348-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/api/0343-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
index 21b3f85c0b..21b3f85c0b 100644
--- a/patches/api/0348-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
+++ b/patches/api/0343-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
diff --git a/patches/api/0349-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0344-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 5775b6f33c..5775b6f33c 100644
--- a/patches/api/0349-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/api/0344-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/api/0350-WorldCreator-keepSpawnLoaded.patch b/patches/api/0345-WorldCreator-keepSpawnLoaded.patch
index 287c313c58..287c313c58 100644
--- a/patches/api/0350-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/api/0345-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/api/0351-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0346-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index e7a4ad2089..e7a4ad2089 100644
--- a/patches/api/0351-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/api/0346-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/api/0352-Add-PlayerStopUsingItemEvent.patch b/patches/api/0347-Add-PlayerStopUsingItemEvent.patch
index c8de1f6ed0..c8de1f6ed0 100644
--- a/patches/api/0352-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/api/0347-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/api/0353-Expand-FallingBlock-API.patch b/patches/api/0348-Expand-FallingBlock-API.patch
index 42538dc688..8c86249a45 100644
--- a/patches/api/0353-Expand-FallingBlock-API.patch
+++ b/patches/api/0348-Expand-FallingBlock-API.patch
@@ -10,10 +10,10 @@ Subject: [PATCH] Expand FallingBlock API
 Co-authored-by: Lukas Planz <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 36deaae317cd9ac0455bc1daef22b7f1e1b73c62..406c404adb999acfa0e8f118b23714803e40a4fb 100644
+index 8e9ab00503167799c6c929d00e48c07cb328848c..907906e15c9250fea385e49f10d3c248236fd004 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2309,8 +2309,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2228,8 +2228,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The spawned {@link FallingBlock} instance
       * @throws IllegalArgumentException if {@link Location} or {@link
       *     MaterialData} are null or {@link Material} of the {@link MaterialData} is not a block
@@ -24,7 +24,7 @@ index 36deaae317cd9ac0455bc1daef22b7f1e1b73c62..406c404adb999acfa0e8f118b2371480
      public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull MaterialData data) throws IllegalArgumentException;
  
      /**
-@@ -2323,8 +2325,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2242,8 +2244,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The spawned {@link FallingBlock} instance
       * @throws IllegalArgumentException if {@link Location} or {@link
       *     BlockData} are null
@@ -35,7 +35,7 @@ index 36deaae317cd9ac0455bc1daef22b7f1e1b73c62..406c404adb999acfa0e8f118b2371480
      public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull BlockData data) throws IllegalArgumentException;
  
      /**
-@@ -2341,7 +2345,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2260,7 +2264,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The spawned {@link FallingBlock} instance
       * @throws IllegalArgumentException if {@link Location} or {@link
       *     Material} are null or {@link Material} is not a block
diff --git a/patches/api/0354-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0349-Add-method-isTickingWorlds-to-Bukkit.patch
index 6092439044..6092439044 100644
--- a/patches/api/0354-Add-method-isTickingWorlds-to-Bukkit.patch
+++ b/patches/api/0349-Add-method-isTickingWorlds-to-Bukkit.patch
diff --git a/patches/api/0355-Add-WardenAngerChangeEvent.patch b/patches/api/0350-Add-WardenAngerChangeEvent.patch
index 4291ccd615..4291ccd615 100644
--- a/patches/api/0355-Add-WardenAngerChangeEvent.patch
+++ b/patches/api/0350-Add-WardenAngerChangeEvent.patch
diff --git a/patches/api/0356-Nameable-Banner-API.patch b/patches/api/0351-Nameable-Banner-API.patch
index eba196daaf..eba196daaf 100644
--- a/patches/api/0356-Nameable-Banner-API.patch
+++ b/patches/api/0351-Nameable-Banner-API.patch
diff --git a/patches/api/0357-Add-Player-getFishHook.patch b/patches/api/0352-Add-Player-getFishHook.patch
index feae3b2e47..feae3b2e47 100644
--- a/patches/api/0357-Add-Player-getFishHook.patch
+++ b/patches/api/0352-Add-Player-getFishHook.patch
diff --git a/patches/api/0358-More-Teleport-API.patch b/patches/api/0353-More-Teleport-API.patch
index a464ab5388..a464ab5388 100644
--- a/patches/api/0358-More-Teleport-API.patch
+++ b/patches/api/0353-More-Teleport-API.patch
diff --git a/patches/api/0359-Add-EntityPortalReadyEvent.patch b/patches/api/0354-Add-EntityPortalReadyEvent.patch
index af86ef0a8f..af86ef0a8f 100644
--- a/patches/api/0359-Add-EntityPortalReadyEvent.patch
+++ b/patches/api/0354-Add-EntityPortalReadyEvent.patch
diff --git a/patches/api/0360-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0355-Custom-Chat-Completion-Suggestions-API.patch
index 83811edce4..83811edce4 100644
--- a/patches/api/0360-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0355-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/api/0361-Collision-API.patch b/patches/api/0356-Collision-API.patch
index ce2e084b64..ce2e084b64 100644
--- a/patches/api/0361-Collision-API.patch
+++ b/patches/api/0356-Collision-API.patch
diff --git a/patches/api/0362-Block-Ticking-API.patch b/patches/api/0357-Block-Ticking-API.patch
index d588899982..d588899982 100644
--- a/patches/api/0362-Block-Ticking-API.patch
+++ b/patches/api/0357-Block-Ticking-API.patch
diff --git a/patches/api/0363-Add-NamespacedKey-biome-methods.patch b/patches/api/0358-Add-NamespacedKey-biome-methods.patch
index 29bd350af8..29bd350af8 100644
--- a/patches/api/0363-Add-NamespacedKey-biome-methods.patch
+++ b/patches/api/0358-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/api/0364-Also-load-resources-from-LibraryLoader.patch b/patches/api/0359-Also-load-resources-from-LibraryLoader.patch
index c2a41c2e53..c2a41c2e53 100644
--- a/patches/api/0364-Also-load-resources-from-LibraryLoader.patch
+++ b/patches/api/0359-Also-load-resources-from-LibraryLoader.patch
diff --git a/patches/api/0365-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0360-Added-byte-array-serialization-deserialization-for-P.patch
index 9b71f12681..9b71f12681 100644
--- a/patches/api/0365-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/api/0360-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/api/0366-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0361-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 291761dadb..291761dadb 100644
--- a/patches/api/0366-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/api/0361-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/api/0367-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0362-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
index 9b5ef25cf4..9b5ef25cf4 100644
--- a/patches/api/0367-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
+++ b/patches/api/0362-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
diff --git a/patches/api/0368-Add-getDrops-to-BlockState.patch b/patches/api/0363-Add-getDrops-to-BlockState.patch
index f9e8152229..f9e8152229 100644
--- a/patches/api/0368-Add-getDrops-to-BlockState.patch
+++ b/patches/api/0363-Add-getDrops-to-BlockState.patch
diff --git a/patches/api/0369-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0364-Add-PlayerInventorySlotChangeEvent.patch
index d76df6d87d..d76df6d87d 100644
--- a/patches/api/0369-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/api/0364-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/api/0370-Elder-Guardian-appearance-API.patch b/patches/api/0365-Elder-Guardian-appearance-API.patch
index 4c5b51b7a5..4c5b51b7a5 100644
--- a/patches/api/0370-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0365-Elder-Guardian-appearance-API.patch
diff --git a/patches/api/0371-Allow-changing-bed-s-occupied-property.patch b/patches/api/0366-Allow-changing-bed-s-occupied-property.patch
index 8dfafd6d33..8dfafd6d33 100644
--- a/patches/api/0371-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/api/0366-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/api/0372-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0367-Add-EquipmentSlot-convenience-methods.patch
index f7e2301f31..f7e2301f31 100644
--- a/patches/api/0372-Add-EquipmentSlot-convenience-methods.patch
+++ b/patches/api/0367-Add-EquipmentSlot-convenience-methods.patch
diff --git a/patches/api/0373-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0368-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
index b745878796..b745878796 100644
--- a/patches/api/0373-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
+++ b/patches/api/0368-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
diff --git a/patches/api/0374-Add-entity-knockback-API.patch b/patches/api/0369-Add-entity-knockback-API.patch
index fe9d0a85bb..fe9d0a85bb 100644
--- a/patches/api/0374-Add-entity-knockback-API.patch
+++ b/patches/api/0369-Add-entity-knockback-API.patch
diff --git a/patches/api/0375-Added-EntityToggleSitEvent.patch b/patches/api/0370-Added-EntityToggleSitEvent.patch
index d5a8c46dc8..d5a8c46dc8 100644
--- a/patches/api/0375-Added-EntityToggleSitEvent.patch
+++ b/patches/api/0370-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0376-Add-Moving-Piston-API.patch b/patches/api/0371-Add-Moving-Piston-API.patch
index 8f889f1e3d..8f889f1e3d 100644
--- a/patches/api/0376-Add-Moving-Piston-API.patch
+++ b/patches/api/0371-Add-Moving-Piston-API.patch
diff --git a/patches/api/0377-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0372-Add-PrePlayerAttackEntityEvent.patch
index ac0ebedde7..ac0ebedde7 100644
--- a/patches/api/0377-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/api/0372-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0378-Add-Player-Warden-Warning-API.patch b/patches/api/0373-Add-Player-Warden-Warning-API.patch
index d1728e9492..d1728e9492 100644
--- a/patches/api/0378-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0373-Add-Player-Warden-Warning-API.patch
diff --git a/patches/api/0379-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0374-More-vanilla-friendly-methods-to-update-trades.patch
index f13fdb5601..f13fdb5601 100644
--- a/patches/api/0379-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/api/0374-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/api/0380-Add-paper-dumplisteners-command.patch b/patches/api/0375-Add-paper-dumplisteners-command.patch
index a5d858851f..a5d858851f 100644
--- a/patches/api/0380-Add-paper-dumplisteners-command.patch
+++ b/patches/api/0375-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0381-ItemStack-damage-API.patch b/patches/api/0376-ItemStack-damage-API.patch
index bd4ff35bcc..bd4ff35bcc 100644
--- a/patches/api/0381-ItemStack-damage-API.patch
+++ b/patches/api/0376-ItemStack-damage-API.patch
diff --git a/patches/api/0382-Add-Tick-TemporalUnit.patch b/patches/api/0377-Add-Tick-TemporalUnit.patch
index 562eb00082..562eb00082 100644
--- a/patches/api/0382-Add-Tick-TemporalUnit.patch
+++ b/patches/api/0377-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0383-Friction-API.patch b/patches/api/0378-Friction-API.patch
index 23ae7abbae..23ae7abbae 100644
--- a/patches/api/0383-Friction-API.patch
+++ b/patches/api/0378-Friction-API.patch
diff --git a/patches/api/0384-Player-Entity-Tracking-Events.patch b/patches/api/0379-Player-Entity-Tracking-Events.patch
index 3dfa72c922..3dfa72c922 100644
--- a/patches/api/0384-Player-Entity-Tracking-Events.patch
+++ b/patches/api/0379-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0385-Add-missing-Fluid-type.patch b/patches/api/0380-Add-missing-Fluid-type.patch
index c260bf8497..c260bf8497 100644
--- a/patches/api/0385-Add-missing-Fluid-type.patch
+++ b/patches/api/0380-Add-missing-Fluid-type.patch
diff --git a/patches/api/0386-fix-Instruments.patch b/patches/api/0381-fix-Instruments.patch
index 468dc80a34..468dc80a34 100644
--- a/patches/api/0386-fix-Instruments.patch
+++ b/patches/api/0381-fix-Instruments.patch
diff --git a/patches/api/0387-Add-BlockLockCheckEvent.patch b/patches/api/0382-Add-BlockLockCheckEvent.patch
index c5d560192c..c5d560192c 100644
--- a/patches/api/0387-Add-BlockLockCheckEvent.patch
+++ b/patches/api/0382-Add-BlockLockCheckEvent.patch
diff --git a/patches/api/0388-Add-Sneaking-API-for-Entities.patch b/patches/api/0383-Add-Sneaking-API-for-Entities.patch
index 5419ce7d3c..5419ce7d3c 100644
--- a/patches/api/0388-Add-Sneaking-API-for-Entities.patch
+++ b/patches/api/0383-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/api/0389-Improve-PortalEvents.patch b/patches/api/0384-Improve-PortalEvents.patch
index f7f53b19fc..f7f53b19fc 100644
--- a/patches/api/0389-Improve-PortalEvents.patch
+++ b/patches/api/0384-Improve-PortalEvents.patch
diff --git a/patches/api/0390-Flying-Fall-Damage-API.patch b/patches/api/0385-Flying-Fall-Damage-API.patch
index 13493c2aa9..13493c2aa9 100644
--- a/patches/api/0390-Flying-Fall-Damage-API.patch
+++ b/patches/api/0385-Flying-Fall-Damage-API.patch
diff --git a/patches/api/0391-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0386-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
index 475ca65bbf..475ca65bbf 100644
--- a/patches/api/0391-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
+++ b/patches/api/0386-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0392-Win-Screen-API.patch b/patches/api/0387-Win-Screen-API.patch
index cdeea2f4f9..cdeea2f4f9 100644
--- a/patches/api/0392-Win-Screen-API.patch
+++ b/patches/api/0387-Win-Screen-API.patch
diff --git a/patches/api/0393-Add-Entity-Body-Yaw-API.patch b/patches/api/0388-Add-Entity-Body-Yaw-API.patch
index c0186ee4f1..c0186ee4f1 100644
--- a/patches/api/0393-Add-Entity-Body-Yaw-API.patch
+++ b/patches/api/0388-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/api/0394-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0389-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
index c375206bf7..c375206bf7 100644
--- a/patches/api/0394-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
+++ b/patches/api/0389-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0395-Add-EntityFertilizeEggEvent.patch b/patches/api/0390-Add-EntityFertilizeEggEvent.patch
index 4ae6ff9f0f..4ae6ff9f0f 100644
--- a/patches/api/0395-Add-EntityFertilizeEggEvent.patch
+++ b/patches/api/0390-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0396-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0391-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 9dee250212..9dee250212 100644
--- a/patches/api/0396-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/api/0391-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0397-Add-Shearable-API.patch b/patches/api/0392-Add-Shearable-API.patch
index 06e4cefb44..06e4cefb44 100644
--- a/patches/api/0397-Add-Shearable-API.patch
+++ b/patches/api/0392-Add-Shearable-API.patch
diff --git a/patches/api/0398-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0393-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 27abcd1f93..27abcd1f93 100644
--- a/patches/api/0398-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/api/0393-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/api/0399-Add-Mob-Experience-reward-API.patch b/patches/api/0394-Add-Mob-Experience-reward-API.patch
index 354d6d1eb4..354d6d1eb4 100644
--- a/patches/api/0399-Add-Mob-Experience-reward-API.patch
+++ b/patches/api/0394-Add-Mob-Experience-reward-API.patch
diff --git a/patches/api/0400-Expand-PlayerItemMendEvent.patch b/patches/api/0395-Expand-PlayerItemMendEvent.patch
index 95b15a4753..95b15a4753 100644
--- a/patches/api/0400-Expand-PlayerItemMendEvent.patch
+++ b/patches/api/0395-Expand-PlayerItemMendEvent.patch
diff --git a/patches/api/0401-Add-transient-modifier-API.patch b/patches/api/0396-Add-transient-modifier-API.patch
index a32e4c86a9..a32e4c86a9 100644
--- a/patches/api/0401-Add-transient-modifier-API.patch
+++ b/patches/api/0396-Add-transient-modifier-API.patch
diff --git a/patches/api/0402-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0397-Properly-remove-the-experimental-smithing-inventory-.patch
index 6448068df8..6448068df8 100644
--- a/patches/api/0402-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/api/0397-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/api/0403-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0398-Add-method-to-remove-all-active-potion-effects.patch
index 2b9703cf94..2b9703cf94 100644
--- a/patches/api/0403-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/api/0398-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/api/0404-Folia-scheduler-and-owned-region-API.patch b/patches/api/0399-Folia-scheduler-and-owned-region-API.patch
index 35af43df05..35af43df05 100644
--- a/patches/api/0404-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/api/0399-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/api/0405-Add-event-for-player-editing-sign.patch b/patches/api/0400-Add-event-for-player-editing-sign.patch
index ec38bf008b..ec38bf008b 100644
--- a/patches/api/0405-Add-event-for-player-editing-sign.patch
+++ b/patches/api/0400-Add-event-for-player-editing-sign.patch
diff --git a/patches/api/0406-Add-Sign-getInteractableSideFor.patch b/patches/api/0401-Add-Sign-getInteractableSideFor.patch
index 1e085323ca..1e085323ca 100644
--- a/patches/api/0406-Add-Sign-getInteractableSideFor.patch
+++ b/patches/api/0401-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/api/0407-Fix-BanList-API.patch b/patches/api/0402-Fix-BanList-API.patch
index a9640f44a2..a9640f44a2 100644
--- a/patches/api/0407-Fix-BanList-API.patch
+++ b/patches/api/0402-Fix-BanList-API.patch
diff --git a/patches/api/0408-Add-whitelist-events.patch b/patches/api/0403-Add-whitelist-events.patch
index 75458e78df..75458e78df 100644
--- a/patches/api/0408-Add-whitelist-events.patch
+++ b/patches/api/0403-Add-whitelist-events.patch
diff --git a/patches/api/0409-API-for-updating-recipes-on-clients.patch b/patches/api/0404-API-for-updating-recipes-on-clients.patch
index a3b3f4bb59..a3b3f4bb59 100644
--- a/patches/api/0409-API-for-updating-recipes-on-clients.patch
+++ b/patches/api/0404-API-for-updating-recipes-on-clients.patch
diff --git a/patches/api/0410-Add-PlayerFailMoveEvent.patch b/patches/api/0405-Add-PlayerFailMoveEvent.patch
index c0687e2ae0..c0687e2ae0 100644
--- a/patches/api/0410-Add-PlayerFailMoveEvent.patch
+++ b/patches/api/0405-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0411-Fix-custom-statistic-criteria-creation.patch b/patches/api/0406-Fix-custom-statistic-criteria-creation.patch
index f4070d7bb4..f4070d7bb4 100644
--- a/patches/api/0411-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/api/0406-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0412-SculkCatalyst-bloom-API.patch b/patches/api/0407-SculkCatalyst-bloom-API.patch
index 49d8c8c2bd..49d8c8c2bd 100644
--- a/patches/api/0412-SculkCatalyst-bloom-API.patch
+++ b/patches/api/0407-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0413-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0408-API-for-an-entity-s-scoreboard-name.patch
index 1fb9128be8..1fb9128be8 100644
--- a/patches/api/0413-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/api/0408-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/api/0414-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0409-Deprecate-and-replace-methods-with-old-StructureType.patch
index b1f1fc1cfc..b1f1fc1cfc 100644
--- a/patches/api/0414-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/api/0409-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/api/0415-Add-Listing-API-for-Player.patch b/patches/api/0410-Add-Listing-API-for-Player.patch
index 47a8946b80..47a8946b80 100644
--- a/patches/api/0415-Add-Listing-API-for-Player.patch
+++ b/patches/api/0410-Add-Listing-API-for-Player.patch
diff --git a/patches/api/0416-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0411-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index 34d1940866..34d1940866 100644
--- a/patches/api/0416-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/api/0411-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0417-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0412-Fix-NPE-on-Boat-getStatus.patch
index 1cf6096a92..1cf6096a92 100644
--- a/patches/api/0417-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/api/0412-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0418-Expand-Pose-API.patch b/patches/api/0413-Expand-Pose-API.patch
index a7ac9f7567..a7ac9f7567 100644
--- a/patches/api/0418-Expand-Pose-API.patch
+++ b/patches/api/0413-Expand-Pose-API.patch
diff --git a/patches/api/0419-MerchantRecipe-add-copy-constructor.patch b/patches/api/0414-MerchantRecipe-add-copy-constructor.patch
index 1c5ba2803c..1c5ba2803c 100644
--- a/patches/api/0419-MerchantRecipe-add-copy-constructor.patch
+++ b/patches/api/0414-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0420-More-DragonBattle-API.patch b/patches/api/0415-More-DragonBattle-API.patch
index e25208ec19..e25208ec19 100644
--- a/patches/api/0420-More-DragonBattle-API.patch
+++ b/patches/api/0415-More-DragonBattle-API.patch
diff --git a/patches/api/0421-Add-PlayerPickItemEvent.patch b/patches/api/0416-Add-PlayerPickItemEvent.patch
index 6dd0be80a8..6dd0be80a8 100644
--- a/patches/api/0421-Add-PlayerPickItemEvent.patch
+++ b/patches/api/0416-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0422-Allow-trident-custom-damage.patch b/patches/api/0417-Allow-trident-custom-damage.patch
index 870b735548..870b735548 100644
--- a/patches/api/0422-Allow-trident-custom-damage.patch
+++ b/patches/api/0417-Allow-trident-custom-damage.patch
diff --git a/patches/api/0423-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0418-Expose-hand-during-BlockCanBuildEvent.patch
index 97d99a40d2..97d99a40d2 100644
--- a/patches/api/0423-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/api/0418-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0424-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0419-Limit-setBurnTime-to-valid-short-values.patch
index 2faac56fd8..2faac56fd8 100644
--- a/patches/api/0424-Limit-setBurnTime-to-valid-short-values.patch
+++ b/patches/api/0419-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0425-Add-OfflinePlayer-isConnected.patch b/patches/api/0420-Add-OfflinePlayer-isConnected.patch
index 08e2f91095..08e2f91095 100644
--- a/patches/api/0425-Add-OfflinePlayer-isConnected.patch
+++ b/patches/api/0420-Add-OfflinePlayer-isConnected.patch
diff --git a/patches/api/0426-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0421-Add-titleOverride-to-InventoryOpenEvent.patch
index 68e755f010..68e755f010 100644
--- a/patches/api/0426-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/api/0421-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0427-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0422-Allow-proper-checking-of-empty-item-stacks.patch
index 7c74a0781c..7c74a0781c 100644
--- a/patches/api/0427-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/api/0422-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/api/0428-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0423-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
index e72f86be5d..e72f86be5d 100644
--- a/patches/api/0428-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
+++ b/patches/api/0423-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0429-Add-player-idle-duration-API.patch b/patches/api/0424-Add-player-idle-duration-API.patch
index 2fbfc5dc58..2fbfc5dc58 100644
--- a/patches/api/0429-Add-player-idle-duration-API.patch
+++ b/patches/api/0424-Add-player-idle-duration-API.patch
diff --git a/patches/api/0430-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0425-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 0481690ad4..0481690ad4 100644
--- a/patches/api/0430-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/api/0425-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/api/0431-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0426-Add-predicate-for-blocks-when-raytracing.patch
index 77d36bec08..13d64df888 100644
--- a/patches/api/0431-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/api/0426-Add-predicate-for-blocks-when-raytracing.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add predicate for blocks when raytracing
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 406c404adb999acfa0e8f118b23714803e40a4fb..cda78bdc6e6a76dbb5c711ee16dcb470a7b839a6 100644
+index 907906e15c9250fea385e49f10d3c248236fd004..02184b68cc126b278985fd966e3c8e4ade18c464 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1730,6 +1730,27 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -1649,6 +1649,27 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public RayTraceResult rayTraceEntities(@NotNull Location start, @NotNull Vector direction, double maxDistance, double raySize, @Nullable Predicate<? super Entity> filter);
  
@@ -36,7 +36,7 @@ index 406c404adb999acfa0e8f118b23714803e40a4fb..cda78bdc6e6a76dbb5c711ee16dcb470
      /**
       * Performs a ray trace that checks for block collisions using the blocks'
       * precise collision shapes.
-@@ -1793,6 +1814,34 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -1712,6 +1733,34 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public RayTraceResult rayTraceBlocks(@NotNull Location start, @NotNull Vector direction, double maxDistance, @NotNull FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks);
  
@@ -71,7 +71,7 @@ index 406c404adb999acfa0e8f118b23714803e40a4fb..cda78bdc6e6a76dbb5c711ee16dcb470
      /**
       * Performs a ray trace that checks for both block and entity collisions.
       * <p>
-@@ -1826,6 +1875,42 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -1745,6 +1794,42 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public RayTraceResult rayTrace(@NotNull Location start, @NotNull Vector direction, double maxDistance, @NotNull FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, double raySize, @Nullable Predicate<? super Entity> filter);
  
diff --git a/patches/api/0432-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0427-Add-hand-to-fish-event-for-all-player-interactions.patch
index b431332b9a..b431332b9a 100644
--- a/patches/api/0432-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/api/0427-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0433-Add-UUID-attribute-modifier-API.patch b/patches/api/0428-Add-UUID-attribute-modifier-API.patch
index 64de52c83e..64de52c83e 100644
--- a/patches/api/0433-Add-UUID-attribute-modifier-API.patch
+++ b/patches/api/0428-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/api/0434-Expand-LingeringPotion-API.patch b/patches/api/0429-Expand-LingeringPotion-API.patch
index 40b5a5f547..40b5a5f547 100644
--- a/patches/api/0434-Expand-LingeringPotion-API.patch
+++ b/patches/api/0429-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0435-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0430-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
index 72deb7498e..72deb7498e 100644
--- a/patches/api/0435-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
+++ b/patches/api/0430-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
diff --git a/patches/api/0436-Add-Structure-check-API.patch b/patches/api/0431-Add-Structure-check-API.patch
index ee0adfe254..e2d19afb32 100644
--- a/patches/api/0436-Add-Structure-check-API.patch
+++ b/patches/api/0431-Add-Structure-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Structure check API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index cda78bdc6e6a76dbb5c711ee16dcb470a7b839a6..c1f1faebc0d33710eb17dd96fddb16c85b7868e5 100644
+index 02184b68cc126b278985fd966e3c8e4ade18c464..ecc2d486cfec79cce27a947dfeed4853575a594d 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -78,6 +78,30 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0437-add-missing-Experimental-annotations.patch b/patches/api/0432-add-missing-Experimental-annotations.patch
index b21d99ebd5..b21d99ebd5 100644
--- a/patches/api/0437-add-missing-Experimental-annotations.patch
+++ b/patches/api/0432-add-missing-Experimental-annotations.patch
diff --git a/patches/api/0438-Add-more-scoreboard-API.patch b/patches/api/0433-Add-more-scoreboard-API.patch
index 201af36b0c..201af36b0c 100644
--- a/patches/api/0438-Add-more-scoreboard-API.patch
+++ b/patches/api/0433-Add-more-scoreboard-API.patch
diff --git a/patches/api/0439-Improve-Registry.patch b/patches/api/0434-Improve-Registry.patch
index a106bba08d..1d2d6fa13c 100644
--- a/patches/api/0439-Improve-Registry.patch
+++ b/patches/api/0434-Improve-Registry.patch
@@ -31,10 +31,10 @@ index 62d2b3f950860dee0898d77b0a29635c3f9a7e23..704dba92f9246ef398ed8d162ebee3cf
      @Override
      public @NotNull String translationKey() {
 diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index afd132dab5eb2826b600592429b9e4a8d1fe0b73..b159863568c56202968ac0f9024d3e1f5f118dac 100644
+index 5ba5cf06bf12fc2e81500e09209e26047e683fa9..802511eaf697d703cadb4b418fe51ea6d31ff3c8 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
-@@ -361,6 +361,49 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+@@ -354,6 +354,49 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
      @Nullable
      T get(@NotNull NamespacedKey key);
  
@@ -84,7 +84,7 @@ index afd132dab5eb2826b600592429b9e4a8d1fe0b73..b159863568c56202968ac0f9024d3e1f
      /**
       * Returns a new stream, which contains all registry items, which are registered to the registry.
       *
-@@ -435,5 +478,12 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
+@@ -428,5 +471,12 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
          public Class<T> getType() {
              return this.type;
          }
diff --git a/patches/api/0440-Add-experience-points-API.patch b/patches/api/0435-Add-experience-points-API.patch
index 9b489a9ded..9b489a9ded 100644
--- a/patches/api/0440-Add-experience-points-API.patch
+++ b/patches/api/0435-Add-experience-points-API.patch
diff --git a/patches/api/0441-Add-missing-InventoryType.patch b/patches/api/0436-Add-missing-InventoryType.patch
index 88ed48c3e6..88ed48c3e6 100644
--- a/patches/api/0441-Add-missing-InventoryType.patch
+++ b/patches/api/0436-Add-missing-InventoryType.patch
diff --git a/patches/api/0442-Add-drops-to-shear-events.patch b/patches/api/0437-Add-drops-to-shear-events.patch
index c87460e48d..c87460e48d 100644
--- a/patches/api/0442-Add-drops-to-shear-events.patch
+++ b/patches/api/0437-Add-drops-to-shear-events.patch
diff --git a/patches/api/0443-Add-HiddenPotionEffect-API.patch b/patches/api/0438-Add-HiddenPotionEffect-API.patch
index 94799bbf65..94799bbf65 100644
--- a/patches/api/0443-Add-HiddenPotionEffect-API.patch
+++ b/patches/api/0438-Add-HiddenPotionEffect-API.patch
diff --git a/patches/api/0444-Add-PlayerShieldDisableEvent.patch b/patches/api/0439-Add-PlayerShieldDisableEvent.patch
index 29c7daa0e3..29c7daa0e3 100644
--- a/patches/api/0444-Add-PlayerShieldDisableEvent.patch
+++ b/patches/api/0439-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/api/0445-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0440-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
index 93ba48c77c..93ba48c77c 100644
--- a/patches/api/0445-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
+++ b/patches/api/0440-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
diff --git a/patches/api/0446-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0441-Add-BlockStateMeta-clearBlockState.patch
index 7e8c47a8e2..7e8c47a8e2 100644
--- a/patches/api/0446-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/api/0441-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/api/0447-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0442-Expose-LootTable-of-DecoratedPot.patch
index 42a8de4123..42a8de4123 100644
--- a/patches/api/0447-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/api/0442-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/api/0448-Add-ShulkerDuplicateEvent.patch b/patches/api/0443-Add-ShulkerDuplicateEvent.patch
index a0a81094ce..a0a81094ce 100644
--- a/patches/api/0448-Add-ShulkerDuplicateEvent.patch
+++ b/patches/api/0443-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/api/0449-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0444-Add-api-for-spawn-egg-texture-colors.patch
index 23541c0b38..23541c0b38 100644
--- a/patches/api/0449-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/api/0444-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/api/0450-Add-Lifecycle-Event-system.patch b/patches/api/0445-Add-Lifecycle-Event-system.patch
index d4b3f0411e..d4b3f0411e 100644
--- a/patches/api/0450-Add-Lifecycle-Event-system.patch
+++ b/patches/api/0445-Add-Lifecycle-Event-system.patch
diff --git a/patches/api/0451-ItemStack-Tooltip-API.patch b/patches/api/0446-ItemStack-Tooltip-API.patch
index 7fa28ddc99..7fa28ddc99 100644
--- a/patches/api/0451-ItemStack-Tooltip-API.patch
+++ b/patches/api/0446-ItemStack-Tooltip-API.patch
diff --git a/patches/api/0452-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0447-Add-getChunkSnapshot-includeLightData-parameter.patch
index 9b950f9493..9b950f9493 100644
--- a/patches/api/0452-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/api/0447-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/api/0453-Add-FluidState-API.patch b/patches/api/0448-Add-FluidState-API.patch
index 3235c393f5..3235c393f5 100644
--- a/patches/api/0453-Add-FluidState-API.patch
+++ b/patches/api/0448-Add-FluidState-API.patch
diff --git a/patches/api/0454-add-number-format-api.patch b/patches/api/0449-add-number-format-api.patch
index 6d32302ad0..6d32302ad0 100644
--- a/patches/api/0454-add-number-format-api.patch
+++ b/patches/api/0449-add-number-format-api.patch
diff --git a/patches/api/0455-improve-BanList-types.patch b/patches/api/0450-improve-BanList-types.patch
index f392d209de..f392d209de 100644
--- a/patches/api/0455-improve-BanList-types.patch
+++ b/patches/api/0450-improve-BanList-types.patch
diff --git a/patches/api/0456-Suspicious-Effect-Entry-API.patch b/patches/api/0451-Suspicious-Effect-Entry-API.patch
index bcf3db2033..bcf3db2033 100644
--- a/patches/api/0456-Suspicious-Effect-Entry-API.patch
+++ b/patches/api/0451-Suspicious-Effect-Entry-API.patch
diff --git a/patches/api/0457-Fix-DamageSource-API.patch b/patches/api/0452-Fix-DamageSource-API.patch
index efe4403e2c..efe4403e2c 100644
--- a/patches/api/0457-Fix-DamageSource-API.patch
+++ b/patches/api/0452-Fix-DamageSource-API.patch
diff --git a/patches/api/0458-Expanded-Hopper-API.patch b/patches/api/0453-Expanded-Hopper-API.patch
index 51cb6dfee2..51cb6dfee2 100644
--- a/patches/api/0458-Expanded-Hopper-API.patch
+++ b/patches/api/0453-Expanded-Hopper-API.patch
diff --git a/patches/api/0459-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0454-Clone-mutables-to-prevent-unexpected-issues.patch
index e84ea7d3aa..e84ea7d3aa 100644
--- a/patches/api/0459-Clone-mutables-to-prevent-unexpected-issues.patch
+++ b/patches/api/0454-Clone-mutables-to-prevent-unexpected-issues.patch
diff --git a/patches/api/0460-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0455-Add-BlockBreakProgressUpdateEvent.patch
index a2b5a83baf..a2b5a83baf 100644
--- a/patches/api/0460-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/api/0455-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/api/0461-Deprecate-ItemStack-setType.patch b/patches/api/0456-Deprecate-ItemStack-setType.patch
index 910f35e09e..910f35e09e 100644
--- a/patches/api/0461-Deprecate-ItemStack-setType.patch
+++ b/patches/api/0456-Deprecate-ItemStack-setType.patch
diff --git a/patches/api/0462-Item-Mutation-Fixes.patch b/patches/api/0457-Item-Mutation-Fixes.patch
index ccd77b7fbc..ccd77b7fbc 100644
--- a/patches/api/0462-Item-Mutation-Fixes.patch
+++ b/patches/api/0457-Item-Mutation-Fixes.patch
diff --git a/patches/api/0463-API-for-checking-sent-chunks.patch b/patches/api/0458-API-for-checking-sent-chunks.patch
index a3844b5401..a3844b5401 100644
--- a/patches/api/0463-API-for-checking-sent-chunks.patch
+++ b/patches/api/0458-API-for-checking-sent-chunks.patch
diff --git a/patches/api/0464-Add-CartographyItemEvent.patch b/patches/api/0459-Add-CartographyItemEvent.patch
index 1f19663c9f..1f19663c9f 100644
--- a/patches/api/0464-Add-CartographyItemEvent.patch
+++ b/patches/api/0459-Add-CartographyItemEvent.patch
diff --git a/patches/api/0465-More-Raid-API.patch b/patches/api/0460-More-Raid-API.patch
index 9ea371ec7a..b365913e82 100644
--- a/patches/api/0465-More-Raid-API.patch
+++ b/patches/api/0460-More-Raid-API.patch
@@ -39,10 +39,10 @@ index 983a8c20a06d2b509602b27f49c090598b8ecc42..fa98599e3eee37bf68f0e9813497c718
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c1f1faebc0d33710eb17dd96fddb16c85b7868e5..fdb87adfb8d6eff2bfabe7a41398c53d15d4cd98 100644
+index ecc2d486cfec79cce27a947dfeed4853575a594d..d8a23aa0d898ca3360757721e38ddb97387f7d21 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4242,6 +4242,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4111,6 +4111,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public Raid locateNearestRaid(@NotNull Location location, int radius);
  
diff --git a/patches/api/0466-Fix-SpawnerEntry-Equipment-API.patch b/patches/api/0461-Fix-SpawnerEntry-Equipment-API.patch
index 0a16b34cd5..0a16b34cd5 100644
--- a/patches/api/0466-Fix-SpawnerEntry-Equipment-API.patch
+++ b/patches/api/0461-Fix-SpawnerEntry-Equipment-API.patch
diff --git a/patches/api/0467-Fix-ItemFlags.patch b/patches/api/0462-Fix-ItemFlags.patch
index 1b1eb619b9..1b1eb619b9 100644
--- a/patches/api/0467-Fix-ItemFlags.patch
+++ b/patches/api/0462-Fix-ItemFlags.patch
diff --git a/patches/api/0468-Allow-modifying-library-loader-jars-bytecode.patch b/patches/api/0463-Allow-modifying-library-loader-jars-bytecode.patch
index 0c0311e790..0c0311e790 100644
--- a/patches/api/0468-Allow-modifying-library-loader-jars-bytecode.patch
+++ b/patches/api/0463-Allow-modifying-library-loader-jars-bytecode.patch
diff --git a/patches/api/0469-Add-hook-to-remap-library-jars.patch b/patches/api/0464-Add-hook-to-remap-library-jars.patch
index fe1609629e..fe1609629e 100644
--- a/patches/api/0469-Add-hook-to-remap-library-jars.patch
+++ b/patches/api/0464-Add-hook-to-remap-library-jars.patch
diff --git a/patches/api/0470-Add-GameMode-isInvulnerable.patch b/patches/api/0465-Add-GameMode-isInvulnerable.patch
index b4b81c5f52..b4b81c5f52 100644
--- a/patches/api/0470-Add-GameMode-isInvulnerable.patch
+++ b/patches/api/0465-Add-GameMode-isInvulnerable.patch
diff --git a/patches/api/0471-Expose-hasColor-to-leather-armor.patch b/patches/api/0466-Expose-hasColor-to-leather-armor.patch
index e2c609b4f0..e2c609b4f0 100644
--- a/patches/api/0471-Expose-hasColor-to-leather-armor.patch
+++ b/patches/api/0466-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/api/0472-Add-missing-wind-charge-damage-type.patch b/patches/api/0467-Add-missing-wind-charge-damage-type.patch
index 8b5bd35be7..8b5bd35be7 100644
--- a/patches/api/0472-Add-missing-wind-charge-damage-type.patch
+++ b/patches/api/0467-Add-missing-wind-charge-damage-type.patch
diff --git a/patches/api/0473-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0468-Added-API-to-get-player-ha-proxy-address.patch
index b1702bee61..b1702bee61 100644
--- a/patches/api/0473-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/api/0468-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/api/0474-More-Chest-Block-API.patch b/patches/api/0469-More-Chest-Block-API.patch
index 1fc3614c74..1fc3614c74 100644
--- a/patches/api/0474-More-Chest-Block-API.patch
+++ b/patches/api/0469-More-Chest-Block-API.patch
diff --git a/patches/api/0475-Brigadier-based-command-API.patch b/patches/api/0470-Brigadier-based-command-API.patch
index 20c58c3c82..20c58c3c82 100644
--- a/patches/api/0475-Brigadier-based-command-API.patch
+++ b/patches/api/0470-Brigadier-based-command-API.patch
diff --git a/patches/api/0476-Fix-issues-with-recipe-API.patch b/patches/api/0471-Fix-issues-with-recipe-API.patch
index 19c045290e..19c045290e 100644
--- a/patches/api/0476-Fix-issues-with-recipe-API.patch
+++ b/patches/api/0471-Fix-issues-with-recipe-API.patch
diff --git a/patches/api/0477-Fix-equipment-slot-and-group-API.patch b/patches/api/0472-Fix-equipment-slot-and-group-API.patch
index 4b04cc2455..4b04cc2455 100644
--- a/patches/api/0477-Fix-equipment-slot-and-group-API.patch
+++ b/patches/api/0472-Fix-equipment-slot-and-group-API.patch
diff --git a/patches/api/0478-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/api/0473-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 8a0f6e9468..8a0f6e9468 100644
--- a/patches/api/0478-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/api/0473-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/api/0479-Allow-to-define-new-map-cursor-types.patch b/patches/api/0474-Allow-to-define-new-map-cursor-types.patch
index 4d94dad296..4d94dad296 100644
--- a/patches/api/0479-Allow-to-define-new-map-cursor-types.patch
+++ b/patches/api/0474-Allow-to-define-new-map-cursor-types.patch
diff --git a/patches/api/0480-General-ItemMeta-fixes.patch b/patches/api/0475-General-ItemMeta-fixes.patch
index 22f1db839c..22f1db839c 100644
--- a/patches/api/0480-General-ItemMeta-fixes.patch
+++ b/patches/api/0475-General-ItemMeta-fixes.patch
diff --git a/patches/api/0481-Add-missing-fishing-event-state.patch b/patches/api/0476-Add-missing-fishing-event-state.patch
index 94cba543ec..94cba543ec 100644
--- a/patches/api/0481-Add-missing-fishing-event-state.patch
+++ b/patches/api/0476-Add-missing-fishing-event-state.patch
diff --git a/patches/api/0482-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/api/0477-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index 3efcc02654..3efcc02654 100644
--- a/patches/api/0482-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/api/0477-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/server/0049-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0049-Use-null-Locale-by-default.patch
index 4178880dc7..e731a4f4c4 100644
--- a/patches/server/0049-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0049-Use-null-Locale-by-default.patch
@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <[email protected]>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
-Subject: [PATCH] Implement PlayerLocaleChangeEvent
+Subject: [PATCH] Use null Locale by default
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9f38010f247694e1014c9c93bfcf46d103d8fd20..48cb8a211ab45d072c440dbfaa66ff83112d375c 100644
+index 9f38010f247694e1014c9c93bfcf46d103d8fd20..1115655b1e8090c52840e85b75265da881bbc713 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -236,7 +236,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -26,7 +26,7 @@ index 9f38010f247694e1014c9c93bfcf46d103d8fd20..48cb8a211ab45d072c440dbfaa66ff83
          this.lastSectionPos = SectionPos.of(0, 0, 0);
          this.chunkTrackingView = ChunkTrackingView.EMPTY;
          this.respawnDimension = Level.OVERWORLD;
-@@ -2054,9 +2054,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2054,7 +2054,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), this.getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
              this.server.server.getPluginManager().callEvent(event);
          }
@@ -34,10 +34,7 @@ index 9f38010f247694e1014c9c93bfcf46d103d8fd20..48cb8a211ab45d072c440dbfaa66ff83
 +        if (this.language == null || !this.language.equals(clientOptions.language())) { // Paper
              PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(this.getBukkitEntity(), clientOptions.language());
              this.server.server.getPluginManager().callEvent(event);
-+            this.server.server.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), this.language, clientOptions.language())); // Paper
          }
-         // CraftBukkit end
-         this.language = clientOptions.language();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 index a9df824ae0a28256f3469e085c891a3a2af0fd30..4079cf3d515718a18b41333fbdc96d0c8f56648a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
diff --git a/patches/server/0051-Configurable-container-update-tick-rate.patch b/patches/server/0051-Configurable-container-update-tick-rate.patch
index 42226708f4..6859c0534d 100644
--- a/patches/server/0051-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 48cb8a211ab45d072c440dbfaa66ff83112d375c..03ad47b96fe8ed37bb855a8bdc1513e7ff67c62d 100644
+index 1115655b1e8090c52840e85b75265da881bbc713..70f0f4daff27754aefcadb84387bb3054cc66a8e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -267,6 +267,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0054-Add-PlayerInitialSpawnEvent.patch b/patches/server/0054-Fix-spawn-location-event-changing-location.patch
index 47543684e8..e9256b2783 100644
--- a/patches/server/0054-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/server/0054-Fix-spawn-location-event-changing-location.patch
@@ -1,29 +1,15 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Steve Anton <[email protected]>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
-Subject: [PATCH] Add PlayerInitialSpawnEvent
-
-For modifying a player's initial spawn location as they join the server
-
-This is a duplicate API from spigot, so use our duplicate subclass and
-improve setPosition to use raw
+Subject: [PATCH] Fix spawn location event changing location
 
 == AT ==
 public net.minecraft.world.entity.Entity setRot(FF)V
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 765c412cd0c5cd410c224b4bc55dbf431fd6617b..3cc30aaf63a3a953c1947f0f19ca8816b92654f6 100644
+index 765c412cd0c5cd410c224b4bc55dbf431fd6617b..8a91a44e46a2d49e2f4b9e9970c2b77f2e87767e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -226,7 +226,7 @@ public abstract class PlayerList {
- 
-         // Spigot start - spawn location event
-         Player spawnPlayer = player.getBukkitEntity();
--        org.spigotmc.event.player.PlayerSpawnLocationEvent ev = new org.spigotmc.event.player.PlayerSpawnLocationEvent(spawnPlayer, spawnPlayer.getLocation());
-+        org.spigotmc.event.player.PlayerSpawnLocationEvent ev = new com.destroystokyo.paper.event.player.PlayerInitialSpawnEvent(spawnPlayer, spawnPlayer.getLocation()); // Paper use our duplicate event
-         this.cserver.getPluginManager().callEvent(ev);
- 
-         Location loc = ev.getSpawnLocation();
 @@ -234,7 +234,10 @@ public abstract class PlayerList {
  
          player.spawnIn(worldserver1);
diff --git a/patches/server/0089-Configurable-Player-Collision.patch b/patches/server/0089-Configurable-Player-Collision.patch
index 2604d242a1..01f37915a5 100644
--- a/patches/server/0089-Configurable-Player-Collision.patch
+++ b/patches/server/0089-Configurable-Player-Collision.patch
@@ -43,7 +43,7 @@ index 4fd88b63ae6e6aa3265f72f4f0ae1b1895b70be9..8f0a0384d12b738553a6bec02e3b9438
          if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
          this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3cc30aaf63a3a953c1947f0f19ca8816b92654f6..5c7e8387a885221960df818a1c1178f739a72c43 100644
+index 8a91a44e46a2d49e2f4b9e9970c2b77f2e87767e..98862db2334508ee1a783aeabfb146751552a4d9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -159,6 +159,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0121-Properly-fix-item-duplication-bug.patch b/patches/server/0121-Properly-fix-item-duplication-bug.patch
index 4642efa846..60bdf7de86 100644
--- a/patches/server/0121-Properly-fix-item-duplication-bug.patch
+++ b/patches/server/0121-Properly-fix-item-duplication-bug.patch
@@ -6,10 +6,10 @@ 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 03ad47b96fe8ed37bb855a8bdc1513e7ff67c62d..7b09fc5d9039d792d3cfdf8152c947ba6842b87b 100644
+index 70f0f4daff27754aefcadb84387bb3054cc66a8e..dae729c39e5d3fefc8188069e81f33066746c4a6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2624,7 +2624,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2623,7 +2623,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
  
      @Override
      public boolean isImmobile() {
diff --git a/patches/server/0123-PlayerTeleportEndGatewayEvent.patch b/patches/server/0123-PlayerTeleportEndGatewayEvent.patch
index 25eeb62bd9..6b7a9ec94f 100644
--- a/patches/server/0123-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/server/0123-PlayerTeleportEndGatewayEvent.patch
@@ -7,7 +7,7 @@ Allows you to access the Gateway being used in a teleport event
 Fix the offset used for player teleportation
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 7b09fc5d9039d792d3cfdf8152c947ba6842b87b..5cb79e38ce7b28e7575b8a8a92786415ee6a4dec 100644
+index dae729c39e5d3fefc8188069e81f33066746c4a6..3ae34c67fe3dd8b30d24f1a31102f0a071c1703d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1195,11 +1195,22 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0125-Enforce-Sync-Player-Saves.patch b/patches/server/0125-Enforce-Sync-Player-Saves.patch
index b5f9bb065b..5211b4bc78 100644
--- a/patches/server/0125-Enforce-Sync-Player-Saves.patch
+++ b/patches/server/0125-Enforce-Sync-Player-Saves.patch
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5c7e8387a885221960df818a1c1178f739a72c43..f47c1ccba18b98854fb3671ed5bbce6548a5ef27 100644
+index 98862db2334508ee1a783aeabfb146751552a4d9..e17f4f3882ae77a67e8bfad04646f02c2bbb6669 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1029,11 +1029,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch
index c5198a52d6..c5a8314eac 100644
--- a/patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch
@@ -64,7 +64,7 @@ index 56d51073eb0cd902fa2c1e790201f74d120b149f..7335f9bb936eeb585ee077b0b9c461d7
          if (waitForShutdown) {
              try {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f47c1ccba18b98854fb3671ed5bbce6548a5ef27..c2faf513ad435f979d889d43809e2caa92d11b18 100644
+index e17f4f3882ae77a67e8bfad04646f02c2bbb6669..d5f17d7e3b56ca87ec9070b69265ce098de61f69 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1143,8 +1143,15 @@ public abstract class PlayerList {
diff --git a/patches/server/0146-ProfileWhitelistVerifyEvent.patch b/patches/server/0146-ProfileWhitelistVerifyEvent.patch
index 8e32031865..fc614a6bf3 100644
--- a/patches/server/0146-ProfileWhitelistVerifyEvent.patch
+++ b/patches/server/0146-ProfileWhitelistVerifyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c2faf513ad435f979d889d43809e2caa92d11b18..5375fd660e3ed4a5997896d28ea234a81d183a10 100644
+index d5f17d7e3b56ca87ec9070b69265ce098de61f69..fec45c058695e68a907684880c87ccf11827565d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -624,9 +624,9 @@ public abstract class PlayerList {
diff --git a/patches/server/0165-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0165-PlayerNaturallySpawnCreaturesEvent.patch
index 6395e69f7e..e297aaf103 100644
--- a/patches/server/0165-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0165-PlayerNaturallySpawnCreaturesEvent.patch
@@ -60,7 +60,7 @@ index c0808b6026b94676c1c6457e4bb44dcbc5e2a55b..6e941ca68c2ca9d7753358f738704c4d
                  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 5cb79e38ce7b28e7575b8a8a92786415ee6a4dec..ebedd613fa243c2caa4c3783b2bd3a7ad9c6644f 100644
+index 3ae34c67fe3dd8b30d24f1a31102f0a071c1703d..809a4f403695240b507528fb8fa3f7d390f86349 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -286,6 +286,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0177-Player.setPlayerProfile-API.patch b/patches/server/0177-Player.setPlayerProfile-API.patch
index aae29e9a5f..a0db34e61e 100644
--- a/patches/server/0177-Player.setPlayerProfile-API.patch
+++ b/patches/server/0177-Player.setPlayerProfile-API.patch
@@ -40,7 +40,7 @@ index 2d9db1ac80216a509a7590254e422b3c4792e3ec..b31f00f2f0b7cec59301afe36c9dd7cd
          playerName = gameprofile.getName();
          uniqueId = gameprofile.getId();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5375fd660e3ed4a5997896d28ea234a81d183a10..e959c7e45bffdcf46908a6919c07a0cdf9aa83bb 100644
+index fec45c058695e68a907684880c87ccf11827565d..9019e25f61d4fdb7c5d12ea7630b0bc23827ab6e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -831,10 +831,16 @@ public abstract class PlayerList {
diff --git a/patches/server/0209-InventoryCloseEvent-Reason-API.patch b/patches/server/0209-InventoryCloseEvent-Reason-API.patch
index 8972b2bb78..32d1943356 100644
--- a/patches/server/0209-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0209-InventoryCloseEvent-Reason-API.patch
@@ -29,7 +29,7 @@ index 5bf18ab5c397b32d880ea1827f62945d8d0e80ce..ce6be7aed7b392c3e0c851f3f6e1e216
              }
              // 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 ebedd613fa243c2caa4c3783b2bd3a7ad9c6644f..16f7278ce8d5b8c45026baeb017fdce1ed5945c8 100644
+index 809a4f403695240b507528fb8fa3f7d390f86349..622f890d2613acf948b68d6febe0834ceec23c80 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -707,7 +707,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -96,7 +96,7 @@ index ecc2ce39629f6edbd09e96c85e14ab2196ac3173..75736ebe99e96a20c2c3e7ac5350ab55
          this.player.doCloseContainer();
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e959c7e45bffdcf46908a6919c07a0cdf9aa83bb..3cb56ccb3a42871488b76706d7a6edecd122c418 100644
+index 9019e25f61d4fdb7c5d12ea7630b0bc23827ab6e..38cf3cf1cc7ebae4b6ca8a89dc026b5b4f0b4c2b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -510,7 +510,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0229-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0229-Use-ConcurrentHashMap-in-JsonList.patch
index 96c9189932..06ff8bd2a0 100644
--- a/patches/server/0229-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/server/0229-Use-ConcurrentHashMap-in-JsonList.patch
@@ -23,7 +23,7 @@ Modified isEmpty to use the isEmpty() method instead of the slightly confusing s
 The point of this is readability, but does have a side-benefit of a small microptimization
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3cb56ccb3a42871488b76706d7a6edecd122c418..db80ad51dd824c2d6d119184fd80d3c12199862c 100644
+index 38cf3cf1cc7ebae4b6ca8a89dc026b5b4f0b4c2b..c5ca2d8feed71cdd4dce851941654768c1e5d648 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -627,7 +627,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0244-Improve-death-events.patch b/patches/server/0244-Improve-death-events.patch
index f111a7550c..cd6d8dd40f 100644
--- a/patches/server/0244-Improve-death-events.patch
+++ b/patches/server/0244-Improve-death-events.patch
@@ -19,7 +19,7 @@ public net.minecraft.world.entity.LivingEntity getDeathSound()Lnet/minecraft/sou
 public net.minecraft.world.entity.LivingEntity getSoundVolume()F
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 16f7278ce8d5b8c45026baeb017fdce1ed5945c8..508de7064c08eb22cd66658a98f9833ddc030618 100644
+index 622f890d2613acf948b68d6febe0834ceec23c80..5bf3f2faac0af6bddfd2ecb423a13cdf0dd1af1b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -268,6 +268,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0257-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0257-Call-player-spectator-target-events-and-improve-impl.patch
index ee6807c9db..6ffec5ffc7 100644
--- a/patches/server/0257-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0257-Call-player-spectator-target-events-and-improve-impl.patch
@@ -19,10 +19,10 @@ 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 508de7064c08eb22cd66658a98f9833ddc030618..8c671f5ba49a1dde9a59c0db7fa979055e031713 100644
+index 5bf3f2faac0af6bddfd2ecb423a13cdf0dd1af1b..2fd93f715bd69fb0217939c87f7872720a9adb7c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2186,6 +2186,21 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2185,6 +2185,21 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
  
          this.camera = (Entity) (entity == null ? this : entity);
          if (entity1 != this.camera) {
diff --git a/patches/server/0261-Reset-players-airTicks-on-respawn.patch b/patches/server/0261-Reset-players-airTicks-on-respawn.patch
index 8b7a8fb5c8..4a7eda111a 100644
--- a/patches/server/0261-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0261-Reset-players-airTicks-on-respawn.patch
@@ -5,10 +5,10 @@ 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 8c671f5ba49a1dde9a59c0db7fa979055e031713..661e4a2611b42624606e0d985f98451f63bc3164 100644
+index 2fd93f715bd69fb0217939c87f7872720a9adb7c..b4240bdd2d2baf91f52458602e0063f746dcfb6d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2700,6 +2700,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2699,6 +2699,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
  
          this.setHealth(this.getMaxHealth());
          this.stopUsingItem(); // CraftBukkit - SPIGOT-6682: Clear active item on reset
diff --git a/patches/server/0269-force-entity-dismount-during-teleportation.patch b/patches/server/0269-force-entity-dismount-during-teleportation.patch
index 5e76183f9e..518c1501a3 100644
--- a/patches/server/0269-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0269-force-entity-dismount-during-teleportation.patch
@@ -20,10 +20,10 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 661e4a2611b42624606e0d985f98451f63bc3164..8f484d78145ed4057967ac059d32762eb00f9892 100644
+index b4240bdd2d2baf91f52458602e0063f746dcfb6d..39504d27b8e0bae74c41e89ebabced1c25d30a7b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2519,9 +2519,15 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2518,9 +2518,15 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
  
      @Override
      public void stopRiding() {
diff --git a/patches/server/0273-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0273-Replace-OfflinePlayer-getLastPlayed.patch
index 0facc6efeb..dc94c698a3 100644
--- a/patches/server/0273-Replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0273-Replace-OfflinePlayer-getLastPlayed.patch
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8f484d78145ed4057967ac059d32762eb00f9892..f8b00e44f621580e61f72c3d5af592d46fa24c27 100644
+index 39504d27b8e0bae74c41e89ebabced1c25d30a7b..c75fed2aafc91fbfaed91f5337a5189a1dbb5341 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -268,6 +268,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -28,7 +28,7 @@ index 8f484d78145ed4057967ac059d32762eb00f9892..f8b00e44f621580e61f72c3d5af592d4
      public boolean queueHealthUpdatePacket;
      public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index db80ad51dd824c2d6d119184fd80d3c12199862c..91c1f58aea3f0f7ee5dd314aa3dda099d12ffb46 100644
+index c5ca2d8feed71cdd4dce851941654768c1e5d648..9e8938627bfd1c45a2546e221f819e20c483a9e2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -182,6 +182,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0274-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0274-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index cd60a09f97..62828ec736 100644
--- a/patches/server/0274-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0274-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 f8b00e44f621580e61f72c3d5af592d46fa24c27..e56f9295e8624d1d73443f8f2178c2bc177f3f9f 100644
+index c75fed2aafc91fbfaed91f5337a5189a1dbb5341..ecfc5f59fcc3b256929a7d93972bf63272734a5d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1836,6 +1836,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0281-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0281-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 1465cee6a5..02a8030115 100644
--- a/patches/server/0281-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0281-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 91c1f58aea3f0f7ee5dd314aa3dda099d12ffb46..6dff0c73f1187daed7c037b5c781b6e4c681723c 100644
+index 9e8938627bfd1c45a2546e221f819e20c483a9e2..00c43d7b846e97e2cc2105c93be5ce918fafd775 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1126,6 +1126,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0282-Entity-getEntitySpawnReason.patch b/patches/server/0282-Entity-getEntitySpawnReason.patch
index 4c322684f3..d3d1d0b939 100644
--- a/patches/server/0282-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0282-Entity-getEntitySpawnReason.patch
@@ -34,7 +34,7 @@ index b151506b96a51c74ba408cb555a4d38507b2f8c1..bbcee9d8dbf17085b11bb5e38eb37271
              // 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/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6dff0c73f1187daed7c037b5c781b6e4c681723c..f3b154a14690d6a4650f20a4ab7da7b727b0fa49 100644
+index 00c43d7b846e97e2cc2105c93be5ce918fafd775..8f90e8cd36348089799097807ead774e186c2604 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -223,6 +223,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0284-Add-PlayerPostRespawnEvent.patch b/patches/server/0284-Add-PlayerPostRespawnEvent.patch
index a35b7e7db0..2babd115c1 100644
--- a/patches/server/0284-Add-PlayerPostRespawnEvent.patch
+++ b/patches/server/0284-Add-PlayerPostRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f3b154a14690d6a4650f20a4ab7da7b727b0fa49..54668cfc4666b07681d03c1c2cbad0f387b89b2b 100644
+index 8f90e8cd36348089799097807ead774e186c2604..f0cc34002e260567322d7acaf803f43a8b92e563 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -738,6 +738,10 @@ public abstract class PlayerList {
diff --git a/patches/server/0287-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0287-PlayerDeathEvent-getItemsToKeep.patch
index 8f4476007f..94743e1b6c 100644
--- a/patches/server/0287-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0287-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 e56f9295e8624d1d73443f8f2178c2bc177f3f9f..8209b4d0edf9b9d47d6496c6695c426b26e19e3a 100644
+index ecfc5f59fcc3b256929a7d93972bf63272734a5d..b7419b254295b3b2575ce2c6b5e53b1f3f9a3c41 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -899,6 +899,46 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0289-Add-Heightmap-API.patch b/patches/server/0289-Add-Heightmap-API.patch
deleted file mode 100644
index c719a3fd80..0000000000
--- a/patches/server/0289-Add-Heightmap-API.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <[email protected]>
-Date: Tue, 1 Jan 2019 02:22:01 -0800
-Subject: [PATCH] Add Heightmap API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index eafb186d158c6cf26b97b1982597bde377396172..deb9685b1279e734e4789ba7a2113b0d71ab1cc6 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -229,6 +229,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-         return CraftBlock.at(this.world, new BlockPos(x, y, z));
-     }
- 
-+    // Paper start - Implement heightmap api
-+    @Override
-+    public int getHighestBlockYAt(final int x, final int z, final com.destroystokyo.paper.HeightmapType heightmap) throws UnsupportedOperationException {
-+        this.getChunkAt(x >> 4, z >> 4); // heightmap will ret 0 on unloaded areas
-+
-+        switch (heightmap) {
-+            case LIGHT_BLOCKING:
-+                throw new UnsupportedOperationException(); // TODO
-+                //return this.world.getHighestBlockY(HeightMap.Type.LIGHT_BLOCKING, x, z);
-+            case ANY:
-+                return this.world.getHeight(net.minecraft.world.level.levelgen.Heightmap.Types.WORLD_SURFACE, x, z);
-+            case SOLID:
-+                return this.world.getHeight(net.minecraft.world.level.levelgen.Heightmap.Types.OCEAN_FLOOR, x, z);
-+            case SOLID_OR_LIQUID:
-+                return this.world.getHeight(net.minecraft.world.level.levelgen.Heightmap.Types.MOTION_BLOCKING, x, z);
-+            case SOLID_OR_LIQUID_NO_LEAVES:
-+                return this.world.getHeight(net.minecraft.world.level.levelgen.Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, x, z);
-+            default:
-+                throw new UnsupportedOperationException();
-+        }
-+    }
-+    // Paper end
-+
-     @Override
-     public Location getSpawnLocation() {
-         BlockPos spawn = this.world.getSharedSpawnPos();
diff --git a/patches/server/0290-Mob-Spawner-API-Enhancements.patch b/patches/server/0289-Mob-Spawner-API-Enhancements.patch
index dc419af692..dc419af692 100644
--- a/patches/server/0290-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0289-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0291-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0290-Fix-CB-call-to-changed-postToMainThread-method.patch
index 06263e3eef..06263e3eef 100644
--- a/patches/server/0291-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0290-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0292-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0291-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 83a7d7d541..83a7d7d541 100644
--- a/patches/server/0292-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/server/0291-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0293-Implement-CraftBlockSoundGroup.patch b/patches/server/0292-Implement-CraftBlockSoundGroup.patch
index 9bf16806b3..9bf16806b3 100644
--- a/patches/server/0293-Implement-CraftBlockSoundGroup.patch
+++ b/patches/server/0292-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0294-Expose-the-internal-current-tick.patch b/patches/server/0293-Expose-the-internal-current-tick.patch
index ba742dfb40..ba742dfb40 100644
--- a/patches/server/0294-Expose-the-internal-current-tick.patch
+++ b/patches/server/0293-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0295-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0294-Show-blockstate-location-if-we-failed-to-read-it.patch
index 35f4f6c443..35f4f6c443 100644
--- a/patches/server/0295-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/server/0294-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0296-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0295-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index cb2e502f71..cb2e502f71 100644
--- a/patches/server/0296-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0295-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0297-Configurable-projectile-relative-velocity.patch b/patches/server/0296-Configurable-projectile-relative-velocity.patch
index 9406e01b81..9406e01b81 100644
--- a/patches/server/0297-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0296-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0298-offset-item-frame-ticking.patch b/patches/server/0297-offset-item-frame-ticking.patch
index 3db1ffe305..3db1ffe305 100644
--- a/patches/server/0298-offset-item-frame-ticking.patch
+++ b/patches/server/0297-offset-item-frame-ticking.patch
diff --git a/patches/server/0299-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0298-Prevent-consuming-the-wrong-itemstack.patch
index 82cf04e36c..82cf04e36c 100644
--- a/patches/server/0299-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0298-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0300-Dont-send-unnecessary-sign-update.patch b/patches/server/0299-Dont-send-unnecessary-sign-update.patch
index afca8562db..afca8562db 100644
--- a/patches/server/0300-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0299-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0301-Add-option-to-disable-pillager-patrols.patch b/patches/server/0300-Add-option-to-disable-pillager-patrols.patch
index 3021a1f6c8..3021a1f6c8 100644
--- a/patches/server/0301-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/server/0300-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0302-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0301-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index 82277a287f..82277a287f 100644
--- a/patches/server/0302-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/server/0301-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0303-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0302-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 528cf153ea..528cf153ea 100644
--- a/patches/server/0303-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/server/0302-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0304-Duplicate-UUID-Resolve-Option.patch b/patches/server/0303-Duplicate-UUID-Resolve-Option.patch
index 0139752e8e..0139752e8e 100644
--- a/patches/server/0304-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0303-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0305-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0304-PlayerDeathEvent-shouldDropExperience.patch
index 1a66c5b39e..bdbb0dc0b0 100644
--- a/patches/server/0305-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0304-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 8209b4d0edf9b9d47d6496c6695c426b26e19e3a..6c98221619611028e5a5ebd2c18c5128dc2ede7d 100644
+index b7419b254295b3b2575ce2c6b5e53b1f3f9a3c41..4fe3106379d693e9a61306f284ebab5a4fe68ae5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1020,7 +1020,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0306-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0305-Prevent-bees-loading-chunks-checking-hive-position.patch
index e933516d42..e933516d42 100644
--- a/patches/server/0306-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0305-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0307-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0306-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 3b189be4e4..3b189be4e4 100644
--- a/patches/server/0307-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/server/0306-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0308-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0307-Optimise-EntityGetter-getPlayerByUUID.patch
index ad34491f92..ad34491f92 100644
--- a/patches/server/0308-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0307-Optimise-EntityGetter-getPlayerByUUID.patch
diff --git a/patches/server/0309-Fix-items-not-falling-correctly.patch b/patches/server/0308-Fix-items-not-falling-correctly.patch
index aaff528185..aaff528185 100644
--- a/patches/server/0309-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0308-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0310-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0309-Optimize-call-to-getFluid-for-explosions.patch
index 7c2fe736a6..7c2fe736a6 100644
--- a/patches/server/0310-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0309-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0311-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0310-Guard-against-serializing-mismatching-chunk-coordina.patch
index 6752b44617..6752b44617 100644
--- a/patches/server/0311-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/0310-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0312-Alternative-item-despawn-rate.patch b/patches/server/0311-Alternative-item-despawn-rate.patch
index 5f9a648f99..5f9a648f99 100644
--- a/patches/server/0312-Alternative-item-despawn-rate.patch
+++ b/patches/server/0311-Alternative-item-despawn-rate.patch
diff --git a/patches/server/0313-Tracking-Range-Improvements.patch b/patches/server/0312-Tracking-Range-Improvements.patch
index ce3b2f8004..ce3b2f8004 100644
--- a/patches/server/0313-Tracking-Range-Improvements.patch
+++ b/patches/server/0312-Tracking-Range-Improvements.patch
diff --git a/patches/server/0314-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0313-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 9ea731b674..9ea731b674 100644
--- a/patches/server/0314-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0313-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0315-Improve-Block-breakNaturally-API.patch b/patches/server/0314-Improve-Block-breakNaturally-API.patch
index b478ee5bb4..b478ee5bb4 100644
--- a/patches/server/0315-Improve-Block-breakNaturally-API.patch
+++ b/patches/server/0314-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0316-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0315-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index e331ac40d1..e331ac40d1 100644
--- a/patches/server/0316-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0315-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0317-Add-debug-for-sync-chunk-loads.patch b/patches/server/0316-Add-debug-for-sync-chunk-loads.patch
index 885540cab2..885540cab2 100644
--- a/patches/server/0317-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0316-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0318-Improve-java-version-check.patch b/patches/server/0317-Improve-java-version-check.patch
index df50b64ab2..df50b64ab2 100644
--- a/patches/server/0318-Improve-java-version-check.patch
+++ b/patches/server/0317-Improve-java-version-check.patch
diff --git a/patches/server/0319-Add-ThrownEggHatchEvent.patch b/patches/server/0318-Add-ThrownEggHatchEvent.patch
index 21fd12f380..21fd12f380 100644
--- a/patches/server/0319-Add-ThrownEggHatchEvent.patch
+++ b/patches/server/0318-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0320-Entity-Jump-API.patch b/patches/server/0319-Entity-Jump-API.patch
index 6e26dbe6c5..6e26dbe6c5 100644
--- a/patches/server/0320-Entity-Jump-API.patch
+++ b/patches/server/0319-Entity-Jump-API.patch
diff --git a/patches/server/0321-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0320-Add-option-to-nerf-pigmen-from-nether-portals.patch
index c77757f945..c77757f945 100644
--- a/patches/server/0321-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0320-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0322-Make-the-GUI-graph-fancier.patch b/patches/server/0321-Make-the-GUI-graph-fancier.patch
index 9e79ca7b91..9e79ca7b91 100644
--- a/patches/server/0322-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0321-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0323-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0322-add-hand-to-BlockMultiPlaceEvent.patch
index 3a4d8cf5a7..3a4d8cf5a7 100644
--- a/patches/server/0323-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0322-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0324-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0323-Validate-tripwire-hook-placement-before-update.patch
index bc1125b169..bc1125b169 100644
--- a/patches/server/0324-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/server/0323-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0325-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0324-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index 75d1d9c02b..75d1d9c02b 100644
--- a/patches/server/0325-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/server/0324-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0326-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0325-Configurable-chance-of-villager-zombie-infection.patch
index 217787cdc9..217787cdc9 100644
--- a/patches/server/0326-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0325-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0327-Optimise-Chunk-getFluid.patch b/patches/server/0326-Optimise-Chunk-getFluid.patch
index 955f6f3ed8..955f6f3ed8 100644
--- a/patches/server/0327-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0326-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0328-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0327-Set-spigots-verbose-world-setting-to-false-by-def.patch
index e97303c0a9..e97303c0a9 100644
--- a/patches/server/0328-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0327-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0329-Add-tick-times-API-and-mspt-command.patch b/patches/server/0328-Add-tick-times-API-and-mspt-command.patch
index 06d5d06807..06d5d06807 100644
--- a/patches/server/0329-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0328-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0330-Expose-MinecraftServer-isRunning.patch b/patches/server/0329-Expose-MinecraftServer-isRunning.patch
index 03228c7907..03228c7907 100644
--- a/patches/server/0330-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0329-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0331-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0330-Add-Raw-Byte-ItemStack-Serialization.patch
index 5862ff1c75..5862ff1c75 100644
--- a/patches/server/0331-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0330-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0332-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0331-Pillager-patrol-spawn-settings-and-per-player-option.patch
index de75d23830..c60a1ef7ce 100644
--- a/patches/server/0332-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0331-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 6c98221619611028e5a5ebd2c18c5128dc2ede7d..d63c940012a04fcf7a45804ce2b77293d5d194ce 100644
+index 4fe3106379d693e9a61306f284ebab5a4fe68ae5..6a385b5cb5baf94b1340e0029df7dcd908e5f702 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -269,6 +269,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0333-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0332-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index fb2f7c6706..fb2f7c6706 100644
--- a/patches/server/0333-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0332-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0334-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0333-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index f361af6e50..f361af6e50 100644
--- a/patches/server/0334-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0333-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0335-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0334-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 580844dd61..580844dd61 100644
--- a/patches/server/0335-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0334-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0336-Don-t-tick-dead-players.patch b/patches/server/0335-Don-t-tick-dead-players.patch
index 9518759981..27ce527eee 100644
--- a/patches/server/0336-Don-t-tick-dead-players.patch
+++ b/patches/server/0335-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 d63c940012a04fcf7a45804ce2b77293d5d194ce..dfc7f6c15951dc3dfdfadba67b949cd265abc4ca 100644
+index 6a385b5cb5baf94b1340e0029df7dcd908e5f702..588fcfb614299eeebef081d2dd005f1a8a00153b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -767,7 +767,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0337-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0336-Dead-Player-s-shouldn-t-be-able-to-move.patch
index bcbd0c7040..bcbd0c7040 100644
--- a/patches/server/0337-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0336-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0338-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0337-Don-t-move-existing-players-to-world-spawn.patch
index 0d6a54edf0..e8fef02c0f 100644
--- a/patches/server/0338-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0337-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 dfc7f6c15951dc3dfdfadba67b949cd265abc4ca..28057fad5e8add292a8bd40d027132bef03a6156 100644
+index 588fcfb614299eeebef081d2dd005f1a8a00153b..8dff4fb382639e4db9c80bbdfbc69167aa7996a1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -358,7 +358,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -35,7 +35,7 @@ index dfc7f6c15951dc3dfdfadba67b949cd265abc4ca..28057fad5e8add292a8bd40d027132be
          this.gameMode.setLevel((ServerLevel) world);
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 54668cfc4666b07681d03c1c2cbad0f387b89b2b..511333fc0f00c5de544f5e10ddf4c5262fdf5ee3 100644
+index f0cc34002e260567322d7acaf803f43a8b92e563..8b0c098c795c5a57fce96ad5d98ac8436024cda9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -226,6 +226,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0339-Optimize-Pathfinding.patch b/patches/server/0338-Optimize-Pathfinding.patch
index 281988ce37..281988ce37 100644
--- a/patches/server/0339-Optimize-Pathfinding.patch
+++ b/patches/server/0338-Optimize-Pathfinding.patch
diff --git a/patches/server/0340-Reduce-Either-Optional-allocation.patch b/patches/server/0339-Reduce-Either-Optional-allocation.patch
index d42e0ac184..d42e0ac184 100644
--- a/patches/server/0340-Reduce-Either-Optional-allocation.patch
+++ b/patches/server/0339-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0341-Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0340-Reduce-memory-footprint-of-CompoundTag.patch
index 55111ab6e8..55111ab6e8 100644
--- a/patches/server/0341-Reduce-memory-footprint-of-CompoundTag.patch
+++ b/patches/server/0340-Reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/server/0342-Prevent-opening-inventories-when-frozen.patch b/patches/server/0341-Prevent-opening-inventories-when-frozen.patch
index 9059ad6ae7..db9bb38d46 100644
--- a/patches/server/0342-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0341-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 28057fad5e8add292a8bd40d027132bef03a6156..79006a6d2be528184d1699e75465b68f2a6107d4 100644
+index 8dff4fb382639e4db9c80bbdfbc69167aa7996a1..1e780b73fac4d686444ff3a009cf33318068d8d1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -712,7 +712,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0343-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0342-Don-t-run-entity-collision-code-if-not-needed.patch
index dfd1354b1e..dfd1354b1e 100644
--- a/patches/server/0343-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0342-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0344-Implement-Player-Client-Options-API.patch b/patches/server/0343-Implement-Player-Client-Options-API.patch
index eb3723e537..1778c7d21e 100644
--- a/patches/server/0344-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0343-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 79006a6d2be528184d1699e75465b68f2a6107d4..6664cee716e078272df1039d72840cb2f97187d3 100644
+index 1e780b73fac4d686444ff3a009cf33318068d8d1..8554ee1636416d9fb1aee2051e4a4d08b0c6d636 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -359,7 +359,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -123,8 +123,8 @@ index 79006a6d2be528184d1699e75465b68f2a6107d4..6664cee716e078272df1039d72840cb2
          // CraftBukkit start
          if (this.getMainArm() != clientOptions.mainHand()) {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), this.getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
-@@ -2161,6 +2177,11 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
-             this.server.server.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), this.language, clientOptions.language())); // Paper
+@@ -2160,6 +2176,11 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+             this.server.server.getPluginManager().callEvent(event);
          }
          // CraftBukkit end
 +        // Paper start - don't call options events on login
diff --git a/patches/server/0345-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0344-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 8ac2ea013d..8ac2ea013d 100644
--- a/patches/server/0345-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/server/0344-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0346-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0345-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
index df0ac59424..1d485c4eb5 100644
--- a/patches/server/0346-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
+++ b/patches/server/0345-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
@@ -43,7 +43,7 @@ index 5732aded2e4dbeea84dbe6ebac71c2ad5ce4729a..d1247df5c51b0d377a27ea7cc5b5a2d1
              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 6664cee716e078272df1039d72840cb2f97187d3..be2a0eef9b6a0c7ec5e56bda2a80a05fe597aacb 100644
+index 8554ee1636416d9fb1aee2051e4a4d08b0c6d636..9cba3ac95318f1a4b680b541ce5d825fc5c4ad02 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -288,6 +288,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -55,7 +55,7 @@ index 6664cee716e078272df1039d72840cb2f97187d3..be2a0eef9b6a0c7ec5e56bda2a80a05f
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 511333fc0f00c5de544f5e10ddf4c5262fdf5ee3..cbad29d23f5c90dadd7d442372247e7befe18e49 100644
+index 8b0c098c795c5a57fce96ad5d98ac8436024cda9..ed0ffff1cfc25f66e1947e40008c6c7259b17019 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -297,6 +297,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0347-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0346-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index f015a14ad6..a3ab5bfb73 100644
--- a/patches/server/0347-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0346-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -10,7 +10,7 @@ Co-authored-by: Wyatt Childers <[email protected]>
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cbad29d23f5c90dadd7d442372247e7befe18e49..7d5c82b50c59de0a40ae11e8d7751500288889c5 100644
+index ed0ffff1cfc25f66e1947e40008c6c7259b17019..51426da5f3e7b9f8631880a04cef0a58b00233df 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -197,6 +197,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0348-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0347-Add-PlayerAttackEntityCooldownResetEvent.patch
index 304ad615ed..304ad615ed 100644
--- a/patches/server/0348-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0347-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0349-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0348-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 8a262c1f35..8a262c1f35 100644
--- a/patches/server/0349-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0348-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0350-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0349-Add-phantom-creative-and-insomniac-controls.patch
index 9a012509be..9a012509be 100644
--- a/patches/server/0350-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0349-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0351-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0350-Fix-item-duplication-and-teleport-issues.patch
index 66b9f096ef..66b9f096ef 100644
--- a/patches/server/0351-Fix-item-duplication-and-teleport-issues.patch
+++ b/patches/server/0350-Fix-item-duplication-and-teleport-issues.patch
diff --git a/patches/server/0352-Villager-Restocks-API.patch b/patches/server/0351-Villager-Restocks-API.patch
index 75b7928672..75b7928672 100644
--- a/patches/server/0352-Villager-Restocks-API.patch
+++ b/patches/server/0351-Villager-Restocks-API.patch
diff --git a/patches/server/0353-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0352-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 41621adc9a..41621adc9a 100644
--- a/patches/server/0353-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0352-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0354-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0353-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 44bd324f68..44bd324f68 100644
--- a/patches/server/0354-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0353-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0355-misc-debugging-dumps.patch b/patches/server/0354-misc-debugging-dumps.patch
index 20aae10362..20aae10362 100644
--- a/patches/server/0355-misc-debugging-dumps.patch
+++ b/patches/server/0354-misc-debugging-dumps.patch
diff --git a/patches/server/0356-Prevent-teleporting-dead-entities.patch b/patches/server/0355-Prevent-teleporting-dead-entities.patch
index 0f97cd7b32..0f97cd7b32 100644
--- a/patches/server/0356-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0355-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0357-Implement-Mob-Goal-API.patch b/patches/server/0356-Implement-Mob-Goal-API.patch
index 28beb5dcae..28beb5dcae 100644
--- a/patches/server/0357-Implement-Mob-Goal-API.patch
+++ b/patches/server/0356-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0358-Add-villager-reputation-API.patch b/patches/server/0357-Add-villager-reputation-API.patch
index 5043e90bdc..5043e90bdc 100644
--- a/patches/server/0358-Add-villager-reputation-API.patch
+++ b/patches/server/0357-Add-villager-reputation-API.patch
diff --git a/patches/server/0359-ExperienceOrb-merging-stacking-API-and-fixes.patch b/patches/server/0358-ExperienceOrb-merging-stacking-API-and-fixes.patch
index fb7613e2f0..fb7613e2f0 100644
--- a/patches/server/0359-ExperienceOrb-merging-stacking-API-and-fixes.patch
+++ b/patches/server/0358-ExperienceOrb-merging-stacking-API-and-fixes.patch
diff --git a/patches/server/0360-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0359-Fix-PotionEffect-ignores-icon-flag.patch
index 59845e22d4..59845e22d4 100644
--- a/patches/server/0360-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0359-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0361-Potential-bed-API.patch b/patches/server/0360-Potential-bed-API.patch
index 34470bcfc1..34470bcfc1 100644
--- a/patches/server/0361-Potential-bed-API.patch
+++ b/patches/server/0360-Potential-bed-API.patch
diff --git a/patches/server/0362-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0361-Wait-for-Async-Tasks-during-shutdown.patch
index 25e00fd77b..25e00fd77b 100644
--- a/patches/server/0362-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0361-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0363-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0362-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index dfe8e5260b..dfe8e5260b 100644
--- a/patches/server/0363-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0362-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0364-Add-option-for-console-having-all-permissions.patch b/patches/server/0363-Add-option-for-console-having-all-permissions.patch
index ace91d22dd..ace91d22dd 100644
--- a/patches/server/0364-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0363-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0365-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0364-Fix-villager-trading-demand-MC-163962.patch
index bd7b6c4273..bd7b6c4273 100644
--- a/patches/server/0365-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/server/0364-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0366-Maps-shouldn-t-load-chunks.patch b/patches/server/0365-Maps-shouldn-t-load-chunks.patch
index 3bc3299f81..3bc3299f81 100644
--- a/patches/server/0366-Maps-shouldn-t-load-chunks.patch
+++ b/patches/server/0365-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0367-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0366-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 27672e59d7..27672e59d7 100644
--- a/patches/server/0367-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/server/0366-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0368-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0367-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 4175cae3b0..4175cae3b0 100644
--- a/patches/server/0368-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/server/0367-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0369-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0368-Fix-piston-physics-inconsistency-MC-188840.patch
index 44f85960c4..44f85960c4 100644
--- a/patches/server/0369-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0368-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0370-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0369-Fix-missing-chunks-due-to-integer-overflow.patch
index e7af97469b..e7af97469b 100644
--- a/patches/server/0370-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0369-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0371-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0370-Prevent-position-desync-causing-tp-exploit.patch
index fc79db536a..fc79db536a 100644
--- a/patches/server/0371-Prevent-position-desync-causing-tp-exploit.patch
+++ b/patches/server/0370-Prevent-position-desync-causing-tp-exploit.patch
diff --git a/patches/server/0372-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0371-Inventory-getHolder-method-without-block-snapshot.patch
index b30d42bf56..b30d42bf56 100644
--- a/patches/server/0372-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0371-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0373-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0372-Add-PlayerRecipeBookClickEvent.patch
index b625834ac3..b625834ac3 100644
--- a/patches/server/0373-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0372-Add-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0374-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0373-Hide-sync-chunk-writes-behind-flag.patch
index e8889b31d8..e8889b31d8 100644
--- a/patches/server/0374-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0373-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0375-Add-permission-for-command-blocks.patch b/patches/server/0374-Add-permission-for-command-blocks.patch
index fb8720b998..fb8720b998 100644
--- a/patches/server/0375-Add-permission-for-command-blocks.patch
+++ b/patches/server/0374-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0376-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0375-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index 782935a98b..782935a98b 100644
--- a/patches/server/0376-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/server/0375-Ensure-Entity-position-and-AABB-are-never-invalid.patch
diff --git a/patches/server/0377-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0376-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 454cf22a3f..38766f86dc 100644
--- a/patches/server/0377-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0376-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -104,10 +104,10 @@ index 118708bd917518333359ce1407e1e26e4ec6a180..9e8de1efa2fc42a8ffb3c29579be48a4
              for (SpawnCategory spawnCategory : SpawnCategory.values()) {
                  if (CraftSpawnCategory.isValidForLimits(spawnCategory)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index deb9685b1279e734e4789ba7a2113b0d71ab1cc6..47ab9081ab5839a328b5208ba453f59f973461b1 100644
+index eafb186d158c6cf26b97b1982597bde377396172..990669917cd990d16f9699b085c9ff041c1f77b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1188,7 +1188,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1165,7 +1165,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setDifficulty(Difficulty difficulty) {
diff --git a/patches/server/0378-Paper-dumpitem-command.patch b/patches/server/0377-Paper-dumpitem-command.patch
index cb79e9ddfd..cb79e9ddfd 100644
--- a/patches/server/0378-Paper-dumpitem-command.patch
+++ b/patches/server/0377-Paper-dumpitem-command.patch
diff --git a/patches/server/0379-Improve-Legacy-Component-serialization-size.patch b/patches/server/0378-Improve-Legacy-Component-serialization-size.patch
index 4ee643286d..4ee643286d 100644
--- a/patches/server/0379-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0378-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0380-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0379-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index d3708d395f..2f4252de8c 100644
--- a/patches/server/0380-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0379-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -44,10 +44,10 @@ index 9e8de1efa2fc42a8ffb3c29579be48a4b5b97fca..010ab9cdf3dbe9b89b58744f37b33a23
          this.printSaveWarning = false;
          this.console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 47ab9081ab5839a328b5208ba453f59f973461b1..78b3e22cd720f204d11d56be3ec272d75f042e31 100644
+index 990669917cd990d16f9699b085c9ff041c1f77b4..e085fd750aa8823ca6a3bab9b6e5c5b8338021bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -289,7 +289,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -266,7 +266,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public Chunk getChunkAt(int x, int z) {
@@ -62,7 +62,7 @@ index 47ab9081ab5839a328b5208ba453f59f973461b1..78b3e22cd720f204d11d56be3ec272d7
          return new CraftChunk(chunk);
      }
  
-@@ -303,6 +309,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -280,6 +286,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return new CraftChunk(this.getHandle(), x, z);
      }
  
@@ -75,7 +75,7 @@ index 47ab9081ab5839a328b5208ba453f59f973461b1..78b3e22cd720f204d11d56be3ec272d7
      @Override
      public Chunk getChunkAt(Block block) {
          Preconditions.checkArgument(block != null, "null block");
-@@ -354,7 +366,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -331,7 +343,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public boolean unloadChunkRequest(int x, int z) {
          org.spigotmc.AsyncCatcher.catchOp("chunk unload"); // Spigot
          if (this.isChunkLoaded(x, z)) {
@@ -84,7 +84,7 @@ index 47ab9081ab5839a328b5208ba453f59f973461b1..78b3e22cd720f204d11d56be3ec272d7
          }
  
          return true;
-@@ -464,7 +476,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -441,7 +453,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          }
  
          if (chunk instanceof net.minecraft.world.level.chunk.LevelChunk) {
@@ -93,7 +93,7 @@ index 47ab9081ab5839a328b5208ba453f59f973461b1..78b3e22cd720f204d11d56be3ec272d7
              return true;
          }
  
-@@ -2264,6 +2276,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2241,6 +2253,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          io.papermc.paper.chunk.system.ChunkSystem.scheduleChunkLoad(this.getHandle(), x, z, gen, ChunkStatus.FULL, true, priority, (c) -> {
              net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(() -> {
                  net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk)c;
diff --git a/patches/server/0381-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0380-Add-BlockStateMeta-clearBlockState.patch
index 88d5b8fb28..88d5b8fb28 100644
--- a/patches/server/0381-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/server/0380-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/server/0382-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0381-Convert-legacy-attributes-in-Item-Meta.patch
index 1ee422c71c..1ee422c71c 100644
--- a/patches/server/0382-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0381-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0383-Do-not-accept-invalid-client-settings.patch b/patches/server/0382-Do-not-accept-invalid-client-settings.patch
index adb4669019..adb4669019 100644
--- a/patches/server/0383-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0382-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0384-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0383-Improve-fix-EntityTargetLivingEntityEvent.patch
index 513faeb27d..513faeb27d 100644
--- a/patches/server/0384-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/server/0383-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0385-Add-entity-liquid-API.patch b/patches/server/0384-Add-entity-liquid-API.patch
index 51765a7f3a..51765a7f3a 100644
--- a/patches/server/0385-Add-entity-liquid-API.patch
+++ b/patches/server/0384-Add-entity-liquid-API.patch
diff --git a/patches/server/0386-Add-PrepareResultEvent.patch b/patches/server/0385-Add-PrepareResultEvent.patch
index e49f683638..e49f683638 100644
--- a/patches/server/0386-Add-PrepareResultEvent.patch
+++ b/patches/server/0385-Add-PrepareResultEvent.patch
diff --git a/patches/server/0387-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0386-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 8f99a0e26e..8f99a0e26e 100644
--- a/patches/server/0387-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0386-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0388-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0387-Fix-arrows-never-despawning-MC-125757.patch
index 21d9b7def7..21d9b7def7 100644
--- a/patches/server/0388-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0387-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0389-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0388-Thread-Safe-Vanilla-Command-permission-checking.patch
index a210e43dce..a210e43dce 100644
--- a/patches/server/0389-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0388-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0390-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0389-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index fe347fabc4..fe347fabc4 100644
--- a/patches/server/0390-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0389-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0391-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0390-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index df26348fac..df26348fac 100644
--- a/patches/server/0391-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0390-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0392-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0391-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 5f0bca47b3..5f0bca47b3 100644
--- a/patches/server/0392-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0391-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0393-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0392-Optimize-NetworkManager-Exception-Handling.patch
index 8626e3b900..8626e3b900 100644
--- a/patches/server/0393-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0392-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0394-Fix-some-rails-connecting-improperly.patch b/patches/server/0393-Fix-some-rails-connecting-improperly.patch
index 4f5cd86538..4f5cd86538 100644
--- a/patches/server/0394-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0393-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0395-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0394-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 75cd32bb83..75cd32bb83 100644
--- a/patches/server/0395-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0394-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0396-Brand-support.patch b/patches/server/0395-Brand-support.patch
index 4a54b0e16d..0e14f01ddc 100644
--- a/patches/server/0396-Brand-support.patch
+++ b/patches/server/0395-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index be2a0eef9b6a0c7ec5e56bda2a80a05fe597aacb..cdfc7a229129fc66caaec50f2d613f7178d1f3da 100644
+index 9cba3ac95318f1a4b680b541ce5d825fc5c4ad02..4998643920b8314737832ad15431b794e1aa6df0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -294,6 +294,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0397-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0396-Add-playPickupItemAnimation-to-LivingEntity.patch
index 0fcb956c33..0fcb956c33 100644
--- a/patches/server/0397-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0396-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0398-Don-t-require-FACING-data.patch b/patches/server/0397-Don-t-require-FACING-data.patch
index 2cec1e5276..2cec1e5276 100644
--- a/patches/server/0398-Don-t-require-FACING-data.patch
+++ b/patches/server/0397-Don-t-require-FACING-data.patch
diff --git a/patches/server/0399-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0398-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index ab9e54610d..48ef428173 100644
--- a/patches/server/0399-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0398-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -19,10 +19,10 @@ index a87782c3cb0a751f532feda0b827d7c7eac163e1..2c70df4d6ba8188ef7e1ab30b70bcfaa
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 78b3e22cd720f204d11d56be3ec272d75f042e31..97ab6b50288b0d9303cbe20c5aa2af26ff3e72fb 100644
+index e085fd750aa8823ca6a3bab9b6e5c5b8338021bb..009be0baf925245ff8fa3d849f4233fb952f881e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -269,12 +269,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -246,12 +246,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      public boolean setSpawnLocation(int x, int y, int z, float angle) {
          try {
diff --git a/patches/server/0400-Add-moon-phase-API.patch b/patches/server/0399-Add-moon-phase-API.patch
index 539ccca6de..539ccca6de 100644
--- a/patches/server/0400-Add-moon-phase-API.patch
+++ b/patches/server/0399-Add-moon-phase-API.patch
diff --git a/patches/server/0401-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0400-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 9ada63fcdf..9ada63fcdf 100644
--- a/patches/server/0401-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0400-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0402-Prevent-headless-pistons-from-being-created.patch b/patches/server/0401-Prevent-headless-pistons-from-being-created.patch
index e375acc68a..e375acc68a 100644
--- a/patches/server/0402-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0401-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0403-Add-BellRingEvent.patch b/patches/server/0402-Add-BellRingEvent.patch
index 9ac85f17e9..9ac85f17e9 100644
--- a/patches/server/0403-Add-BellRingEvent.patch
+++ b/patches/server/0402-Add-BellRingEvent.patch
diff --git a/patches/server/0404-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0403-Add-zombie-targets-turtle-egg-config.patch
index 56529e1fd4..56529e1fd4 100644
--- a/patches/server/0404-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0403-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0405-Buffer-joins-to-world.patch b/patches/server/0404-Buffer-joins-to-world.patch
index 2e31ea4385..2e31ea4385 100644
--- a/patches/server/0405-Buffer-joins-to-world.patch
+++ b/patches/server/0404-Buffer-joins-to-world.patch
diff --git a/patches/server/0406-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0405-Fix-hex-colors-not-working-in-some-kick-messages.patch
index f6f865ab1a..f6f865ab1a 100644
--- a/patches/server/0406-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0405-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0407-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0406-PortalCreateEvent-needs-to-know-its-entity.patch
index 97b795bec5..97b795bec5 100644
--- a/patches/server/0407-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0406-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0408-Add-more-Evoker-API.patch b/patches/server/0407-Add-more-Evoker-API.patch
index f44eceff55..f44eceff55 100644
--- a/patches/server/0408-Add-more-Evoker-API.patch
+++ b/patches/server/0407-Add-more-Evoker-API.patch
diff --git a/patches/server/0409-Add-methods-to-get-translation-keys.patch b/patches/server/0408-Add-methods-to-get-translation-keys.patch
index d5d4dd918c..d5d4dd918c 100644
--- a/patches/server/0409-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0408-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0410-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0409-Create-HoverEvent-from-ItemStack-Entity.patch
index d7b9b11116..d7b9b11116 100644
--- a/patches/server/0410-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0409-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0411-Cache-block-data-strings.patch b/patches/server/0410-Cache-block-data-strings.patch
index de40dce04c..de40dce04c 100644
--- a/patches/server/0411-Cache-block-data-strings.patch
+++ b/patches/server/0410-Cache-block-data-strings.patch
diff --git a/patches/server/0412-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0411-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 8793d95a79..8793d95a79 100644
--- a/patches/server/0412-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0411-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0413-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0412-Add-additional-open-container-api-to-HumanEntity.patch
index 47aa453acf..47aa453acf 100644
--- a/patches/server/0413-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0412-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0414-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0413-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 9a0c6f1492..9a0c6f1492 100644
--- a/patches/server/0414-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0413-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0415-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0414-Extend-block-drop-capture-to-capture-all-items-added.patch
index 9531e0f695..9531e0f695 100644
--- a/patches/server/0415-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0414-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0416-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0415-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 0c0efd8dc4..0c0efd8dc4 100644
--- a/patches/server/0416-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0415-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0417-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0416-Lazily-track-plugin-scoreboards-by-default.patch
index 28ae9df043..28ae9df043 100644
--- a/patches/server/0417-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0416-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0418-Entity-isTicking.patch b/patches/server/0417-Entity-isTicking.patch
index 527bcb79ce..527bcb79ce 100644
--- a/patches/server/0418-Entity-isTicking.patch
+++ b/patches/server/0417-Entity-isTicking.patch
diff --git a/patches/server/0419-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0418-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index b387ab8612..b387ab8612 100644
--- a/patches/server/0419-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0418-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0420-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0419-Fix-Concurrency-issue-in-ShufflingList.patch
index f04a40e1ac..f04a40e1ac 100644
--- a/patches/server/0420-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0419-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0421-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0420-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index f727c2200f..f727c2200f 100644
--- a/patches/server/0421-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0420-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0422-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0421-Fix-for-large-move-vectors-crashing-server.patch
index 4215392549..4215392549 100644
--- a/patches/server/0422-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0421-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0423-Optimise-getType-calls.patch b/patches/server/0422-Optimise-getType-calls.patch
index 1b14b0202b..1b14b0202b 100644
--- a/patches/server/0423-Optimise-getType-calls.patch
+++ b/patches/server/0422-Optimise-getType-calls.patch
diff --git a/patches/server/0424-Villager-resetOffers.patch b/patches/server/0423-Villager-resetOffers.patch
index 77f071ec77..77f071ec77 100644
--- a/patches/server/0424-Villager-resetOffers.patch
+++ b/patches/server/0423-Villager-resetOffers.patch
diff --git a/patches/server/0425-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0424-Retain-block-place-order-when-capturing-blockstates.patch
index e7d46e41eb..e7d46e41eb 100644
--- a/patches/server/0425-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0424-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0426-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0425-Fix-item-locations-dropped-from-campfires.patch
index 26a43eb186..26a43eb186 100644
--- a/patches/server/0426-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0425-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0427-Fix-bell-block-entity-memory-leak.patch b/patches/server/0426-Fix-bell-block-entity-memory-leak.patch
index 5343b073cd..5343b073cd 100644
--- a/patches/server/0427-Fix-bell-block-entity-memory-leak.patch
+++ b/patches/server/0426-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0428-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0427-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 6ab78855c4..6ab78855c4 100644
--- a/patches/server/0428-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0427-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0429-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0428-Add-getOfflinePlayerIfCached-String.patch
index 88f95ee405..88f95ee405 100644
--- a/patches/server/0429-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0428-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0430-Add-ignore-discounts-API.patch b/patches/server/0429-Add-ignore-discounts-API.patch
index 5a2d4be36b..5a2d4be36b 100644
--- a/patches/server/0430-Add-ignore-discounts-API.patch
+++ b/patches/server/0429-Add-ignore-discounts-API.patch
diff --git a/patches/server/0431-Toggle-for-removing-existing-dragon.patch b/patches/server/0430-Toggle-for-removing-existing-dragon.patch
index 1bfa511969..1bfa511969 100644
--- a/patches/server/0431-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0430-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0432-Fix-client-lag-on-advancement-loading.patch b/patches/server/0431-Fix-client-lag-on-advancement-loading.patch
index b21d181e44..b21d181e44 100644
--- a/patches/server/0432-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0431-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0433-Item-no-age-no-player-pickup.patch b/patches/server/0432-Item-no-age-no-player-pickup.patch
index 1fffbaf558..1fffbaf558 100644
--- a/patches/server/0433-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0432-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0434-Beacon-API-custom-effect-ranges.patch b/patches/server/0433-Beacon-API-custom-effect-ranges.patch
index b80f1772cd..b80f1772cd 100644
--- a/patches/server/0434-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0433-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0435-Add-API-for-quit-reason.patch b/patches/server/0434-Add-API-for-quit-reason.patch
index efcf971804..06966acb33 100644
--- a/patches/server/0435-Add-API-for-quit-reason.patch
+++ b/patches/server/0434-Add-API-for-quit-reason.patch
@@ -28,7 +28,7 @@ index 134810ac91d828d67759cd1ed56f11b71e292917..ba41646a5edb57c4d9766df08bbc5701
                          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 cdfc7a229129fc66caaec50f2d613f7178d1f3da..42da4c28c6a747174c1b757affa5e245463864ba 100644
+index 4998643920b8314737832ad15431b794e1aa6df0..62dbdc56d5529800d7a424040eb6821e9d527255 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -295,6 +295,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -52,7 +52,7 @@ index a3c67bdc2c08b3550534f37d15b0db90b479e34f..24bf661e76fb421a8be565d9ea68edf7
              this.connection.disconnect(disconnectiondetails);
          }));
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7d5c82b50c59de0a40ae11e8d7751500288889c5..60845fe39f6e24474c1fa39c06a8b164348cb326 100644
+index 51426da5f3e7b9f8631880a04cef0a58b00233df..ec080eb8e3930b6c5cc08c3061535b379a99a7d1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -570,7 +570,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0436-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0435-Add-Wandering-Trader-spawn-rate-config-options.patch
index 98525387d7..98525387d7 100644
--- a/patches/server/0436-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0435-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0437-Add-Destroy-Speed-API.patch b/patches/server/0436-Add-Destroy-Speed-API.patch
index bc04541e7c..bc04541e7c 100644
--- a/patches/server/0437-Add-Destroy-Speed-API.patch
+++ b/patches/server/0436-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0438-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0437-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index bb0bf54468..bb0bf54468 100644
--- a/patches/server/0438-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0437-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0439-Add-LivingEntity-clearActiveItem.patch b/patches/server/0438-Add-LivingEntity-clearActiveItem.patch
index b910c1c70b..b910c1c70b 100644
--- a/patches/server/0439-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0438-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0440-Add-PlayerItemCooldownEvent.patch b/patches/server/0439-Add-PlayerItemCooldownEvent.patch
index 4b90903dd2..4b90903dd2 100644
--- a/patches/server/0440-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0439-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0441-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0440-Significantly-improve-performance-of-the-end-generat.patch
index ed3ee50bc9..ed3ee50bc9 100644
--- a/patches/server/0441-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0440-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0442-More-lightning-API.patch b/patches/server/0441-More-lightning-API.patch
index 967871902a..967871902a 100644
--- a/patches/server/0442-More-lightning-API.patch
+++ b/patches/server/0441-More-lightning-API.patch
diff --git a/patches/server/0443-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0442-Climbing-should-not-bypass-cramming-gamerule.patch
index 3ccfacc9e5..3ccfacc9e5 100644
--- a/patches/server/0443-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0442-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0444-Add-missing-default-perms-for-commands.patch b/patches/server/0443-Add-missing-default-perms-for-commands.patch
index d49628ee32..d49628ee32 100644
--- a/patches/server/0444-Add-missing-default-perms-for-commands.patch
+++ b/patches/server/0443-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0445-Add-PlayerShearBlockEvent.patch b/patches/server/0444-Add-PlayerShearBlockEvent.patch
index c56e74d255..c56e74d255 100644
--- a/patches/server/0445-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0444-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0446-Limit-recipe-packets.patch b/patches/server/0445-Limit-recipe-packets.patch
index a4c87098fa..a4c87098fa 100644
--- a/patches/server/0446-Limit-recipe-packets.patch
+++ b/patches/server/0445-Limit-recipe-packets.patch
diff --git a/patches/server/0447-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0446-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0447-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0446-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0448-Player-Chunk-Load-Unload-Events.patch b/patches/server/0447-Player-Chunk-Load-Unload-Events.patch
index 0fee853cd3..0fee853cd3 100644
--- a/patches/server/0448-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0447-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0449-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0448-Optimize-Dynamic-get-Missing-Keys.patch
index e8bbac8b76..e8bbac8b76 100644
--- a/patches/server/0449-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0448-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0450-Expose-LivingEntity-hurt-direction.patch b/patches/server/0449-Expose-LivingEntity-hurt-direction.patch
index de27c1fb39..de27c1fb39 100644
--- a/patches/server/0450-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0449-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0451-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0450-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index c72796ff26..c72796ff26 100644
--- a/patches/server/0451-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0450-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0452-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0451-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
index 4186b39237..4186b39237 100644
--- a/patches/server/0452-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
+++ b/patches/server/0451-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0453-Add-TargetHitEvent.patch b/patches/server/0452-Add-TargetHitEvent.patch
index 816c525fd2..816c525fd2 100644
--- a/patches/server/0453-Add-TargetHitEvent.patch
+++ b/patches/server/0452-Add-TargetHitEvent.patch
diff --git a/patches/server/0454-MC-4-Fix-item-position-desync.patch b/patches/server/0453-MC-4-Fix-item-position-desync.patch
index 9420ce8945..9420ce8945 100644
--- a/patches/server/0454-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0453-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0455-Additional-Block-Material-API.patch b/patches/server/0454-Additional-Block-Material-API.patch
index 81728edf48..81728edf48 100644
--- a/patches/server/0455-Additional-Block-Material-API.patch
+++ b/patches/server/0454-Additional-Block-Material-API.patch
diff --git a/patches/server/0456-Fix-harming-potion-dupe.patch b/patches/server/0455-Fix-harming-potion-dupe.patch
index b184bf641c..b184bf641c 100644
--- a/patches/server/0456-Fix-harming-potion-dupe.patch
+++ b/patches/server/0455-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0457-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0456-API-to-get-Material-from-Boats-and-Minecarts.patch
index 9bcb17ad14..9bcb17ad14 100644
--- a/patches/server/0457-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/server/0456-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0458-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0457-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index da8441444c..da8441444c 100644
--- a/patches/server/0458-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0457-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0459-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0458-Fix-Not-a-string-Map-Conversion-spam.patch
index 5b2328afe8..5b2328afe8 100644
--- a/patches/server/0459-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0458-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0460-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0459-Add-PlayerFlowerPotManipulateEvent.patch
index 8b61833059..8b61833059 100644
--- a/patches/server/0460-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0459-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0461-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0460-Fix-interact-event-not-being-called-sometimes.patch
index 579eae9915..579eae9915 100644
--- a/patches/server/0461-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0460-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0462-Zombie-API-breaking-doors.patch b/patches/server/0461-Zombie-API-breaking-doors.patch
index 50bb6965cf..50bb6965cf 100644
--- a/patches/server/0462-Zombie-API-breaking-doors.patch
+++ b/patches/server/0461-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0463-Fix-nerfed-slime-when-splitting.patch b/patches/server/0462-Fix-nerfed-slime-when-splitting.patch
index a32a88f5ad..a32a88f5ad 100644
--- a/patches/server/0463-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0462-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0464-Add-EntityLoadCrossbowEvent.patch b/patches/server/0463-Add-EntityLoadCrossbowEvent.patch
index a2f95139f8..a2f95139f8 100644
--- a/patches/server/0464-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0463-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0465-Add-WorldGameRuleChangeEvent.patch b/patches/server/0464-Add-WorldGameRuleChangeEvent.patch
index 40e2bb8cc9..40dab3d535 100644
--- a/patches/server/0465-Add-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0464-Add-WorldGameRuleChangeEvent.patch
@@ -64,10 +64,10 @@ index 0b46ad360be919e4aeb0ffc0eebae9fe712fb861..51e560d7856f230c5aa2dc32706c3a49
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 97ab6b50288b0d9303cbe20c5aa2af26ff3e72fb..ab5b7ed7ebc1205cb9e4aa017f5d69ccb4fc8ac2 100644
+index 009be0baf925245ff8fa3d849f4233fb952f881e..c1125b0db7449a6d61e7b0a4e7c5d30917744b5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1908,8 +1908,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1885,8 +1885,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          if (!this.isGameRule(rule)) return false;
  
@@ -82,7 +82,7 @@ index 97ab6b50288b0d9303cbe20c5aa2af26ff3e72fb..ab5b7ed7ebc1205cb9e4aa017f5d69cc
          handle.onChanged(this.getHandle());
          return true;
      }
-@@ -1945,8 +1950,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1922,8 +1927,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          if (!this.isGameRule(rule.getName())) return false;
  
diff --git a/patches/server/0466-Add-ServerResourcesReloadedEvent.patch b/patches/server/0465-Add-ServerResourcesReloadedEvent.patch
index 2268c27b1c..2268c27b1c 100644
--- a/patches/server/0466-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0465-Add-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0467-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0466-Add-world-settings-for-mobs-picking-up-loot.patch
index a6e23dc931..a6e23dc931 100644
--- a/patches/server/0467-Add-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0466-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0468-Add-BlockFailedDispenseEvent.patch b/patches/server/0467-Add-BlockFailedDispenseEvent.patch
index 4d96419af9..4d96419af9 100644
--- a/patches/server/0468-Add-BlockFailedDispenseEvent.patch
+++ b/patches/server/0467-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0469-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0468-Add-PlayerLecternPageChangeEvent.patch
index 2e62d2becf..2e62d2becf 100644
--- a/patches/server/0469-Add-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0468-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0470-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0469-Add-PlayerLoomPatternSelectEvent.patch
index 4d74c20681..4d74c20681 100644
--- a/patches/server/0470-Add-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0469-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0471-Configurable-door-breaking-difficulty.patch b/patches/server/0470-Configurable-door-breaking-difficulty.patch
index 679bb5f5e7..679bb5f5e7 100644
--- a/patches/server/0471-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0470-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0472-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0471-Empty-commands-shall-not-be-dispatched.patch
index 42a615398b..42a615398b 100644
--- a/patches/server/0472-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0471-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0473-Remove-stale-POIs.patch b/patches/server/0472-Remove-stale-POIs.patch
index 221b65719b..221b65719b 100644
--- a/patches/server/0473-Remove-stale-POIs.patch
+++ b/patches/server/0472-Remove-stale-POIs.patch
diff --git a/patches/server/0474-Fix-villager-boat-exploit.patch b/patches/server/0473-Fix-villager-boat-exploit.patch
index 69ce1a86af..8f9249892b 100644
--- a/patches/server/0474-Fix-villager-boat-exploit.patch
+++ b/patches/server/0473-Fix-villager-boat-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 60845fe39f6e24474c1fa39c06a8b164348cb326..5a709e301b336ee2fc62b422a2f3d878b81f9743 100644
+index ec080eb8e3930b6c5cc08c3061535b379a99a7d1..846132dad557b04a3d52184cfb1c0dd35673f8c6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -595,6 +595,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0475-Add-sendOpLevel-API.patch b/patches/server/0474-Add-sendOpLevel-API.patch
index c97ae56aab..ad4f27d640 100644
--- a/patches/server/0475-Add-sendOpLevel-API.patch
+++ b/patches/server/0474-Add-sendOpLevel-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5a709e301b336ee2fc62b422a2f3d878b81f9743..f9ecdb537b7cbf4a97888a88a61686d9a2847cd6 100644
+index 846132dad557b04a3d52184cfb1c0dd35673f8c6..5100b2d00452f97849239ca32164eed4345e4024 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1062,6 +1062,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0476-Add-RegistryAccess-for-managing-Registries.patch b/patches/server/0475-Add-RegistryAccess-for-managing-Registries.patch
index 808bc4c6c6..808bc4c6c6 100644
--- a/patches/server/0476-Add-RegistryAccess-for-managing-Registries.patch
+++ b/patches/server/0475-Add-RegistryAccess-for-managing-Registries.patch
diff --git a/patches/server/0476-Add-StructuresLocateEvent.patch b/patches/server/0476-Add-StructuresLocateEvent.patch
new file mode 100644
index 0000000000..d8c688e2ae
--- /dev/null
+++ b/patches/server/0476-Add-StructuresLocateEvent.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: dfsek <[email protected]>
+Date: Wed, 16 Sep 2020 01:12:29 -0700
+Subject: [PATCH] Add StructuresLocateEvent
+
+Co-authored-by: Jake Potrebic <[email protected]>
+
+diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+index 0a779632c9d11496fcfc147870fba2699d9cc274..5adc1952504b26772116b55a5144b7704136edfa 100644
+--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
++++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+@@ -126,6 +126,24 @@ public abstract class ChunkGenerator {
+ 
+     @Nullable
+     public Pair<BlockPos, Holder<Structure>> findNearestMapStructure(ServerLevel world, HolderSet<Structure> structures, BlockPos center, int radius, boolean skipReferencedStructures) {
++        // Paper start - StructuresLocateEvent
++        final org.bukkit.World bukkitWorld = world.getWorld();
++        final org.bukkit.Location origin = io.papermc.paper.util.MCUtil.toLocation(world, center);
++        final List<org.bukkit.generator.structure.Structure> apiStructures = structures.stream().map(Holder::value).map(nms -> org.bukkit.craftbukkit.generator.structure.CraftStructure.minecraftToBukkit(nms)).toList();
++        if (!apiStructures.isEmpty()) {
++            final io.papermc.paper.event.world.StructuresLocateEvent event = new io.papermc.paper.event.world.StructuresLocateEvent(bukkitWorld, origin, apiStructures, radius, skipReferencedStructures);
++            if (!event.callEvent()) {
++                return null;
++            }
++            if (event.getResult() != null) {
++                return Pair.of(io.papermc.paper.util.MCUtil.toBlockPos(event.getResult().pos()), world.registryAccess().registryOrThrow(Registries.STRUCTURE).wrapAsHolder(org.bukkit.craftbukkit.generator.structure.CraftStructure.bukkitToMinecraft(event.getResult().structure())));
++            }
++            center = io.papermc.paper.util.MCUtil.toBlockPosition(event.getOrigin());
++            radius = event.getRadius();
++            skipReferencedStructures = event.shouldFindUnexplored();
++            structures = HolderSet.direct(api -> world.registryAccess().registryOrThrow(Registries.STRUCTURE).wrapAsHolder(org.bukkit.craftbukkit.generator.structure.CraftStructure.bukkitToMinecraft(api)), event.getStructures());
++        }
++        // Paper end
+         ChunkGeneratorStructureState chunkgeneratorstructurestate = world.getChunkSource().getGeneratorState();
+         Map<StructurePlacement, Set<Holder<Structure>>> map = new Object2ObjectArrayMap();
+         Iterator iterator = structures.iterator();
diff --git a/patches/server/0477-Add-StructuresLocateEvent.patch b/patches/server/0477-Add-StructuresLocateEvent.patch
deleted file mode 100644
index 48c0824bd5..0000000000
--- a/patches/server/0477-Add-StructuresLocateEvent.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: dfsek <[email protected]>
-Date: Wed, 16 Sep 2020 01:12:29 -0700
-Subject: [PATCH] Add StructuresLocateEvent
-
-Co-authored-by: Jake Potrebic <[email protected]>
-
-diff --git a/src/main/java/io/papermc/paper/registry/PaperRegistries.java b/src/main/java/io/papermc/paper/registry/PaperRegistries.java
-index 55feffc03d2924e5ec0f55fc65e8aa148cb0cc62..1b5a791e4cca089774cb3519012a538f3f88eac4 100644
---- a/src/main/java/io/papermc/paper/registry/PaperRegistries.java
-+++ b/src/main/java/io/papermc/paper/registry/PaperRegistries.java
-@@ -48,6 +48,12 @@ import static io.papermc.paper.registry.entry.RegistryEntry.entry;
- @DefaultQualifier(NonNull.class)
- public final class PaperRegistries {
- 
-+    @Deprecated(forRemoval = true)
-+    @org.jetbrains.annotations.VisibleForTesting
-+    public static final RegistryKey<io.papermc.paper.world.structure.ConfiguredStructure> CONFIGURED_STRUCTURE_REGISTRY_KEY = RegistryKeyImpl.createInternal("worldgen/structure");
-+    @Deprecated(forRemoval = true)
-+    static final RegistryEntry<Structure, io.papermc.paper.world.structure.ConfiguredStructure, ?> CONFIGURED_STRUCTURE_REGISTRY_ENTRY = entry(Registries.STRUCTURE, CONFIGURED_STRUCTURE_REGISTRY_KEY, io.papermc.paper.world.structure.ConfiguredStructure.class, io.papermc.paper.world.structure.PaperConfiguredStructure::minecraftToBukkit).delayed();
-+
-     static final List<RegistryEntry<?, ?, ?>> REGISTRY_ENTRIES;
-     private static final Map<RegistryKey<?>, RegistryEntry<?, ?, ?>> BY_REGISTRY_KEY;
-     private static final Map<ResourceKey<?>, RegistryEntry<?, ?, ?>> BY_RESOURCE_KEY;
-diff --git a/src/main/java/io/papermc/paper/registry/PaperRegistryAccess.java b/src/main/java/io/papermc/paper/registry/PaperRegistryAccess.java
-index 9f2bcfe0d9e479466a1e46e503071d1151310e6a..7aa1a29e93b787e1167169bc7d6e9563daf6241e 100644
---- a/src/main/java/io/papermc/paper/registry/PaperRegistryAccess.java
-+++ b/src/main/java/io/papermc/paper/registry/PaperRegistryAccess.java
-@@ -45,8 +45,13 @@ public class PaperRegistryAccess implements RegistryAccess {
-     public <T extends Keyed> @Nullable Registry<T> getRegistry(final Class<T> type) {
-         final RegistryKey<T> registryKey;
-         final @Nullable RegistryEntry<?, T, ?> entry;
--        registryKey = requireNonNull(byType(type), () -> type + " is not a valid registry type");
--        entry = PaperRegistries.getEntry(registryKey);
-+        if (type == io.papermc.paper.world.structure.ConfiguredStructure.class) { // manually handle "duplicate" registries to avoid polluting maps in PaperRegistries
-+            registryKey = (RegistryKey<T>) PaperRegistries.CONFIGURED_STRUCTURE_REGISTRY_KEY;
-+            entry = (RegistryEntry<?, T, ?>) PaperRegistries.CONFIGURED_STRUCTURE_REGISTRY_ENTRY;
-+        } else {
-+            registryKey = requireNonNull(byType(type), () -> type + " is not a valid registry type");
-+            entry = PaperRegistries.getEntry(registryKey);
-+        }
-         final @Nullable RegistryHolder<T> registry = (RegistryHolder<T>) this.registries.get(registryKey);
-         if (registry != null) {
-             // if the registry exists, return right away. Since this is the "legacy" method, we return DelayedRegistry
-diff --git a/src/main/java/io/papermc/paper/world/structure/PaperConfiguredStructure.java b/src/main/java/io/papermc/paper/world/structure/PaperConfiguredStructure.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..013d614a1cf1ab2b5a6ec190c2b4ba7753268731
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/world/structure/PaperConfiguredStructure.java
-@@ -0,0 +1,27 @@
-+package io.papermc.paper.world.structure;
-+
-+import java.util.Objects;
-+import net.minecraft.core.Registry;
-+import net.minecraft.core.registries.BuiltInRegistries;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.world.level.levelgen.structure.Structure;
-+import org.bukkit.NamespacedKey;
-+import org.bukkit.StructureType;
-+import org.bukkit.craftbukkit.CraftRegistry;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+@Deprecated(forRemoval = true)
-+public final class PaperConfiguredStructure {
-+
-+    private PaperConfiguredStructure() {
-+    }
-+
-+    public static @Nullable ConfiguredStructure minecraftToBukkit(NamespacedKey key, Structure nms) {
-+        final ResourceLocation structureTypeLoc = Objects.requireNonNull(BuiltInRegistries.STRUCTURE_TYPE.getKey(nms.type()), "unexpected structure type " + nms.type());
-+        final @Nullable StructureType structureType = StructureType.getStructureTypes().get(structureTypeLoc.getPath());
-+        return structureType == null ? null : new ConfiguredStructure(key, structureType);
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 0a779632c9d11496fcfc147870fba2699d9cc274..5adc1952504b26772116b55a5144b7704136edfa 100644
---- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -126,6 +126,24 @@ public abstract class ChunkGenerator {
- 
-     @Nullable
-     public Pair<BlockPos, Holder<Structure>> findNearestMapStructure(ServerLevel world, HolderSet<Structure> structures, BlockPos center, int radius, boolean skipReferencedStructures) {
-+        // Paper start - StructuresLocateEvent
-+        final org.bukkit.World bukkitWorld = world.getWorld();
-+        final org.bukkit.Location origin = io.papermc.paper.util.MCUtil.toLocation(world, center);
-+        final List<org.bukkit.generator.structure.Structure> apiStructures = structures.stream().map(Holder::value).map(nms -> org.bukkit.craftbukkit.generator.structure.CraftStructure.minecraftToBukkit(nms)).toList();
-+        if (!apiStructures.isEmpty()) {
-+            final io.papermc.paper.event.world.StructuresLocateEvent event = new io.papermc.paper.event.world.StructuresLocateEvent(bukkitWorld, origin, apiStructures, radius, skipReferencedStructures);
-+            if (!event.callEvent()) {
-+                return null;
-+            }
-+            if (event.getResult() != null) {
-+                return Pair.of(io.papermc.paper.util.MCUtil.toBlockPos(event.getResult().pos()), world.registryAccess().registryOrThrow(Registries.STRUCTURE).wrapAsHolder(org.bukkit.craftbukkit.generator.structure.CraftStructure.bukkitToMinecraft(event.getResult().structure())));
-+            }
-+            center = io.papermc.paper.util.MCUtil.toBlockPosition(event.getOrigin());
-+            radius = event.getRadius();
-+            skipReferencedStructures = event.shouldFindUnexplored();
-+            structures = HolderSet.direct(api -> world.registryAccess().registryOrThrow(Registries.STRUCTURE).wrapAsHolder(org.bukkit.craftbukkit.generator.structure.CraftStructure.bukkitToMinecraft(api)), event.getStructures());
-+        }
-+        // Paper end
-         ChunkGeneratorStructureState chunkgeneratorstructurestate = world.getChunkSource().getGeneratorState();
-         Map<StructurePlacement, Set<Holder<Structure>>> map = new Object2ObjectArrayMap();
-         Iterator iterator = structures.iterator();
-diff --git a/src/test/java/io/papermc/paper/world/structure/ConfiguredStructureTest.java b/src/test/java/io/papermc/paper/world/structure/ConfiguredStructureTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..9178fe0d01b998ca1442bf2511f8fc00db9388ba
---- /dev/null
-+++ b/src/test/java/io/papermc/paper/world/structure/ConfiguredStructureTest.java
-@@ -0,0 +1,96 @@
-+package io.papermc.paper.world.structure;
-+
-+import io.papermc.paper.registry.Reference;
-+import net.minecraft.core.Registry;
-+import net.minecraft.core.registries.Registries;
-+import net.minecraft.resources.ResourceKey;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.server.Bootstrap;
-+import net.minecraft.world.level.levelgen.structure.Structure;
-+import net.minecraft.world.level.levelgen.structure.BuiltinStructures;
-+import org.bukkit.NamespacedKey;
-+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-+import org.bukkit.support.AbstractTestingBase;
-+import org.junit.jupiter.api.AfterAll;
-+import org.junit.jupiter.api.BeforeAll;
-+import org.junit.jupiter.api.Test;
-+
-+import java.io.PrintStream;
-+import java.lang.reflect.Field;
-+import java.lang.reflect.Modifier;
-+import java.util.LinkedHashMap;
-+import java.util.Map;
-+import java.util.StringJoiner;
-+
-+import static org.junit.jupiter.api.Assertions.assertEquals;
-+import static org.junit.jupiter.api.Assertions.assertNotNull;
-+import static org.junit.jupiter.api.Assertions.assertTrue;
-+
-+@Deprecated(forRemoval = true)
-+public class ConfiguredStructureTest extends AbstractTestingBase {
-+
-+    private static final Map<ResourceLocation, String> BUILT_IN_STRUCTURES = new LinkedHashMap<>();
-+    private static final Map<NamespacedKey, Reference<?>> DEFAULT_CONFIGURED_STRUCTURES = new LinkedHashMap<>();
-+
-+    private static PrintStream out;
-+
-+    @BeforeAll
-+    public static void collectStructures() throws ReflectiveOperationException {
-+        out = System.out;
-+        System.setOut(Bootstrap.STDOUT);
-+        for (Field field : BuiltinStructures.class.getDeclaredFields()) {
-+            if (field.getType().equals(ResourceKey.class) && Modifier.isStatic(field.getModifiers())) {
-+                BUILT_IN_STRUCTURES.put(((ResourceKey<?>) field.get(null)).location(), field.getName());
-+            }
-+        }
-+        for (Field field : ConfiguredStructure.class.getDeclaredFields()) {
-+            if (field.getType().equals(Reference.class) && Modifier.isStatic(field.getModifiers())) {
-+                final Reference<?> ref = (Reference<?>) field.get(null);
-+                DEFAULT_CONFIGURED_STRUCTURES.put(ref.getKey(), ref);
-+            }
-+        }
-+    }
-+
-+    @Test
-+    public void testMinecraftToApi() {
-+        Registry<Structure> structureRegistry = AbstractTestingBase.REGISTRY_CUSTOM.registryOrThrow(Registries.STRUCTURE);
-+        assertEquals(BUILT_IN_STRUCTURES.size(), structureRegistry.size(), "configured structure maps should be the same size");
-+
-+        Map<ResourceLocation, Structure> missing = new LinkedHashMap<>();
-+        for (Structure feature : structureRegistry) {
-+            final ResourceLocation key = structureRegistry.getKey(feature);
-+            assertNotNull(key, "Missing built-in registry key");
-+            if (key.equals(BuiltinStructures.ANCIENT_CITY.location()) || key.equals(BuiltinStructures.TRAIL_RUINS.location()) || key.equals(BuiltinStructures.TRIAL_CHAMBERS.location())) {
-+                continue; // TODO remove when upstream adds "jigsaw" StructureType
-+            }
-+            if (DEFAULT_CONFIGURED_STRUCTURES.get(CraftNamespacedKey.fromMinecraft(key)) == null) {
-+                missing.put(key, feature);
-+            }
-+        }
-+
-+        assertTrue(missing.isEmpty(), printMissing(missing));
-+    }
-+
-+    @Test
-+    public void testApiToMinecraft() {
-+        Registry<Structure> structureRegistry = AbstractTestingBase.REGISTRY_CUSTOM.registryOrThrow(Registries.STRUCTURE);
-+        for (NamespacedKey apiKey : DEFAULT_CONFIGURED_STRUCTURES.keySet()) {
-+            assertTrue(structureRegistry.containsKey(CraftNamespacedKey.toMinecraft(apiKey)), apiKey + " does not have a minecraft counterpart");
-+        }
-+    }
-+
-+    private static String printMissing(Map<ResourceLocation, Structure> missing) {
-+        final StringJoiner joiner = new StringJoiner("\n", "Missing: \n", "");
-+
-+        missing.forEach((key, configuredFeature) -> {
-+            joiner.add("public static final Reference<ConfiguredStructure> " + BUILT_IN_STRUCTURES.get(key) + " = create(\"" + key.getPath() + "\");");
-+        });
-+
-+        return joiner.toString();
-+    }
-+
-+    @AfterAll
-+    public static void after() {
-+        System.setOut(out);
-+    }
-+}
-diff --git a/src/test/java/org/bukkit/registry/PerRegistryTest.java b/src/test/java/org/bukkit/registry/PerRegistryTest.java
-index 4e4ea083063daf22f1bb785ef212958ea889c43b..523b4b208e05c6b70014440200e3196cc84f36cc 100644
---- a/src/test/java/org/bukkit/registry/PerRegistryTest.java
-+++ b/src/test/java/org/bukkit/registry/PerRegistryTest.java
-@@ -36,6 +36,7 @@ public class PerRegistryTest extends AbstractTestingBase {
-                 if (!(object instanceof CraftRegistry<?, ?> registry)) {
-                     continue;
-                 }
-+                if (object == Registry.CONFIGURED_STRUCTURE) continue; // Paper - skip
- 
-                 data.add(Arguments.of(registry));
-             } catch (ReflectiveOperationException e) {
-diff --git a/src/test/java/org/bukkit/registry/RegistryArgumentAddedTest.java b/src/test/java/org/bukkit/registry/RegistryArgumentAddedTest.java
-index 0dd775ad1bd0bf9ba7ea05255d543a9df8b5fcfd..c1e51d104c52dd3f3e48d651b0ff1f00ae9bf96d 100644
---- a/src/test/java/org/bukkit/registry/RegistryArgumentAddedTest.java
-+++ b/src/test/java/org/bukkit/registry/RegistryArgumentAddedTest.java
-@@ -26,6 +26,7 @@ public class RegistryArgumentAddedTest extends AbstractTestingBase {
-         loadedRegistries.addAll(io.papermc.paper.registry.PaperRegistryAccess.instance().getLoadedServerBackedRegistries());
-         // Paper end
-         Set<io.papermc.paper.registry.RegistryKey<?>> notFound = new HashSet<>(); // Paper
-+        loadedRegistries.remove(io.papermc.paper.registry.PaperRegistries.CONFIGURED_STRUCTURE_REGISTRY_KEY); // Paper - ignore
- 
-         RegistriesArgumentProvider
-                 .getData()
diff --git a/patches/server/0478-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0477-Collision-option-for-requiring-a-player-participant.patch
index 663c5bd3d9..663c5bd3d9 100644
--- a/patches/server/0478-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0477-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0479-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0478-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 265be53faf..265be53faf 100644
--- a/patches/server/0479-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0478-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0480-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0479-Return-chat-component-with-empty-text-instead-of-thr.patch
index 4dea2ddeed..4dea2ddeed 100644
--- a/patches/server/0480-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0479-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0481-Make-schedule-command-per-world.patch b/patches/server/0480-Make-schedule-command-per-world.patch
index 2d8f63ad1e..2d8f63ad1e 100644
--- a/patches/server/0481-Make-schedule-command-per-world.patch
+++ b/patches/server/0480-Make-schedule-command-per-world.patch
diff --git a/patches/server/0482-Configurable-max-leash-distance.patch b/patches/server/0481-Configurable-max-leash-distance.patch
index 404169cae8..404169cae8 100644
--- a/patches/server/0482-Configurable-max-leash-distance.patch
+++ b/patches/server/0481-Configurable-max-leash-distance.patch
diff --git a/patches/server/0483-Add-BlockPreDispenseEvent.patch b/patches/server/0482-Add-BlockPreDispenseEvent.patch
index 76ee7d959e..76ee7d959e 100644
--- a/patches/server/0483-Add-BlockPreDispenseEvent.patch
+++ b/patches/server/0482-Add-BlockPreDispenseEvent.patch
diff --git a/patches/server/0484-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0483-Add-PlayerChangeBeaconEffectEvent.patch
index b3444419ee..b3444419ee 100644
--- a/patches/server/0484-Add-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0483-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0485-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0484-Add-toggle-for-always-placing-the-dragon-egg.patch
index 2576990e24..2576990e24 100644
--- a/patches/server/0485-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0484-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0486-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0485-Add-PlayerStonecutterRecipeSelectEvent.patch
index ec46b8f54b..ec46b8f54b 100644
--- a/patches/server/0486-Add-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0485-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0487-Expand-EntityUnleashEvent.patch b/patches/server/0486-Expand-EntityUnleashEvent.patch
index 4641c486ef..4641c486ef 100644
--- a/patches/server/0487-Expand-EntityUnleashEvent.patch
+++ b/patches/server/0486-Expand-EntityUnleashEvent.patch
diff --git a/patches/server/0488-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0487-Reset-shield-blocking-on-dimension-change.patch
index 1dc7e3c626..c53c26b979 100644
--- a/patches/server/0488-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0487-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 42da4c28c6a747174c1b757affa5e245463864ba..cd563b639ed970d8bf390eb87f2b66412473a783 100644
+index 62dbdc56d5529800d7a424040eb6821e9d527255..0f5c34ad7b983b9ea4e994145142457033a8c997 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1352,6 +1352,11 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0489-Add-DragonEggFormEvent.patch b/patches/server/0488-Add-DragonEggFormEvent.patch
index c9ec752038..c9ec752038 100644
--- a/patches/server/0489-Add-DragonEggFormEvent.patch
+++ b/patches/server/0488-Add-DragonEggFormEvent.patch
diff --git a/patches/server/0490-Add-EntityMoveEvent.patch b/patches/server/0489-Add-EntityMoveEvent.patch
index ed5994857e..ed5994857e 100644
--- a/patches/server/0490-Add-EntityMoveEvent.patch
+++ b/patches/server/0489-Add-EntityMoveEvent.patch
diff --git a/patches/server/0491-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0490-added-option-to-disable-pathfinding-updates-on-block.patch
index dd30ec31b5..dd30ec31b5 100644
--- a/patches/server/0491-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0490-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0492-Inline-shift-direction-fields.patch b/patches/server/0491-Inline-shift-direction-fields.patch
index 910b881e3a..910b881e3a 100644
--- a/patches/server/0492-Inline-shift-direction-fields.patch
+++ b/patches/server/0491-Inline-shift-direction-fields.patch
diff --git a/patches/server/0493-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0492-Allow-adding-items-to-BlockDropItemEvent.patch
index 0808b4dbcd..0808b4dbcd 100644
--- a/patches/server/0493-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0492-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0494-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0493-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 57d54a0434..57d54a0434 100644
--- a/patches/server/0494-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0493-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0495-living-entity-allow-attribute-registration.patch b/patches/server/0494-living-entity-allow-attribute-registration.patch
index 995d796169..995d796169 100644
--- a/patches/server/0495-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0494-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0496-fix-dead-slime-setSize-invincibility.patch b/patches/server/0495-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0496-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0495-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0497-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0496-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0497-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0496-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0498-Expose-Tracked-Players.patch b/patches/server/0497-Expose-Tracked-Players.patch
index f7b030cbff..f7b030cbff 100644
--- a/patches/server/0498-Expose-Tracked-Players.patch
+++ b/patches/server/0497-Expose-Tracked-Players.patch
diff --git a/patches/server/0499-Improve-ServerGUI.patch b/patches/server/0498-Improve-ServerGUI.patch
index 872206f5fe..872206f5fe 100644
--- a/patches/server/0499-Improve-ServerGUI.patch
+++ b/patches/server/0498-Improve-ServerGUI.patch
diff --git a/patches/server/0500-fix-converting-txt-to-json-file.patch b/patches/server/0499-fix-converting-txt-to-json-file.patch
index 760da20ec3..efc09dd833 100644
--- a/patches/server/0500-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0499-fix-converting-txt-to-json-file.patch
@@ -48,7 +48,7 @@ index 2b1d7a2360a9ee7bca9d93a2dc8c61d1648a8348..d5153f804cfcfd1a70c46975e3fb1e50
          if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
              return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f9ecdb537b7cbf4a97888a88a61686d9a2847cd6..bf1a8d273a9599597fc4bb0c8e33b15177ad5d8e 100644
+index 5100b2d00452f97849239ca32164eed4345e4024..6ef0e5c607c1b7ef9ba6a9f5c7bc452ce9a84250 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -179,6 +179,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0501-Add-worldborder-events.patch b/patches/server/0500-Add-worldborder-events.patch
index 44a467547c..44a467547c 100644
--- a/patches/server/0501-Add-worldborder-events.patch
+++ b/patches/server/0500-Add-worldborder-events.patch
diff --git a/patches/server/0502-Add-PlayerNameEntityEvent.patch b/patches/server/0501-Add-PlayerNameEntityEvent.patch
index 9287edc1b7..9287edc1b7 100644
--- a/patches/server/0502-Add-PlayerNameEntityEvent.patch
+++ b/patches/server/0501-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0503-Add-recipe-to-cook-events.patch b/patches/server/0502-Add-recipe-to-cook-events.patch
index 6fe8720d21..6fe8720d21 100644
--- a/patches/server/0503-Add-recipe-to-cook-events.patch
+++ b/patches/server/0502-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0504-Add-Block-isValidTool.patch b/patches/server/0503-Add-Block-isValidTool.patch
index 5f36fb047c..5f36fb047c 100644
--- a/patches/server/0504-Add-Block-isValidTool.patch
+++ b/patches/server/0503-Add-Block-isValidTool.patch
diff --git a/patches/server/0505-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0504-Allow-using-signs-inside-spawn-protection.patch
index 9350df5f61..9350df5f61 100644
--- a/patches/server/0505-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0504-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0506-Expand-world-key-API.patch b/patches/server/0505-Expand-world-key-API.patch
index dab6d8f7be..dab6d8f7be 100644
--- a/patches/server/0506-Expand-world-key-API.patch
+++ b/patches/server/0505-Expand-world-key-API.patch
diff --git a/patches/server/0507-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0506-Add-fast-alternative-constructor-for-Rotations.patch
index e28775fc9a..e28775fc9a 100644
--- a/patches/server/0507-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0506-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0508-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0507-Drop-carried-item-when-player-has-disconnected.patch
index 768ba92804..757cfd681e 100644
--- a/patches/server/0508-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0507-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index bf1a8d273a9599597fc4bb0c8e33b15177ad5d8e..995f085b0a1c7b14c4942dd4ed700f0271e18ec5 100644
+index 6ef0e5c607c1b7ef9ba6a9f5c7bc452ce9a84250..7ef760cb1c88f557947e9b88409a2935666f86f0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -588,6 +588,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0509-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0508-forced-whitelist-use-configurable-kick-message.patch
index 20600f75d1..20600f75d1 100644
--- a/patches/server/0509-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0508-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0510-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0509-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 086d9c426c..086d9c426c 100644
--- a/patches/server/0510-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0509-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0511-Expose-protocol-version.patch b/patches/server/0510-Expose-protocol-version.patch
index 3bdee13099..3bdee13099 100644
--- a/patches/server/0511-Expose-protocol-version.patch
+++ b/patches/server/0510-Expose-protocol-version.patch
diff --git a/patches/server/0512-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0511-Enhance-console-tab-completions-for-brigadier-comman.patch
index 701ba9042a..701ba9042a 100644
--- a/patches/server/0512-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0511-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0513-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0512-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 9263944a8d..9263944a8d 100644
--- a/patches/server/0513-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0512-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0514-Add-bypass-host-check.patch b/patches/server/0513-Add-bypass-host-check.patch
index 53fea6e14d..53fea6e14d 100644
--- a/patches/server/0514-Add-bypass-host-check.patch
+++ b/patches/server/0513-Add-bypass-host-check.patch
diff --git a/patches/server/0515-Set-area-affect-cloud-rotation.patch b/patches/server/0514-Set-area-affect-cloud-rotation.patch
index 1816791836..1816791836 100644
--- a/patches/server/0515-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0514-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0516-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0515-add-isDeeplySleeping-to-HumanEntity.patch
index 26e38b4777..26e38b4777 100644
--- a/patches/server/0516-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0515-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0517-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0516-add-consumeFuel-to-FurnaceBurnEvent.patch
index 1938dc07ed..1938dc07ed 100644
--- a/patches/server/0517-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0516-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0518-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0517-add-get-set-drop-chance-to-EntityEquipment.patch
index 746b410784..746b410784 100644
--- a/patches/server/0518-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0517-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0519-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0518-fix-PigZombieAngerEvent-cancellation.patch
index 3f0d89aea9..3f0d89aea9 100644
--- a/patches/server/0519-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0518-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0520-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0519-fix-PlayerItemHeldEvent-firing-twice.patch
index 98082daee6..98082daee6 100644
--- a/patches/server/0520-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0519-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0521-Add-PlayerDeepSleepEvent.patch b/patches/server/0520-Add-PlayerDeepSleepEvent.patch
index 34cc1de399..34cc1de399 100644
--- a/patches/server/0521-Add-PlayerDeepSleepEvent.patch
+++ b/patches/server/0520-Add-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0522-More-World-API.patch b/patches/server/0521-More-World-API.patch
index 7fb64c5dfa..93e3efa40d 100644
--- a/patches/server/0522-More-World-API.patch
+++ b/patches/server/0521-More-World-API.patch
@@ -5,45 +5,20 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ab5b7ed7ebc1205cb9e4aa017f5d69ccb4fc8ac2..ab8a2906ee2c5eb3d11001f421e76ddde1172d46 100644
+index c1125b0db7449a6d61e7b0a4e7c5d30917744b5d..a197e6993842a1e43311ad9c1fae2f18f799e44b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2153,6 +2153,53 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2130,6 +2130,28 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return new CraftStructureSearchResult(CraftStructure.minecraftToBukkit(found.getSecond().value()), CraftLocation.toBukkit(found.getFirst(), this));
      }
  
 +    // Paper start
 +    @Override
-+    public boolean isUltrawarm() {
-+        return getHandle().dimensionType().ultraWarm();
-+    }
-+
-+    @Override
 +    public double getCoordinateScale() {
 +        return getHandle().dimensionType().coordinateScale();
 +    }
 +
 +    @Override
-+    public boolean hasSkylight() {
-+        return getHandle().dimensionType().hasSkyLight();
-+    }
-+
-+    @Override
-+    public boolean hasBedrockCeiling() {
-+        return getHandle().dimensionType().hasSkyLight();
-+    }
-+
-+    @Override
-+    public boolean doesBedWork() {
-+        return getHandle().dimensionType().bedWorks();
-+    }
-+
-+    @Override
-+    public boolean doesRespawnAnchorWork() {
-+        return getHandle().dimensionType().respawnAnchorWorks();
-+    }
-+
-+    @Override
 +    public boolean isFixedTime() {
 +        return getHandle().dimensionType().hasFixedTime();
 +    }
diff --git a/patches/server/0523-Add-PlayerBedFailEnterEvent.patch b/patches/server/0522-Add-PlayerBedFailEnterEvent.patch
index feffef2aec..feffef2aec 100644
--- a/patches/server/0523-Add-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0522-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0524-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0523-Implement-methods-to-convert-between-Component-and-B.patch
index 614386ecde..614386ecde 100644
--- a/patches/server/0524-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0523-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0525-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0524-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index 936345f0c5..ac20a62072 100644
--- a/patches/server/0525-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
+++ b/patches/server/0524-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand PlayerRespawnEvent, fix passed parameter issues
 Co-authored-by: Jake Potrebic <[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 cd563b639ed970d8bf390eb87f2b66412473a783..47bada5b674c9cc1f30e7d722432f8ecb7fe8f51 100644
+index 0f5c34ad7b983b9ea4e994145142457033a8c997..bd1abd4ad5dc129df4c844571c9a91e7cc1748d9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1197,7 +1197,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0526-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0525-Introduce-beacon-activation-deactivation-events.patch
index 6d74a805c1..6d74a805c1 100644
--- a/patches/server/0526-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0525-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0527-Add-Channel-initialization-listeners.patch b/patches/server/0526-Add-Channel-initialization-listeners.patch
index 334eb230f0..334eb230f0 100644
--- a/patches/server/0527-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0526-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0528-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0527-Send-empty-commands-if-tab-completion-is-disabled.patch
index cd5ed84e1e..cd5ed84e1e 100644
--- a/patches/server/0528-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0527-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0529-Add-more-WanderingTrader-API.patch b/patches/server/0528-Add-more-WanderingTrader-API.patch
index 0ce65786dc..0ce65786dc 100644
--- a/patches/server/0529-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0528-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0530-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0529-Add-EntityBlockStorage-clearEntities.patch
index e52d1c5e1c..e52d1c5e1c 100644
--- a/patches/server/0530-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0529-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0531-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0530-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index c0fd5f11db..c0fd5f11db 100644
--- a/patches/server/0531-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0530-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0532-Add-HiddenPotionEffect-API.patch b/patches/server/0531-Add-HiddenPotionEffect-API.patch
index 2d0b0d5b03..2d0b0d5b03 100644
--- a/patches/server/0532-Add-HiddenPotionEffect-API.patch
+++ b/patches/server/0531-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0533-Inventory-close.patch b/patches/server/0532-Inventory-close.patch
index 9ca8b717ab..9ca8b717ab 100644
--- a/patches/server/0533-Inventory-close.patch
+++ b/patches/server/0532-Inventory-close.patch
diff --git a/patches/server/0534-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0533-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index d5f2f9db1f..d5f2f9db1f 100644
--- a/patches/server/0534-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0533-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0535-Add-basic-Datapack-API.patch b/patches/server/0534-Add-basic-Datapack-API.patch
index e6fb0b935a..e6fb0b935a 100644
--- a/patches/server/0535-Add-basic-Datapack-API.patch
+++ b/patches/server/0534-Add-basic-Datapack-API.patch
diff --git a/patches/server/0536-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0535-Add-environment-variable-to-disable-server-gui.patch
index e4de8ec477..e4de8ec477 100644
--- a/patches/server/0536-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0535-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0537-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0536-Expand-PlayerGameModeChangeEvent.patch
index 92b5afe5fc..46de1ba9ee 100644
--- a/patches/server/0537-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0536-Expand-PlayerGameModeChangeEvent.patch
@@ -45,7 +45,7 @@ index 7f09119bc7d661e08a960dd2bd46006efe752d3e..d1da3600dc07107309b20ebe6e7c0c4d
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 47bada5b674c9cc1f30e7d722432f8ecb7fe8f51..31eccb60919eedf2dba23c759c3c29e011065edc 100644
+index bd1abd4ad5dc129df4c844571c9a91e7cc1748d9..04c9fe154a72804d7bb817bf3bbfccd8be96a6ee 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2087,10 +2087,18 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -78,7 +78,7 @@ index 47bada5b674c9cc1f30e7d722432f8ecb7fe8f51..31eccb60919eedf2dba23c759c3c29e0
          }
      }
  
-@@ -2506,6 +2514,16 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2505,6 +2513,16 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
      }
  
      public void loadGameTypes(@Nullable CompoundTag nbt) {
diff --git a/patches/server/0538-ItemStack-repair-check-API.patch b/patches/server/0537-ItemStack-repair-check-API.patch
index 1a746225f9..1a746225f9 100644
--- a/patches/server/0538-ItemStack-repair-check-API.patch
+++ b/patches/server/0537-ItemStack-repair-check-API.patch
diff --git a/patches/server/0539-More-Enchantment-API.patch b/patches/server/0538-More-Enchantment-API.patch
index 70558c14b9..70558c14b9 100644
--- a/patches/server/0539-More-Enchantment-API.patch
+++ b/patches/server/0538-More-Enchantment-API.patch
diff --git a/patches/server/0540-Move-range-check-for-block-placing-up.patch b/patches/server/0539-Move-range-check-for-block-placing-up.patch
index eb20c018aa..eb20c018aa 100644
--- a/patches/server/0540-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0539-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0541-Add-Mob-lookAt-API.patch b/patches/server/0540-Add-Mob-lookAt-API.patch
index 3139490a61..3139490a61 100644
--- a/patches/server/0541-Add-Mob-lookAt-API.patch
+++ b/patches/server/0540-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0542-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0541-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
index 5a8b0c1cb5..5a8b0c1cb5 100644
--- a/patches/server/0542-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/server/0541-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0543-Add-Unix-domain-socket-support.patch b/patches/server/0542-Add-Unix-domain-socket-support.patch
index a2b93364e7..a2b93364e7 100644
--- a/patches/server/0543-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0542-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0544-Add-EntityInsideBlockEvent.patch b/patches/server/0543-Add-EntityInsideBlockEvent.patch
index 912a0dbe33..912a0dbe33 100644
--- a/patches/server/0544-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0543-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0545-Improve-item-default-attribute-API.patch b/patches/server/0544-Improve-item-default-attribute-API.patch
index cce3124b76..cce3124b76 100644
--- a/patches/server/0545-Improve-item-default-attribute-API.patch
+++ b/patches/server/0544-Improve-item-default-attribute-API.patch
diff --git a/patches/server/0546-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0545-Add-cause-to-Weather-ThunderChangeEvents.patch
index 960089e7d4..6fddf161d3 100644
--- a/patches/server/0546-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0545-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -95,10 +95,10 @@ index e50ad48658193f889d65d37c57b1e30ce46758b7..efd0bcfebb3b4f63018d4e20a6a89f79
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ab8a2906ee2c5eb3d11001f421e76ddde1172d46..a27fb39dfada76b1d33364b2b3e92e4f5203074b 100644
+index a197e6993842a1e43311ad9c1fae2f18f799e44b..862a83b421b77b7126efa455e5f7ba9c744f59f5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1231,7 +1231,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1208,7 +1208,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setStorm(boolean hasStorm) {
@@ -107,7 +107,7 @@ index ab8a2906ee2c5eb3d11001f421e76ddde1172d46..a27fb39dfada76b1d33364b2b3e92e4f
          this.setWeatherDuration(0); // Reset weather duration (legacy behaviour)
          this.setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands)
      }
-@@ -1253,7 +1253,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1230,7 +1230,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setThundering(boolean thundering) {
diff --git a/patches/server/0547-More-Lidded-Block-API.patch b/patches/server/0546-More-Lidded-Block-API.patch
index 437434c525..437434c525 100644
--- a/patches/server/0547-More-Lidded-Block-API.patch
+++ b/patches/server/0546-More-Lidded-Block-API.patch
diff --git a/patches/server/0548-Limit-item-frame-cursors-on-maps.patch b/patches/server/0547-Limit-item-frame-cursors-on-maps.patch
index d710b59685..d710b59685 100644
--- a/patches/server/0548-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0547-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0549-Add-PlayerKickEvent-causes.patch b/patches/server/0548-Add-PlayerKickEvent-causes.patch
index 654ca5ee4e..394d6fdcf6 100644
--- a/patches/server/0549-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0548-Add-PlayerKickEvent-causes.patch
@@ -428,7 +428,7 @@ index 54a370e3cf9f7fd1fa32ee8c76d45f0769a6e612..472e46503df2d3f330e2f8a7f987255d
  
              }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 995f085b0a1c7b14c4942dd4ed700f0271e18ec5..51f723ef7362ff3eb1bb58f2a75acd12928fabac 100644
+index 7ef760cb1c88f557947e9b88409a2935666f86f0..0474b88416e0d016da38909196d32fe992b37d00 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -675,7 +675,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0550-Add-PufferFishStateChangeEvent.patch b/patches/server/0549-Add-PufferFishStateChangeEvent.patch
index 87e61bb2a3..87e61bb2a3 100644
--- a/patches/server/0550-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0549-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0551-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0550-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 12c519eefe..12c519eefe 100644
--- a/patches/server/0551-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0550-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0552-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0551-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 04a6d787b6..04a6d787b6 100644
--- a/patches/server/0552-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0551-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0553-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0552-Add-option-to-fix-items-merging-through-walls.patch
index 636797089d..636797089d 100644
--- a/patches/server/0553-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0552-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0554-Add-BellRevealRaiderEvent.patch b/patches/server/0553-Add-BellRevealRaiderEvent.patch
index 871aa2a198..871aa2a198 100644
--- a/patches/server/0554-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0553-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0555-Fix-invulnerable-end-crystals.patch b/patches/server/0554-Fix-invulnerable-end-crystals.patch
index 57cba19656..57cba19656 100644
--- a/patches/server/0555-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0554-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0556-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0555-Add-ElderGuardianAppearanceEvent.patch
index d9bc14356d..d9bc14356d 100644
--- a/patches/server/0556-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0555-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0557-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0556-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 3d03f4c4d2..3d03f4c4d2 100644
--- a/patches/server/0557-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0556-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0558-Line-Of-Sight-Changes.patch b/patches/server/0557-Line-Of-Sight-Changes.patch
index d9f57b6dfd..d9f57b6dfd 100644
--- a/patches/server/0558-Line-Of-Sight-Changes.patch
+++ b/patches/server/0557-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0559-add-per-world-spawn-limits.patch b/patches/server/0558-add-per-world-spawn-limits.patch
index 79ac41227e..90e01a2a02 100644
--- a/patches/server/0559-add-per-world-spawn-limits.patch
+++ b/patches/server/0558-add-per-world-spawn-limits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add per world spawn limits
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a27fb39dfada76b1d33364b2b3e92e4f5203074b..6734f9e22e9bd1d1b385812d35a72487fe2b7b9b 100644
+index 862a83b421b77b7126efa455e5f7ba9c744f59f5..bcde7c39e0676bf247a825b40b63f6c7b9f19952 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -222,6 +222,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0560-Fix-potions-splash-events.patch b/patches/server/0559-Fix-potions-splash-events.patch
index dc4c8cf698..dc4c8cf698 100644
--- a/patches/server/0560-Fix-potions-splash-events.patch
+++ b/patches/server/0559-Fix-potions-splash-events.patch
diff --git a/patches/server/0561-Add-more-LimitedRegion-API.patch b/patches/server/0560-Add-more-LimitedRegion-API.patch
index 6e183e954e..6e183e954e 100644
--- a/patches/server/0561-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0560-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0562-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0561-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 9b0d0e1d6f..148874452d 100644
--- a/patches/server/0562-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0561-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -31,10 +31,10 @@ 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 31eccb60919eedf2dba23c759c3c29e011065edc..ce23e2058feea0583b58b56eb776f9eaf4c46fac 100644
+index 04c9fe154a72804d7bb817bf3bbfccd8be96a6ee..d413c4d445f42f6a923a49ce4f04b13c3ee28f7a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2483,7 +2483,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2482,7 +2482,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
  
              if (retainOwnership) {
                  if (!itemstack1.isEmpty()) {
diff --git a/patches/server/0563-Missing-Entity-API.patch b/patches/server/0562-Missing-Entity-API.patch
index 1c7bf215a5..1c7bf215a5 100644
--- a/patches/server/0563-Missing-Entity-API.patch
+++ b/patches/server/0562-Missing-Entity-API.patch
diff --git a/patches/server/0564-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0563-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index fdbd6154ca..fdbd6154ca 100644
--- a/patches/server/0564-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0563-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0565-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0564-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index a5c4eefb9a..a5c4eefb9a 100644
--- a/patches/server/0565-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0564-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0566-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0565-Use-getChunkIfLoadedImmediately-in-places.patch
index 0cfa5936f9..0cfa5936f9 100644
--- a/patches/server/0566-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0565-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0567-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0566-Fix-commands-from-signs-not-firing-command-events.patch
index b86e341359..b86e341359 100644
--- a/patches/server/0567-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0566-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0568-Add-PlayerArmSwingEvent.patch b/patches/server/0567-Add-PlayerArmSwingEvent.patch
index 14199e4997..14199e4997 100644
--- a/patches/server/0568-Add-PlayerArmSwingEvent.patch
+++ b/patches/server/0567-Add-PlayerArmSwingEvent.patch
diff --git a/patches/server/0569-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0568-Fix-kick-event-leave-message-not-being-sent.patch
index 61a516dbd3..f833e4de3d 100644
--- a/patches/server/0569-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0568-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 ce23e2058feea0583b58b56eb776f9eaf4c46fac..a2dd1e423b97de27b9825dddb1705538982417b3 100644
+index d413c4d445f42f6a923a49ce4f04b13c3ee28f7a..698fe3042670cee5495ab96f475d36c5b837593e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -289,7 +289,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -101,7 +101,7 @@ index d4917f507b5602bd1cc5e0cc6dc1ca166888f21e..63830e8dd1a91836b8b6830f0f5758e5
              this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(quitMessage), false);
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 51f723ef7362ff3eb1bb58f2a75acd12928fabac..ab0b33de277c90404a24b842d7d17124895d6d4e 100644
+index 0474b88416e0d016da38909196d32fe992b37d00..5b449dd681390eb7aee229a3b6366dcbb96ce2d7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -561,6 +561,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0570-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0569-Don-t-apply-cramming-damage-to-players.patch
index faba14eb93..5176f24655 100644
--- a/patches/server/0570-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0569-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 a2dd1e423b97de27b9825dddb1705538982417b3..ca1bd7f63181ae8c00bf07732ad58416b356ba98 100644
+index 698fe3042670cee5495ab96f475d36c5b837593e..967a61aa38f5361e5fceb8b7761664cb36cf568e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -95,6 +95,7 @@ import net.minecraft.util.Mth;
diff --git a/patches/server/0571-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0570-Rate-options-and-timings-for-sensors-and-behaviors.patch
index d74af14524..d74af14524 100644
--- a/patches/server/0571-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0570-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0572-Add-missing-forceDrop-toggles.patch b/patches/server/0571-Add-missing-forceDrop-toggles.patch
index d7c261ea7c..d7c261ea7c 100644
--- a/patches/server/0572-Add-missing-forceDrop-toggles.patch
+++ b/patches/server/0571-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0573-Stinger-API.patch b/patches/server/0572-Stinger-API.patch
index 2690191442..2690191442 100644
--- a/patches/server/0573-Stinger-API.patch
+++ b/patches/server/0572-Stinger-API.patch
diff --git a/patches/server/0574-Add-System.out-err-catcher.patch b/patches/server/0573-Add-System.out-err-catcher.patch
index 1a4bfc12d1..1a4bfc12d1 100644
--- a/patches/server/0574-Add-System.out-err-catcher.patch
+++ b/patches/server/0573-Add-System.out-err-catcher.patch
diff --git a/patches/server/0575-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0574-Prevent-AFK-kick-while-watching-end-credits.patch
index ec264e9e98..ec264e9e98 100644
--- a/patches/server/0575-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0574-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0576-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0575-Allow-skipping-writing-of-comments-to-server.propert.patch
index 1fce522892..1fce522892 100644
--- a/patches/server/0576-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0575-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0577-Add-PlayerSetSpawnEvent.patch b/patches/server/0576-Add-PlayerSetSpawnEvent.patch
index 6adf7a8c15..b54fcfb9d0 100644
--- a/patches/server/0577-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0576-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 ca1bd7f63181ae8c00bf07732ad58416b356ba98..3e9298db73d1318d28310f1a2536c9fca8b116b3 100644
+index 967a61aa38f5361e5fceb8b7761664cb36cf568e..ce894b31e391786fe98742b9bf22d653df018570 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1425,7 +1425,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -61,7 +61,7 @@ index ca1bd7f63181ae8c00bf07732ad58416b356ba98..3e9298db73d1318d28310f1a2536c9fc
                  if (this.level().isDay()) {
                      return Either.left(net.minecraft.world.entity.player.Player.BedSleepingProblem.NOT_POSSIBLE_NOW);
                  } else {
-@@ -2403,44 +2403,50 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2402,44 +2402,50 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
          this.setRespawnPosition(player.getRespawnDimension(), player.getRespawnPosition(), player.getRespawnAngle(), player.isRespawnForced(), false);
      }
  
@@ -145,7 +145,7 @@ index ca1bd7f63181ae8c00bf07732ad58416b356ba98..3e9298db73d1318d28310f1a2536c9fc
          } else {
              this.respawnPosition = null;
              this.respawnDimension = Level.OVERWORLD;
-@@ -2448,6 +2454,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2447,6 +2453,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
              this.respawnForced = false;
          }
  
@@ -154,7 +154,7 @@ index ca1bd7f63181ae8c00bf07732ad58416b356ba98..3e9298db73d1318d28310f1a2536c9fc
  
      public SectionPos getLastSectionPos() {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ab0b33de277c90404a24b842d7d17124895d6d4e..1ba8fa300b95ad5709e35068e8a372b627d132f9 100644
+index 5b449dd681390eb7aee229a3b6366dcbb96ce2d7..2eced5d3b539dfd072b8b4eafb34f21f849b1bd5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -841,7 +841,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0578-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0577-Make-hoppers-respect-inventory-max-stack-size.patch
index c5f669b979..c5f669b979 100644
--- a/patches/server/0578-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0577-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0579-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0578-Optimize-entity-tracker-passenger-checks.patch
index 0dd7d25ba3..0dd7d25ba3 100644
--- a/patches/server/0579-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0578-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0580-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0579-Config-option-for-Piglins-guarding-chests.patch
index 8e2094a53d..8e2094a53d 100644
--- a/patches/server/0580-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0579-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0581-Add-EntityDamageItemEvent.patch b/patches/server/0580-Add-EntityDamageItemEvent.patch
index 6026e41afa..6026e41afa 100644
--- a/patches/server/0581-Add-EntityDamageItemEvent.patch
+++ b/patches/server/0580-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0582-Optimize-indirect-passenger-iteration.patch b/patches/server/0581-Optimize-indirect-passenger-iteration.patch
index 5f05159ded..5f05159ded 100644
--- a/patches/server/0582-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0581-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0583-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0582-Configurable-item-frame-map-cursor-update-interval.patch
index a6389cdcbb..a6389cdcbb 100644
--- a/patches/server/0583-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0582-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0584-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0583-Change-EnderEye-target-without-changing-other-things.patch
index 53d06a36ec..53d06a36ec 100644
--- a/patches/server/0584-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0583-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0585-Add-BlockBreakBlockEvent.patch b/patches/server/0584-Add-BlockBreakBlockEvent.patch
index 4bc0c5116f..4bc0c5116f 100644
--- a/patches/server/0585-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0584-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0586-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0585-Option-to-prevent-data-components-copy-in-smithing-r.patch
index 7246d24edd..7246d24edd 100644
--- a/patches/server/0586-Option-to-prevent-data-components-copy-in-smithing-r.patch
+++ b/patches/server/0585-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/server/0587-More-CommandBlock-API.patch b/patches/server/0586-More-CommandBlock-API.patch
index 16cf3ee3d7..16cf3ee3d7 100644
--- a/patches/server/0587-More-CommandBlock-API.patch
+++ b/patches/server/0586-More-CommandBlock-API.patch
diff --git a/patches/server/0588-Add-missing-team-sidebar-display-slots.patch b/patches/server/0587-Add-missing-team-sidebar-display-slots.patch
index 641de83a40..641de83a40 100644
--- a/patches/server/0588-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0587-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0589-Add-back-EntityPortalExitEvent.patch b/patches/server/0588-Add-back-EntityPortalExitEvent.patch
index ccbe08c67a..ccbe08c67a 100644
--- a/patches/server/0589-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0588-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0590-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0589-Add-methods-to-find-targets-for-lightning-strikes.patch
index 10a30cf7b6..fac79b2807 100644
--- a/patches/server/0590-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0589-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -31,10 +31,10 @@ index 8c268f57d44d70df3210510abf7832939d41781d..efc27bb4072172f10839c181de9b5fba
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6734f9e22e9bd1d1b385812d35a72487fe2b7b9b..e6adac1897902dfefe18bd67f903b4a524efdf59 100644
+index bcde7c39e0676bf247a825b40b63f6c7b9f19952..7fbf4fba8df8f47b730a46068e68b33502ed63f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -712,6 +712,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -689,6 +689,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (LightningStrike) lightning.getBukkitEntity();
      }
  
diff --git a/patches/server/0591-Get-entity-default-attributes.patch b/patches/server/0590-Get-entity-default-attributes.patch
index 6f99af1f3a..6f99af1f3a 100644
--- a/patches/server/0591-Get-entity-default-attributes.patch
+++ b/patches/server/0590-Get-entity-default-attributes.patch
diff --git a/patches/server/0592-Left-handed-API.patch b/patches/server/0591-Left-handed-API.patch
index 643df451a4..643df451a4 100644
--- a/patches/server/0592-Left-handed-API.patch
+++ b/patches/server/0591-Left-handed-API.patch
diff --git a/patches/server/0593-Add-more-advancement-API.patch b/patches/server/0592-Add-more-advancement-API.patch
index 772c00ba58..772c00ba58 100644
--- a/patches/server/0593-Add-more-advancement-API.patch
+++ b/patches/server/0592-Add-more-advancement-API.patch
diff --git a/patches/server/0594-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0593-Add-ItemFactory-getSpawnEgg-API.patch
index 6b1d0721f9..6b1d0721f9 100644
--- a/patches/server/0594-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0593-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0595-Add-critical-damage-API.patch b/patches/server/0594-Add-critical-damage-API.patch
index 8215f698f2..8215f698f2 100644
--- a/patches/server/0595-Add-critical-damage-API.patch
+++ b/patches/server/0594-Add-critical-damage-API.patch
diff --git a/patches/server/0596-Fix-issues-with-mob-conversion.patch b/patches/server/0595-Fix-issues-with-mob-conversion.patch
index 1b4597fe00..1b4597fe00 100644
--- a/patches/server/0596-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0595-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0597-Add-hasCollision-methods-to-various-places.patch b/patches/server/0596-Add-hasCollision-methods-to-various-places.patch
index a6045ddd1b..a6045ddd1b 100644
--- a/patches/server/0597-Add-hasCollision-methods-to-various-places.patch
+++ b/patches/server/0596-Add-hasCollision-methods-to-various-places.patch
diff --git a/patches/server/0598-Goat-ram-API.patch b/patches/server/0597-Goat-ram-API.patch
index 2f5ccdfed4..2f5ccdfed4 100644
--- a/patches/server/0598-Goat-ram-API.patch
+++ b/patches/server/0597-Goat-ram-API.patch
diff --git a/patches/server/0599-Add-API-for-resetting-a-single-score.patch b/patches/server/0598-Add-API-for-resetting-a-single-score.patch
index b9dd1c2be3..b9dd1c2be3 100644
--- a/patches/server/0599-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0598-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0600-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0599-Add-Raw-Byte-Entity-Serialization.patch
index 1c6a7c7472..1c6a7c7472 100644
--- a/patches/server/0600-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0599-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0601-Vanilla-command-permission-fixes.patch b/patches/server/0600-Vanilla-command-permission-fixes.patch
index 53fa2975d6..53fa2975d6 100644
--- a/patches/server/0601-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0600-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0602-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0601-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 3b942d6ada..c1d628caf8 100644
--- a/patches/server/0602-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0601-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -28,7 +28,7 @@ index efc27bb4072172f10839c181de9b5fba1f488b6f..4c739717fcf53b28312e8a98f9bf0989
          }
          // 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 3e9298db73d1318d28310f1a2536c9fca8b116b3..0fe9c977d8313a1822eef17aebca1784faa03672 100644
+index ce894b31e391786fe98742b9bf22d653df018570..ecd43bbca7ea0e74f506f49fd14f2dd5d467efa1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1718,6 +1718,18 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0603-Fix-GameProfileCache-concurrency.patch b/patches/server/0602-Fix-GameProfileCache-concurrency.patch
index 6cb7e5235f..6cb7e5235f 100644
--- a/patches/server/0603-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0602-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0604-Improve-and-expand-AsyncCatcher.patch b/patches/server/0603-Improve-and-expand-AsyncCatcher.patch
index 4566a450b7..b181efb0b4 100644
--- a/patches/server/0604-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0603-Improve-and-expand-AsyncCatcher.patch
@@ -166,10 +166,10 @@ index 219062cff8a05c765b092f1525043d9d9a1153ae..1c6e8438219f355274db4e0fa849cdd9
                  PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason});
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e6adac1897902dfefe18bd67f903b4a524efdf59..13d7ecd67a94b4651624df3c24d0ae6f4753a32f 100644
+index 7fbf4fba8df8f47b730a46068e68b33502ed63f8..c5265e9731f32b08916a60067ee5ae3fcadd35db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1781,6 +1781,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1758,6 +1758,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void playSound(Location loc, Sound sound, org.bukkit.SoundCategory category, float volume, float pitch, long seed) {
@@ -177,7 +177,7 @@ index e6adac1897902dfefe18bd67f903b4a524efdf59..13d7ecd67a94b4651624df3c24d0ae6f
          if (loc == null || sound == null || category == null) return;
  
          double x = loc.getX();
-@@ -1792,6 +1793,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1769,6 +1770,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void playSound(Location loc, String sound, org.bukkit.SoundCategory category, float volume, float pitch, long seed) {
@@ -185,7 +185,7 @@ index e6adac1897902dfefe18bd67f903b4a524efdf59..13d7ecd67a94b4651624df3c24d0ae6f
          if (loc == null || sound == null || category == null) return;
  
          double x = loc.getX();
-@@ -1824,6 +1826,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1801,6 +1803,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void playSound(Entity entity, Sound sound, org.bukkit.SoundCategory category, float volume, float pitch, long seed) {
@@ -193,7 +193,7 @@ index e6adac1897902dfefe18bd67f903b4a524efdf59..13d7ecd67a94b4651624df3c24d0ae6f
          if (!(entity instanceof CraftEntity craftEntity) || entity.getWorld() != this || sound == null || category == null) return;
  
          ClientboundSoundEntityPacket packet = new ClientboundSoundEntityPacket(CraftSound.bukkitToMinecraftHolder(sound), net.minecraft.sounds.SoundSource.valueOf(category.name()), craftEntity.getHandle(), volume, pitch, seed);
-@@ -1835,6 +1838,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1812,6 +1815,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void playSound(Entity entity, String sound, org.bukkit.SoundCategory category, float volume, float pitch, long seed) {
diff --git a/patches/server/0605-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0604-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 122b297cd8..e945bbb794 100644
--- a/patches/server/0605-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0604-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -294,10 +294,10 @@ index 0fc2e453c63b63e12f33cde28ad5afea5657ac57..3c9a9103783495c9015a8cea41562083
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 13d7ecd67a94b4651624df3c24d0ae6f4753a32f..6c5865c4c29e5470239dcabdfbb54057d05c80c7 100644
+index c5265e9731f32b08916a60067ee5ae3fcadd35db..560d2ff53abd3cdc82d44b45f6896de553b8035c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1739,9 +1739,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1716,9 +1716,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Preconditions.checkArgument(spawnCategory != null, "SpawnCategory cannot be null");
          Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory.%s are not supported", spawnCategory);
  
diff --git a/patches/server/0606-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0605-Sanitize-ResourceLocation-error-logging.patch
index 602f0d3b27..602f0d3b27 100644
--- a/patches/server/0606-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0605-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0607-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0606-Manually-inline-methods-in-BlockPosition.patch
index 77b9a47ac1..77b9a47ac1 100644
--- a/patches/server/0607-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0606-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0608-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0607-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 30f250f235..30f250f235 100644
--- a/patches/server/0608-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0607-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0609-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0608-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 976f278b20..976f278b20 100644
--- a/patches/server/0609-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0608-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0610-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0609-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 48449be461..48449be461 100644
--- a/patches/server/0610-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0609-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0611-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0610-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index 0ab3e48f48..0ab3e48f48 100644
--- a/patches/server/0611-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
+++ b/patches/server/0610-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0612-Time-scoreboard-search.patch b/patches/server/0611-Time-scoreboard-search.patch
index 8d15084758..8d15084758 100644
--- a/patches/server/0612-Time-scoreboard-search.patch
+++ b/patches/server/0611-Time-scoreboard-search.patch
diff --git a/patches/server/0613-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0612-Oprimise-map-impl-for-tracked-players.patch
index ad5326c8f4..ad5326c8f4 100644
--- a/patches/server/0613-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0612-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0614-Add-missing-InventoryType.patch b/patches/server/0613-Add-missing-InventoryType.patch
index a49bdf073d..a49bdf073d 100644
--- a/patches/server/0614-Add-missing-InventoryType.patch
+++ b/patches/server/0613-Add-missing-InventoryType.patch
diff --git a/patches/server/0615-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0614-Optimise-BlockSoil-nearby-water-lookup.patch
index 81b199a243..81b199a243 100644
--- a/patches/server/0615-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0614-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0616-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0615-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index e15a3485c3..e15a3485c3 100644
--- a/patches/server/0616-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0615-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0617-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0616-Check-requirement-before-suggesting-root-nodes.patch
index fce5e326f9..fce5e326f9 100644
--- a/patches/server/0617-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0616-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0618-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0617-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 940ce06e1e..940ce06e1e 100644
--- a/patches/server/0618-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0617-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0619-Add-packet-limiter-config.patch b/patches/server/0618-Add-packet-limiter-config.patch
index a6bd6521f4..a6bd6521f4 100644
--- a/patches/server/0619-Add-packet-limiter-config.patch
+++ b/patches/server/0618-Add-packet-limiter-config.patch
diff --git a/patches/server/0620-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0619-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index d9f19d0199..d9f19d0199 100644
--- a/patches/server/0620-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0619-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0621-Ensure-valid-vehicle-status.patch b/patches/server/0620-Ensure-valid-vehicle-status.patch
index 1d5297804a..70f49165db 100644
--- a/patches/server/0621-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0620-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 0fe9c977d8313a1822eef17aebca1784faa03672..bd37e1a78b42c948c7259b690001794d087a2e18 100644
+index ecd43bbca7ea0e74f506f49fd14f2dd5d467efa1..a9a0e6c495c696a40bdc8147e9a2856500e422e5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -576,7 +576,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0622-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0621-Prevent-softlocked-end-exit-portal-generation.patch
index e2698e961b..e2698e961b 100644
--- a/patches/server/0622-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0621-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0623-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0622-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 4fac0c1ab3..4fac0c1ab3 100644
--- a/patches/server/0623-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0622-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0624-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0623-Don-t-log-debug-logging-being-disabled.patch
index d62e56bfc1..d62e56bfc1 100644
--- a/patches/server/0624-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0623-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0625-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0624-fix-various-menus-with-empty-level-accesses.patch
index efe5d1ddce..efe5d1ddce 100644
--- a/patches/server/0625-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0624-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0626-Preserve-overstacked-loot.patch b/patches/server/0625-Preserve-overstacked-loot.patch
index bd657ec906..bd657ec906 100644
--- a/patches/server/0626-Preserve-overstacked-loot.patch
+++ b/patches/server/0625-Preserve-overstacked-loot.patch
diff --git a/patches/server/0627-Update-head-rotation-in-missing-places.patch b/patches/server/0626-Update-head-rotation-in-missing-places.patch
index ab7ede0fd7..ab7ede0fd7 100644
--- a/patches/server/0627-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0626-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0628-prevent-unintended-light-block-manipulation.patch b/patches/server/0627-prevent-unintended-light-block-manipulation.patch
index bff44792dc..bff44792dc 100644
--- a/patches/server/0628-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0627-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0629-Fix-CraftCriteria-defaults-map.patch b/patches/server/0628-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0629-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0628-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0630-Fix-upstreams-block-state-factories.patch b/patches/server/0629-Fix-upstreams-block-state-factories.patch
index a48a6b0d09..a48a6b0d09 100644
--- a/patches/server/0630-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0629-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0631-Configurable-feature-seeds.patch b/patches/server/0630-Configurable-feature-seeds.patch
index 27997ba7c0..27997ba7c0 100644
--- a/patches/server/0631-Configurable-feature-seeds.patch
+++ b/patches/server/0630-Configurable-feature-seeds.patch
diff --git a/patches/server/0632-Add-root-admin-user-detection.patch b/patches/server/0631-Add-root-admin-user-detection.patch
index abe2f3b5ae..abe2f3b5ae 100644
--- a/patches/server/0632-Add-root-admin-user-detection.patch
+++ b/patches/server/0631-Add-root-admin-user-detection.patch
diff --git a/patches/server/0633-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0632-don-t-attempt-to-teleport-dead-entities.patch
index c207194634..c207194634 100644
--- a/patches/server/0633-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0632-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0634-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0633-Prevent-excessive-velocity-through-repeated-crits.patch
index 6cad6a1123..6cad6a1123 100644
--- a/patches/server/0634-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0633-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0635-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0634-Remove-client-side-code-using-deprecated-for-removal.patch
index 4aed4f1f3a..4aed4f1f3a 100644
--- a/patches/server/0635-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0634-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0636-Fix-Spigot-growth-modifiers.patch b/patches/server/0635-Fix-Spigot-growth-modifiers.patch
index dbaed5a331..dbaed5a331 100644
--- a/patches/server/0636-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0635-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0637-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0636-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index b017de75d1..b017de75d1 100644
--- a/patches/server/0637-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0636-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0638-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0637-Add-PlayerItemFrameChangeEvent.patch
index e047726740..e047726740 100644
--- a/patches/server/0638-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0637-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0639-Optimize-HashMapPalette.patch b/patches/server/0638-Optimize-HashMapPalette.patch
index d50159b901..d50159b901 100644
--- a/patches/server/0639-Optimize-HashMapPalette.patch
+++ b/patches/server/0638-Optimize-HashMapPalette.patch
diff --git a/patches/server/0640-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0639-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 8f7f6be080..8f7f6be080 100644
--- a/patches/server/0640-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0639-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0641-Add-more-Campfire-API.patch b/patches/server/0640-Add-more-Campfire-API.patch
index 012ca1cc7d..012ca1cc7d 100644
--- a/patches/server/0641-Add-more-Campfire-API.patch
+++ b/patches/server/0640-Add-more-Campfire-API.patch
diff --git a/patches/server/0642-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0641-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 148e6899d1..148e6899d1 100644
--- a/patches/server/0642-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0641-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0643-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0642-Forward-CraftEntity-in-teleport-command.patch
index 0471bae893..0471bae893 100644
--- a/patches/server/0643-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0642-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0644-Improve-scoreboard-entries.patch b/patches/server/0643-Improve-scoreboard-entries.patch
index 8acac86ce3..8acac86ce3 100644
--- a/patches/server/0644-Improve-scoreboard-entries.patch
+++ b/patches/server/0643-Improve-scoreboard-entries.patch
diff --git a/patches/server/0645-Entity-powdered-snow-API.patch b/patches/server/0644-Entity-powdered-snow-API.patch
index adef89850e..adef89850e 100644
--- a/patches/server/0645-Entity-powdered-snow-API.patch
+++ b/patches/server/0644-Entity-powdered-snow-API.patch
diff --git a/patches/server/0646-Add-API-for-item-entity-health.patch b/patches/server/0645-Add-API-for-item-entity-health.patch
index cd2757b544..cd2757b544 100644
--- a/patches/server/0646-Add-API-for-item-entity-health.patch
+++ b/patches/server/0645-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0647-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0646-Configurable-max-block-light-for-monster-spawning.patch
index 421d176050..421d176050 100644
--- a/patches/server/0647-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0646-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0648-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0647-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 2ee001a77a..2ee001a77a 100644
--- a/patches/server/0648-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0647-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0649-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0648-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 026f793541..026f793541 100644
--- a/patches/server/0649-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0648-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0650-Bucketable-API.patch b/patches/server/0649-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0650-Bucketable-API.patch
+++ b/patches/server/0649-Bucketable-API.patch
diff --git a/patches/server/0651-Validate-usernames.patch b/patches/server/0650-Validate-usernames.patch
index 8ba85fd205..08d6e377eb 100644
--- a/patches/server/0651-Validate-usernames.patch
+++ b/patches/server/0650-Validate-usernames.patch
@@ -32,7 +32,7 @@ index baedae23865ea80c6546d1f6f439e1d7712258b9..e9cd90b6bb2f57d605323add43f12962
          GameProfile gameprofile = this.server.getSingleplayerProfile();
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1ba8fa300b95ad5709e35068e8a372b627d132f9..2944ec6fd810957e6c01cf914b48d58235a1822c 100644
+index 2eced5d3b539dfd072b8b4eafb34f21f849b1bd5..97257e44163ed565b5f1152f0738649b1adbeb07 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -670,7 +670,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0652-Make-water-animal-spawn-height-configurable.patch b/patches/server/0651-Make-water-animal-spawn-height-configurable.patch
index 14f75d9b89..14f75d9b89 100644
--- a/patches/server/0652-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0651-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0653-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0652-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 7a32d3fd79..8306fb57e8 100644
--- a/patches/server/0653-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0652-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -31,7 +31,7 @@ index 3c9a9103783495c9015a8cea415620839f140f9c..b3c6ecff971cc6fbff463d17f49f0907
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6c5865c4c29e5470239dcabdfbb54057d05c80c7..8d41492cd6305331deca3748eb24d689f23e280b 100644
+index 560d2ff53abd3cdc82d44b45f6896de553b8035c..87379165355e597d02115907da4a096621caf254 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -212,6 +212,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0654-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0653-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0654-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0653-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0655-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0654-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
index be0eedab93..be0eedab93 100644
--- a/patches/server/0655-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/server/0654-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0656-Multiple-Entries-with-Scoreboards.patch b/patches/server/0655-Multiple-Entries-with-Scoreboards.patch
index c286ca9e4b..c286ca9e4b 100644
--- a/patches/server/0656-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0655-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0657-Reset-placed-block-on-exception.patch b/patches/server/0656-Reset-placed-block-on-exception.patch
index c5b6f9f135..c5b6f9f135 100644
--- a/patches/server/0657-Reset-placed-block-on-exception.patch
+++ b/patches/server/0656-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0658-Add-configurable-height-for-slime-spawn.patch b/patches/server/0657-Add-configurable-height-for-slime-spawn.patch
index 5ed7f1549d..5ed7f1549d 100644
--- a/patches/server/0658-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0657-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0659-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0658-Fix-xp-reward-for-baby-zombies.patch
index a4fec4e0f2..a4fec4e0f2 100644
--- a/patches/server/0659-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0658-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0660-Multi-Block-Change-API-Implementation.patch b/patches/server/0659-Multi-Block-Change-API-Implementation.patch
index 52d9d21721..52d9d21721 100644
--- a/patches/server/0660-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0659-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0661-Fix-NotePlayEvent.patch b/patches/server/0660-Fix-NotePlayEvent.patch
index 4a601d8f1b..4a601d8f1b 100644
--- a/patches/server/0661-Fix-NotePlayEvent.patch
+++ b/patches/server/0660-Fix-NotePlayEvent.patch
diff --git a/patches/server/0662-Freeze-Tick-Lock-API.patch b/patches/server/0661-Freeze-Tick-Lock-API.patch
index b8d9e5813b..b8d9e5813b 100644
--- a/patches/server/0662-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0661-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0663-More-PotionEffectType-API.patch b/patches/server/0662-More-PotionEffectType-API.patch
index 1bbb96d291..1bbb96d291 100644
--- a/patches/server/0663-More-PotionEffectType-API.patch
+++ b/patches/server/0662-More-PotionEffectType-API.patch
diff --git a/patches/server/0664-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0663-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 82d25835a6..82d25835a6 100644
--- a/patches/server/0664-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0663-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0665-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0664-API-for-creating-command-sender-which-forwards-feedb.patch
index 0bd41db0fa..0bd41db0fa 100644
--- a/patches/server/0665-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0664-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0666-Add-missing-structure-set-seed-configs.patch b/patches/server/0665-Add-missing-structure-set-seed-configs.patch
index d97d88a95d..d97d88a95d 100644
--- a/patches/server/0666-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0665-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0667-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0666-Fix-cancelled-powdered-snow-bucket-placement.patch
index d4169a6e7a..d4169a6e7a 100644
--- a/patches/server/0667-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0666-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0668-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0667-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index d797848359..d797848359 100644
--- a/patches/server/0668-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0667-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0669-Add-GameEvent-tags.patch b/patches/server/0668-Add-GameEvent-tags.patch
index 7bd38c77bb..7bd38c77bb 100644
--- a/patches/server/0669-Add-GameEvent-tags.patch
+++ b/patches/server/0668-Add-GameEvent-tags.patch
diff --git a/patches/server/0670-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0669-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 351cec2218..351cec2218 100644
--- a/patches/server/0670-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0669-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0671-Furnace-RecipesUsed-API.patch b/patches/server/0670-Furnace-RecipesUsed-API.patch
index d8224fe839..d8224fe839 100644
--- a/patches/server/0671-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0670-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0672-Configurable-sculk-sensor-listener-range.patch b/patches/server/0671-Configurable-sculk-sensor-listener-range.patch
index 99ff902efa..99ff902efa 100644
--- a/patches/server/0672-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0671-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0673-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0672-Add-missing-block-data-mins-and-maxes.patch
index fe8170196d..fe8170196d 100644
--- a/patches/server/0673-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0672-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0674-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0673-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index eed2fe11bf..eed2fe11bf 100644
--- a/patches/server/0674-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0673-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0675-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0674-Put-world-into-worldlist-before-initing-the-world.patch
index 28d59a5fbf..28d59a5fbf 100644
--- a/patches/server/0675-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0674-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0676-Custom-Potion-Mixes.patch b/patches/server/0675-Custom-Potion-Mixes.patch
index 62f7870ba8..62f7870ba8 100644
--- a/patches/server/0676-Custom-Potion-Mixes.patch
+++ b/patches/server/0675-Custom-Potion-Mixes.patch
diff --git a/patches/server/0677-Force-close-world-loading-screen.patch b/patches/server/0676-Force-close-world-loading-screen.patch
index 5cfd6fbb41..83d9e2f203 100644
--- a/patches/server/0677-Force-close-world-loading-screen.patch
+++ b/patches/server/0676-Force-close-world-loading-screen.patch
@@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2944ec6fd810957e6c01cf914b48d58235a1822c..11ac1a4e2cc276b9817014b8bb6a454e282d6258 100644
+index 97257e44163ed565b5f1152f0738649b1adbeb07..d21d9a66ab7197ea4fa324a9af64a1457d8e602b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -394,6 +394,16 @@ public abstract class PlayerList {
diff --git a/patches/server/0678-Fix-falling-block-spawn-methods.patch b/patches/server/0677-Fix-falling-block-spawn-methods.patch
index 033430dbd9..22cab6121b 100644
--- a/patches/server/0678-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0677-Fix-falling-block-spawn-methods.patch
@@ -11,10 +11,10 @@ Restores the API behavior from previous versions of the server
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8d41492cd6305331deca3748eb24d689f23e280b..7fc3343217a98f136bd188e1a65fc92dd0766237 100644
+index 87379165355e597d02115907da4a096621caf254..fd732a22916cba613d168bc03a2ef06dd63960a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1406,7 +1406,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1383,7 +1383,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Preconditions.checkArgument(material != null, "Material cannot be null");
          Preconditions.checkArgument(material.isBlock(), "Material.%s must be a block", material);
  
@@ -28,7 +28,7 @@ index 8d41492cd6305331deca3748eb24d689f23e280b..7fc3343217a98f136bd188e1a65fc92d
          return (FallingBlock) entity.getBukkitEntity();
      }
  
-@@ -1415,7 +1420,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1392,7 +1397,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Preconditions.checkArgument(location != null, "Location cannot be null");
          Preconditions.checkArgument(data != null, "BlockData cannot be null");
  
diff --git a/patches/server/0679-Expose-furnace-minecart-push-values.patch b/patches/server/0678-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0679-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0678-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0680-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0679-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 17d61012f7..17d61012f7 100644
--- a/patches/server/0680-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0679-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0681-More-Projectile-API.patch b/patches/server/0680-More-Projectile-API.patch
index 65d96303ec..65d96303ec 100644
--- a/patches/server/0681-More-Projectile-API.patch
+++ b/patches/server/0680-More-Projectile-API.patch
diff --git a/patches/server/0682-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0681-Fix-swamp-hut-cat-generation-deadlock.patch
index 6aa68bdd5c..6aa68bdd5c 100644
--- a/patches/server/0682-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0681-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0683-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0682-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 1e7c828a4a..1e7c828a4a 100644
--- a/patches/server/0683-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0682-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0684-Implement-getComputedBiome-API.patch b/patches/server/0683-Implement-getComputedBiome-API.patch
index 41624673a7..41624673a7 100644
--- a/patches/server/0684-Implement-getComputedBiome-API.patch
+++ b/patches/server/0683-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0685-Make-some-itemstacks-nonnull.patch b/patches/server/0684-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0685-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0684-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0686-Implement-enchantWithLevels-API.patch b/patches/server/0685-Implement-enchantWithLevels-API.patch
index f8d9bb82f2..f8d9bb82f2 100644
--- a/patches/server/0686-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0685-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0687-Fix-saving-in-unloadWorld.patch b/patches/server/0686-Fix-saving-in-unloadWorld.patch
index 6148bbda3c..6148bbda3c 100644
--- a/patches/server/0687-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0686-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0688-Buffer-OOB-setBlock-calls.patch b/patches/server/0687-Buffer-OOB-setBlock-calls.patch
index 7bc7bd4823..7bc7bd4823 100644
--- a/patches/server/0688-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0687-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0689-Add-TameableDeathMessageEvent.patch b/patches/server/0688-Add-TameableDeathMessageEvent.patch
index e683289da1..e683289da1 100644
--- a/patches/server/0689-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0688-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0690-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0689-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 924b330ad8..924b330ad8 100644
--- a/patches/server/0690-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0689-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0691-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0690-fix-player-loottables-running-when-mob-loot-gamerule.patch
index a2415395a6..a4490f06fd 100644
--- a/patches/server/0691-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0690-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 bd37e1a78b42c948c7259b690001794d087a2e18..c364023ca15d837b64ac1bc2d0c3877fd86ab3cf 100644
+index a9a0e6c495c696a40bdc8147e9a2856500e422e5..af19742353008b42f5e12ed4e9351e3a3697c925 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -961,12 +961,14 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0692-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0691-Ensure-entity-passenger-world-matches-ridden-entity.patch
index ec690057bb..ec690057bb 100644
--- a/patches/server/0692-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0691-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0693-cache-resource-keys.patch b/patches/server/0692-cache-resource-keys.patch
index 7f3b6ce992..7f3b6ce992 100644
--- a/patches/server/0693-cache-resource-keys.patch
+++ b/patches/server/0692-cache-resource-keys.patch
diff --git a/patches/server/0694-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0693-Allow-changing-the-EnderDragon-podium.patch
index 7c00628ca0..7c00628ca0 100644
--- a/patches/server/0694-Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/server/0693-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0695-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0694-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 265f2bbdbb..265f2bbdbb 100644
--- a/patches/server/0695-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0694-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0696-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0695-Prevent-tile-entity-copies-loading-chunks.patch
index b695517b43..b695517b43 100644
--- a/patches/server/0696-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0695-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0697-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0696-Use-username-instead-of-display-name-in-PlayerList-g.patch
index b18fcc5683..59639c77c4 100644
--- a/patches/server/0697-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0696-Use-username-instead-of-display-name-in-PlayerList-g.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 11ac1a4e2cc276b9817014b8bb6a454e282d6258..fc96b6e2a279ce6a9fff2a4171604da9e5eeb660 100644
+index d21d9a66ab7197ea4fa324a9af64a1457d8e602b..d430e6c08bae0a630e71c11c9eae26bef85bde36 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1388,7 +1388,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0698-Expand-PlayerItemDamageEvent.patch b/patches/server/0697-Expand-PlayerItemDamageEvent.patch
index bf458d8c9b..bf458d8c9b 100644
--- a/patches/server/0698-Expand-PlayerItemDamageEvent.patch
+++ b/patches/server/0697-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0699-WorldCreator-keepSpawnLoaded.patch b/patches/server/0698-WorldCreator-keepSpawnLoaded.patch
index ce6b29605a..ce6b29605a 100644
--- a/patches/server/0699-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0698-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0700-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0699-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index ed8adb4503..ed8adb4503 100644
--- a/patches/server/0700-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0699-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0701-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0700-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index ed6f344427..ed6f344427 100644
--- a/patches/server/0701-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0700-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0702-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0701-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 16f87ae350..16f87ae350 100644
--- a/patches/server/0702-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0701-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0703-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0702-Fire-CauldronLevelChange-on-initial-fill.patch
index 07f836b363..07f836b363 100644
--- a/patches/server/0703-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0702-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0704-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0703-fix-powder-snow-cauldrons-not-turning-to-water.patch
index f277b93aa1..f277b93aa1 100644
--- a/patches/server/0704-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0703-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0705-Add-PlayerStopUsingItemEvent.patch b/patches/server/0704-Add-PlayerStopUsingItemEvent.patch
index fde5fa1e6a..fde5fa1e6a 100644
--- a/patches/server/0705-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0704-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0706-Don-t-tick-markers.patch b/patches/server/0705-Don-t-tick-markers.patch
index c8a214b154..c8a214b154 100644
--- a/patches/server/0706-Don-t-tick-markers.patch
+++ b/patches/server/0705-Don-t-tick-markers.patch
diff --git a/patches/server/0707-Expand-FallingBlock-API.patch b/patches/server/0706-Expand-FallingBlock-API.patch
index 84c7821142..84c7821142 100644
--- a/patches/server/0707-Expand-FallingBlock-API.patch
+++ b/patches/server/0706-Expand-FallingBlock-API.patch
diff --git a/patches/server/0708-Add-support-for-Proxy-Protocol.patch b/patches/server/0707-Add-support-for-Proxy-Protocol.patch
index 9fb1a82dd2..9fb1a82dd2 100644
--- a/patches/server/0708-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0707-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0709-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0708-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 61c9b7dd07..61c9b7dd07 100644
--- a/patches/server/0709-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0708-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0710-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0709-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 7158b83635..7158b83635 100644
--- a/patches/server/0710-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0709-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0711-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0710-Sanitize-sent-BlockEntity-NBT.patch
index 0f97b535cc..0f97b535cc 100644
--- a/patches/server/0711-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/server/0710-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0712-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0711-Disable-component-selector-resolving-in-books-by-def.patch
index 796fcc7f2a..796fcc7f2a 100644
--- a/patches/server/0712-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0711-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0713-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0712-Prevent-entity-loading-causing-async-lookups.patch
index 107aabb196..107aabb196 100644
--- a/patches/server/0713-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0712-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0714-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0713-Throw-exception-on-world-create-while-being-ticked.patch
index 5d2cb89f00..5d2cb89f00 100644
--- a/patches/server/0714-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0713-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0715-Dont-resent-entity-on-art-update.patch b/patches/server/0714-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0715-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0714-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0716-Add-WardenAngerChangeEvent.patch b/patches/server/0715-Add-WardenAngerChangeEvent.patch
index 41f4251548..41f4251548 100644
--- a/patches/server/0716-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0715-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0717-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0716-Add-option-for-strict-advancement-dimension-checks.patch
index a58d273ef9..236729352e 100644
--- a/patches/server/0717-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0716-Add-option-for-strict-advancement-dimension-checks.patch
@@ -24,7 +24,7 @@ index 01b8f7024fbc965bc6a7f97f79ba3dec964ef769..801823d003a8e28a13fe90db4604cd09
          } 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 c364023ca15d837b64ac1bc2d0c3877fd86ab3cf..d8a21c34cb93fe36e98c8b36ea9aea7068753c6d 100644
+index af19742353008b42f5e12ed4e9351e3a3697c925..cb244eccf64c285d56e824131171da5ad1eec0c8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1390,6 +1390,12 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0718-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0717-Add-missing-important-BlockStateListPopulator-method.patch
index ecf565ebf6..ecf565ebf6 100644
--- a/patches/server/0718-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0717-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0719-Nameable-Banner-API.patch b/patches/server/0718-Nameable-Banner-API.patch
index 21ca7151b4..21ca7151b4 100644
--- a/patches/server/0719-Nameable-Banner-API.patch
+++ b/patches/server/0718-Nameable-Banner-API.patch
diff --git a/patches/server/0720-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0719-Don-t-broadcast-messages-to-command-blocks.patch
index 5a89b4427f..5a89b4427f 100644
--- a/patches/server/0720-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0719-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0721-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0720-Prevent-empty-items-from-being-added-to-world.patch
index 5659cfbcab..5659cfbcab 100644
--- a/patches/server/0721-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0720-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0722-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0721-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 56d5a7ad9e..56d5a7ad9e 100644
--- a/patches/server/0722-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0721-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0723-Add-Player-getFishHook.patch b/patches/server/0722-Add-Player-getFishHook.patch
index d87fa21619..d87fa21619 100644
--- a/patches/server/0723-Add-Player-getFishHook.patch
+++ b/patches/server/0722-Add-Player-getFishHook.patch
diff --git a/patches/server/0724-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0723-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 32aaf6dc6e..32aaf6dc6e 100644
--- a/patches/server/0724-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0723-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0725-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0724-Add-various-missing-EntityDropItemEvent-calls.patch
index d3b522d0fb..d3b522d0fb 100644
--- a/patches/server/0725-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0724-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0726-Fix-Bee-flower-NPE.patch b/patches/server/0725-Fix-Bee-flower-NPE.patch
index db6e1b0ad9..db6e1b0ad9 100644
--- a/patches/server/0726-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0725-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0727-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0726-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 1d13098f80..1d13098f80 100644
--- a/patches/server/0727-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0726-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0728-More-Teleport-API.patch b/patches/server/0727-More-Teleport-API.patch
index 4fe9942d06..4fe9942d06 100644
--- a/patches/server/0728-More-Teleport-API.patch
+++ b/patches/server/0727-More-Teleport-API.patch
diff --git a/patches/server/0729-Add-EntityPortalReadyEvent.patch b/patches/server/0728-Add-EntityPortalReadyEvent.patch
index 72e8f57726..72e8f57726 100644
--- a/patches/server/0729-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0728-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0730-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0729-Don-t-use-level-random-in-entity-constructors.patch
index cb41bd38c5..cb41bd38c5 100644
--- a/patches/server/0730-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0729-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0731-Send-block-entities-after-destroy-prediction.patch b/patches/server/0730-Send-block-entities-after-destroy-prediction.patch
index 9ae630db23..9ae630db23 100644
--- a/patches/server/0731-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0730-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0732-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0731-Warn-on-plugins-accessing-faraway-chunks.patch
index 01414937ed..e97023798f 100644
--- a/patches/server/0732-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0731-Warn-on-plugins-accessing-faraway-chunks.patch
@@ -18,10 +18,10 @@ index 481248ef82d4257ca4cc88ab28a1a7946e22aef6..b97427789d6162e16b9c3a56b89b2dd0
  
      private static boolean isOutsideSpawnableHeight(int y) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7fc3343217a98f136bd188e1a65fc92dd0766237..38a24517e30007d3077b48b8b0401c8c361710ca 100644
+index fd732a22916cba613d168bc03a2ef06dd63960a9..1ef380cbd77132b743520f952afa8321042bec6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -318,9 +318,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -295,9 +295,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public boolean setSpawnLocation(int x, int y, int z) {
          return this.setSpawnLocation(x, y, z, 0.0F);
      }
@@ -46,7 +46,7 @@ index 7fc3343217a98f136bd188e1a65fc92dd0766237..38a24517e30007d3077b48b8b0401c8c
          // Paper start - add ticket to hold chunk for a little while longer if plugin accesses it
          net.minecraft.world.level.chunk.LevelChunk chunk = this.world.getChunkSource().getChunkAtIfLoadedImmediately(x, z);
          if (chunk == null) {
-@@ -426,6 +441,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -403,6 +418,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          if (!unloadChunk0(x, z, false)) {
              return false;
          }
@@ -54,7 +54,7 @@ index 7fc3343217a98f136bd188e1a65fc92dd0766237..38a24517e30007d3077b48b8b0401c8c
  
          final long chunkKey = ChunkCoordIntPair.pair(x, z);
          world.getChunkProvider().unloadQueue.remove(chunkKey);
-@@ -499,6 +515,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -476,6 +492,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      public boolean loadChunk(int x, int z, boolean generate) {
          org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
@@ -62,7 +62,7 @@ index 7fc3343217a98f136bd188e1a65fc92dd0766237..38a24517e30007d3077b48b8b0401c8c
          ChunkAccess chunk = this.world.getChunkSource().getChunk(x, z, generate || isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // Paper
  
          // If generate = false, but the chunk already exists, we will get this back.
-@@ -531,6 +548,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -508,6 +525,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean addPluginChunkTicket(int x, int z, Plugin plugin) {
@@ -70,7 +70,7 @@ index 7fc3343217a98f136bd188e1a65fc92dd0766237..38a24517e30007d3077b48b8b0401c8c
          Preconditions.checkArgument(plugin != null, "null plugin");
          Preconditions.checkArgument(plugin.isEnabled(), "plugin is not enabled");
  
-@@ -631,6 +649,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -608,6 +626,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setChunkForceLoaded(int x, int z, boolean forced) {
@@ -78,7 +78,7 @@ index 7fc3343217a98f136bd188e1a65fc92dd0766237..38a24517e30007d3077b48b8b0401c8c
          this.getHandle().setChunkForced(x, z, forced);
      }
  
-@@ -959,6 +978,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -936,6 +955,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public int getHighestBlockYAt(int x, int z, org.bukkit.HeightMap heightMap) {
@@ -86,7 +86,7 @@ index 7fc3343217a98f136bd188e1a65fc92dd0766237..38a24517e30007d3077b48b8b0401c8c
          // Transient load for this tick
          return this.world.getChunk(x >> 4, z >> 4).getHeight(CraftHeightMap.toNMS(heightMap), x, z);
      }
-@@ -2381,6 +2401,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2333,6 +2353,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      // Spigot end
      // Paper start
      public java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent) {
diff --git a/patches/server/0733-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0732-Custom-Chat-Completion-Suggestions-API.patch
index 839ee2255a..839ee2255a 100644
--- a/patches/server/0733-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0732-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0734-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0733-Add-and-fix-missing-BlockFadeEvents.patch
index 055406ea3e..055406ea3e 100644
--- a/patches/server/0734-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0733-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0735-Collision-API.patch b/patches/server/0734-Collision-API.patch
index 6bd05181ad..6bd05181ad 100644
--- a/patches/server/0735-Collision-API.patch
+++ b/patches/server/0734-Collision-API.patch
diff --git a/patches/server/0736-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0735-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 1a84359dae..1a84359dae 100644
--- a/patches/server/0736-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0735-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0737-Block-Ticking-API.patch b/patches/server/0736-Block-Ticking-API.patch
index 341f5a79ac..341f5a79ac 100644
--- a/patches/server/0737-Block-Ticking-API.patch
+++ b/patches/server/0736-Block-Ticking-API.patch
diff --git a/patches/server/0738-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0737-Add-Velocity-IP-Forwarding-Support.patch
index 99b0cc4d6a..99b0cc4d6a 100644
--- a/patches/server/0738-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0737-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0739-Add-NamespacedKey-biome-methods.patch b/patches/server/0738-Add-NamespacedKey-biome-methods.patch
index d981229c6f..d981229c6f 100644
--- a/patches/server/0739-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0738-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0740-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0739-Fix-plugin-loggers-on-server-shutdown.patch
index 6914ddec62..6914ddec62 100644
--- a/patches/server/0740-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0739-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0741-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0740-Stop-large-look-changes-from-crashing-the-server.patch
index 83fe0e5640..83fe0e5640 100644
--- a/patches/server/0741-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0740-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0742-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0741-Fire-EntityChangeBlockEvent-in-more-places.patch
index d281ac226e..d281ac226e 100644
--- a/patches/server/0742-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0741-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0743-Missing-eating-regain-reason.patch b/patches/server/0742-Missing-eating-regain-reason.patch
index ac2e750c71..ac2e750c71 100644
--- a/patches/server/0743-Missing-eating-regain-reason.patch
+++ b/patches/server/0742-Missing-eating-regain-reason.patch
diff --git a/patches/server/0744-Missing-effect-cause.patch b/patches/server/0743-Missing-effect-cause.patch
index a56cd781d5..a56cd781d5 100644
--- a/patches/server/0744-Missing-effect-cause.patch
+++ b/patches/server/0743-Missing-effect-cause.patch
diff --git a/patches/server/0745-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0744-Added-byte-array-serialization-deserialization-for-P.patch
index f2a4d437f0..f2a4d437f0 100644
--- a/patches/server/0745-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0744-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0746-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0745-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index c20eb336eb..c20eb336eb 100644
--- a/patches/server/0746-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0745-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0747-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0746-Call-BlockPhysicsEvent-more-often.patch
index 1839fbe711..1839fbe711 100644
--- a/patches/server/0747-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0746-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0748-Configurable-chat-thread-limit.patch b/patches/server/0747-Configurable-chat-thread-limit.patch
index fa5e60fd33..fa5e60fd33 100644
--- a/patches/server/0748-Configurable-chat-thread-limit.patch
+++ b/patches/server/0747-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0749-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0748-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 4d07ca9402..4d07ca9402 100644
--- a/patches/server/0749-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0748-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0750-fix-Jigsaw-block-kicking-user.patch b/patches/server/0749-fix-Jigsaw-block-kicking-user.patch
index 6e1aef94c8..6e1aef94c8 100644
--- a/patches/server/0750-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0749-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0751-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0750-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 8653ffd786..8653ffd786 100644
--- a/patches/server/0751-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0750-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0752-Add-getDrops-to-BlockState.patch b/patches/server/0751-Add-getDrops-to-BlockState.patch
index ea12f69bde..ea12f69bde 100644
--- a/patches/server/0752-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0751-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0753-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0752-Fix-a-bunch-of-vanilla-bugs.patch
index 23b2357fc4..7af4dbba9b 100644
--- a/patches/server/0753-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0752-Fix-a-bunch-of-vanilla-bugs.patch
@@ -124,7 +124,7 @@ index 6abecaac8407b992d208a9108e11fd4954a4106f..03d89f326d320c5d778c3d1e2db7d6b8
              this.player.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit
              this.level.updateSleepingPlayerList();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fc96b6e2a279ce6a9fff2a4171604da9e5eeb660..283ed3e0b0ad26c57edcfcadd4d600e67b75eca9 100644
+index d430e6c08bae0a630e71c11c9eae26bef85bde36..a929b8f1c452db08a64e4be53b488cf2676e0a94 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -260,7 +260,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0754-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0753-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 382d4cc3a7..382d4cc3a7 100644
--- a/patches/server/0754-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0753-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0755-Fix-custom-piglin-loved-items.patch b/patches/server/0754-Fix-custom-piglin-loved-items.patch
index a09a51f7ea..a09a51f7ea 100644
--- a/patches/server/0755-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0754-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0756-EntityPickupItemEvent-fixes.patch b/patches/server/0755-EntityPickupItemEvent-fixes.patch
index 375a09d01d..375a09d01d 100644
--- a/patches/server/0756-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0755-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0757-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0756-Correctly-handle-interactions-with-items-on-cooldown.patch
index 5b61753747..5b61753747 100644
--- a/patches/server/0757-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0756-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0758-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0757-Add-PlayerInventorySlotChangeEvent.patch
index 56b45fccca..ddeaac02da 100644
--- a/patches/server/0758-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0757-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 d8a21c34cb93fe36e98c8b36ea9aea7068753c6d..22771e7c77032b579cdd8e0184e66576b314a530 100644
+index cb244eccf64c285d56e824131171da5ad1eec0c8..118a6b58947417d107f8b0b4c0622d69332eee95 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -352,6 +352,25 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0759-Elder-Guardian-appearance-API.patch b/patches/server/0758-Elder-Guardian-appearance-API.patch
index 05ac7bf793..05ac7bf793 100644
--- a/patches/server/0759-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0758-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0760-Allow-changing-bed-s-occupied-property.patch b/patches/server/0759-Allow-changing-bed-s-occupied-property.patch
index d8b51d7f0b..d8b51d7f0b 100644
--- a/patches/server/0760-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0759-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0761-Add-entity-knockback-API.patch b/patches/server/0760-Add-entity-knockback-API.patch
index f18cd45c36..f18cd45c36 100644
--- a/patches/server/0761-Add-entity-knockback-API.patch
+++ b/patches/server/0760-Add-entity-knockback-API.patch
diff --git a/patches/server/0762-Detect-headless-JREs.patch b/patches/server/0761-Detect-headless-JREs.patch
index 5ba28913a8..5ba28913a8 100644
--- a/patches/server/0762-Detect-headless-JREs.patch
+++ b/patches/server/0761-Detect-headless-JREs.patch
diff --git a/patches/server/0763-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0762-fix-entity-vehicle-collision-event-not-called.patch
index e39b0eaf22..e39b0eaf22 100644
--- a/patches/server/0763-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0762-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0764-Add-EntityToggleSitEvent.patch b/patches/server/0763-Add-EntityToggleSitEvent.patch
index 66349ee5a3..66349ee5a3 100644
--- a/patches/server/0764-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0763-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0765-Add-fire-tick-delay-option.patch b/patches/server/0764-Add-fire-tick-delay-option.patch
index 848f831f0e..848f831f0e 100644
--- a/patches/server/0765-Add-fire-tick-delay-option.patch
+++ b/patches/server/0764-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0766-Add-Moving-Piston-API.patch b/patches/server/0765-Add-Moving-Piston-API.patch
index e3d3955822..e3d3955822 100644
--- a/patches/server/0766-Add-Moving-Piston-API.patch
+++ b/patches/server/0765-Add-Moving-Piston-API.patch
diff --git a/patches/server/0767-Ignore-impossible-spawn-tick.patch b/patches/server/0766-Ignore-impossible-spawn-tick.patch
index f046102ceb..f046102ceb 100644
--- a/patches/server/0767-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0766-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0768-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0767-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index c42422ceca..c42422ceca 100644
--- a/patches/server/0768-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0767-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0769-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0768-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index aeff32467f..aeff32467f 100644
--- a/patches/server/0769-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0768-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0770-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0769-Add-PrePlayerAttackEntityEvent.patch
index da2cbed41e..da2cbed41e 100644
--- a/patches/server/0770-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0769-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0771-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0770-ensure-reset-EnderDragon-boss-event-name.patch
index 854c391fc5..854c391fc5 100644
--- a/patches/server/0771-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0770-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0772-Add-Player-Warden-Warning-API.patch b/patches/server/0771-Add-Player-Warden-Warning-API.patch
index 48110ad056..48110ad056 100644
--- a/patches/server/0772-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0771-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0773-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0772-More-vanilla-friendly-methods-to-update-trades.patch
index 79a6b155bd..79a6b155bd 100644
--- a/patches/server/0773-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0772-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0774-Add-paper-dumplisteners-command.patch b/patches/server/0773-Add-paper-dumplisteners-command.patch
index aabb60033d..aabb60033d 100644
--- a/patches/server/0774-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0773-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0775-check-global-player-list-where-appropriate.patch b/patches/server/0774-check-global-player-list-where-appropriate.patch
index 412ae0a7f3..412ae0a7f3 100644
--- a/patches/server/0775-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0774-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0776-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0775-Fix-async-entity-add-due-to-fungus-trees.patch
index 2a7830d952..2a7830d952 100644
--- a/patches/server/0776-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0775-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0777-ItemStack-damage-API.patch b/patches/server/0776-ItemStack-damage-API.patch
index 4dd87b1f24..4dd87b1f24 100644
--- a/patches/server/0777-ItemStack-damage-API.patch
+++ b/patches/server/0776-ItemStack-damage-API.patch
diff --git a/patches/server/0778-Friction-API.patch b/patches/server/0777-Friction-API.patch
index b7a6ac55da..b7a6ac55da 100644
--- a/patches/server/0778-Friction-API.patch
+++ b/patches/server/0777-Friction-API.patch
diff --git a/patches/server/0779-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0778-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 5bc45a7af4..5bc45a7af4 100644
--- a/patches/server/0779-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0778-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0780-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0779-Fix-premature-player-kicks-on-shutdown.patch
index 7f465faed2..7f465faed2 100644
--- a/patches/server/0780-Fix-premature-player-kicks-on-shutdown.patch
+++ b/patches/server/0779-Fix-premature-player-kicks-on-shutdown.patch
diff --git a/patches/server/0781-Sync-offhand-slot-in-menus.patch b/patches/server/0780-Sync-offhand-slot-in-menus.patch
index 6f4471b8bc..0cac839445 100644
--- a/patches/server/0781-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0780-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 22771e7c77032b579cdd8e0184e66576b314a530..ff0fae77868a8b0e0acee35ea39dbbb98af03e99 100644
+index 118a6b58947417d107f8b0b4c0622d69332eee95..9d6c6a979fb1751ca90c9c1210ec52bbf12495f4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -321,6 +321,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0782-Player-Entity-Tracking-Events.patch b/patches/server/0781-Player-Entity-Tracking-Events.patch
index 4b16731def..4b16731def 100644
--- a/patches/server/0782-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0781-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0783-Limit-pet-look-distance.patch b/patches/server/0782-Limit-pet-look-distance.patch
index 983f861539..983f861539 100644
--- a/patches/server/0783-Limit-pet-look-distance.patch
+++ b/patches/server/0782-Limit-pet-look-distance.patch
diff --git a/patches/server/0784-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0783-Fixes-and-additions-to-the-SpawnReason-API.patch
index e66bfd2b7d..e66bfd2b7d 100644
--- a/patches/server/0784-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0783-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0785-fix-Instruments.patch b/patches/server/0784-fix-Instruments.patch
index a77e5ed5f6..a77e5ed5f6 100644
--- a/patches/server/0785-fix-Instruments.patch
+++ b/patches/server/0784-fix-Instruments.patch
diff --git a/patches/server/0786-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0785-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 3a64891f6a..3a64891f6a 100644
--- a/patches/server/0786-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0785-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0787-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0786-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 8b797606ed..8b797606ed 100644
--- a/patches/server/0787-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0786-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0788-Add-BlockLockCheckEvent.patch b/patches/server/0787-Add-BlockLockCheckEvent.patch
index deeeae6839..deeeae6839 100644
--- a/patches/server/0788-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0787-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0789-Add-Sneaking-API-for-Entities.patch b/patches/server/0788-Add-Sneaking-API-for-Entities.patch
index a8db30ee3c..a8db30ee3c 100644
--- a/patches/server/0789-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0788-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0790-Improve-logging-and-errors.patch b/patches/server/0789-Improve-logging-and-errors.patch
index f0f15d3d4f..f0f15d3d4f 100644
--- a/patches/server/0790-Improve-logging-and-errors.patch
+++ b/patches/server/0789-Improve-logging-and-errors.patch
diff --git a/patches/server/0791-Improve-PortalEvents.patch b/patches/server/0790-Improve-PortalEvents.patch
index 99cd6ef169..99cd6ef169 100644
--- a/patches/server/0791-Improve-PortalEvents.patch
+++ b/patches/server/0790-Improve-PortalEvents.patch
diff --git a/patches/server/0792-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0791-Add-config-option-for-spider-worldborder-climbing.patch
index b10bcacd3c..b10bcacd3c 100644
--- a/patches/server/0792-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0791-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0793-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0792-Add-missing-SpigotConfig-logCommands-check.patch
index 34b8d7f80a..34b8d7f80a 100644
--- a/patches/server/0793-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0792-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0794-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0793-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0794-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0793-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0795-Flying-Fall-Damage.patch b/patches/server/0794-Flying-Fall-Damage.patch
index 021a59a960..021a59a960 100644
--- a/patches/server/0795-Flying-Fall-Damage.patch
+++ b/patches/server/0794-Flying-Fall-Damage.patch
diff --git a/patches/server/0796-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0795-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index d2369905d5..d2369905d5 100644
--- a/patches/server/0796-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0795-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0797-config-for-disabling-entity-tag-tags.patch b/patches/server/0796-config-for-disabling-entity-tag-tags.patch
index aabc1e1a31..aabc1e1a31 100644
--- a/patches/server/0797-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0796-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0798-Use-single-player-info-update-packet-on-join.patch b/patches/server/0797-Use-single-player-info-update-packet-on-join.patch
index 1ef54d3257..1eab622611 100644
--- a/patches/server/0798-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0797-Use-single-player-info-update-packet-on-join.patch
@@ -18,7 +18,7 @@ index 70ad2f0370ec1d5b4f829d0b624e31a54ba53e64..4950d3a1abe346680e4047bad835c7bf
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 283ed3e0b0ad26c57edcfcadd4d600e67b75eca9..f730d441e5e577b354d507a175690fe3246107d5 100644
+index a929b8f1c452db08a64e4be53b488cf2676e0a94..2ea29c9491186d7a25ed3eed99ee4a488bcaa272 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -361,6 +361,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0799-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0798-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 2bb49f6ef4..2bb49f6ef4 100644
--- a/patches/server/0799-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0798-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0800-Win-Screen-API.patch b/patches/server/0799-Win-Screen-API.patch
index 6fb9c91a90..6fb9c91a90 100644
--- a/patches/server/0800-Win-Screen-API.patch
+++ b/patches/server/0799-Win-Screen-API.patch
diff --git a/patches/server/0801-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0800-Remove-CraftItemStack-setAmount-null-assignment.patch
index 04050cfc0f..04050cfc0f 100644
--- a/patches/server/0801-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0800-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0802-Fix-force-opening-enchantment-tables.patch b/patches/server/0801-Fix-force-opening-enchantment-tables.patch
index eac3ab63ee..eac3ab63ee 100644
--- a/patches/server/0802-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0801-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0803-Add-Entity-Body-Yaw-API.patch b/patches/server/0802-Add-Entity-Body-Yaw-API.patch
index 4b118801d5..4b118801d5 100644
--- a/patches/server/0803-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0802-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0804-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0803-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 962917dab8..962917dab8 100644
--- a/patches/server/0804-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0803-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0805-Add-EntityFertilizeEggEvent.patch b/patches/server/0804-Add-EntityFertilizeEggEvent.patch
index a077b2cfc0..a077b2cfc0 100644
--- a/patches/server/0805-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0804-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0806-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0805-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index a3e0925b49..a3e0925b49 100644
--- a/patches/server/0806-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0805-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0807-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0806-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 85321a4a5b..85321a4a5b 100644
--- a/patches/server/0807-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0806-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0808-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0807-Correctly-handle-ArmorStand-invisibility.patch
index 34b66d686a..34b66d686a 100644
--- a/patches/server/0808-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0807-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0809-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0808-Fix-advancement-triggers-for-entity-damage.patch
index 3ad297e9ed..3ad297e9ed 100644
--- a/patches/server/0809-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0808-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0810-Fix-text-display-error-on-spawn.patch b/patches/server/0809-Fix-text-display-error-on-spawn.patch
index 7f64cfe6d9..7f64cfe6d9 100644
--- a/patches/server/0810-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0809-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0811-Fix-inventories-returning-null-Locations.patch b/patches/server/0810-Fix-inventories-returning-null-Locations.patch
index eabfae28c5..eabfae28c5 100644
--- a/patches/server/0811-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0810-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0812-Add-Shearable-API.patch b/patches/server/0811-Add-Shearable-API.patch
index 675a1bf358..675a1bf358 100644
--- a/patches/server/0812-Add-Shearable-API.patch
+++ b/patches/server/0811-Add-Shearable-API.patch
diff --git a/patches/server/0813-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0812-Fix-SpawnEggMeta-get-setSpawnedType.patch
index c0fda16f78..c0fda16f78 100644
--- a/patches/server/0813-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0812-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0814-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0813-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index d90e599897..d90e599897 100644
--- a/patches/server/0814-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0813-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0815-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0814-Treat-sequence-violations-like-they-should-be.patch
index 4fb5d800bb..4fb5d800bb 100644
--- a/patches/server/0815-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0814-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0816-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0815-Prevent-causing-expired-keys-from-impacting-new-join.patch
index b30fcefb55..b30fcefb55 100644
--- a/patches/server/0816-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0815-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0817-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0816-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 9f9f6c26b3..9f9f6c26b3 100644
--- a/patches/server/0817-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0816-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0818-Use-array-for-gamerule-storage.patch b/patches/server/0817-Use-array-for-gamerule-storage.patch
index 194ff8f15b..194ff8f15b 100644
--- a/patches/server/0818-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0817-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0819-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0818-Fix-a-couple-of-upstream-bed-issues.patch
index 665db524c5..665db524c5 100644
--- a/patches/server/0819-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0818-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0820-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0819-Fix-demo-flag-not-enabling-demo-mode.patch
index d64dd23e37..d64dd23e37 100644
--- a/patches/server/0820-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0819-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0821-Add-Mob-Experience-reward-API.patch b/patches/server/0820-Add-Mob-Experience-reward-API.patch
index f82f765beb..f82f765beb 100644
--- a/patches/server/0821-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0820-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0822-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0821-Break-redstone-on-top-of-trap-doors-early.patch
index 11c427e808..11c427e808 100644
--- a/patches/server/0822-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0821-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0823-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0822-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index becde16ce8..becde16ce8 100644
--- a/patches/server/0823-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0822-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0824-More-accurate-isInOpenWater-impl.patch b/patches/server/0823-More-accurate-isInOpenWater-impl.patch
index 6e110094dd..6e110094dd 100644
--- a/patches/server/0824-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0823-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0825-Expand-PlayerItemMendEvent.patch b/patches/server/0824-Expand-PlayerItemMendEvent.patch
index 73068bdf5a..73068bdf5a 100644
--- a/patches/server/0825-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0824-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0826-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0825-Refresh-ProjectileSource-for-projectiles.patch
index 4762f3cc7b..4762f3cc7b 100644
--- a/patches/server/0826-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0825-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0827-Add-transient-modifier-API.patch b/patches/server/0826-Add-transient-modifier-API.patch
index 36cc0a030a..36cc0a030a 100644
--- a/patches/server/0827-Add-transient-modifier-API.patch
+++ b/patches/server/0826-Add-transient-modifier-API.patch
diff --git a/patches/server/0828-Fix-block-place-logic.patch b/patches/server/0827-Fix-block-place-logic.patch
index de31264ab7..de31264ab7 100644
--- a/patches/server/0828-Fix-block-place-logic.patch
+++ b/patches/server/0827-Fix-block-place-logic.patch
diff --git a/patches/server/0829-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0828-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index ba85bd867f..ba85bd867f 100644
--- a/patches/server/0829-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0828-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0830-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0829-Call-BlockGrowEvent-for-missing-blocks.patch
index 895a528de8..895a528de8 100644
--- a/patches/server/0830-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0829-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0831-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0830-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 5c55e8560a..5c55e8560a 100644
--- a/patches/server/0831-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0830-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0832-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0831-fix-MapLike-spam-for-missing-key-selector.patch
index 2bd3b889f1..2bd3b889f1 100644
--- a/patches/server/0832-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0831-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0833-Fix-sniffer-removeExploredLocation.patch b/patches/server/0832-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0833-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0832-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0834-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0833-Add-method-to-remove-all-active-potion-effects.patch
index 0acdf4ee22..0acdf4ee22 100644
--- a/patches/server/0834-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0833-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0835-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0834-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index ed5525cfda..ed5525cfda 100644
--- a/patches/server/0835-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0834-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0836-Add-event-for-player-editing-sign.patch b/patches/server/0835-Add-event-for-player-editing-sign.patch
index a7fbf6addc..a7fbf6addc 100644
--- a/patches/server/0836-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0835-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0837-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0836-Only-tick-item-frames-if-players-can-see-it.patch
index bf73ba4a5c..bf73ba4a5c 100644
--- a/patches/server/0837-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0836-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0838-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0837-Fix-cmd-permission-levels-for-command-blocks.patch
index 0c24048293..0c24048293 100644
--- a/patches/server/0838-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0837-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0839-Add-option-to-disable-block-updates.patch b/patches/server/0838-Add-option-to-disable-block-updates.patch
index 8fe599472e..8fe599472e 100644
--- a/patches/server/0839-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0838-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0840-Call-missing-BlockDispenseEvent.patch b/patches/server/0839-Call-missing-BlockDispenseEvent.patch
index 97050595b8..97050595b8 100644
--- a/patches/server/0840-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0839-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0841-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0840-Don-t-load-chunks-for-supporting-block-checks.patch
index f674b02e68..f674b02e68 100644
--- a/patches/server/0841-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0840-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0842-Optimize-player-lookups-for-beacons.patch b/patches/server/0841-Optimize-player-lookups-for-beacons.patch
index 1c203c23a6..1c203c23a6 100644
--- a/patches/server/0842-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0841-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0843-Add-Sign-getInteractableSideFor.patch b/patches/server/0842-Add-Sign-getInteractableSideFor.patch
index 2833829ce4..2833829ce4 100644
--- a/patches/server/0843-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0842-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0844-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0843-fix-item-meta-for-tadpole-buckets.patch
index b3fab8868c..b3fab8868c 100644
--- a/patches/server/0844-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0843-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0845-Fix-BanList-API.patch b/patches/server/0844-Fix-BanList-API.patch
index dcc17ccb44..dcc17ccb44 100644
--- a/patches/server/0845-Fix-BanList-API.patch
+++ b/patches/server/0844-Fix-BanList-API.patch
diff --git a/patches/server/0846-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0845-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 5f51eb317c..5f51eb317c 100644
--- a/patches/server/0846-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0845-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0847-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0846-Fix-possible-NPE-on-painting-creation.patch
index dc3838be94..dc3838be94 100644
--- a/patches/server/0847-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0846-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0848-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0847-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 6785f755ab..6785f755ab 100644
--- a/patches/server/0848-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0847-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0849-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0848-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 542bede5c4..542bede5c4 100644
--- a/patches/server/0849-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0848-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0850-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0849-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 301b345fb9..301b345fb9 100644
--- a/patches/server/0850-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0849-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0851-Add-whitelist-events.patch b/patches/server/0850-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0851-Add-whitelist-events.patch
+++ b/patches/server/0850-Add-whitelist-events.patch
diff --git a/patches/server/0852-Implement-PlayerFailMoveEvent.patch b/patches/server/0851-Implement-PlayerFailMoveEvent.patch
index 179c8b53b4..179c8b53b4 100644
--- a/patches/server/0852-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0851-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0853-Folia-scheduler-and-owned-region-API.patch b/patches/server/0852-Folia-scheduler-and-owned-region-API.patch
index c0f04707ea..9fcb2209e9 100644
--- a/patches/server/0853-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0852-Folia-scheduler-and-owned-region-API.patch
@@ -1173,7 +1173,7 @@ index fcf450f9fefda8cf2391dcb61075cbd855475d6c..b7254c342501f2d7fbbe8959a6e88a5d
          this.profiler.push("commandFunctions");
          MinecraftTimings.commandFunctionsTimer.startTiming(); // Spigot // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f730d441e5e577b354d507a175690fe3246107d5..c6316960e9765239fbf117702b3c81c542839643 100644
+index 2ea29c9491186d7a25ed3eed99ee4a488bcaa272..de96d7df65713f2fa7b8f2dd068856bb5fa45a45 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -640,6 +640,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0854-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0853-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0854-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0853-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0855-API-for-updating-recipes-on-clients.patch b/patches/server/0854-API-for-updating-recipes-on-clients.patch
index 4d2861d204..5c29dfb157 100644
--- a/patches/server/0855-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0854-API-for-updating-recipes-on-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for updating recipes on clients
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c6316960e9765239fbf117702b3c81c542839643..b2fab1e6a83b2603aeb8565b25022f9e99a61029 100644
+index de96d7df65713f2fa7b8f2dd068856bb5fa45a45..be6bf7afa3cea4ed48f363e89ccd079062edc8d9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1484,6 +1484,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0856-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0855-Fix-rotation-when-spawning-display-entities.patch
index 7491ff60fe..7491ff60fe 100644
--- a/patches/server/0856-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0855-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0857-Only-capture-actual-tree-growth.patch b/patches/server/0856-Only-capture-actual-tree-growth.patch
index 1cba6ddee8..1cba6ddee8 100644
--- a/patches/server/0857-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0856-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0858-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0857-Use-correct-source-for-mushroom-block-spread-event.patch
index a295e29bcb..a295e29bcb 100644
--- a/patches/server/0858-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0857-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0859-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0858-Respect-randomizeData-on-more-entities-when-spawning.patch
index d04e8bf4f6..d04e8bf4f6 100644
--- a/patches/server/0859-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0858-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0860-Use-correct-seed-on-api-world-load.patch b/patches/server/0859-Use-correct-seed-on-api-world-load.patch
index f29dbe4467..f29dbe4467 100644
--- a/patches/server/0860-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0859-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0861-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0860-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 2f19c9d94a..2f19c9d94a 100644
--- a/patches/server/0861-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0860-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0862-Cache-map-ids-on-item-frames.patch b/patches/server/0861-Cache-map-ids-on-item-frames.patch
index 65e3e3499f..65e3e3499f 100644
--- a/patches/server/0862-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0861-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0863-Fix-custom-statistic-criteria-creation.patch b/patches/server/0862-Fix-custom-statistic-criteria-creation.patch
index f399187f50..f399187f50 100644
--- a/patches/server/0863-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0862-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0864-Bandaid-fix-for-Effect.patch b/patches/server/0863-Bandaid-fix-for-Effect.patch
index cf863d7311..2a382dcc25 100644
--- a/patches/server/0864-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0863-Bandaid-fix-for-Effect.patch
@@ -68,10 +68,10 @@ index 71733f918ed84b9879ac1b142ef6205c5e768a9c..c856384019eff2f2d0bb831ebe1ccb0f
              break;
          case BONE_MEAL_USE:
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 38a24517e30007d3077b48b8b0401c8c361710ca..7927b702f8ce1e170f96a8150c5a76413a9fd918 100644
+index 1ef380cbd77132b743520f952afa8321042bec6d..7fe43ac849d3ee80c447e8c024ea39fd338d616f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1383,7 +1383,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1360,7 +1360,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public <T> void playEffect(Location loc, Effect effect, T data, int radius) {
          if (data != null) {
              Preconditions.checkArgument(effect.getData() != null, "Effect.%s does not have a valid Data", effect);
diff --git a/patches/server/0865-SculkCatalyst-bloom-API.patch b/patches/server/0864-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0865-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0864-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0866-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0865-API-for-an-entity-s-scoreboard-name.patch
index a7d3664dd4..a7d3664dd4 100644
--- a/patches/server/0866-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0865-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0867-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0866-Deprecate-and-replace-methods-with-old-StructureType.patch
index 7eeb4db8f2..7eeb4db8f2 100644
--- a/patches/server/0867-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0866-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0868-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0867-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 9e3d20928c..9e3d20928c 100644
--- a/patches/server/0868-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0867-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0869-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0868-Properly-handle-BlockBreakEvent-isDropItems.patch
index 75a746ca81..75a746ca81 100644
--- a/patches/server/0869-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0868-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0870-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0869-Fire-entity-death-event-for-ender-dragon.patch
index 7f6054281d..7f6054281d 100644
--- a/patches/server/0870-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0869-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0871-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0870-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 3c28b2c60f..3c28b2c60f 100644
--- a/patches/server/0871-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0870-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0872-Add-Listing-API-for-Player.patch b/patches/server/0871-Add-Listing-API-for-Player.patch
index bf35caf426..45d76a9d22 100644
--- a/patches/server/0872-Add-Listing-API-for-Player.patch
+++ b/patches/server/0871-Add-Listing-API-for-Player.patch
@@ -82,7 +82,7 @@ index 6247a21c9c391abf1f6db3482c659593e4f29355..9ccca41bf23efadba5329cc584bbcdca
  
      static class EntryBuilder {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b2fab1e6a83b2603aeb8565b25022f9e99a61029..8ba99f6ef2b50ceb8e279ed559a375ada6877576 100644
+index be6bf7afa3cea4ed48f363e89ccd079062edc8d9..9b1a6d8351fb473eec75a2fd08fb892b770e3586 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -359,14 +359,22 @@ public abstract class PlayerList {
diff --git a/patches/server/0873-Configurable-Region-Compression-Format.patch b/patches/server/0872-Configurable-Region-Compression-Format.patch
index 64a52a4ea2..64a52a4ea2 100644
--- a/patches/server/0873-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0872-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0874-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0873-Add-BlockFace-to-BlockDamageEvent.patch
index 7ad1e7c9e4..7ad1e7c9e4 100644
--- a/patches/server/0874-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0873-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0875-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0874-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0875-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0874-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0876-Expand-Pose-API.patch b/patches/server/0875-Expand-Pose-API.patch
index 59a2bc1a09..59a2bc1a09 100644
--- a/patches/server/0876-Expand-Pose-API.patch
+++ b/patches/server/0875-Expand-Pose-API.patch
diff --git a/patches/server/0877-More-DragonBattle-API.patch b/patches/server/0876-More-DragonBattle-API.patch
index a6e0c111c0..a6e0c111c0 100644
--- a/patches/server/0877-More-DragonBattle-API.patch
+++ b/patches/server/0876-More-DragonBattle-API.patch
diff --git a/patches/server/0878-Add-PlayerPickItemEvent.patch b/patches/server/0877-Add-PlayerPickItemEvent.patch
index 542c0e535f..542c0e535f 100644
--- a/patches/server/0878-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0877-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0879-Allow-trident-custom-damage.patch b/patches/server/0878-Allow-trident-custom-damage.patch
index 75570ca360..75570ca360 100644
--- a/patches/server/0879-Allow-trident-custom-damage.patch
+++ b/patches/server/0878-Allow-trident-custom-damage.patch
diff --git a/patches/server/0880-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0879-Expose-hand-in-BlockCanBuildEvent.patch
index 4abc7e9fc5..4abc7e9fc5 100644
--- a/patches/server/0880-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0879-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0881-Optimize-nearest-structure-border-iteration.patch b/patches/server/0880-Optimize-nearest-structure-border-iteration.patch
index df5f60c52c..df5f60c52c 100644
--- a/patches/server/0881-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0880-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0882-Implement-OfflinePlayer-isConnected.patch b/patches/server/0881-Implement-OfflinePlayer-isConnected.patch
index f0ac88e8c8..f0ac88e8c8 100644
--- a/patches/server/0882-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0881-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0883-Fix-inventory-desync.patch b/patches/server/0882-Fix-inventory-desync.patch
index f9f1cad8e3..25475a237b 100644
--- a/patches/server/0883-Fix-inventory-desync.patch
+++ b/patches/server/0882-Fix-inventory-desync.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix inventory desync
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ff0fae77868a8b0e0acee35ea39dbbb98af03e99..acb594f93c40e19cc441d4444dbcb85aaae0a92b 100644
+index 9d6c6a979fb1751ca90c9c1210ec52bbf12495f4..46d6fb2591f47c245446db210a00cbaa1e2bd99b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -402,6 +402,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0884-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0883-Add-titleOverride-to-InventoryOpenEvent.patch
index 1b322025c9..3bb0db6ef2 100644
--- a/patches/server/0884-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0883-Add-titleOverride-to-InventoryOpenEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add titleOverride to InventoryOpenEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index acb594f93c40e19cc441d4444dbcb85aaae0a92b..ee1ac37298232c91264e5bff52a12dfdd7480fcb 100644
+index 46d6fb2591f47c245446db210a00cbaa1e2bd99b..184f3c7a1304f4f9d2aaeae27172be9d853c30de 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1659,12 +1659,17 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
diff --git a/patches/server/0885-Configure-sniffer-egg-hatch-time.patch b/patches/server/0884-Configure-sniffer-egg-hatch-time.patch
index 7def55b1f7..7def55b1f7 100644
--- a/patches/server/0885-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0884-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0886-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0885-Do-crystal-portal-proximity-check-before-entity-look.patch
index 67d506a715..67d506a715 100644
--- a/patches/server/0886-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0885-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0887-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0886-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0887-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0886-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0888-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0887-Add-slot-sanity-checks-in-container-clicks.patch
index 4f1058e85b..4f1058e85b 100644
--- a/patches/server/0888-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0887-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0889-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0888-Call-BlockRedstoneEvents-for-lecterns.patch
index b2cf0ce209..b2cf0ce209 100644
--- a/patches/server/0889-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0888-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0890-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0889-Allow-proper-checking-of-empty-item-stacks.patch
index 62401e7f99..62401e7f99 100644
--- a/patches/server/0890-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0889-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0891-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0890-Fix-silent-equipment-change-for-mobs.patch
index edc3ea39f0..edc3ea39f0 100644
--- a/patches/server/0891-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0890-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0892-Fix-spigot-s-Forced-Stats.patch b/patches/server/0891-Fix-spigot-s-Forced-Stats.patch
index 554f1f8844..554f1f8844 100644
--- a/patches/server/0892-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0891-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0893-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0892-Add-missing-InventoryHolders-to-inventories.patch
index ae956d4693..ae956d4693 100644
--- a/patches/server/0893-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0892-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0894-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0893-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index ab4d61b97a..ab4d61b97a 100644
--- a/patches/server/0894-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0893-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0895-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0894-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0895-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0894-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0896-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0895-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e1f2934daa..e1f2934daa 100644
--- a/patches/server/0896-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0895-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0897-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0896-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0897-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0896-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0898-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0897-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0898-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0897-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0899-Fix-missing-map-initialize-event-call.patch b/patches/server/0898-Fix-missing-map-initialize-event-call.patch
index 214c9bce18..214c9bce18 100644
--- a/patches/server/0899-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0898-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0900-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0899-Update-entity-data-when-attaching-firework-to-entity.patch
index 35494c32ed..35494c32ed 100644
--- a/patches/server/0900-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0899-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0901-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0900-Fix-UnsafeValues-loadAdvancement.patch
index 205c42df23..205c42df23 100644
--- a/patches/server/0901-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0900-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0902-Add-player-idle-duration-API.patch b/patches/server/0901-Add-player-idle-duration-API.patch
index e9d6bf10c6..e9d6bf10c6 100644
--- a/patches/server/0902-Add-player-idle-duration-API.patch
+++ b/patches/server/0901-Add-player-idle-duration-API.patch
diff --git a/patches/server/0903-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0902-Don-t-check-if-we-can-see-non-visible-entities.patch
index 43404ba162..43404ba162 100644
--- a/patches/server/0903-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0902-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0904-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0903-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 5abf7cda2c..5abf7cda2c 100644
--- a/patches/server/0904-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0903-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0905-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0904-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 10e1013d26..10e1013d26 100644
--- a/patches/server/0905-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0904-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0906-Optimize-VarInts.patch b/patches/server/0905-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0906-Optimize-VarInts.patch
+++ b/patches/server/0905-Optimize-VarInts.patch
diff --git a/patches/server/0907-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0906-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 8c1635a676..8c1635a676 100644
--- a/patches/server/0907-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0906-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0908-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0907-Add-predicate-for-blocks-when-raytracing.patch
index afc0a1a6e4..96bceb6bfa 100644
--- a/patches/server/0908-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0907-Add-predicate-for-blocks-when-raytracing.patch
@@ -47,10 +47,10 @@ index c978f3b2d42f512e982f289e76c2422e41b7eec6..bb8e962e63c7a2d931f9bd7f7c002aa3
              Vec3 vec3d = raytrace1.getFrom().subtract(raytrace1.getTo());
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7927b702f8ce1e170f96a8150c5a76413a9fd918..ee3e8e3b766f7cc363001fb44ae1eb98679cbcc9 100644
+index 7fe43ac849d3ee80c447e8c024ea39fd338d616f..e216ac53f94cc5bcd90330a21e0cbda11b65b6ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1117,9 +1117,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1094,9 +1094,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, double raySize, Predicate<? super Entity> filter) {
@@ -68,7 +68,7 @@ index 7927b702f8ce1e170f96a8150c5a76413a9fd918..ee3e8e3b766f7cc363001fb44ae1eb98
  
          Preconditions.checkArgument(direction != null, "Vector direction cannot be null");
          direction.checkFinite();
-@@ -1169,9 +1175,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1146,9 +1152,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public RayTraceResult rayTraceBlocks(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks) {
@@ -87,7 +87,7 @@ index 7927b702f8ce1e170f96a8150c5a76413a9fd918..ee3e8e3b766f7cc363001fb44ae1eb98
  
          Preconditions.checkArgument(direction != null, "Vector direction cannot be null");
          direction.checkFinite();
-@@ -1184,16 +1197,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1161,16 +1174,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          }
  
          Vector dir = direction.clone().normalize().multiply(maxDistance);
diff --git a/patches/server/0909-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0908-Broadcast-take-item-packets-with-collector-as-source.patch
index dc40dd2151..dc40dd2151 100644
--- a/patches/server/0909-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0908-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0910-Expand-LingeringPotion-API.patch b/patches/server/0909-Expand-LingeringPotion-API.patch
index fdd0abf668..fdd0abf668 100644
--- a/patches/server/0910-Expand-LingeringPotion-API.patch
+++ b/patches/server/0909-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0911-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0910-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index 1945ea0379..00e51b071b 100644
--- a/patches/server/0911-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0910-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
@@ -45,10 +45,10 @@ index 0471d9c85af02133f99cca4e181b83b58a3f1abc..4f701788bd21b61cad251a3a88f9bc41
              BlockState iblockdata = BaseFireBlock.getState(this.level(), blockposition);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ee3e8e3b766f7cc363001fb44ae1eb98679cbcc9..c1642dd60531494d173ac08aa90791143f5bd99a 100644
+index e216ac53f94cc5bcd90330a21e0cbda11b65b6ac..202470633343add6768caa000bda05a0b5d93f4e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -749,7 +749,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -726,7 +726,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          LightningBolt lightning = EntityType.LIGHTNING_BOLT.create(this.world);
          lightning.moveTo(loc.getX(), loc.getY(), loc.getZ());
diff --git a/patches/server/0912-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0911-Add-hand-to-fish-event-for-all-player-interactions.patch
index dd3e5bba44..dd3e5bba44 100644
--- a/patches/server/0912-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0911-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0913-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0912-Fix-several-issues-with-EntityBreedEvent.patch
index 9e82a901a0..9e82a901a0 100644
--- a/patches/server/0913-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0912-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0914-Add-UUID-attribute-modifier-API.patch b/patches/server/0913-Add-UUID-attribute-modifier-API.patch
index 4b5e695553..4b5e695553 100644
--- a/patches/server/0914-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0913-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0915-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0914-Fix-missing-event-call-for-entity-teleport-API.patch
index 79cebb8989..79cebb8989 100644
--- a/patches/server/0915-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0914-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0916-Lazily-create-LootContext-for-criterions.patch b/patches/server/0915-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0916-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0915-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0917-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0916-Don-t-fire-sync-events-during-worldgen.patch
index aa4e2240b4..aa4e2240b4 100644
--- a/patches/server/0917-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0916-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0918-Add-Structure-check-API.patch b/patches/server/0917-Add-Structure-check-API.patch
index 891759cee9..93eeb5ef48 100644
--- a/patches/server/0918-Add-Structure-check-API.patch
+++ b/patches/server/0917-Add-Structure-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Structure check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c1642dd60531494d173ac08aa90791143f5bd99a..395da7e8ca0971610f06bf5b8357ef05f2247da6 100644
+index 202470633343add6768caa000bda05a0b5d93f4e..b3bc35956228a997a88d4af2f7b5810f1c09d5b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -236,6 +236,20 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0919-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0918-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index fd122481de..fd122481de 100644
--- a/patches/server/0919-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0918-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0920-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0919-Restore-vanilla-entity-drops-behavior.patch
index 34f07dad88..471b19c764 100644
--- a/patches/server/0920-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0919-Restore-vanilla-entity-drops-behavior.patch
@@ -9,7 +9,7 @@ on dropping the item instead of generalizing it for all dropped
 items like CB does.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ee1ac37298232c91264e5bff52a12dfdd7480fcb..40b5d379e917771b30d888eb390f5d5698a34ffb 100644
+index 184f3c7a1304f4f9d2aaeae27172be9d853c30de..3cbb59df34156479d24a8251f2b3acbb5e60dc2c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -978,22 +978,20 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
@@ -38,7 +38,7 @@ index ee1ac37298232c91264e5bff52a12dfdd7480fcb..40b5d379e917771b30d888eb390f5d56
          this.drops.clear(); // SPIGOT-5188: make sure to clear
          } // Paper - fix player loottables running when mob loot gamerule is false
  
-@@ -2531,8 +2529,8 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -2530,8 +2528,8 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
      }
  
      @Override
diff --git a/patches/server/0921-Dont-resend-blocks-on-interactions.patch b/patches/server/0920-Dont-resend-blocks-on-interactions.patch
index f522a08097..f522a08097 100644
--- a/patches/server/0921-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0920-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0922-add-more-scoreboard-API.patch b/patches/server/0921-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0922-add-more-scoreboard-API.patch
+++ b/patches/server/0921-add-more-scoreboard-API.patch
diff --git a/patches/server/0923-Improve-Registry.patch b/patches/server/0922-Improve-Registry.patch
index 32f844a5d8..14131191a6 100644
--- a/patches/server/0923-Improve-Registry.patch
+++ b/patches/server/0922-Improve-Registry.patch
@@ -61,10 +61,10 @@ index 364f8d7a7106259401154d91b1b79869d014a469..f336bf98574e4fdeabc3b21062983439
      }
  
 diff --git a/src/test/java/org/bukkit/registry/PerRegistryTest.java b/src/test/java/org/bukkit/registry/PerRegistryTest.java
-index 523b4b208e05c6b70014440200e3196cc84f36cc..12b93a6e091de47522d060fa0cd84fe41318c46a 100644
+index 4e4ea083063daf22f1bb785ef212958ea889c43b..dad7935f9a4c7c8bb2a755cc0631330a59834233 100644
 --- a/src/test/java/org/bukkit/registry/PerRegistryTest.java
 +++ b/src/test/java/org/bukkit/registry/PerRegistryTest.java
-@@ -49,19 +49,22 @@ public class PerRegistryTest extends AbstractTestingBase {
+@@ -48,19 +48,22 @@ public class PerRegistryTest extends AbstractTestingBase {
  
      @ParameterizedTest
      @MethodSource("data")
@@ -91,7 +91,7 @@ index 523b4b208e05c6b70014440200e3196cc84f36cc..12b93a6e091de47522d060fa0cd84fe4
  
              this.assertSameMatchWithKeyMessage(registry, element, key.toString()); // namespace:key
              this.assertSameMatchWithKeyMessage(registry, element, key.getKey()); // key
-@@ -72,7 +75,7 @@ public class PerRegistryTest extends AbstractTestingBase {
+@@ -71,7 +74,7 @@ public class PerRegistryTest extends AbstractTestingBase {
          });
      }
  
diff --git a/patches/server/0924-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0923-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 1c9f726e07..1c9f726e07 100644
--- a/patches/server/0924-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0923-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0925-Add-experience-points-API.patch b/patches/server/0924-Add-experience-points-API.patch
index 9844f2f32a..9844f2f32a 100644
--- a/patches/server/0925-Add-experience-points-API.patch
+++ b/patches/server/0924-Add-experience-points-API.patch
diff --git a/patches/server/0926-Add-drops-to-shear-events.patch b/patches/server/0925-Add-drops-to-shear-events.patch
index c29c4f4212..c29c4f4212 100644
--- a/patches/server/0926-Add-drops-to-shear-events.patch
+++ b/patches/server/0925-Add-drops-to-shear-events.patch
diff --git a/patches/server/0927-Add-PlayerShieldDisableEvent.patch b/patches/server/0926-Add-PlayerShieldDisableEvent.patch
index f9d5404f63..f9d5404f63 100644
--- a/patches/server/0927-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0926-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0928-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0927-Validate-ResourceLocation-in-NBT-reading.patch
index a054908025..a054908025 100644
--- a/patches/server/0928-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0927-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0929-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0928-Properly-handle-experience-dropping-on-block-break.patch
index 471a743c29..471a743c29 100644
--- a/patches/server/0929-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0928-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0930-Fixup-NamespacedKey-handling.patch b/patches/server/0929-Fixup-NamespacedKey-handling.patch
index 95e2943521..95e2943521 100644
--- a/patches/server/0930-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0929-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0931-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0930-Expose-LootTable-of-DecoratedPot.patch
index afa86977a9..afa86977a9 100644
--- a/patches/server/0931-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0930-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0932-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0931-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 357d185f0a..357d185f0a 100644
--- a/patches/server/0932-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0931-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0933-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0932-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index a58beffec5..a58beffec5 100644
--- a/patches/server/0933-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0932-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0934-Add-ShulkerDuplicateEvent.patch b/patches/server/0933-Add-ShulkerDuplicateEvent.patch
index de864137e2..de864137e2 100644
--- a/patches/server/0934-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/0933-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0935-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0934-Add-api-for-spawn-egg-texture-colors.patch
index 2462562bb0..2462562bb0 100644
--- a/patches/server/0935-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0934-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/0936-Add-Lifecycle-Event-system.patch b/patches/server/0935-Add-Lifecycle-Event-system.patch
index 89149b0c71..89149b0c71 100644
--- a/patches/server/0936-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0935-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/0937-ItemStack-Tooltip-API.patch b/patches/server/0936-ItemStack-Tooltip-API.patch
index 6b01a6f311..6b01a6f311 100644
--- a/patches/server/0937-ItemStack-Tooltip-API.patch
+++ b/patches/server/0936-ItemStack-Tooltip-API.patch
diff --git a/patches/server/0938-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0937-Add-getChunkSnapshot-includeLightData-parameter.patch
index 54aa35539f..54aa35539f 100644
--- a/patches/server/0938-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/0937-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0939-Add-FluidState-API.patch b/patches/server/0938-Add-FluidState-API.patch
index aac0912819..aac0912819 100644
--- a/patches/server/0939-Add-FluidState-API.patch
+++ b/patches/server/0938-Add-FluidState-API.patch
diff --git a/patches/server/0940-add-number-format-api.patch b/patches/server/0939-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0940-add-number-format-api.patch
+++ b/patches/server/0939-add-number-format-api.patch
diff --git a/patches/server/0941-improve-BanList-types.patch b/patches/server/0940-improve-BanList-types.patch
index c63e72309a..c63e72309a 100644
--- a/patches/server/0941-improve-BanList-types.patch
+++ b/patches/server/0940-improve-BanList-types.patch
diff --git a/patches/server/0942-Expanded-Hopper-API.patch b/patches/server/0941-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0942-Expanded-Hopper-API.patch
+++ b/patches/server/0941-Expanded-Hopper-API.patch
diff --git a/patches/server/0943-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0942-Add-BlockBreakProgressUpdateEvent.patch
index 125844c5b6..125844c5b6 100644
--- a/patches/server/0943-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0942-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0944-Deprecate-ItemStack-setType.patch b/patches/server/0943-Deprecate-ItemStack-setType.patch
index a909fcfb22..a909fcfb22 100644
--- a/patches/server/0944-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0943-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0945-Add-CartographyItemEvent.patch b/patches/server/0944-Add-CartographyItemEvent.patch
index 56311c8376..56311c8376 100644
--- a/patches/server/0945-Add-CartographyItemEvent.patch
+++ b/patches/server/0944-Add-CartographyItemEvent.patch
diff --git a/patches/server/0946-More-Raid-API.patch b/patches/server/0945-More-Raid-API.patch
index bf5d4e7fc9..c98e63a452 100644
--- a/patches/server/0946-More-Raid-API.patch
+++ b/patches/server/0945-More-Raid-API.patch
@@ -86,10 +86,10 @@ index b8ce1c1c2447f9cff1717bfcfd6eb911ade0d4b3..51f21af9d75769abdcba713b9aa33392
 +    // Paper end - more Raid API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 395da7e8ca0971610f06bf5b8357ef05f2247da6..fc38d65914143aaf93aa85badf3adcdfe4dda1b5 100644
+index b3bc35956228a997a88d4af2f7b5810f1c09d5b8..8f88ccec6b8947ca2738dc07c23aebe258145c83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2354,6 +2354,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2306,6 +2306,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (raid == null) ? null : new CraftRaid(raid);
      }
  
diff --git a/patches/server/0947-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0946-Add-onboarding-message-for-initial-server-start.patch
index ca3fd81590..ca3fd81590 100644
--- a/patches/server/0947-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0946-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/0948-Configurable-max-block-fluid-ticks.patch b/patches/server/0947-Configurable-max-block-fluid-ticks.patch
index 02e6a701ce..02e6a701ce 100644
--- a/patches/server/0948-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0947-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0949-Fix-bees-aging-inside-hives.patch b/patches/server/0948-Fix-bees-aging-inside-hives.patch
index ae6a0ff63d..ae6a0ff63d 100644
--- a/patches/server/0949-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0948-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0950-Disable-memory-reserve-allocating.patch b/patches/server/0949-Disable-memory-reserve-allocating.patch
index ea801f5092..ea801f5092 100644
--- a/patches/server/0950-Disable-memory-reserve-allocating.patch
+++ b/patches/server/0949-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0951-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0950-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index d98b3aeccc..d98b3aeccc 100644
--- a/patches/server/0951-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/0950-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0952-Fix-DamageSource-API.patch b/patches/server/0951-Fix-DamageSource-API.patch
index 1cf932b9ac..1cf932b9ac 100644
--- a/patches/server/0952-Fix-DamageSource-API.patch
+++ b/patches/server/0951-Fix-DamageSource-API.patch
diff --git a/patches/server/0953-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0952-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index 8769e0adaf..8769e0adaf 100644
--- a/patches/server/0953-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/server/0952-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0954-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0953-Fix-possible-StackOverflowError-for-some-dispenses.patch
index 5a6627392e..5a6627392e 100644
--- a/patches/server/0954-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/0953-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0955-Improve-tag-parser-handling.patch b/patches/server/0954-Improve-tag-parser-handling.patch
index b89772ccad..b89772ccad 100644
--- a/patches/server/0955-Improve-tag-parser-handling.patch
+++ b/patches/server/0954-Improve-tag-parser-handling.patch
diff --git a/patches/server/0956-Item-Mutation-Fixes.patch b/patches/server/0955-Item-Mutation-Fixes.patch
index 0e20a90a87..0e20a90a87 100644
--- a/patches/server/0956-Item-Mutation-Fixes.patch
+++ b/patches/server/0955-Item-Mutation-Fixes.patch
diff --git a/patches/server/0957-Per-world-ticks-per-spawn-settings.patch b/patches/server/0956-Per-world-ticks-per-spawn-settings.patch
index bfd6fd26af..bfd6fd26af 100644
--- a/patches/server/0957-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0956-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0958-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0957-Properly-track-the-changed-item-from-dispense-events.patch
index f0c05e1f86..f0c05e1f86 100644
--- a/patches/server/0958-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/0957-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0959-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0958-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 0fd49bd9ed..0fd49bd9ed 100644
--- a/patches/server/0959-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0958-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0960-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/0959-Fix-tripwire-disarming-not-working-as-intended.patch
index fa7f6bde06..fa7f6bde06 100644
--- a/patches/server/0960-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/server/0959-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/0961-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0960-Add-config-for-mobs-immune-to-default-effects.patch
index 5989f9bd5f..5989f9bd5f 100644
--- a/patches/server/0961-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0960-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0962-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/0961-Deep-clone-nbt-tags-in-PDC.patch
index 6a8a671064..6a8a671064 100644
--- a/patches/server/0962-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/server/0961-Deep-clone-nbt-tags-in-PDC.patch
diff --git a/patches/server/0963-Support-old-UUID-format-for-NBT.patch b/patches/server/0962-Support-old-UUID-format-for-NBT.patch
index a38c2a7f7b..a38c2a7f7b 100644
--- a/patches/server/0963-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0962-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0964-Fix-shield-disable-inconsistency.patch b/patches/server/0963-Fix-shield-disable-inconsistency.patch
index 5653036c7f..5653036c7f 100644
--- a/patches/server/0964-Fix-shield-disable-inconsistency.patch
+++ b/patches/server/0963-Fix-shield-disable-inconsistency.patch
diff --git a/patches/server/0965-Don-t-lose-removed-data-components-in-ItemMeta.patch b/patches/server/0964-Don-t-lose-removed-data-components-in-ItemMeta.patch
index a46f8877b4..a46f8877b4 100644
--- a/patches/server/0965-Don-t-lose-removed-data-components-in-ItemMeta.patch
+++ b/patches/server/0964-Don-t-lose-removed-data-components-in-ItemMeta.patch
diff --git a/patches/server/0966-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0965-Handle-Large-Packets-disconnecting-client.patch
index ea20a101a7..ea20a101a7 100644
--- a/patches/server/0966-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0965-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0967-Fix-ItemFlags.patch b/patches/server/0966-Fix-ItemFlags.patch
index 249bd1854a..249bd1854a 100644
--- a/patches/server/0967-Fix-ItemFlags.patch
+++ b/patches/server/0966-Fix-ItemFlags.patch
diff --git a/patches/server/0968-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0967-Fix-helmet-damage-reduction-inconsistencies.patch
index bbce375f3f..bbce375f3f 100644
--- a/patches/server/0968-Fix-helmet-damage-reduction-inconsistencies.patch
+++ b/patches/server/0967-Fix-helmet-damage-reduction-inconsistencies.patch
diff --git a/patches/server/0969-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/0968-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index 4e3efb9b25..4e3efb9b25 100644
--- a/patches/server/0969-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/0968-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/patches/server/0970-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/0969-improve-checking-handled-tags-in-itemmeta.patch
index 955dfaca5d..955dfaca5d 100644
--- a/patches/server/0970-improve-checking-handled-tags-in-itemmeta.patch
+++ b/patches/server/0969-improve-checking-handled-tags-in-itemmeta.patch
diff --git a/patches/server/0971-General-ItemMeta-fixes.patch b/patches/server/0970-General-ItemMeta-fixes.patch
index ee7ee45e11..ee7ee45e11 100644
--- a/patches/server/0971-General-ItemMeta-fixes.patch
+++ b/patches/server/0970-General-ItemMeta-fixes.patch
diff --git a/patches/server/0972-Expose-hasColor-to-leather-armor.patch b/patches/server/0971-Expose-hasColor-to-leather-armor.patch
index 0cdf66fe04..0cdf66fe04 100644
--- a/patches/server/0972-Expose-hasColor-to-leather-armor.patch
+++ b/patches/server/0971-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/server/0973-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/0972-Added-API-to-get-player-ha-proxy-address.patch
index 5ef4bac68c..5ef4bac68c 100644
--- a/patches/server/0973-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/server/0972-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/server/0974-More-Chest-Block-API.patch b/patches/server/0973-More-Chest-Block-API.patch
index 020d97d086..020d97d086 100644
--- a/patches/server/0974-More-Chest-Block-API.patch
+++ b/patches/server/0973-More-Chest-Block-API.patch
diff --git a/patches/server/0975-Print-data-component-type-on-encoding-error.patch b/patches/server/0974-Print-data-component-type-on-encoding-error.patch
index a60bdfee87..a60bdfee87 100644
--- a/patches/server/0975-Print-data-component-type-on-encoding-error.patch
+++ b/patches/server/0974-Print-data-component-type-on-encoding-error.patch
diff --git a/patches/server/0976-Brigadier-based-command-API.patch b/patches/server/0975-Brigadier-based-command-API.patch
index e551e947aa..e551e947aa 100644
--- a/patches/server/0976-Brigadier-based-command-API.patch
+++ b/patches/server/0975-Brigadier-based-command-API.patch
diff --git a/patches/server/0977-Fix-issues-with-Recipe-API.patch b/patches/server/0976-Fix-issues-with-Recipe-API.patch
index b6f0cb1a91..b6f0cb1a91 100644
--- a/patches/server/0977-Fix-issues-with-Recipe-API.patch
+++ b/patches/server/0976-Fix-issues-with-Recipe-API.patch
diff --git a/patches/server/0978-Fix-equipment-slot-and-group-API.patch b/patches/server/0977-Fix-equipment-slot-and-group-API.patch
index eaaf981851..eaaf981851 100644
--- a/patches/server/0978-Fix-equipment-slot-and-group-API.patch
+++ b/patches/server/0977-Fix-equipment-slot-and-group-API.patch
diff --git a/patches/server/0979-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/0978-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 980c3dc8a0..980c3dc8a0 100644
--- a/patches/server/0979-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/server/0978-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/server/0980-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0979-Prevent-sending-oversized-item-data-in-equipment-and.patch
index b686bee3b0..b686bee3b0 100644
--- a/patches/server/0980-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0979-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0981-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/0980-Prevent-NPE-if-hooked-entity-was-cleared.patch
index 8d3547db93..8d3547db93 100644
--- a/patches/server/0981-Prevent-NPE-if-hooked-entity-was-cleared.patch
+++ b/patches/server/0980-Prevent-NPE-if-hooked-entity-was-cleared.patch
diff --git a/patches/server/0982-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/0981-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
index 7c3afdd7bb..7c3afdd7bb 100644
--- a/patches/server/0982-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
+++ b/patches/server/0981-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
diff --git a/patches/server/0983-Add-missing-fishing-event-state.patch b/patches/server/0982-Add-missing-fishing-event-state.patch
index 6ad1a92dd0..6ad1a92dd0 100644
--- a/patches/server/0983-Add-missing-fishing-event-state.patch
+++ b/patches/server/0982-Add-missing-fishing-event-state.patch
diff --git a/patches/server/0984-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0983-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index b0f57581f4..b0f57581f4 100644
--- a/patches/server/0984-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/server/0983-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/server/0985-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/server/0984-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
index 1abf467e7e..1abf467e7e 100644
--- a/patches/server/0985-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
+++ b/patches/server/0984-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
diff --git a/patches/server/0986-Adopt-MaterialRerouting.patch b/patches/server/0985-Adopt-MaterialRerouting.patch
index c1057b6bc1..c1057b6bc1 100644
--- a/patches/server/0986-Adopt-MaterialRerouting.patch
+++ b/patches/server/0985-Adopt-MaterialRerouting.patch
diff --git a/patches/server/0987-Suspicious-Effect-Entry-API.patch b/patches/server/0986-Suspicious-Effect-Entry-API.patch
index 42710c795a..42710c795a 100644
--- a/patches/server/0987-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/0986-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0988-check-if-itemstack-is-stackable-first.patch b/patches/server/0987-check-if-itemstack-is-stackable-first.patch
index 8e11960bdd..8e11960bdd 100644
--- a/patches/server/0988-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/0987-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0989-Rewrite-dataconverter-system.patch b/patches/server/0988-Rewrite-dataconverter-system.patch
index 8602229378..8602229378 100644
--- a/patches/server/0989-Rewrite-dataconverter-system.patch
+++ b/patches/server/0988-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0990-disable-forced-empty-world-ticks.patch b/patches/server/0989-disable-forced-empty-world-ticks.patch
index 7415c872ae..7415c872ae 100644
--- a/patches/server/0990-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0989-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0991-stubs.patch b/patches/server/0990-stubs.patch
index 7f57021011..7f57021011 100644
--- a/patches/server/0991-stubs.patch
+++ b/patches/server/0990-stubs.patch