Cleanup some patches (#9093)

203 files changed, 70 insertions, 84 deletions

diff --git a/patches/api/0171-Entity-getEntitySpawnReason.patch b/patches/api/0171-Entity-getEntitySpawnReason.patch
index 713f65284d..f14999e52d 100644
--- a/patches/api/0171-Entity-getEntitySpawnReason.patch
+++ b/patches/api/0171-Entity-getEntitySpawnReason.patch
@@ -9,8 +9,10 @@ Pre existing entities will return NATURAL if it was a non
 persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
+Co-authored-by: Aurora <[email protected]>
+
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 6fb14175962ec9730e4b70330481ec21d2c87da5..84e201c1695e9a97354f84156d82c47f9b722281 100644
+index cd489dddec0b1ab50947a523c467ce3825961549..b541674b1d7061be9e8e7545a5050c7ee0ca4c66 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -780,5 +780,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -19,7 +21,7 @@ index 6fb14175962ec9730e4b70330481ec21d2c87da5..84e201c1695e9a97354f84156d82c47f
      }
 +
 +    /**
-+     * @return The {@link org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason} that spawned this entity.
++     * @return The {@link org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason} that initially spawned this entity. <!-- Paper - added "initially" to clarify that the SpawnReason doesn't change after the Entity was initially spawned" -->
 +     */
 +    @NotNull
 +    org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
diff --git a/patches/api/0217-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/api/0217-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
deleted file mode 100644
index bc84bc0456..0000000000
--- a/patches/api/0217-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aurora <[email protected]>
-Date: Sat, 3 Oct 2020 16:28:41 +0200
-Subject: [PATCH] Clarify the Javadocs for Entity.getEntitySpawnReason()
-
-
-diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 2c7c53b96b92ea9ef4e185558d744d0955a5e9e7..81d9f085905283e54c3bd597e15ac1bf693f541f 100644
---- a/src/main/java/org/bukkit/entity/Entity.java
-+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -782,7 +782,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
-     }
- 
-     /**
--     * @return The {@link org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason} that spawned this entity.
-+     * @return The {@link org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason} that initially spawned this entity. <!-- Paper - added "initially" to clarify that the SpawnReason doesn't change after the Entity was initially spawned" -->
-      */
-     @NotNull
-     org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
diff --git a/patches/api/0218-Villager-resetOffers.patch b/patches/api/0217-Villager-resetOffers.patch
index 60fedfba0f..60fedfba0f 100644
--- a/patches/api/0218-Villager-resetOffers.patch
+++ b/patches/api/0217-Villager-resetOffers.patch
diff --git a/patches/api/0219-Player-elytra-boost-API.patch b/patches/api/0218-Player-elytra-boost-API.patch
index aa1a957b00..7b84cee0e7 100644
--- a/patches/api/0219-Player-elytra-boost-API.patch
+++ b/patches/api/0218-Player-elytra-boost-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 40191fb054e90724e5f28b4078d41073c7bc5dc5..f6bbd49e655c5f89d77f36ca21952679ab31b6bb 100644
+index edd90e8311c47e9bbd6e962395503c445455bc23..2a3eed2795d26dc104a143ede85428f15a7f839d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2579,6 +2579,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0220-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0219-Add-getOfflinePlayerIfCached-String.patch
index 62c719d46c..62c719d46c 100644
--- a/patches/api/0220-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0219-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/api/0221-Add-ignore-discounts-API.patch b/patches/api/0220-Add-ignore-discounts-API.patch
index 89655ddef8..89655ddef8 100644
--- a/patches/api/0221-Add-ignore-discounts-API.patch
+++ b/patches/api/0220-Add-ignore-discounts-API.patch
diff --git a/patches/api/0222-Item-no-age-no-player-pickup.patch b/patches/api/0221-Item-no-age-no-player-pickup.patch
index 5dd7572120..5dd7572120 100644
--- a/patches/api/0222-Item-no-age-no-player-pickup.patch
+++ b/patches/api/0221-Item-no-age-no-player-pickup.patch
diff --git a/patches/api/0223-Beacon-API-custom-effect-ranges.patch b/patches/api/0222-Beacon-API-custom-effect-ranges.patch
index effd7b3ae9..effd7b3ae9 100644
--- a/patches/api/0223-Beacon-API-custom-effect-ranges.patch
+++ b/patches/api/0222-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/api/0224-Add-API-for-quit-reason.patch b/patches/api/0223-Add-API-for-quit-reason.patch
index 70e37ffc9b..0350afaf92 100644
--- a/patches/api/0224-Add-API-for-quit-reason.patch
+++ b/patches/api/0223-Add-API-for-quit-reason.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API for quit reason
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
-index 0395ca85a466f6356259078d3bad48b2ce6e57b7..6e9205024ca9d3000a371bd0eb723dcd6c662bce 100644
+index 14b27eaaf744736b3e56bb1383481df98a218c43..84703b5d174625b1a4a995a244e6400d2675fbb5 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
 @@ -11,16 +11,28 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0225-Add-Destroy-Speed-API.patch b/patches/api/0224-Add-Destroy-Speed-API.patch
index bdf9933289..bdf9933289 100644
--- a/patches/api/0225-Add-Destroy-Speed-API.patch
+++ b/patches/api/0224-Add-Destroy-Speed-API.patch
diff --git a/patches/api/0226-Add-LivingEntity-clearActiveItem.patch b/patches/api/0225-Add-LivingEntity-clearActiveItem.patch
index 224ac62396..224ac62396 100644
--- a/patches/api/0226-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/api/0225-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/api/0227-Add-PlayerItemCooldownEvent.patch b/patches/api/0226-Add-PlayerItemCooldownEvent.patch
index 378f88f6e6..378f88f6e6 100644
--- a/patches/api/0227-Add-PlayerItemCooldownEvent.patch
+++ b/patches/api/0226-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/0228-More-lightning-API.patch b/patches/api/0227-More-lightning-API.patch
index 3ff480a14c..3ff480a14c 100644
--- a/patches/api/0228-More-lightning-API.patch
+++ b/patches/api/0227-More-lightning-API.patch
diff --git a/patches/api/0229-Add-PlayerShearBlockEvent.patch b/patches/api/0228-Add-PlayerShearBlockEvent.patch
index 051544b4a9..051544b4a9 100644
--- a/patches/api/0229-Add-PlayerShearBlockEvent.patch
+++ b/patches/api/0228-Add-PlayerShearBlockEvent.patch
diff --git a/patches/api/0230-Player-Chunk-Load-Unload-Events.patch b/patches/api/0229-Player-Chunk-Load-Unload-Events.patch
index e2ce87ec9d..e2ce87ec9d 100644
--- a/patches/api/0230-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/api/0229-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/api/0231-Expose-LivingEntity-hurt-direction.patch b/patches/api/0230-Expose-LivingEntity-hurt-direction.patch
index 7e10cc2c27..7e10cc2c27 100644
--- a/patches/api/0231-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/api/0230-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/api/0232-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 00552e9137..00552e9137 100644
--- a/patches/api/0232-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/api/0233-Added-PlayerTradeEvent.patch b/patches/api/0232-Added-PlayerTradeEvent.patch
index e09b088160..e09b088160 100644
--- a/patches/api/0233-Added-PlayerTradeEvent.patch
+++ b/patches/api/0232-Added-PlayerTradeEvent.patch
diff --git a/patches/api/0234-Add-TargetHitEvent-API.patch b/patches/api/0233-Add-TargetHitEvent-API.patch
index 247421fb61..247421fb61 100644
--- a/patches/api/0234-Add-TargetHitEvent-API.patch
+++ b/patches/api/0233-Add-TargetHitEvent-API.patch
diff --git a/patches/api/0235-Additional-Block-Material-API-s.patch b/patches/api/0234-Additional-Block-Material-API-s.patch
index 5d7efccc1f..5d7efccc1f 100644
--- a/patches/api/0235-Additional-Block-Material-API-s.patch
+++ b/patches/api/0234-Additional-Block-Material-API-s.patch
diff --git a/patches/api/0236-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
index d297dd5c24..d297dd5c24 100644
--- a/patches/api/0236-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/api/0237-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0236-Add-PlayerFlowerPotManipulateEvent.patch
index d9cd5a9f01..d9cd5a9f01 100644
--- a/patches/api/0237-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/api/0236-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/api/0238-Zombie-API-breaking-doors.patch b/patches/api/0237-Zombie-API-breaking-doors.patch
index cda09b776b..cda09b776b 100644
--- a/patches/api/0238-Zombie-API-breaking-doors.patch
+++ b/patches/api/0237-Zombie-API-breaking-doors.patch
diff --git a/patches/api/0239-Add-EntityLoadCrossbowEvent.patch b/patches/api/0238-Add-EntityLoadCrossbowEvent.patch
index 1e0386a9aa..1e0386a9aa 100644
--- a/patches/api/0239-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/api/0238-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/api/0240-Added-WorldGameRuleChangeEvent.patch b/patches/api/0239-Added-WorldGameRuleChangeEvent.patch
index 8ef5f7efcd..8ef5f7efcd 100644
--- a/patches/api/0240-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/api/0239-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/api/0241-Added-ServerResourcesReloadedEvent.patch b/patches/api/0240-Added-ServerResourcesReloadedEvent.patch
index de081bbae7..de081bbae7 100644
--- a/patches/api/0241-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/api/0240-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/api/0242-Add-BlockFailedDispenseEvent.patch b/patches/api/0241-Add-BlockFailedDispenseEvent.patch
index 126714b965..126714b965 100644
--- a/patches/api/0242-Add-BlockFailedDispenseEvent.patch
+++ b/patches/api/0241-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/api/0243-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0242-Added-PlayerLecternPageChangeEvent.patch
index 2b65c3a245..2b65c3a245 100644
--- a/patches/api/0243-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/api/0242-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/api/0244-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0243-Added-PlayerLoomPatternSelectEvent.patch
index 5677026956..5677026956 100644
--- a/patches/api/0244-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/api/0243-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/api/0245-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
index afc3f45d28..afc3f45d28 100644
--- a/patches/api/0245-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
+++ b/patches/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/0246-Add-sendOpLevel-API.patch b/patches/api/0245-Add-sendOpLevel-API.patch
index e332e795e2..9449042cfd 100644
--- a/patches/api/0246-Add-sendOpLevel-API.patch
+++ b/patches/api/0245-Add-sendOpLevel-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f6bbd49e655c5f89d77f36ca21952679ab31b6bb..6c4d148202c3378e361fd8068c00cc0b67d6dc1e 100644
+index 2a3eed2795d26dc104a143ede85428f15a7f839d..77fb32968d9d32096d93a760a8b08ded310d31b5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2592,6 +2592,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0247-Add-PaperRegistry.patch b/patches/api/0246-Add-PaperRegistry.patch
index 8cc1e1b931..8cc1e1b931 100644
--- a/patches/api/0247-Add-PaperRegistry.patch
+++ b/patches/api/0246-Add-PaperRegistry.patch
diff --git a/patches/api/0248-Add-StructuresLocateEvent.patch b/patches/api/0247-Add-StructuresLocateEvent.patch
index 4000811de1..4000811de1 100644
--- a/patches/api/0248-Add-StructuresLocateEvent.patch
+++ b/patches/api/0247-Add-StructuresLocateEvent.patch
diff --git a/patches/api/0249-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/api/0248-Return-chat-component-with-empty-text-instead-of-thr.patch
index 73b9ed0483..73b9ed0483 100644
--- a/patches/api/0249-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/api/0248-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/api/0250-Add-BlockPreDispenseEvent.patch b/patches/api/0249-Add-BlockPreDispenseEvent.patch
index fb0b89a4ee..fb0b89a4ee 100644
--- a/patches/api/0250-Add-BlockPreDispenseEvent.patch
+++ b/patches/api/0249-Add-BlockPreDispenseEvent.patch
diff --git a/patches/api/0251-Added-missing-vanilla-tags.patch b/patches/api/0250-Added-missing-vanilla-tags.patch
index 06920bad60..06920bad60 100644
--- a/patches/api/0251-Added-missing-vanilla-tags.patch
+++ b/patches/api/0250-Added-missing-vanilla-tags.patch
diff --git a/patches/api/0252-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0251-Added-PlayerChangeBeaconEffectEvent.patch
index 336e7b1302..336e7b1302 100644
--- a/patches/api/0252-Added-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/api/0251-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0253-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0252-Added-PlayerStonecutterRecipeSelectEvent.patch
index ce446c46fe..ce446c46fe 100644
--- a/patches/api/0253-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/api/0252-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0254-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0253-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index f85f2a4f26..f85f2a4f26 100644
--- a/patches/api/0254-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/api/0253-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/0255-add-DragonEggFormEvent.patch b/patches/api/0254-add-DragonEggFormEvent.patch
index c465295e88..c465295e88 100644
--- a/patches/api/0255-add-DragonEggFormEvent.patch
+++ b/patches/api/0254-add-DragonEggFormEvent.patch
diff --git a/patches/api/0256-EntityMoveEvent.patch b/patches/api/0255-EntityMoveEvent.patch
index 2855c3bdef..2855c3bdef 100644
--- a/patches/api/0256-EntityMoveEvent.patch
+++ b/patches/api/0255-EntityMoveEvent.patch
diff --git a/patches/api/0257-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0256-Allow-adding-items-to-BlockDropItemEvent.patch
index 984da00f52..984da00f52 100644
--- a/patches/api/0257-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/api/0256-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0258-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0257-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index bbb81fdcf6..bbb81fdcf6 100644
--- a/patches/api/0258-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/api/0257-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/0259-living-entity-allow-attribute-registration.patch b/patches/api/0258-living-entity-allow-attribute-registration.patch
index e7ded6dabb..e7ded6dabb 100644
--- a/patches/api/0259-living-entity-allow-attribute-registration.patch
+++ b/patches/api/0258-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0260-Add-missing-effects.patch b/patches/api/0259-Add-missing-effects.patch
index 17eba7efe0..17eba7efe0 100644
--- a/patches/api/0260-Add-missing-effects.patch
+++ b/patches/api/0259-Add-missing-effects.patch
diff --git a/patches/api/0261-Expose-Tracked-Players.patch b/patches/api/0260-Expose-Tracked-Players.patch
index 22bf58c5b1..8582519d3b 100644
--- a/patches/api/0261-Expose-Tracked-Players.patch
+++ b/patches/api/0260-Expose-Tracked-Players.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose Tracked Players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 81d9f085905283e54c3bd597e15ac1bf693f541f..e0265937a5daf968a9a3f453f4aabf37f76d2c1c 100644
+index e212fcb53c9d2f8aad3e1582b64de1743f2efbfc..368a308e5420f9a9ed403358e7224d2df67a89bb 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -826,5 +826,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0262-Cache-the-result-of-Material-isBlock.patch b/patches/api/0261-Cache-the-result-of-Material-isBlock.patch
index 13bedd1afb..13bedd1afb 100644
--- a/patches/api/0262-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/api/0261-Cache-the-result-of-Material-isBlock.patch
diff --git a/patches/api/0263-Add-worldborder-events.patch b/patches/api/0262-Add-worldborder-events.patch
index 2a1d4164b2..2a1d4164b2 100644
--- a/patches/api/0263-Add-worldborder-events.patch
+++ b/patches/api/0262-Add-worldborder-events.patch
diff --git a/patches/api/0264-added-PlayerNameEntityEvent.patch b/patches/api/0263-added-PlayerNameEntityEvent.patch
index a38082f8e8..a38082f8e8 100644
--- a/patches/api/0264-added-PlayerNameEntityEvent.patch
+++ b/patches/api/0263-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0265-Add-recipe-to-cook-events.patch b/patches/api/0264-Add-recipe-to-cook-events.patch
index b0b34773c0..b0b34773c0 100644
--- a/patches/api/0265-Add-recipe-to-cook-events.patch
+++ b/patches/api/0264-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0266-Add-Block-isValidTool.patch b/patches/api/0265-Add-Block-isValidTool.patch
index 84a641142e..84a641142e 100644
--- a/patches/api/0266-Add-Block-isValidTool.patch
+++ b/patches/api/0265-Add-Block-isValidTool.patch
diff --git a/patches/api/0267-Expand-world-key-API.patch b/patches/api/0266-Expand-world-key-API.patch
index 258c8f382b..258c8f382b 100644
--- a/patches/api/0267-Expand-world-key-API.patch
+++ b/patches/api/0266-Expand-world-key-API.patch
diff --git a/patches/api/0268-Item-Rarity-API.patch b/patches/api/0267-Item-Rarity-API.patch
index 1344f21cde..ad0914d330 100644
--- a/patches/api/0268-Item-Rarity-API.patch
+++ b/patches/api/0267-Item-Rarity-API.patch
@@ -88,7 +88,7 @@ index 6c45841538f2f073691331f975741a62b03a6637..e87cbaf9c1ea1330ab1597f98c8864d0
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 03a15727c85a08c0c79965be249373a11f31ce6e..c6378a880eac9f444c66f640260e8d410efd015b 100644
+index e4ad3a550050c4bf9cc7a2a1082bfdf668050efe..4f867ba2bc9b1a7c277e4a5f0ea8b452315f3272 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -877,5 +877,15 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0269-Expose-protocol-version.patch b/patches/api/0268-Expose-protocol-version.patch
index 5e7493cad9..5e7493cad9 100644
--- a/patches/api/0269-Expose-protocol-version.patch
+++ b/patches/api/0268-Expose-protocol-version.patch
diff --git a/patches/api/0270-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0269-add-isDeeplySleeping-to-HumanEntity.patch
index 55b6ed4860..55b6ed4860 100644
--- a/patches/api/0270-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/api/0269-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0271-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0270-add-consumeFuel-to-FurnaceBurnEvent.patch
index 6c8b681cd9..6c8b681cd9 100644
--- a/patches/api/0271-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/api/0270-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0272-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0271-add-get-set-drop-chance-to-EntityEquipment.patch
index c42542a195..a9a1c98000 100644
--- a/patches/api/0272-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/api/0271-add-get-set-drop-chance-to-EntityEquipment.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add get-set drop chance to EntityEquipment
 
 
 diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java
-index 42f76751ec414648ee719c341d471d947bf85be6..58d52f6e1660ebdb098566a2ae6b50c8b44dc0d9 100644
+index 62c1c3f01fd58db39f635eee415fcbc19fb36ec9..fddffa6f415048c4a1eda049178c6d34d8519337 100644
 --- a/src/main/java/org/bukkit/inventory/EntityEquipment.java
 +++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java
 @@ -513,4 +513,32 @@ public interface EntityEquipment {
diff --git a/patches/api/0273-Added-PlayerDeepSleepEvent.patch b/patches/api/0272-Added-PlayerDeepSleepEvent.patch
index d8dccca755..d8dccca755 100644
--- a/patches/api/0273-Added-PlayerDeepSleepEvent.patch
+++ b/patches/api/0272-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0274-More-World-API.patch b/patches/api/0273-More-World-API.patch
index 8cdf7647b1..8cdf7647b1 100644
--- a/patches/api/0274-More-World-API.patch
+++ b/patches/api/0273-More-World-API.patch
diff --git a/patches/api/0275-Added-PlayerBedFailEnterEvent.patch b/patches/api/0274-Added-PlayerBedFailEnterEvent.patch
index a622f2b98f..a622f2b98f 100644
--- a/patches/api/0275-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/api/0274-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0276-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0275-Introduce-beacon-activation-deactivation-events.patch
index c2f0577191..c2f0577191 100644
--- a/patches/api/0276-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/api/0275-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0277-PlayerMoveEvent-Improvements.patch b/patches/api/0276-PlayerMoveEvent-Improvements.patch
index 33cf16e54b..33cf16e54b 100644
--- a/patches/api/0277-PlayerMoveEvent-Improvements.patch
+++ b/patches/api/0276-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0278-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0277-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 3b5d058fcc..3b5d058fcc 100644
--- a/patches/api/0278-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/api/0277-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0279-Add-more-WanderingTrader-API.patch b/patches/api/0278-Add-more-WanderingTrader-API.patch
index 99045d4949..99045d4949 100644
--- a/patches/api/0279-Add-more-WanderingTrader-API.patch
+++ b/patches/api/0278-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0280-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0279-Add-EntityBlockStorage-clearEntities.patch
index 7032ba6155..7032ba6155 100644
--- a/patches/api/0280-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/api/0279-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0281-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0280-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 16af3a7728..16af3a7728 100644
--- a/patches/api/0281-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/api/0280-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0282-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0281-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index f42f7eed00..f42f7eed00 100644
--- a/patches/api/0282-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/api/0281-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0283-Inventory-close.patch b/patches/api/0282-Inventory-close.patch
index 87dfa1a083..87dfa1a083 100644
--- a/patches/api/0283-Inventory-close.patch
+++ b/patches/api/0282-Inventory-close.patch
diff --git a/patches/api/0284-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0283-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 3103f1ce2c..3103f1ce2c 100644
--- a/patches/api/0284-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/api/0283-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0285-Add-basic-Datapack-API.patch b/patches/api/0284-Add-basic-Datapack-API.patch
index 7a764c779e..7a764c779e 100644
--- a/patches/api/0285-Add-basic-Datapack-API.patch
+++ b/patches/api/0284-Add-basic-Datapack-API.patch
diff --git a/patches/api/0286-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0285-additions-to-PlayerGameModeChangeEvent.patch
index b2e65ae490..b2e65ae490 100644
--- a/patches/api/0286-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/api/0285-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0287-ItemStack-repair-check-API.patch b/patches/api/0286-ItemStack-repair-check-API.patch
index 5641bba3a7..780a5da832 100644
--- a/patches/api/0287-ItemStack-repair-check-API.patch
+++ b/patches/api/0286-ItemStack-repair-check-API.patch
@@ -26,7 +26,7 @@ index 906f313d8c91e65ce934143208ed281ce02f5354..29a91ec8e97ce66383a1dd1fc3dcbcdc
       * Returns the server's protocol version.
       *
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index c6378a880eac9f444c66f640260e8d410efd015b..b731ac4f6cd82d8476e4040a2204f58b0f63a0d3 100644
+index 4f867ba2bc9b1a7c277e4a5f0ea8b452315f3272..2d945516ec65ffe103479aea218b3002cc572dc1 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -887,5 +887,27 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0288-More-Enchantment-API.patch b/patches/api/0287-More-Enchantment-API.patch
index 0ccfe049b4..0ccfe049b4 100644
--- a/patches/api/0288-More-Enchantment-API.patch
+++ b/patches/api/0287-More-Enchantment-API.patch
diff --git a/patches/api/0289-Add-Mob-lookAt-API.patch b/patches/api/0288-Add-Mob-lookAt-API.patch
index 0dd5126905..0dd5126905 100644
--- a/patches/api/0289-Add-Mob-lookAt-API.patch
+++ b/patches/api/0288-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0290-ItemStack-editMeta.patch b/patches/api/0289-ItemStack-editMeta.patch
index 4b652c8977..7893a035c9 100644
--- a/patches/api/0290-ItemStack-editMeta.patch
+++ b/patches/api/0289-ItemStack-editMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack#editMeta
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index ffde4d11d4d5e783afb77bc2e96cf71113b2eb25..c5579710f73e9b8d407d5b8d698d2543a25a752d 100644
+index 2d945516ec65ffe103479aea218b3002cc572dc1..f9faef1b73b5027a3d22e76a0b33b7c952f3ae08 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -547,6 +547,50 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0291-Add-EntityInsideBlockEvent.patch b/patches/api/0290-Add-EntityInsideBlockEvent.patch
index f1ce553e7b..f1ce553e7b 100644
--- a/patches/api/0291-Add-EntityInsideBlockEvent.patch
+++ b/patches/api/0290-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0292-Attributes-API-for-item-defaults.patch b/patches/api/0291-Attributes-API-for-item-defaults.patch
index 8d822f5e8d..8d822f5e8d 100644
--- a/patches/api/0292-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0291-Attributes-API-for-item-defaults.patch
diff --git a/patches/api/0293-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0292-Add-cause-to-Weather-ThunderChangeEvents.patch
index 8e5d45d87b..8e5d45d87b 100644
--- a/patches/api/0293-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/api/0292-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0294-More-Lidded-Block-API.patch b/patches/api/0293-More-Lidded-Block-API.patch
index a89f206f9a..a89f206f9a 100644
--- a/patches/api/0294-More-Lidded-Block-API.patch
+++ b/patches/api/0293-More-Lidded-Block-API.patch
diff --git a/patches/api/0295-Add-PlayerKickEvent-causes.patch b/patches/api/0294-Add-PlayerKickEvent-causes.patch
index bc035c363f..c02b838aa2 100644
--- a/patches/api/0295-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0294-Add-PlayerKickEvent-causes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b49620af0edcf10e7f74d616dcb4fb775308308f..bf5eeaffb7983c6a849ee80df0b78230d3cce42b 100644
+index 77fb32968d9d32096d93a760a8b08ded310d31b5..11c5cfa3e35395c2967dc1e0864e0b953fda30c6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -249,6 +249,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0296-Add-PufferFishStateChangeEvent.patch b/patches/api/0295-Add-PufferFishStateChangeEvent.patch
index c3014534d3..c3014534d3 100644
--- a/patches/api/0296-Add-PufferFishStateChangeEvent.patch
+++ b/patches/api/0295-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0297-Add-BellRevealRaiderEvent.patch b/patches/api/0296-Add-BellRevealRaiderEvent.patch
index 8b0ee3e5b4..8b0ee3e5b4 100644
--- a/patches/api/0297-Add-BellRevealRaiderEvent.patch
+++ b/patches/api/0296-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0298-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0297-Add-ElderGuardianAppearanceEvent.patch
index 8d925d10ac..8d925d10ac 100644
--- a/patches/api/0298-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/api/0297-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0299-Add-more-line-of-sight-methods.patch b/patches/api/0298-Add-more-line-of-sight-methods.patch
index 23ee16c98c..66f4c9a514 100644
--- a/patches/api/0299-Add-more-line-of-sight-methods.patch
+++ b/patches/api/0298-Add-more-line-of-sight-methods.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more line of sight methods
 
 
 diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
-index aa534b1a9a1fb84a2fbd4b372f313bb4b63325fa..43b53c21af01e0f496c8aaacff82dfdfadaf40f6 100644
+index f30fff08bf04c4d274b2ce242a135a14924f1cb0..3c38abfbe0391bf748702b1599d359a1180838af 100644
 --- a/src/main/java/org/bukkit/RegionAccessor.java
 +++ b/src/main/java/org/bukkit/RegionAccessor.java
 @@ -392,5 +392,13 @@ public interface RegionAccessor extends Keyed { // Paper
@@ -23,7 +23,7 @@ index aa534b1a9a1fb84a2fbd4b372f313bb4b63325fa..43b53c21af01e0f496c8aaacff82dfdf
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 16536dae04b020de43f9e13ff32c659b9e6cab0c..72f7bf02ec1ace2c835e4ad58e3e59b3d7357972 100644
+index 6a4c54ea92478be6e53b62ebe4e73068b9ed4a29..626eb1796d5a19d110855e2fb95cb4c761ecc544 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -546,6 +546,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0300-Add-WaterBottleSplashEvent.patch b/patches/api/0299-Add-WaterBottleSplashEvent.patch
index 198b488051..198b488051 100644
--- a/patches/api/0300-Add-WaterBottleSplashEvent.patch
+++ b/patches/api/0299-Add-WaterBottleSplashEvent.patch
diff --git a/patches/api/0301-Add-more-LimitedRegion-API.patch b/patches/api/0300-Add-more-LimitedRegion-API.patch
index 292f95c890..292f95c890 100644
--- a/patches/api/0301-Add-more-LimitedRegion-API.patch
+++ b/patches/api/0300-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0302-Missing-Entity-Behavior-API.patch b/patches/api/0301-Missing-Entity-Behavior-API.patch
index a6b5eb90d3..a6b5eb90d3 100644
--- a/patches/api/0302-Missing-Entity-Behavior-API.patch
+++ b/patches/api/0301-Missing-Entity-Behavior-API.patch
diff --git a/patches/api/0303-Adds-PlayerArmSwingEvent.patch b/patches/api/0302-Adds-PlayerArmSwingEvent.patch
index 0a501495fe..0a501495fe 100644
--- a/patches/api/0303-Adds-PlayerArmSwingEvent.patch
+++ b/patches/api/0302-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/0304-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0303-Add-PlayerSignCommandPreprocessEvent.patch
index fd095653a3..fd095653a3 100644
--- a/patches/api/0304-Add-PlayerSignCommandPreprocessEvent.patch
+++ b/patches/api/0303-Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/0305-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0304-fix-empty-array-elements-in-command-arguments.patch
index 4b66990211..4b66990211 100644
--- a/patches/api/0305-fix-empty-array-elements-in-command-arguments.patch
+++ b/patches/api/0304-fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/0306-Stinger-API.patch b/patches/api/0305-Stinger-API.patch
index b73ac9aa85..4011649092 100644
--- a/patches/api/0306-Stinger-API.patch
+++ b/patches/api/0305-Stinger-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 72f7bf02ec1ace2c835e4ad58e3e59b3d7357972..4febec3623b936cf40daba6196392ebce4b8d5a8 100644
+index 626eb1796d5a19d110855e2fb95cb4c761ecc544..08167783b6e4e7d393779c92500793518ee346a6 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -399,6 +399,36 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0307-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0306-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 639c8a6a2f..639c8a6a2f 100644
--- a/patches/api/0307-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/api/0306-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/0308-Add-PlayerSetSpawnEvent.patch b/patches/api/0307-Add-PlayerSetSpawnEvent.patch
index 74772fd9d8..74772fd9d8 100644
--- a/patches/api/0308-Add-PlayerSetSpawnEvent.patch
+++ b/patches/api/0307-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/0309-Added-EntityDamageItemEvent.patch b/patches/api/0308-Added-EntityDamageItemEvent.patch
index 8bbe79f9f3..8bbe79f9f3 100644
--- a/patches/api/0309-Added-EntityDamageItemEvent.patch
+++ b/patches/api/0308-Added-EntityDamageItemEvent.patch
diff --git a/patches/api/0310-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0309-Make-EntityUnleashEvent-cancellable.patch
index e99584c277..e99584c277 100644
--- a/patches/api/0310-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/api/0309-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/0311-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0310-Change-EnderEye-target-without-changing-other-things.patch
index d8e53593ae..d8e53593ae 100644
--- a/patches/api/0311-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/api/0310-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/0312-Add-BlockBreakBlockEvent.patch b/patches/api/0311-Add-BlockBreakBlockEvent.patch
index dfd13b1355..dfd13b1355 100644
--- a/patches/api/0312-Add-BlockBreakBlockEvent.patch
+++ b/patches/api/0311-Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/0313-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0312-Add-helpers-for-left-right-click-to-Action.patch
index 9dac2fe612..9dac2fe612 100644
--- a/patches/api/0313-Add-helpers-for-left-right-click-to-Action.patch
+++ b/patches/api/0312-Add-helpers-for-left-right-click-to-Action.patch
diff --git a/patches/api/0314-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0313-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 0a0b5515e3..0a0b5515e3 100644
--- a/patches/api/0314-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/api/0313-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/api/0315-More-CommandBlock-API.patch b/patches/api/0314-More-CommandBlock-API.patch
index 242270eb12..46ea583f90 100644
--- a/patches/api/0315-More-CommandBlock-API.patch
+++ b/patches/api/0314-More-CommandBlock-API.patch
@@ -69,7 +69,7 @@ index 0000000000000000000000000000000000000000..09e57f495e3cbf3c6f434d12ab348308
 +    void setSuccessCount(int successCount);
 +}
 diff --git a/src/main/java/org/bukkit/block/CommandBlock.java b/src/main/java/org/bukkit/block/CommandBlock.java
-index 73dce588d1f7a5048300073bf8c2b14d6da1e857..d63da691fb8cfa04bb699adb2eb55278e8b76200 100644
+index 9c88be68b4f403d0500cb607394b3a1646675ef7..02bf0f8c12052dd5c17422153228083f56bea75b 100644
 --- a/src/main/java/org/bukkit/block/CommandBlock.java
 +++ b/src/main/java/org/bukkit/block/CommandBlock.java
 @@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0316-Add-missing-team-sidebar-display-slots.patch b/patches/api/0315-Add-missing-team-sidebar-display-slots.patch
index 1d9b731fb4..1d9b731fb4 100644
--- a/patches/api/0316-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/api/0315-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/0317-add-back-EntityPortalExitEvent.patch b/patches/api/0316-add-back-EntityPortalExitEvent.patch
index 5a153e2345..5a153e2345 100644
--- a/patches/api/0317-add-back-EntityPortalExitEvent.patch
+++ b/patches/api/0316-add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/0318-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0317-Add-methods-to-find-targets-for-lightning-strikes.patch
index d0652f734d..b2594d5902 100644
--- a/patches/api/0318-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/api/0317-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -5,7 +5,7 @@ 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 6da379edbf35321f7265606228695f40a9ea6977..2955302b08b30570e4a561e3b076d10d80f2f2b3 100644
+index 04c9329bb0309a1d3b0a1bbc755af7190a6ad0d4..792817079f03d082141660ab2a51c9bf56144f60 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -749,6 +749,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0319-Get-entity-default-attributes.patch b/patches/api/0318-Get-entity-default-attributes.patch
index 72fbc24349..72fbc24349 100644
--- a/patches/api/0319-Get-entity-default-attributes.patch
+++ b/patches/api/0318-Get-entity-default-attributes.patch
diff --git a/patches/api/0320-Left-handed-API.patch b/patches/api/0319-Left-handed-API.patch
index 6b5d42a329..6b5d42a329 100644
--- a/patches/api/0320-Left-handed-API.patch
+++ b/patches/api/0319-Left-handed-API.patch
diff --git a/patches/api/0321-Add-more-advancement-API.patch b/patches/api/0320-Add-more-advancement-API.patch
index e29e9ff891..e29e9ff891 100644
--- a/patches/api/0321-Add-more-advancement-API.patch
+++ b/patches/api/0320-Add-more-advancement-API.patch
diff --git a/patches/api/0322-Add-ItemFactory-getSpawnEgg-API.patch b/patches/api/0321-Add-ItemFactory-getSpawnEgg-API.patch
index 54fbf45e4b..c90b0ee882 100644
--- a/patches/api/0322-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/api/0321-Add-ItemFactory-getSpawnEgg-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ItemFactory#getSpawnEgg API
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 34c13845f4916fb167fc9d83fe792975e5c52bdc..2acafae468fcbb7213d6b6c30803a3924a3bbc30 100644
+index fea728e9c4aaab792e6a6b4a71c1e9c34096d305..bed2278dbd35be9bdc82e7fcfaf077fdf040edd0 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -261,5 +261,14 @@ public interface ItemFactory {
diff --git a/patches/api/0323-Add-critical-damage-API.patch b/patches/api/0322-Add-critical-damage-API.patch
index 3a9d1f8070..3a9d1f8070 100644
--- a/patches/api/0323-Add-critical-damage-API.patch
+++ b/patches/api/0322-Add-critical-damage-API.patch
diff --git a/patches/api/0324-Fix-issues-with-mob-conversion.patch b/patches/api/0323-Fix-issues-with-mob-conversion.patch
index f451d967b6..f451d967b6 100644
--- a/patches/api/0324-Fix-issues-with-mob-conversion.patch
+++ b/patches/api/0323-Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/0325-Add-isCollidable-methods-to-various-places.patch b/patches/api/0324-Add-isCollidable-methods-to-various-places.patch
index 97a86a8b35..97a86a8b35 100644
--- a/patches/api/0325-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/api/0324-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/api/0326-Goat-ram-API.patch b/patches/api/0325-Goat-ram-API.patch
index 06d426a786..06d426a786 100644
--- a/patches/api/0326-Goat-ram-API.patch
+++ b/patches/api/0325-Goat-ram-API.patch
diff --git a/patches/api/0327-Add-API-for-resetting-a-single-score.patch b/patches/api/0326-Add-API-for-resetting-a-single-score.patch
index 997ebf42f6..997ebf42f6 100644
--- a/patches/api/0327-Add-API-for-resetting-a-single-score.patch
+++ b/patches/api/0326-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/api/0328-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0327-Add-Raw-Byte-Entity-Serialization.patch
index d939672f1b..62e9d36079 100644
--- a/patches/api/0328-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/api/0327-Add-Raw-Byte-Entity-Serialization.patch
@@ -24,7 +24,7 @@ index 2a23e93d9e308c5eba0a2b658f11f571a0c01e26..b8ca571f8e88e7b676c5d1e1d90f6e5c
       * Creates and returns the next EntityId available.
       * <p>
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index e0265937a5daf968a9a3f453f4aabf37f76d2c1c..24a409ff2bc554edde610a223f20bbfc09ef5152 100644
+index 368a308e5420f9a9ed403358e7224d2df67a89bb..822d39dde955f981323e6e6ac31d8da6b2289942 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -833,5 +833,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0329-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0328-Add-PlayerItemFrameChangeEvent.patch
index a62e452bb4..a62e452bb4 100644
--- a/patches/api/0329-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/api/0328-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/api/0330-Add-player-health-update-API.patch b/patches/api/0329-Add-player-health-update-API.patch
index c218a50cce..c81c3a463d 100644
--- a/patches/api/0330-Add-player-health-update-API.patch
+++ b/patches/api/0329-Add-player-health-update-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add player health update API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b834537b1fa7ee349d10fe1ac5aa7e7dca4e35f7..eca9b83ef932979517f9232def0a8c3eaf087d96 100644
+index 11c5cfa3e35395c2967dc1e0864e0b953fda30c6..1be287747e9aad2abf3ec5cf8e9655c252bb681d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1980,6 +1980,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0331-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0330-Allow-delegation-to-vanilla-chunk-gen.patch
index b0f7bf1f6f..b0f7bf1f6f 100644
--- a/patches/api/0331-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0330-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/api/0332-Add-more-Campfire-API.patch b/patches/api/0331-Add-more-Campfire-API.patch
index 80cdc0bb39..80cdc0bb39 100644
--- a/patches/api/0332-Add-more-Campfire-API.patch
+++ b/patches/api/0331-Add-more-Campfire-API.patch
diff --git a/patches/api/0333-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0332-Move-VehicleCollisionEvent-HandlerList-up.patch
index 4be8907b49..4be8907b49 100644
--- a/patches/api/0333-Move-VehicleCollisionEvent-HandlerList-up.patch
+++ b/patches/api/0332-Move-VehicleCollisionEvent-HandlerList-up.patch
diff --git a/patches/api/0334-Improve-scoreboard-entries.patch b/patches/api/0333-Improve-scoreboard-entries.patch
index 749ed64c6f..bb288528e5 100644
--- a/patches/api/0334-Improve-scoreboard-entries.patch
+++ b/patches/api/0333-Improve-scoreboard-entries.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve scoreboard entries
 
 
 diff --git a/src/main/java/org/bukkit/scoreboard/Objective.java b/src/main/java/org/bukkit/scoreboard/Objective.java
-index de8789b79c8c36ba909c9532642acf22136a0faa..79bfae9626f0ed6c279eda21ddd1e25b09ed0be9 100644
+index 571b43c2809d2b248feebc7decba6017a67c8aee..4830db50f408bd9b7e79c30a6d90af567a45af0c 100644
 --- a/src/main/java/org/bukkit/scoreboard/Objective.java
 +++ b/src/main/java/org/bukkit/scoreboard/Objective.java
 @@ -151,9 +151,8 @@ public interface Objective {
@@ -37,7 +37,7 @@ index de8789b79c8c36ba909c9532642acf22136a0faa..79bfae9626f0ed6c279eda21ddd1e25b
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/scoreboard/Scoreboard.java b/src/main/java/org/bukkit/scoreboard/Scoreboard.java
-index ef3e729caf430b08cdf2d680d5a137a1ba56c1c5..ec264ecfe6835d00afa3622024d2cbb200bd3d63 100644
+index ebb72912c1f8431606162b0643f6289203331253..5547f82d3d739035da3acc4bdbda72930c863138 100644
 --- a/src/main/java/org/bukkit/scoreboard/Scoreboard.java
 +++ b/src/main/java/org/bukkit/scoreboard/Scoreboard.java
 @@ -265,9 +265,8 @@ public interface Scoreboard {
@@ -110,7 +110,7 @@ index ef3e729caf430b08cdf2d680d5a137a1ba56c1c5..ec264ecfe6835d00afa3622024d2cbb2
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index eaf5d2cf07b97a6bc23e52b40b63b9eba82bced3..2014bca326ec67f178129d8b044fa0b0654e1ffd 100644
+index 937a28638c251509ebeb254178a4583fe03c52d0..b7f0686d22cef8d9bd23105ab60051ccb10fa1e6 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
 @@ -308,9 +308,8 @@ public interface Team {
diff --git a/patches/api/0335-Entity-powdered-snow-API.patch b/patches/api/0334-Entity-powdered-snow-API.patch
index 5f8078650e..b7b3ded711 100644
--- a/patches/api/0335-Entity-powdered-snow-API.patch
+++ b/patches/api/0334-Entity-powdered-snow-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity powdered snow API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 24a409ff2bc554edde610a223f20bbfc09ef5152..970a07fdc68fc988adbd8cdceccb97960709dff3 100644
+index 822d39dde955f981323e6e6ac31d8da6b2289942..56d6d9fae622f7cc4a397b1cc55aa9458ee925dc 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -860,5 +860,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0336-Add-API-for-item-entity-health.patch b/patches/api/0335-Add-API-for-item-entity-health.patch
index 94373dbdf2..94373dbdf2 100644
--- a/patches/api/0336-Add-API-for-item-entity-health.patch
+++ b/patches/api/0335-Add-API-for-item-entity-health.patch
diff --git a/patches/api/0337-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0336-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index f094cdc255..f094cdc255 100644
--- a/patches/api/0337-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/api/0336-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0338-Bucketable-API.patch b/patches/api/0337-Bucketable-API.patch
index 26dbdc9f5d..26dbdc9f5d 100644
--- a/patches/api/0338-Bucketable-API.patch
+++ b/patches/api/0337-Bucketable-API.patch
diff --git a/patches/api/0339-System-prop-for-default-config-comment-parsing.patch b/patches/api/0338-System-prop-for-default-config-comment-parsing.patch
index 632f71e519..632f71e519 100644
--- a/patches/api/0339-System-prop-for-default-config-comment-parsing.patch
+++ b/patches/api/0338-System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/api/0340-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0339-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 9b189fc918..9b189fc918 100644
--- a/patches/api/0340-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/api/0339-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/api/0341-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/api/0340-Add-new-overload-to-PersistentDataContainer-has.patch
index 73c49a2fc8..73c49a2fc8 100644
--- a/patches/api/0341-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/api/0340-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/api/0342-Multiple-Entries-with-Scoreboards.patch b/patches/api/0341-Multiple-Entries-with-Scoreboards.patch
index a91b109ea9..0a4fbab3a7 100644
--- a/patches/api/0342-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/api/0341-Multiple-Entries-with-Scoreboards.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Multiple Entries with Scoreboards
 
 
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index 2014bca326ec67f178129d8b044fa0b0654e1ffd..376a873ce809fa6ce4dce49d9e00ddbdabb1315e 100644
+index b7f0686d22cef8d9bd23105ab60051ccb10fa1e6..0f1c08092577a7d66fdc1ea8b645ea67e0d9c6cf 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
 @@ -323,6 +323,60 @@ public interface Team {
diff --git a/patches/api/0343-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0342-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 2d133482d3..2d133482d3 100644
--- a/patches/api/0343-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/api/0342-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0344-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0343-Warn-on-strange-EventHandler-return-types.patch
index 29026c1725..29026c1725 100644
--- a/patches/api/0344-Warn-on-strange-EventHandler-return-types.patch
+++ b/patches/api/0343-Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/api/0345-Multi-Block-Change-API.patch b/patches/api/0344-Multi-Block-Change-API.patch
index c04b59d605..5436a8526d 100644
--- a/patches/api/0345-Multi-Block-Change-API.patch
+++ b/patches/api/0344-Multi-Block-Change-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Multi Block Change API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index eca9b83ef932979517f9232def0a8c3eaf087d96..f3fe0266778d9d513f6a561b8829644d1f66e617 100644
+index 1be287747e9aad2abf3ec5cf8e9655c252bb681d..4532e4955d5c42fe27dc9a3702d83f825c6074cc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -646,6 +646,27 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0346-Fix-NotePlayEvent.patch b/patches/api/0345-Fix-NotePlayEvent.patch
index a474627df0..a474627df0 100644
--- a/patches/api/0346-Fix-NotePlayEvent.patch
+++ b/patches/api/0345-Fix-NotePlayEvent.patch
diff --git a/patches/api/0347-Freeze-Tick-Lock-API.patch b/patches/api/0346-Freeze-Tick-Lock-API.patch
index 7ebe09b2be..8466db6302 100644
--- a/patches/api/0347-Freeze-Tick-Lock-API.patch
+++ b/patches/api/0346-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 970a07fdc68fc988adbd8cdceccb97960709dff3..b92096ec80198aa007ed1aeff057db463ec11c0b 100644
+index 56d6d9fae622f7cc4a397b1cc55aa9458ee925dc..0feb4912e5fd230b0b566f2303f0e3f4098f43ae 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -279,6 +279,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0348-Dolphin-API.patch b/patches/api/0347-Dolphin-API.patch
index 73beed437b..73beed437b 100644
--- a/patches/api/0348-Dolphin-API.patch
+++ b/patches/api/0347-Dolphin-API.patch
diff --git a/patches/api/0349-More-PotionEffectType-API.patch b/patches/api/0348-More-PotionEffectType-API.patch
index fbbaaee341..fbbaaee341 100644
--- a/patches/api/0349-More-PotionEffectType-API.patch
+++ b/patches/api/0348-More-PotionEffectType-API.patch
diff --git a/patches/api/0350-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0349-API-for-creating-command-sender-which-forwards-feedb.patch
index e53227fc75..e53227fc75 100644
--- a/patches/api/0350-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0349-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/api/0351-Implement-regenerateChunk.patch b/patches/api/0350-Implement-regenerateChunk.patch
index fc4adbf415..fec8e98fd9 100644
--- a/patches/api/0351-Implement-regenerateChunk.patch
+++ b/patches/api/0350-Implement-regenerateChunk.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement regenerateChunk
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 2955302b08b30570e4a561e3b076d10d80f2f2b3..aa04d7df70d99402c91e920fd693d7d4fb655786 100644
+index 792817079f03d082141660ab2a51c9bf56144f60..6716a1185e733f3ddf56b295f3153938f57d4229 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -498,8 +498,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0352-Add-GameEvent-tags.patch b/patches/api/0351-Add-GameEvent-tags.patch
index 6fc6bfda74..6fc6bfda74 100644
--- a/patches/api/0352-Add-GameEvent-tags.patch
+++ b/patches/api/0351-Add-GameEvent-tags.patch
diff --git a/patches/api/0353-Furnace-RecipesUsed-API.patch b/patches/api/0352-Furnace-RecipesUsed-API.patch
index 7fed82db21..7fed82db21 100644
--- a/patches/api/0353-Furnace-RecipesUsed-API.patch
+++ b/patches/api/0352-Furnace-RecipesUsed-API.patch
diff --git a/patches/api/0354-Configurable-sculk-sensor-listener-range.patch b/patches/api/0353-Configurable-sculk-sensor-listener-range.patch
index b1ad0cdb5b..b1ad0cdb5b 100644
--- a/patches/api/0354-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/api/0353-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/api/0355-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0354-Add-missing-block-data-mins-and-maxes.patch
index 600497b952..600497b952 100644
--- a/patches/api/0355-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/api/0354-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0356-Custom-Potion-Mixes.patch b/patches/api/0355-Custom-Potion-Mixes.patch
index 378c03e0e3..378c03e0e3 100644
--- a/patches/api/0356-Custom-Potion-Mixes.patch
+++ b/patches/api/0355-Custom-Potion-Mixes.patch
diff --git a/patches/api/0357-Expose-furnace-minecart-push-values.patch b/patches/api/0356-Expose-furnace-minecart-push-values.patch
index 3d8c2336e7..3d8c2336e7 100644
--- a/patches/api/0357-Expose-furnace-minecart-push-values.patch
+++ b/patches/api/0356-Expose-furnace-minecart-push-values.patch
diff --git a/patches/api/0358-More-Projectile-API.patch b/patches/api/0357-More-Projectile-API.patch
index 74619e0a48..74619e0a48 100644
--- a/patches/api/0358-More-Projectile-API.patch
+++ b/patches/api/0357-More-Projectile-API.patch
diff --git a/patches/api/0359-Add-getComputedBiome-API.patch b/patches/api/0358-Add-getComputedBiome-API.patch
index 98dc77cad2..f065c8e543 100644
--- a/patches/api/0359-Add-getComputedBiome-API.patch
+++ b/patches/api/0358-Add-getComputedBiome-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getComputedBiome API
 
 
 diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
-index 43b53c21af01e0f496c8aaacff82dfdfadaf40f6..3f7e860de4e28745fcdf8d2f41f4a8c210f48909 100644
+index 3c38abfbe0391bf748702b1599d359a1180838af..96291baf8bd06ff5f7fb2fccdbb2a172f01ba8db 100644
 --- a/src/main/java/org/bukkit/RegionAccessor.java
 +++ b/src/main/java/org/bukkit/RegionAccessor.java
 @@ -26,6 +26,7 @@ public interface RegionAccessor extends Keyed { // Paper
diff --git a/patches/api/0360-Add-enchantWithLevels-API.patch b/patches/api/0359-Add-enchantWithLevels-API.patch
index 42506ea030..175b43f65f 100644
--- a/patches/api/0360-Add-enchantWithLevels-API.patch
+++ b/patches/api/0359-Add-enchantWithLevels-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add enchantWithLevels API
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 2acafae468fcbb7213d6b6c30803a3924a3bbc30..40edff7c93b6bf75de81102326667135b9344666 100644
+index bed2278dbd35be9bdc82e7fcfaf077fdf040edd0..c066d877b5eec3578439c2de1ab9568381ccf7c5 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -161,6 +161,22 @@ public interface ItemFactory {
@@ -32,7 +32,7 @@ index 2acafae468fcbb7213d6b6c30803a3924a3bbc30..40edff7c93b6bf75de81102326667135
       * Creates a hover event for the given item.
       *
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 84ea952cdee1eaec5572641e09fdd85930ddeb47..6f33145f1ccc7645616f310a68676207318c2a58 100644
+index f9faef1b73b5027a3d22e76a0b33b7c952f3ae08..eac7adf622b91489711a2f8bcff77fb31292dd67 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -656,6 +656,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0361-Add-TameableDeathMessageEvent.patch b/patches/api/0360-Add-TameableDeathMessageEvent.patch
index 6152eacbe6..6152eacbe6 100644
--- a/patches/api/0361-Add-TameableDeathMessageEvent.patch
+++ b/patches/api/0360-Add-TameableDeathMessageEvent.patch
diff --git a/patches/api/0362-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0361-Allow-to-change-the-podium-of-the-EnderDragon.patch
index 7f59d6b57f..c2f08b9adc 100644
--- a/patches/api/0362-Allow-to-change-the-podium-of-the-EnderDragon.patch
+++ b/patches/api/0361-Allow-to-change-the-podium-of-the-EnderDragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow to change the podium of the EnderDragon
 
 
 diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java
-index 0449664d7cd0c52ac34d2101110f1ab42070257c..bcf3b6f2d88c3e6170f637943432cc84f69c5065 100644
+index 57f8e7bf4c7b4c4a4e793cfd5d7db74384d8b1b5..64805bef298f869035614da010ace941b2a4d70b 100644
 --- a/src/main/java/org/bukkit/entity/EnderDragon.java
 +++ b/src/main/java/org/bukkit/entity/EnderDragon.java
 @@ -104,4 +104,22 @@ public interface EnderDragon extends ComplexLivingEntity, Boss, Mob, Enemy {
diff --git a/patches/api/0363-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0362-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 5775b6f33c..5775b6f33c 100644
--- a/patches/api/0363-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/api/0362-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/api/0364-WorldCreator-keepSpawnLoaded.patch b/patches/api/0363-WorldCreator-keepSpawnLoaded.patch
index c148a391f4..c148a391f4 100644
--- a/patches/api/0364-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/api/0363-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/api/0365-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0364-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 032a0872d1..032a0872d1 100644
--- a/patches/api/0365-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/api/0364-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/api/0366-Add-PlayerStopUsingItemEvent.patch b/patches/api/0365-Add-PlayerStopUsingItemEvent.patch
index 0743d44ae1..0743d44ae1 100644
--- a/patches/api/0366-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/api/0365-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/api/0367-FallingBlock-auto-expire-setting.patch b/patches/api/0366-FallingBlock-auto-expire-setting.patch
index 90c104c7ce..90c104c7ce 100644
--- a/patches/api/0367-FallingBlock-auto-expire-setting.patch
+++ b/patches/api/0366-FallingBlock-auto-expire-setting.patch
diff --git a/patches/api/0368-Keyed-Cat-Type.patch b/patches/api/0367-Keyed-Cat-Type.patch
index b0797d78b7..b0797d78b7 100644
--- a/patches/api/0368-Keyed-Cat-Type.patch
+++ b/patches/api/0367-Keyed-Cat-Type.patch
diff --git a/patches/api/0369-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0368-Add-method-isTickingWorlds-to-Bukkit.patch
index d6f5910e14..d6f5910e14 100644
--- a/patches/api/0369-Add-method-isTickingWorlds-to-Bukkit.patch
+++ b/patches/api/0368-Add-method-isTickingWorlds-to-Bukkit.patch
diff --git a/patches/api/0370-Add-WardenAngerChangeEvent.patch b/patches/api/0369-Add-WardenAngerChangeEvent.patch
index acf45b5314..acf45b5314 100644
--- a/patches/api/0370-Add-WardenAngerChangeEvent.patch
+++ b/patches/api/0369-Add-WardenAngerChangeEvent.patch
diff --git a/patches/api/0371-Nameable-Banner-API.patch b/patches/api/0370-Nameable-Banner-API.patch
index eba196daaf..eba196daaf 100644
--- a/patches/api/0371-Nameable-Banner-API.patch
+++ b/patches/api/0370-Nameable-Banner-API.patch
diff --git a/patches/api/0372-Add-Player-getFishHook.patch b/patches/api/0371-Add-Player-getFishHook.patch
index cbedf28c68..cbedf28c68 100644
--- a/patches/api/0372-Add-Player-getFishHook.patch
+++ b/patches/api/0371-Add-Player-getFishHook.patch
diff --git a/patches/api/0373-More-Teleport-API.patch b/patches/api/0372-More-Teleport-API.patch
index a9928a2bcd..83c5752055 100644
--- a/patches/api/0373-More-Teleport-API.patch
+++ b/patches/api/0372-More-Teleport-API.patch
@@ -125,7 +125,7 @@ index 0000000000000000000000000000000000000000..dbacefc919fd6ed6a0f5cdaa0f695a12
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index b92096ec80198aa007ed1aeff057db463ec11c0b..d15ff4d1b975e2a872adc13528942662fa1a3b6b 100644
+index 0feb4912e5fd230b0b566f2303f0e3f4098f43ae..cb31e07d65075a58a906ca5163f9802f7a651a64 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -122,10 +122,34 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -165,7 +165,7 @@ index b92096ec80198aa007ed1aeff057db463ec11c0b..d15ff4d1b975e2a872adc13528942662
       * Teleports this entity to the given location. If this entity is riding a
       * vehicle, it will be dismounted prior to teleportation.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f3fe0266778d9d513f6a561b8829644d1f66e617..058c2f9da196d68477d5fbdcf55b507401e5f3ef 100644
+index 4532e4955d5c42fe27dc9a3702d83f825c6074cc..53c2ed8d5b2ddd787ee5b3d9035278dca6727a7a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2793,6 +2793,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0374-Add-EntityPortalReadyEvent.patch b/patches/api/0373-Add-EntityPortalReadyEvent.patch
index 4b1b1f1e1f..4b1b1f1e1f 100644
--- a/patches/api/0374-Add-EntityPortalReadyEvent.patch
+++ b/patches/api/0373-Add-EntityPortalReadyEvent.patch
diff --git a/patches/api/0375-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0374-Custom-Chat-Completion-Suggestions-API.patch
index 26092bb58e..7f667db718 100644
--- a/patches/api/0375-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0374-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 058c2f9da196d68477d5fbdcf55b507401e5f3ef..607415c6dae4f107406365a97925d1cb89c630d8 100644
+index 53c2ed8d5b2ddd787ee5b3d9035278dca6727a7a..a92a36629c926e1fdf9b3e5d18d77a4b24b80010 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2657,6 +2657,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0376-Collision-API.patch b/patches/api/0375-Collision-API.patch
index 208b29b0d3..f6e91de00e 100644
--- a/patches/api/0376-Collision-API.patch
+++ b/patches/api/0375-Collision-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision API
 
 
 diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
-index 3f7e860de4e28745fcdf8d2f41f4a8c210f48909..39fa4c65e0f61450901662ff5c08d54a5d9841b2 100644
+index 96291baf8bd06ff5f7fb2fccdbb2a172f01ba8db..9ff8d5e104ca35bc7145cd845d96b3825e279277 100644
 --- a/src/main/java/org/bukkit/RegionAccessor.java
 +++ b/src/main/java/org/bukkit/RegionAccessor.java
 @@ -424,5 +424,15 @@ public interface RegionAccessor extends Keyed { // Paper
@@ -25,7 +25,7 @@ index 3f7e860de4e28745fcdf8d2f41f4a8c210f48909..39fa4c65e0f61450901662ff5c08d54a
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index d15ff4d1b975e2a872adc13528942662fa1a3b6b..4d7a0cd1ec5e55c4244e30dc957e75d1feada78c 100644
+index cb31e07d65075a58a906ca5163f9802f7a651a64..e0e4300d24f6b53f35c450bbae18511a6ce0b05e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -912,4 +912,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0377-Block-Ticking-API.patch b/patches/api/0376-Block-Ticking-API.patch
index a95bb919f9..8c0df71065 100644
--- a/patches/api/0377-Block-Ticking-API.patch
+++ b/patches/api/0376-Block-Ticking-API.patch
@@ -31,7 +31,7 @@ index 13485933b8b897b5a9b35f337b43eab5c968f13a..390a2a2611df35a9ea6f1eb996b47e2a
  
      /**
 diff --git a/src/main/java/org/bukkit/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java
-index 12a7ca1808cb80daceb7695a2f0e8f97e0e21a49..f531ef38b07d95f68d6b985ce7714bd6e93d6876 100644
+index 0d5ef61e100d972a5cf308b23d5e8f2fdbad5718..e65b7d1cf7b0655a3f31949f94f2f4a12e662c94 100644
 --- a/src/main/java/org/bukkit/block/data/BlockData.java
 +++ b/src/main/java/org/bukkit/block/data/BlockData.java
 @@ -215,4 +215,14 @@ public interface BlockData extends Cloneable {
diff --git a/patches/api/0378-Add-NamespacedKey-biome-methods.patch b/patches/api/0377-Add-NamespacedKey-biome-methods.patch
index 29c18d7554..29c18d7554 100644
--- a/patches/api/0378-Add-NamespacedKey-biome-methods.patch
+++ b/patches/api/0377-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/api/0379-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/api/0378-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
index dec28c4837..3c12709b33 100644
--- a/patches/api/0379-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
+++ b/patches/api/0378-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add custom destroyerIdentity to sendBlockDamage
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 607415c6dae4f107406365a97925d1cb89c630d8..13d3676f9a394ba10f772b89b30dde55c3f4a133 100644
+index a92a36629c926e1fdf9b3e5d18d77a4b24b80010..08f6ee441a20217afd3863b3b39638b2f83aa994 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -638,7 +638,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0380-Also-load-resources-from-LibraryLoader.patch b/patches/api/0379-Also-load-resources-from-LibraryLoader.patch
index 6e88f5bd00..6e88f5bd00 100644
--- a/patches/api/0380-Also-load-resources-from-LibraryLoader.patch
+++ b/patches/api/0379-Also-load-resources-from-LibraryLoader.patch
diff --git a/patches/api/0381-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0380-Added-byte-array-serialization-deserialization-for-P.patch
index 161c82afe3..161c82afe3 100644
--- a/patches/api/0381-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/api/0380-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/api/0382-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0381-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index bec7a5d015..bec7a5d015 100644
--- a/patches/api/0382-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/api/0381-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/api/0383-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0382-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
index 52d54bf98e..52d54bf98e 100644
--- a/patches/api/0383-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
+++ b/patches/api/0382-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
diff --git a/patches/api/0384-Add-getDrops-to-BlockState.patch b/patches/api/0383-Add-getDrops-to-BlockState.patch
index 48f3a99f04..48f3a99f04 100644
--- a/patches/api/0384-Add-getDrops-to-BlockState.patch
+++ b/patches/api/0383-Add-getDrops-to-BlockState.patch
diff --git a/patches/api/0385-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0384-Add-PlayerInventorySlotChangeEvent.patch
index f094f9dbc9..f094f9dbc9 100644
--- a/patches/api/0385-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/api/0384-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/api/0386-Elder-Guardian-appearance-API.patch b/patches/api/0385-Elder-Guardian-appearance-API.patch
index 1eb891c370..35954e7a43 100644
--- a/patches/api/0386-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0385-Elder-Guardian-appearance-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 13d3676f9a394ba10f772b89b30dde55c3f4a133..c37096864750581dd6a646c13eb96be1aaf24441 100644
+index 08f6ee441a20217afd3863b3b39638b2f83aa994..de0d25b489ca4b35728c2def5c1734a3b0135e6c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2867,6 +2867,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0387-Allow-changing-bed-s-occupied-property.patch b/patches/api/0386-Allow-changing-bed-s-occupied-property.patch
index 8dfafd6d33..8dfafd6d33 100644
--- a/patches/api/0387-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/api/0386-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/api/0388-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0387-Add-EquipmentSlot-convenience-methods.patch
index 0ef6b4c9b0..0ef6b4c9b0 100644
--- a/patches/api/0388-Add-EquipmentSlot-convenience-methods.patch
+++ b/patches/api/0387-Add-EquipmentSlot-convenience-methods.patch
diff --git a/patches/api/0389-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0388-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
index 1a53a5fcc5..1a53a5fcc5 100644
--- a/patches/api/0389-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
+++ b/patches/api/0388-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
diff --git a/patches/api/0390-Add-entity-knockback-API.patch b/patches/api/0389-Add-entity-knockback-API.patch
index f53aa9c293..f53aa9c293 100644
--- a/patches/api/0390-Add-entity-knockback-API.patch
+++ b/patches/api/0389-Add-entity-knockback-API.patch
diff --git a/patches/api/0391-Added-EntityToggleSitEvent.patch b/patches/api/0390-Added-EntityToggleSitEvent.patch
index af2476123b..af2476123b 100644
--- a/patches/api/0391-Added-EntityToggleSitEvent.patch
+++ b/patches/api/0390-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0392-Add-Moving-Piston-API.patch b/patches/api/0391-Add-Moving-Piston-API.patch
index 8f889f1e3d..8f889f1e3d 100644
--- a/patches/api/0392-Add-Moving-Piston-API.patch
+++ b/patches/api/0391-Add-Moving-Piston-API.patch
diff --git a/patches/api/0393-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0392-Add-PrePlayerAttackEntityEvent.patch
index 507b313e56..507b313e56 100644
--- a/patches/api/0393-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/api/0392-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0394-Add-Player-Warden-Warning-API.patch b/patches/api/0393-Add-Player-Warden-Warning-API.patch
index a53050c05c..7483522235 100644
--- a/patches/api/0394-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0393-Add-Player-Warden-Warning-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Player Warden Warning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c37096864750581dd6a646c13eb96be1aaf24441..02155e8f4fbb7fe1a0782a6e3cc347394679abc1 100644
+index de0d25b489ca4b35728c2def5c1734a3b0135e6c..62122a36ad4c5d9967d9f927306cbaec18f340ed 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2883,6 +2883,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0395-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0394-More-vanilla-friendly-methods-to-update-trades.patch
index b2dadf139e..f13fdb5601 100644
--- a/patches/api/0395-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/api/0394-More-vanilla-friendly-methods-to-update-trades.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More vanilla friendly methods to update trades
 
 
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index d61855b83da0776fe910dee8cde184c720571a71..c61e7e41aeb3d4f5f4ac47da8890051d8e97340d 100644
+index 8c8176121cafed0ed09239b6a7b392dc846438e2..3bc24457d143449e6a338d79becf7c39b9f81054 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
 @@ -60,8 +60,11 @@ public interface Villager extends AbstractVillager {
diff --git a/patches/api/0396-Add-paper-dumplisteners-command.patch b/patches/api/0395-Add-paper-dumplisteners-command.patch
index 1cb3b7ce26..1cb3b7ce26 100644
--- a/patches/api/0396-Add-paper-dumplisteners-command.patch
+++ b/patches/api/0395-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0397-ItemStack-damage-API.patch b/patches/api/0396-ItemStack-damage-API.patch
index 12c1e68439..12c1e68439 100644
--- a/patches/api/0397-ItemStack-damage-API.patch
+++ b/patches/api/0396-ItemStack-damage-API.patch
diff --git a/patches/api/0398-Add-Tick-TemporalUnit.patch b/patches/api/0397-Add-Tick-TemporalUnit.patch
index 96c1dddab8..96c1dddab8 100644
--- a/patches/api/0398-Add-Tick-TemporalUnit.patch
+++ b/patches/api/0397-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0399-Friction-API.patch b/patches/api/0398-Friction-API.patch
index 79adabb9ba..f4d3031506 100644
--- a/patches/api/0399-Friction-API.patch
+++ b/patches/api/0398-Friction-API.patch
@@ -59,7 +59,7 @@ index d0bef15785493b512ff0f7414c1d58d38fead581..58017fce436cdbda255f7172fbdadb72
      /**
       * Gets the item stack associated with this item drop.
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 329ca07b6e166729d33446c4cd1ae19e09b7f444..3f35fc2e2311c6c568afd2ed9896584e1ebb716f 100644
+index 5b0e14a7397d3de683d17ee2f1a805d289597a4b..ec5fe22b8092c8fc837e5c36e4f17053e48a77a8 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0400-Player-Entity-Tracking-Events.patch b/patches/api/0399-Player-Entity-Tracking-Events.patch
index a824ae278f..a824ae278f 100644
--- a/patches/api/0400-Player-Entity-Tracking-Events.patch
+++ b/patches/api/0399-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0401-Add-missing-Fluid-type.patch b/patches/api/0400-Add-missing-Fluid-type.patch
index c260bf8497..c260bf8497 100644
--- a/patches/api/0401-Add-missing-Fluid-type.patch
+++ b/patches/api/0400-Add-missing-Fluid-type.patch
diff --git a/patches/api/0402-Mark-experimental-api-as-such.patch b/patches/api/0401-Mark-experimental-api-as-such.patch
index 990d5b1570..990d5b1570 100644
--- a/patches/api/0402-Mark-experimental-api-as-such.patch
+++ b/patches/api/0401-Mark-experimental-api-as-such.patch
diff --git a/patches/api/0403-fix-Instruments.patch b/patches/api/0402-fix-Instruments.patch
index e66e061a7e..fd18358b87 100644
--- a/patches/api/0403-fix-Instruments.patch
+++ b/patches/api/0402-fix-Instruments.patch
@@ -105,7 +105,7 @@ index de976be7132d05506fde7a839cac3954b0dd8da4..c449b4a03e43752b98e008b69d2a956c
      public static Instrument getByType(final byte type) {
          return BY_DATA.get(type);
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 02155e8f4fbb7fe1a0782a6e3cc347394679abc1..37639815182969c97dc678c2552f84a546fbafa7 100644
+index 62122a36ad4c5d9967d9f927306cbaec18f340ed..ac0312ccdfeb1222c18c398dd42a77b4727a80ea 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -390,9 +390,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0404-Add-BlockLockCheckEvent.patch b/patches/api/0403-Add-BlockLockCheckEvent.patch
index 10465344b9..55a23307b1 100644
--- a/patches/api/0404-Add-BlockLockCheckEvent.patch
+++ b/patches/api/0403-Add-BlockLockCheckEvent.patch
@@ -215,7 +215,7 @@ index 0000000000000000000000000000000000000000..d298ebecaa6e0a4cdc273e326d1976d2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/block/Beacon.java b/src/main/java/org/bukkit/block/Beacon.java
-index 78475fc6faff0f295828d7b53792001d51aa2889..c86e18508c3df72bf1d67b226bf02af00d66ce98 100644
+index 7d212c409035ccb8b22d4ffc322b4a1aea367627..79c04b840adb768f7a38e95a82f79287f42681f5 100644
 --- a/src/main/java/org/bukkit/block/Beacon.java
 +++ b/src/main/java/org/bukkit/block/Beacon.java
 @@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0405-Add-Sneaking-API-for-Entities.patch b/patches/api/0404-Add-Sneaking-API-for-Entities.patch
index a9caac21ba..1ce4eb525c 100644
--- a/patches/api/0405-Add-Sneaking-API-for-Entities.patch
+++ b/patches/api/0404-Add-Sneaking-API-for-Entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Sneaking API for Entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 4d7a0cd1ec5e55c4244e30dc957e75d1feada78c..365350d38b2eee00d22bad09ab95c6054f11d536 100644
+index e0e4300d24f6b53f35c450bbae18511a6ce0b05e..8c58018b155c52a7b2a139f784abceb6aa00a268 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -764,6 +764,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -35,7 +35,7 @@ index 4d7a0cd1ec5e55c4244e30dc957e75d1feada78c..365350d38b2eee00d22bad09ab95c605
       * Get the category of spawn to which this entity belongs.
       *
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 37639815182969c97dc678c2552f84a546fbafa7..1bca5f0567c4d32d2dac780b0bcebaf0a1d626d8 100644
+index ac0312ccdfeb1222c18c398dd42a77b4727a80ea..c19e72ec5fcba00948ad039bec7068c4545cc51d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -293,6 +293,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0406-Improve-PortalEvents.patch b/patches/api/0405-Improve-PortalEvents.patch
index f7f53b19fc..f7f53b19fc 100644
--- a/patches/api/0406-Improve-PortalEvents.patch
+++ b/patches/api/0405-Improve-PortalEvents.patch
diff --git a/patches/api/0407-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/api/0406-Add-exploded-block-state-to-BlockExplodeEvent.patch
index bdc2de6d23..bdc2de6d23 100644
--- a/patches/api/0407-Add-exploded-block-state-to-BlockExplodeEvent.patch
+++ b/patches/api/0406-Add-exploded-block-state-to-BlockExplodeEvent.patch
diff --git a/patches/api/0408-Flying-Fall-Damage-API.patch b/patches/api/0407-Flying-Fall-Damage-API.patch
index e8489dd646..578428ede5 100644
--- a/patches/api/0408-Flying-Fall-Damage-API.patch
+++ b/patches/api/0407-Flying-Fall-Damage-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1bca5f0567c4d32d2dac780b0bcebaf0a1d626d8..dfe407ad3f5eef963a447ad4f89605300545a595 100644
+index c19e72ec5fcba00948ad039bec7068c4545cc51d..0a75196050beff92948290b3e8d4b7d230c5700b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1454,6 +1454,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0409-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/api/0408-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 25fa280b26..25fa280b26 100644
--- a/patches/api/0409-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/api/0408-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/api/0410-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0409-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
index 0372472444..0372472444 100644
--- a/patches/api/0410-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
+++ b/patches/api/0409-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0411-Win-Screen-API.patch b/patches/api/0410-Win-Screen-API.patch
index d38cac94bf..38941768a9 100644
--- a/patches/api/0411-Win-Screen-API.patch
+++ b/patches/api/0410-Win-Screen-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Win Screen API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index dfe407ad3f5eef963a447ad4f89605300545a595..660f28e371176c62e38a84b187958aceb235c8e3 100644
+index 0a75196050beff92948290b3e8d4b7d230c5700b..8fe11fce80c3b29164b79ece8dc9ed8da6fc1790 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -854,6 +854,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0412-Add-Entity-Body-Yaw-API.patch b/patches/api/0411-Add-Entity-Body-Yaw-API.patch
index 1d6aba7a15..1d6aba7a15 100644
--- a/patches/api/0412-Add-Entity-Body-Yaw-API.patch
+++ b/patches/api/0411-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/api/0413-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0412-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
index 98799cd97d..98799cd97d 100644
--- a/patches/api/0413-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
+++ b/patches/api/0412-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0414-Add-EntityFertilizeEggEvent.patch b/patches/api/0413-Add-EntityFertilizeEggEvent.patch
index f9604adba0..f9604adba0 100644
--- a/patches/api/0414-Add-EntityFertilizeEggEvent.patch
+++ b/patches/api/0413-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0415-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0414-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index f720032bf2..f720032bf2 100644
--- a/patches/api/0415-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/api/0414-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0416-Add-Shearable-API.patch b/patches/api/0415-Add-Shearable-API.patch
index 96049cfd38..96049cfd38 100644
--- a/patches/api/0416-Add-Shearable-API.patch
+++ b/patches/api/0415-Add-Shearable-API.patch
diff --git a/patches/api/0417-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0416-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 4014e17083..4014e17083 100644
--- a/patches/api/0417-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/api/0416-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0896-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0896-Fix-a-bunch-of-vanilla-bugs.patch
index be254b8b4b..519e58a711 100644
--- a/patches/server/0896-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0896-Fix-a-bunch-of-vanilla-bugs.patch
@@ -29,26 +29,13 @@ https://bugs.mojang.com/browse/MC-191591
 https://bugs.mojang.com/browse/MC-258360
   Fix items equipped on AbstractHorse losing NBT
 
-https://bugs.mojang.com/browse/MC-121048
-  by: MelnCat <[email protected]>
-  This moves the setHealth call to below the recordDamage call to prevent
-  recordDamage from clearing the CombatTracker, since recordDamage will
-  clear the CombatTracker if the entity is dead. This fixes death messages
-  such as the "doomed to fall" messages.
-
-https://bugs.mojang.com/browse/MC-257875
-  by: Jake Potrebic <[email protected]>
-  Fixes server not consuming fire charges when igniting a creeper
-
-https://bugs.mojang.com/browse/MC-258535
-  by: Jake Potrebic <[email protected]>
-  Fixes certain explosion damage not scaling with difficulty
-
 https://bugs.mojang.com/browse/MC-259571
   Fix changeGameModeForPlayer to use gameModeForPlayer
 
+https://bugs.mojang.com/browse/MC-260219
+  Play sniffer eat sound for the last item
+
 Co-authored-by: William Blake Galbreath <[email protected]>
-Co-authored-by: MelnCat <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 index 1023f91b6a23fc974ba709ec09834d9faae8003a..6fedf7381762ae3d76c4801ed6d5c0844c6c857b 100644
@@ -90,7 +77,7 @@ index 43e77cef0fce75f59aeb05e161668bebb8fca229..ef50fbf8cb3f008827850b5ed3342200
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 13031576c20bda3bb12c926f6cd938fa5fb105f2..f14c4ec49e7206b8192050f1bd20a18e78f392fa 100644
+index 45b48da09eafa8482836e49768426069b0a73cca..16a1416cb2ce01071a033c5049edfb60b614d56a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -91,7 +91,7 @@ public class ServerPlayerGameMode {
@@ -180,6 +167,22 @@ index d38ac1f3ef105474df1294541041c2607ca53244..f9496f757bcf7000fab1f16386e775d5
              if (!player.getAbilities().instabuild) {
                  stack.shrink(1);
              }
+diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+index 89f761871a84f8ab95f2a16aba8340bb8726da30..f6e2348b280eaefc0eb05bf5d962593caa654357 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
++++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+@@ -347,9 +347,10 @@ public class Sniffer extends Animal {
+     @Override
+     public InteractionResult mobInteract(Player player, InteractionHand hand) {
+         ItemStack itemstack = player.getItemInHand(hand);
++        boolean wasFood = this.isFood(itemstack); // Paper - Fix MC-260219
+         InteractionResult enuminteractionresult = super.mobInteract(player, hand);
+ 
+-        if (enuminteractionresult.consumesAction() && this.isFood(itemstack)) {
++        if (enuminteractionresult.consumesAction() && wasFood) { // Paper - Fix MC-260219
+             this.level.playSound((Player) null, (Entity) this, this.getEatingSound(itemstack), SoundSource.NEUTRAL, 1.0F, Mth.randomBetween(this.level.random, 0.8F, 1.2F));
+         }
+ 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
 index f174094febfdfdc309f1b50877be60bae8a98156..5f407535298a31a34cfe114dd863fd6a9b977707 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java