218 files changed, 59 insertions, 54 deletions
diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch
index 5a408070fe..7689102526 100644
--- a/patches/api/0006-Adventure.patch
+++ b/patches/api/0006-Adventure.patch
@@ -1595,10 +1595,10 @@ index 372c0bd5a4d7800a11c24c95e39fe376a96232bf..9c88be68b4f403d0500cb607394b3a16
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/block/Sign.java b/src/main/java/org/bukkit/block/Sign.java
-index 5fc1c759e6e8f3fd43a5fa5c6e3f777efa16b1ec..2813f96bb13b9be28867d2c045a3003a18456879 100644
+index d9fae47539a382bf87e4265111b7e6c2a1819caf..1fdb1144949adc3a2b5cbc3aca94d2f8e0c6d9ee 100644
 --- a/src/main/java/org/bukkit/block/Sign.java
 +++ b/src/main/java/org/bukkit/block/Sign.java
-@@ -10,12 +10,51 @@ import org.jetbrains.annotations.NotNull;
+@@ -12,12 +12,51 @@ import org.jetbrains.annotations.Nullable;
   * Represents a captured state of either a SignPost or a WallSign.
   */
  public interface Sign extends TileState, Colorable {
@@ -1651,7 +1651,7 @@ index 5fc1c759e6e8f3fd43a5fa5c6e3f777efa16b1ec..2813f96bb13b9be28867d2c045a3003a
       */
      @Deprecated
      @NotNull
-@@ -29,7 +68,7 @@ public interface Sign extends TileState, Colorable {
+@@ -31,7 +70,7 @@ public interface Sign extends TileState, Colorable {
       * @param index Line number to get the text from, starting at 0
       * @return Text on the given line
       * @throws IndexOutOfBoundsException Thrown when the line does not exist
@@ -1660,7 +1660,7 @@ index 5fc1c759e6e8f3fd43a5fa5c6e3f777efa16b1ec..2813f96bb13b9be28867d2c045a3003a
       */
      @Deprecated
      @NotNull
-@@ -44,7 +83,7 @@ public interface Sign extends TileState, Colorable {
+@@ -46,7 +85,7 @@ public interface Sign extends TileState, Colorable {
       * @param index Line number to set the text at, starting from 0
       * @param line New text to set at the specified index
       * @throws IndexOutOfBoundsException If the index is out of the range 0..3
diff --git a/patches/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch
index e76689a73f..4d41106879 100644
--- a/patches/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/api/0033-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -104,3 +104,32 @@ index 0000000000000000000000000000000000000000..d75e6a8334c7408ea8c3f155414fc14d
 +        return HANDLER_LIST;
 +    }
 +}
+diff --git a/src/main/java/org/bukkit/event/entity/EntityRemoveEvent.java b/src/main/java/org/bukkit/event/entity/EntityRemoveEvent.java
+index e32df91d911bae42c8137c6f952a6ac6a94d27e0..8ed5d1ccc44951089999db360219b556db89b4ba 100644
+--- a/src/main/java/org/bukkit/event/entity/EntityRemoveEvent.java
++++ b/src/main/java/org/bukkit/event/entity/EntityRemoveEvent.java
+@@ -1,5 +1,6 @@
+ package org.bukkit.event.entity;
+ 
++import com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent;
+ import org.bukkit.entity.Entity;
+ import org.bukkit.event.HandlerList;
+ import org.jetbrains.annotations.ApiStatus;
+@@ -11,8 +12,9 @@ import org.jetbrains.annotations.NotNull;
+  * This event should only be used for monitoring. The result
+  * of modifying the entity during or after this event is unspecified.
+  * This event is not called for a {@link org.bukkit.entity.Player}.
++ * @deprecated use {@link EntityRemoveFromWorldEvent} instead
+  */
+[email protected]
++@Deprecated(forRemoval = true)
+ public class EntityRemoveEvent extends EntityEvent {
+ 
+     private static final HandlerList handlers = new HandlerList();
+@@ -112,5 +114,6 @@ public class EntityRemoveEvent extends EntityEvent {
+          * When the chunk an entity is in gets unloaded.
+          */
+         UNLOAD,
++        DISCARD
+     }
+ }
diff --git a/patches/api/0250-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0249-Added-PlayerChangeBeaconEffectEvent.patch
index 4d84c9e1b1..4d84c9e1b1 100644
--- a/patches/api/0250-Added-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/api/0249-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0249-Added-missing-vanilla-tags.patch b/patches/api/0249-Added-missing-vanilla-tags.patch
deleted file mode 100644
index cfa894aa95..0000000000
--- a/patches/api/0249-Added-missing-vanilla-tags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Sun, 3 Jan 2021 20:03:40 -0800
-Subject: [PATCH] Added missing vanilla tags
-
-
-diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 971bc2e3ae0c265664e2fc3105f4be3027edce26..31bdecf8cbea40129a568c1761f27fa1ae0f535a 100644
---- a/src/main/java/org/bukkit/Tag.java
-+++ b/src/main/java/org/bukkit/Tag.java
-@@ -767,6 +767,12 @@ public interface Tag<T extends Keyed> extends Keyed {
-      * Vanilla item tag representing all chest boat items.
-      */
-     Tag<Material> ITEMS_CHEST_BOATS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("chest_boats"), Material.class);
-+    // Paper start
-+    /**
-+     * Vanilla item tag representing all non-flammable wood items.
-+     */
-+    Tag<Material> ITEMS_NON_FLAMMABLE_WOOD = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("non_flammable_wood"), Material.class);
-+    // Paper end
-     /**
-      * Vanilla item tag representing all fish items.
-      */
diff --git a/patches/api/0251-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0250-Added-PlayerStonecutterRecipeSelectEvent.patch
index 46377a6798..46377a6798 100644
--- a/patches/api/0251-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/api/0250-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0252-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0251-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index f85f2a4f26..f85f2a4f26 100644
--- a/patches/api/0252-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/api/0251-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/0253-add-DragonEggFormEvent.patch b/patches/api/0252-add-DragonEggFormEvent.patch
index 3b40a9f99d..3b40a9f99d 100644
--- a/patches/api/0253-add-DragonEggFormEvent.patch
+++ b/patches/api/0252-add-DragonEggFormEvent.patch
diff --git a/patches/api/0254-EntityMoveEvent.patch b/patches/api/0253-EntityMoveEvent.patch
index d9e828eb8c..d9e828eb8c 100644
--- a/patches/api/0254-EntityMoveEvent.patch
+++ b/patches/api/0253-EntityMoveEvent.patch
diff --git a/patches/api/0255-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0254-Allow-adding-items-to-BlockDropItemEvent.patch
index c6b7565fe4..c6b7565fe4 100644
--- a/patches/api/0255-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/api/0254-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0256-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0255-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 7cc686da5a..7cc686da5a 100644
--- a/patches/api/0256-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/api/0255-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/0257-living-entity-allow-attribute-registration.patch b/patches/api/0256-living-entity-allow-attribute-registration.patch
index e7ded6dabb..e7ded6dabb 100644
--- a/patches/api/0257-living-entity-allow-attribute-registration.patch
+++ b/patches/api/0256-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0258-Add-missing-effects.patch b/patches/api/0257-Add-missing-effects.patch
index 63c42ebfec..63c42ebfec 100644
--- a/patches/api/0258-Add-missing-effects.patch
+++ b/patches/api/0257-Add-missing-effects.patch
diff --git a/patches/api/0259-Expose-Tracked-Players.patch b/patches/api/0258-Expose-Tracked-Players.patch
index f3f9ff4532..f3f9ff4532 100644
--- a/patches/api/0259-Expose-Tracked-Players.patch
+++ b/patches/api/0258-Expose-Tracked-Players.patch
diff --git a/patches/api/0260-Cache-the-result-of-Material-isBlock.patch b/patches/api/0259-Cache-the-result-of-Material-isBlock.patch
index ee04af53bb..ee04af53bb 100644
--- a/patches/api/0260-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/api/0259-Cache-the-result-of-Material-isBlock.patch
diff --git a/patches/api/0261-Add-worldborder-events.patch b/patches/api/0260-Add-worldborder-events.patch
index 1c889b6cdd..1c889b6cdd 100644
--- a/patches/api/0261-Add-worldborder-events.patch
+++ b/patches/api/0260-Add-worldborder-events.patch
diff --git a/patches/api/0262-added-PlayerNameEntityEvent.patch b/patches/api/0261-added-PlayerNameEntityEvent.patch
index 69bd20d13e..69bd20d13e 100644
--- a/patches/api/0262-added-PlayerNameEntityEvent.patch
+++ b/patches/api/0261-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0263-Add-recipe-to-cook-events.patch b/patches/api/0262-Add-recipe-to-cook-events.patch
index 8c8712541e..8c8712541e 100644
--- a/patches/api/0263-Add-recipe-to-cook-events.patch
+++ b/patches/api/0262-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0264-Add-Block-isValidTool.patch b/patches/api/0263-Add-Block-isValidTool.patch
index caa83ab79b..835cf73b7a 100644
--- a/patches/api/0264-Add-Block-isValidTool.patch
+++ b/patches/api/0263-Add-Block-isValidTool.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Block#isValidTool
 
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 689170a273ce68cf6fbd4659f3e08577c100535f..987dfdc9b09299e5ef3ae1fea2882ae56f8da38e 100644
+index c68ed7de2d50da4105dd38c0986f237e8c56b2d6..b5fe76a6353816a2d009dfa5921f8ada92984f34 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -230,6 +230,15 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
diff --git a/patches/api/0265-Expand-world-key-API.patch b/patches/api/0264-Expand-world-key-API.patch
index ee70bbcfd2..ee70bbcfd2 100644
--- a/patches/api/0265-Expand-world-key-API.patch
+++ b/patches/api/0264-Expand-world-key-API.patch
diff --git a/patches/api/0266-Item-Rarity-API.patch b/patches/api/0265-Item-Rarity-API.patch
index 5e00725324..5e00725324 100644
--- a/patches/api/0266-Item-Rarity-API.patch
+++ b/patches/api/0265-Item-Rarity-API.patch
diff --git a/patches/api/0267-Expose-protocol-version.patch b/patches/api/0266-Expose-protocol-version.patch
index 0d34eacc4c..0d34eacc4c 100644
--- a/patches/api/0267-Expose-protocol-version.patch
+++ b/patches/api/0266-Expose-protocol-version.patch
diff --git a/patches/api/0268-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0267-add-isDeeplySleeping-to-HumanEntity.patch
index fc6f6dcab3..fc6f6dcab3 100644
--- a/patches/api/0268-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/api/0267-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0269-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0268-add-consumeFuel-to-FurnaceBurnEvent.patch
index 07036efb43..07036efb43 100644
--- a/patches/api/0269-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/api/0268-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0270-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0269-add-get-set-drop-chance-to-EntityEquipment.patch
index 836af12518..836af12518 100644
--- a/patches/api/0270-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/api/0269-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/api/0271-Added-PlayerDeepSleepEvent.patch b/patches/api/0270-Added-PlayerDeepSleepEvent.patch
index b333894788..b333894788 100644
--- a/patches/api/0271-Added-PlayerDeepSleepEvent.patch
+++ b/patches/api/0270-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0272-More-World-API.patch b/patches/api/0271-More-World-API.patch
index a3d88eb648..a3d88eb648 100644
--- a/patches/api/0272-More-World-API.patch
+++ b/patches/api/0271-More-World-API.patch
diff --git a/patches/api/0273-Added-PlayerBedFailEnterEvent.patch b/patches/api/0272-Added-PlayerBedFailEnterEvent.patch
index 6f9decf5fc..6f9decf5fc 100644
--- a/patches/api/0273-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/api/0272-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0274-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0273-Introduce-beacon-activation-deactivation-events.patch
index 4e173b3d6c..4e173b3d6c 100644
--- a/patches/api/0274-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/api/0273-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0275-PlayerMoveEvent-Improvements.patch b/patches/api/0274-PlayerMoveEvent-Improvements.patch
index 33cf16e54b..33cf16e54b 100644
--- a/patches/api/0275-PlayerMoveEvent-Improvements.patch
+++ b/patches/api/0274-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0276-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0275-add-RespawnFlags-to-PlayerRespawnEvent.patch
index c596be8b98..c596be8b98 100644
--- a/patches/api/0276-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/api/0275-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0277-Add-more-WanderingTrader-API.patch b/patches/api/0276-Add-more-WanderingTrader-API.patch
index 99045d4949..99045d4949 100644
--- a/patches/api/0277-Add-more-WanderingTrader-API.patch
+++ b/patches/api/0276-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0278-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0277-Add-EntityBlockStorage-clearEntities.patch
index 7032ba6155..7032ba6155 100644
--- a/patches/api/0278-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/api/0277-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0279-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0278-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 16af3a7728..16af3a7728 100644
--- a/patches/api/0279-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/api/0278-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0280-Inventory-close.patch b/patches/api/0279-Inventory-close.patch
index 87dfa1a083..87dfa1a083 100644
--- a/patches/api/0280-Inventory-close.patch
+++ b/patches/api/0279-Inventory-close.patch
diff --git a/patches/api/0281-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0280-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 3103f1ce2c..3103f1ce2c 100644
--- a/patches/api/0281-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/api/0280-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0282-Add-basic-Datapack-API.patch b/patches/api/0281-Add-basic-Datapack-API.patch
index dafb02a98d..dafb02a98d 100644
--- a/patches/api/0282-Add-basic-Datapack-API.patch
+++ b/patches/api/0281-Add-basic-Datapack-API.patch
diff --git a/patches/api/0283-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0282-additions-to-PlayerGameModeChangeEvent.patch
index b2e65ae490..b2e65ae490 100644
--- a/patches/api/0283-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/api/0282-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0284-ItemStack-repair-check-API.patch b/patches/api/0283-ItemStack-repair-check-API.patch
index 46650ec4b7..46650ec4b7 100644
--- a/patches/api/0284-ItemStack-repair-check-API.patch
+++ b/patches/api/0283-ItemStack-repair-check-API.patch
diff --git a/patches/api/0285-More-Enchantment-API.patch b/patches/api/0284-More-Enchantment-API.patch
index 98c3ef060b..98c3ef060b 100644
--- a/patches/api/0285-More-Enchantment-API.patch
+++ b/patches/api/0284-More-Enchantment-API.patch
diff --git a/patches/api/0286-Add-Mob-lookAt-API.patch b/patches/api/0285-Add-Mob-lookAt-API.patch
index 0dd5126905..0dd5126905 100644
--- a/patches/api/0286-Add-Mob-lookAt-API.patch
+++ b/patches/api/0285-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0287-ItemStack-editMeta.patch b/patches/api/0286-ItemStack-editMeta.patch
index 5996dc1000..5996dc1000 100644
--- a/patches/api/0287-ItemStack-editMeta.patch
+++ b/patches/api/0286-ItemStack-editMeta.patch
diff --git a/patches/api/0288-Add-EntityInsideBlockEvent.patch b/patches/api/0287-Add-EntityInsideBlockEvent.patch
index 2805c40dcc..2805c40dcc 100644
--- a/patches/api/0288-Add-EntityInsideBlockEvent.patch
+++ b/patches/api/0287-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0289-Attributes-API-for-item-defaults.patch b/patches/api/0288-Attributes-API-for-item-defaults.patch
index 66172a6027..66172a6027 100644
--- a/patches/api/0289-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0288-Attributes-API-for-item-defaults.patch
diff --git a/patches/api/0290-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0289-Add-cause-to-Weather-ThunderChangeEvents.patch
index 8e5d45d87b..8e5d45d87b 100644
--- a/patches/api/0290-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/api/0289-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0291-More-Lidded-Block-API.patch b/patches/api/0290-More-Lidded-Block-API.patch
index a89f206f9a..a89f206f9a 100644
--- a/patches/api/0291-More-Lidded-Block-API.patch
+++ b/patches/api/0290-More-Lidded-Block-API.patch
diff --git a/patches/api/0292-Add-PlayerKickEvent-causes.patch b/patches/api/0291-Add-PlayerKickEvent-causes.patch
index 39657e4039..39657e4039 100644
--- a/patches/api/0292-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0291-Add-PlayerKickEvent-causes.patch
diff --git a/patches/api/0293-Add-PufferFishStateChangeEvent.patch b/patches/api/0292-Add-PufferFishStateChangeEvent.patch
index 7a719777e3..7a719777e3 100644
--- a/patches/api/0293-Add-PufferFishStateChangeEvent.patch
+++ b/patches/api/0292-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0294-Add-BellRevealRaiderEvent.patch b/patches/api/0293-Add-BellRevealRaiderEvent.patch
index c45f89fd4b..c45f89fd4b 100644
--- a/patches/api/0294-Add-BellRevealRaiderEvent.patch
+++ b/patches/api/0293-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0295-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0294-Add-ElderGuardianAppearanceEvent.patch
index 23897b7390..23897b7390 100644
--- a/patches/api/0295-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/api/0294-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0296-Add-more-line-of-sight-methods.patch b/patches/api/0295-Add-more-line-of-sight-methods.patch
index 419a436957..6540c2d0f4 100644
--- a/patches/api/0296-Add-more-line-of-sight-methods.patch
+++ b/patches/api/0295-Add-more-line-of-sight-methods.patch
@@ -23,7 +23,7 @@ index d8b1fa79dc24138dc71e32c14bda71c1d570ed88..b68367f123f029c3ff47eab6bfabd7a8
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 62d0d2fe3c6dfc9faaa821bde074b623914e4a44..129df18c471f1ec0c286746953ae8803a209cfa7 100644
+index e9919fce380ec1d0d48b3ac706e7fd31af0be26b..b1fb059fc2249814c9e509c219da2aed84d34fe0 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -590,6 +590,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0297-Add-WaterBottleSplashEvent.patch b/patches/api/0296-Add-WaterBottleSplashEvent.patch
index f5525245fa..f5525245fa 100644
--- a/patches/api/0297-Add-WaterBottleSplashEvent.patch
+++ b/patches/api/0296-Add-WaterBottleSplashEvent.patch
diff --git a/patches/api/0298-Add-more-LimitedRegion-API.patch b/patches/api/0297-Add-more-LimitedRegion-API.patch
index 292f95c890..292f95c890 100644
--- a/patches/api/0298-Add-more-LimitedRegion-API.patch
+++ b/patches/api/0297-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0299-Missing-Entity-API.patch b/patches/api/0298-Missing-Entity-API.patch
index 7dff1ccf46..7dff1ccf46 100644
--- a/patches/api/0299-Missing-Entity-API.patch
+++ b/patches/api/0298-Missing-Entity-API.patch
diff --git a/patches/api/0300-Adds-PlayerArmSwingEvent.patch b/patches/api/0299-Adds-PlayerArmSwingEvent.patch
index 48e43517eb..48e43517eb 100644
--- a/patches/api/0300-Adds-PlayerArmSwingEvent.patch
+++ b/patches/api/0299-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/0301-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0300-Add-PlayerSignCommandPreprocessEvent.patch
index 8882c35337..8882c35337 100644
--- a/patches/api/0301-Add-PlayerSignCommandPreprocessEvent.patch
+++ b/patches/api/0300-Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/0302-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0301-fix-empty-array-elements-in-command-arguments.patch
index 4b66990211..4b66990211 100644
--- a/patches/api/0302-fix-empty-array-elements-in-command-arguments.patch
+++ b/patches/api/0301-fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/0303-Stinger-API.patch b/patches/api/0302-Stinger-API.patch
index d2dc349f90..d2dc349f90 100644
--- a/patches/api/0303-Stinger-API.patch
+++ b/patches/api/0302-Stinger-API.patch
diff --git a/patches/api/0304-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0303-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index aefa20a2d9..aefa20a2d9 100644
--- a/patches/api/0304-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/api/0303-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/0305-Add-PlayerSetSpawnEvent.patch b/patches/api/0304-Add-PlayerSetSpawnEvent.patch
index 42bce4d456..42bce4d456 100644
--- a/patches/api/0305-Add-PlayerSetSpawnEvent.patch
+++ b/patches/api/0304-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/0306-Added-EntityDamageItemEvent.patch b/patches/api/0305-Added-EntityDamageItemEvent.patch
index 60513a1cbd..60513a1cbd 100644
--- a/patches/api/0306-Added-EntityDamageItemEvent.patch
+++ b/patches/api/0305-Added-EntityDamageItemEvent.patch
diff --git a/patches/api/0307-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0306-Make-EntityUnleashEvent-cancellable.patch
index e99584c277..e99584c277 100644
--- a/patches/api/0307-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/api/0306-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/0308-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0307-Change-EnderEye-target-without-changing-other-things.patch
index d8e53593ae..d8e53593ae 100644
--- a/patches/api/0308-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/api/0307-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/0309-Add-BlockBreakBlockEvent.patch b/patches/api/0308-Add-BlockBreakBlockEvent.patch
index dd02c33432..dd02c33432 100644
--- a/patches/api/0309-Add-BlockBreakBlockEvent.patch
+++ b/patches/api/0308-Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/0310-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0309-Add-helpers-for-left-right-click-to-Action.patch
index 9dac2fe612..9dac2fe612 100644
--- a/patches/api/0310-Add-helpers-for-left-right-click-to-Action.patch
+++ b/patches/api/0309-Add-helpers-for-left-right-click-to-Action.patch
diff --git a/patches/api/0311-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0310-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 7e61d68783..7e61d68783 100644
--- a/patches/api/0311-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/api/0310-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/api/0312-More-CommandBlock-API.patch b/patches/api/0311-More-CommandBlock-API.patch
index c8c52c7587..c8c52c7587 100644
--- a/patches/api/0312-More-CommandBlock-API.patch
+++ b/patches/api/0311-More-CommandBlock-API.patch
diff --git a/patches/api/0313-Add-missing-team-sidebar-display-slots.patch b/patches/api/0312-Add-missing-team-sidebar-display-slots.patch
index cdecbd1764..cdecbd1764 100644
--- a/patches/api/0313-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/api/0312-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/0314-add-back-EntityPortalExitEvent.patch b/patches/api/0313-add-back-EntityPortalExitEvent.patch
index 5a153e2345..5a153e2345 100644
--- a/patches/api/0314-add-back-EntityPortalExitEvent.patch
+++ b/patches/api/0313-add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/0315-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0314-Add-methods-to-find-targets-for-lightning-strikes.patch
index c84e83d2de..c84e83d2de 100644
--- a/patches/api/0315-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/api/0314-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/api/0316-Get-entity-default-attributes.patch b/patches/api/0315-Get-entity-default-attributes.patch
index 60dc6739f1..60dc6739f1 100644
--- a/patches/api/0316-Get-entity-default-attributes.patch
+++ b/patches/api/0315-Get-entity-default-attributes.patch
diff --git a/patches/api/0317-Left-handed-API.patch b/patches/api/0316-Left-handed-API.patch
index cae17a697b..cae17a697b 100644
--- a/patches/api/0317-Left-handed-API.patch
+++ b/patches/api/0316-Left-handed-API.patch
diff --git a/patches/api/0318-Add-critical-damage-API.patch b/patches/api/0317-Add-critical-damage-API.patch
index f04ac65ac5..f04ac65ac5 100644
--- a/patches/api/0318-Add-critical-damage-API.patch
+++ b/patches/api/0317-Add-critical-damage-API.patch
diff --git a/patches/api/0319-Add-more-advancement-API.patch b/patches/api/0318-Add-more-advancement-API.patch
index 179dbdc225..179dbdc225 100644
--- a/patches/api/0319-Add-more-advancement-API.patch
+++ b/patches/api/0318-Add-more-advancement-API.patch
diff --git a/patches/api/0320-Fix-issues-with-mob-conversion.patch b/patches/api/0319-Fix-issues-with-mob-conversion.patch
index f451d967b6..f451d967b6 100644
--- a/patches/api/0320-Fix-issues-with-mob-conversion.patch
+++ b/patches/api/0319-Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/0321-Add-isCollidable-methods-to-various-places.patch b/patches/api/0320-Add-isCollidable-methods-to-various-places.patch
index a3abc4242a..a3abc4242a 100644
--- a/patches/api/0321-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/api/0320-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/api/0322-Goat-ram-API.patch b/patches/api/0321-Goat-ram-API.patch
index 06d426a786..06d426a786 100644
--- a/patches/api/0322-Goat-ram-API.patch
+++ b/patches/api/0321-Goat-ram-API.patch
diff --git a/patches/api/0323-Add-API-for-resetting-a-single-score.patch b/patches/api/0322-Add-API-for-resetting-a-single-score.patch
index 14142e8f6c..14142e8f6c 100644
--- a/patches/api/0323-Add-API-for-resetting-a-single-score.patch
+++ b/patches/api/0322-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/api/0324-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch
index 6c33be9317..6c33be9317 100644
--- a/patches/api/0324-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/api/0325-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0324-Add-PlayerItemFrameChangeEvent.patch
index b5d6cf7bd1..b5d6cf7bd1 100644
--- a/patches/api/0325-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/api/0324-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/api/0326-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0325-Allow-delegation-to-vanilla-chunk-gen.patch
index e8f75d98e2..e8f75d98e2 100644
--- a/patches/api/0326-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0325-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/api/0327-Add-more-Campfire-API.patch b/patches/api/0326-Add-more-Campfire-API.patch
index 80cdc0bb39..80cdc0bb39 100644
--- a/patches/api/0327-Add-more-Campfire-API.patch
+++ b/patches/api/0326-Add-more-Campfire-API.patch
diff --git a/patches/api/0328-Extend-VehicleCollisionEvent-move-HandlerList-up.patch b/patches/api/0327-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
index 5f5a4f4140..5f5a4f4140 100644
--- a/patches/api/0328-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
+++ b/patches/api/0327-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
diff --git a/patches/api/0329-Improve-scoreboard-entries.patch b/patches/api/0328-Improve-scoreboard-entries.patch
index 0dcc796b4d..0dcc796b4d 100644
--- a/patches/api/0329-Improve-scoreboard-entries.patch
+++ b/patches/api/0328-Improve-scoreboard-entries.patch
diff --git a/patches/api/0330-Entity-powdered-snow-API.patch b/patches/api/0329-Entity-powdered-snow-API.patch
index d31b58855c..d31b58855c 100644
--- a/patches/api/0330-Entity-powdered-snow-API.patch
+++ b/patches/api/0329-Entity-powdered-snow-API.patch
diff --git a/patches/api/0331-Add-API-for-item-entity-health.patch b/patches/api/0330-Add-API-for-item-entity-health.patch
index 94373dbdf2..572034e557 100644
--- a/patches/api/0331-Add-API-for-item-entity-health.patch
+++ b/patches/api/0330-Add-API-for-item-entity-health.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API for item entity health
 
 
 diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index 48858e1c58c13d786bbc935abedb0f059837833c..d0bef15785493b512ff0f7414c1d58d38fead581 100644
+index 6239aec4f6c625a814fa4fd610cdc5ab1a9f6e0f..ced419f8655bff72f0257b639d5f7d73afe3c2e2 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
 @@ -133,5 +133,24 @@ public interface Item extends Entity {
diff --git a/patches/api/0332-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0331-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index f094cdc255..f094cdc255 100644
--- a/patches/api/0332-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/api/0331-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0333-Bucketable-API.patch b/patches/api/0332-Bucketable-API.patch
index 26dbdc9f5d..26dbdc9f5d 100644
--- a/patches/api/0333-Bucketable-API.patch
+++ b/patches/api/0332-Bucketable-API.patch
diff --git a/patches/api/0334-System-prop-for-default-config-comment-parsing.patch b/patches/api/0333-System-prop-for-default-config-comment-parsing.patch
index 632f71e519..632f71e519 100644
--- a/patches/api/0334-System-prop-for-default-config-comment-parsing.patch
+++ b/patches/api/0333-System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/api/0335-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0334-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 9b189fc918..9b189fc918 100644
--- a/patches/api/0335-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/api/0334-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/api/0336-Multiple-Entries-with-Scoreboards.patch b/patches/api/0335-Multiple-Entries-with-Scoreboards.patch
index 920c2f117e..920c2f117e 100644
--- a/patches/api/0336-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/api/0335-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/api/0337-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0336-Warn-on-strange-EventHandler-return-types.patch
index c7807b823b..c7807b823b 100644
--- a/patches/api/0337-Warn-on-strange-EventHandler-return-types.patch
+++ b/patches/api/0336-Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/api/0338-Multi-Block-Change-API.patch b/patches/api/0337-Multi-Block-Change-API.patch
index 45664f22b3..45664f22b3 100644
--- a/patches/api/0338-Multi-Block-Change-API.patch
+++ b/patches/api/0337-Multi-Block-Change-API.patch
diff --git a/patches/api/0339-Fix-NotePlayEvent.patch b/patches/api/0338-Fix-NotePlayEvent.patch
index d3f827bfd8..d3f827bfd8 100644
--- a/patches/api/0339-Fix-NotePlayEvent.patch
+++ b/patches/api/0338-Fix-NotePlayEvent.patch
diff --git a/patches/api/0340-Freeze-Tick-Lock-API.patch b/patches/api/0339-Freeze-Tick-Lock-API.patch
index ab42b3657d..8d16a0e1d3 100644
--- a/patches/api/0340-Freeze-Tick-Lock-API.patch
+++ b/patches/api/0339-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 6456f7bfc8aa8cb5c9aaf0c06f9130242003ee3e..f090368dbb5acf352e1bee34d78b55eb92373c6d 100644
+index bdc2bbeddc47587334a8e92f5e0728f3c50218f6..e1fe5d93eb7a1f96954d907dbbe0758f25bd1ce7 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -283,6 +283,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0341-Dolphin-API.patch b/patches/api/0340-Dolphin-API.patch
index 73beed437b..73beed437b 100644
--- a/patches/api/0341-Dolphin-API.patch
+++ b/patches/api/0340-Dolphin-API.patch
diff --git a/patches/api/0342-More-PotionEffectType-API.patch b/patches/api/0341-More-PotionEffectType-API.patch
index 7e3682f8b4..7e3682f8b4 100644
--- a/patches/api/0342-More-PotionEffectType-API.patch
+++ b/patches/api/0341-More-PotionEffectType-API.patch
diff --git a/patches/api/0343-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0342-API-for-creating-command-sender-which-forwards-feedb.patch
index 5c1c336819..5c1c336819 100644
--- a/patches/api/0343-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0342-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/api/0344-Implement-regenerateChunk.patch b/patches/api/0343-Implement-regenerateChunk.patch
index 8023a26d0f..8023a26d0f 100644
--- a/patches/api/0344-Implement-regenerateChunk.patch
+++ b/patches/api/0343-Implement-regenerateChunk.patch
diff --git a/patches/api/0345-Add-GameEvent-tags.patch b/patches/api/0344-Add-GameEvent-tags.patch
index ca433ecee7..1bbdc9c696 100644
--- a/patches/api/0345-Add-GameEvent-tags.patch
+++ b/patches/api/0344-Add-GameEvent-tags.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add GameEvent tags
 
 
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 31bdecf8cbea40129a568c1761f27fa1ae0f535a..741c34b74811666c3b38e9d6fbb74b0a7bc64699 100644
+index 894e72aa97cd272ae57a91165cca0737a6d5742d..dd509bd1f7e80a04a63d2ba6eca1ff845d12fb2d 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -985,6 +985,25 @@ public interface Tag<T extends Keyed> extends Keyed {
+@@ -983,6 +983,25 @@ public interface Tag<T extends Keyed> extends Keyed {
       */
      Tag<EntityType> ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class);
  
diff --git a/patches/api/0346-Furnace-RecipesUsed-API.patch b/patches/api/0345-Furnace-RecipesUsed-API.patch
index 7fed82db21..7fed82db21 100644
--- a/patches/api/0346-Furnace-RecipesUsed-API.patch
+++ b/patches/api/0345-Furnace-RecipesUsed-API.patch
diff --git a/patches/api/0347-Configurable-sculk-sensor-listener-range.patch b/patches/api/0346-Configurable-sculk-sensor-listener-range.patch
index b1ad0cdb5b..b1ad0cdb5b 100644
--- a/patches/api/0347-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/api/0346-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/api/0348-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0347-Add-missing-block-data-mins-and-maxes.patch
index 600497b952..600497b952 100644
--- a/patches/api/0348-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/api/0347-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0349-Custom-Potion-Mixes.patch b/patches/api/0348-Custom-Potion-Mixes.patch
index 3881038adb..3881038adb 100644
--- a/patches/api/0349-Custom-Potion-Mixes.patch
+++ b/patches/api/0348-Custom-Potion-Mixes.patch
diff --git a/patches/api/0350-Expose-furnace-minecart-push-values.patch b/patches/api/0349-Expose-furnace-minecart-push-values.patch
index 3d8c2336e7..3d8c2336e7 100644
--- a/patches/api/0350-Expose-furnace-minecart-push-values.patch
+++ b/patches/api/0349-Expose-furnace-minecart-push-values.patch
diff --git a/patches/api/0351-More-Projectile-API.patch b/patches/api/0350-More-Projectile-API.patch
index 569c337346..569c337346 100644
--- a/patches/api/0351-More-Projectile-API.patch
+++ b/patches/api/0350-More-Projectile-API.patch
diff --git a/patches/api/0352-Add-getComputedBiome-API.patch b/patches/api/0351-Add-getComputedBiome-API.patch
index 260ec7d327..6d24c2c66a 100644
--- a/patches/api/0352-Add-getComputedBiome-API.patch
+++ b/patches/api/0351-Add-getComputedBiome-API.patch
@@ -51,7 +51,7 @@ index b68367f123f029c3ff47eab6bfabd7a894a99da4..44ee56a5956cc17194c767a0c1071a2a
       * Sets the {@link Biome} at the given {@link Location}.
       *
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 05fd2aa8a1639598b488712d2fe5f739019f41dc..732e8ea9e1bdcbc8f9a0888e07940fe21617b490 100644
+index 42cc4f2ee960c0abf9c6688aeee4150754612c32..cf9600c743e977312c0a15c455d602391797ef34 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -371,10 +371,22 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
diff --git a/patches/api/0353-Add-enchantWithLevels-API.patch b/patches/api/0352-Add-enchantWithLevels-API.patch
index 1c94264d8f..1c94264d8f 100644
--- a/patches/api/0353-Add-enchantWithLevels-API.patch
+++ b/patches/api/0352-Add-enchantWithLevels-API.patch
diff --git a/patches/api/0354-Add-TameableDeathMessageEvent.patch b/patches/api/0353-Add-TameableDeathMessageEvent.patch
index aec53f13ba..aec53f13ba 100644
--- a/patches/api/0354-Add-TameableDeathMessageEvent.patch
+++ b/patches/api/0353-Add-TameableDeathMessageEvent.patch
diff --git a/patches/api/0355-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0354-Allow-to-change-the-podium-of-the-EnderDragon.patch
index 08ffa1fdde..08ffa1fdde 100644
--- a/patches/api/0355-Allow-to-change-the-podium-of-the-EnderDragon.patch
+++ b/patches/api/0354-Allow-to-change-the-podium-of-the-EnderDragon.patch
diff --git a/patches/api/0356-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/api/0355-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
index 21b3f85c0b..21b3f85c0b 100644
--- a/patches/api/0356-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
+++ b/patches/api/0355-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
diff --git a/patches/api/0357-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0356-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 5775b6f33c..5775b6f33c 100644
--- a/patches/api/0357-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/api/0356-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/api/0358-WorldCreator-keepSpawnLoaded.patch b/patches/api/0357-WorldCreator-keepSpawnLoaded.patch
index 287c313c58..287c313c58 100644
--- a/patches/api/0358-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/api/0357-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/api/0359-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0358-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 9b70c2dc74..9b70c2dc74 100644
--- a/patches/api/0359-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/api/0358-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/api/0360-Add-PlayerStopUsingItemEvent.patch b/patches/api/0359-Add-PlayerStopUsingItemEvent.patch
index c8de1f6ed0..c8de1f6ed0 100644
--- a/patches/api/0360-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/api/0359-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/api/0361-Expand-FallingBlock-API.patch b/patches/api/0360-Expand-FallingBlock-API.patch
index bbff3129a4..bbff3129a4 100644
--- a/patches/api/0361-Expand-FallingBlock-API.patch
+++ b/patches/api/0360-Expand-FallingBlock-API.patch
diff --git a/patches/api/0362-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0361-Add-method-isTickingWorlds-to-Bukkit.patch
index 91e4d0fdac..91e4d0fdac 100644
--- a/patches/api/0362-Add-method-isTickingWorlds-to-Bukkit.patch
+++ b/patches/api/0361-Add-method-isTickingWorlds-to-Bukkit.patch
diff --git a/patches/api/0363-Add-WardenAngerChangeEvent.patch b/patches/api/0362-Add-WardenAngerChangeEvent.patch
index 4291ccd615..4291ccd615 100644
--- a/patches/api/0363-Add-WardenAngerChangeEvent.patch
+++ b/patches/api/0362-Add-WardenAngerChangeEvent.patch
diff --git a/patches/api/0364-Nameable-Banner-API.patch b/patches/api/0363-Nameable-Banner-API.patch
index eba196daaf..eba196daaf 100644
--- a/patches/api/0364-Nameable-Banner-API.patch
+++ b/patches/api/0363-Nameable-Banner-API.patch
diff --git a/patches/api/0365-Add-Player-getFishHook.patch b/patches/api/0364-Add-Player-getFishHook.patch
index 291eac5db5..291eac5db5 100644
--- a/patches/api/0365-Add-Player-getFishHook.patch
+++ b/patches/api/0364-Add-Player-getFishHook.patch
diff --git a/patches/api/0366-More-Teleport-API.patch b/patches/api/0365-More-Teleport-API.patch
index a7561dc079..5b2f5bb571 100644
--- a/patches/api/0366-More-Teleport-API.patch
+++ b/patches/api/0365-More-Teleport-API.patch
@@ -120,7 +120,7 @@ index 0000000000000000000000000000000000000000..c8b5b570d44da9524bfc59c7e11b2ae5
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 29a34fa6bef077550526e00d0cdd0d8f49872e0c..3905c12b23bbfc88c9667b04e60fad7ad2febd60 100644
+index e1fe5d93eb7a1f96954d907dbbe0758f25bd1ce7..948d6a08ff459afd5d4d5b151c41d94d1d5847b6 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -126,10 +126,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0367-Add-EntityPortalReadyEvent.patch b/patches/api/0366-Add-EntityPortalReadyEvent.patch
index b9321a8e0d..b9321a8e0d 100644
--- a/patches/api/0367-Add-EntityPortalReadyEvent.patch
+++ b/patches/api/0366-Add-EntityPortalReadyEvent.patch
diff --git a/patches/api/0368-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0367-Custom-Chat-Completion-Suggestions-API.patch
index 1eb0e934e4..1eb0e934e4 100644
--- a/patches/api/0368-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0367-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/api/0369-Collision-API.patch b/patches/api/0368-Collision-API.patch
index fc4f5486d9..fc4f5486d9 100644
--- a/patches/api/0369-Collision-API.patch
+++ b/patches/api/0368-Collision-API.patch
diff --git a/patches/api/0370-Block-Ticking-API.patch b/patches/api/0369-Block-Ticking-API.patch
index e2fa606e8c..aba95a2d13 100644
--- a/patches/api/0370-Block-Ticking-API.patch
+++ b/patches/api/0369-Block-Ticking-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Block Ticking API
 
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index efae68513fe59e95866cdbc6c8c1d9031907bedc..25650e9a31bcaf672acd115547abc1ec41a1de34 100644
+index cf9600c743e977312c0a15c455d602391797ef34..38cf77e32b76bc7d9db7523f7f21427ebb72f913 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -589,6 +589,21 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
diff --git a/patches/api/0371-Add-NamespacedKey-biome-methods.patch b/patches/api/0370-Add-NamespacedKey-biome-methods.patch
index f11f727f1a..f11f727f1a 100644
--- a/patches/api/0371-Add-NamespacedKey-biome-methods.patch
+++ b/patches/api/0370-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/api/0372-Also-load-resources-from-LibraryLoader.patch b/patches/api/0371-Also-load-resources-from-LibraryLoader.patch
index c999e55c24..c2a41c2e53 100644
--- a/patches/api/0372-Also-load-resources-from-LibraryLoader.patch
+++ b/patches/api/0371-Also-load-resources-from-LibraryLoader.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Also load resources from LibraryLoader
 
 
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 877bfe10b858145278133acbc7049f700d2b4f8a..f9b57b872780aa6b9b959494874b57c7a8ff0c53 100644
+index de017d10db19ca7ca7f73ff0ac08fe6e1773d7dc..7e4f7cb2afbc145e532285c793573ad107bc3033 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -109,14 +109,35 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
diff --git a/patches/api/0373-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0372-Added-byte-array-serialization-deserialization-for-P.patch
index 9b71f12681..9b71f12681 100644
--- a/patches/api/0373-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/api/0372-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/api/0374-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0373-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 291761dadb..291761dadb 100644
--- a/patches/api/0374-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/api/0373-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/api/0375-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0374-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
index 9b5ef25cf4..9b5ef25cf4 100644
--- a/patches/api/0375-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
+++ b/patches/api/0374-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
diff --git a/patches/api/0376-Add-getDrops-to-BlockState.patch b/patches/api/0375-Add-getDrops-to-BlockState.patch
index 0a8d8ad13a..0a8d8ad13a 100644
--- a/patches/api/0376-Add-getDrops-to-BlockState.patch
+++ b/patches/api/0375-Add-getDrops-to-BlockState.patch
diff --git a/patches/api/0377-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0376-Add-PlayerInventorySlotChangeEvent.patch
index d76df6d87d..d76df6d87d 100644
--- a/patches/api/0377-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/api/0376-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/api/0378-Elder-Guardian-appearance-API.patch b/patches/api/0377-Elder-Guardian-appearance-API.patch
index 338c1b65a3..338c1b65a3 100644
--- a/patches/api/0378-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0377-Elder-Guardian-appearance-API.patch
diff --git a/patches/api/0379-Allow-changing-bed-s-occupied-property.patch b/patches/api/0378-Allow-changing-bed-s-occupied-property.patch
index 8dfafd6d33..8dfafd6d33 100644
--- a/patches/api/0379-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/api/0378-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/api/0380-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0379-Add-EquipmentSlot-convenience-methods.patch
index 0ef6b4c9b0..0ef6b4c9b0 100644
--- a/patches/api/0380-Add-EquipmentSlot-convenience-methods.patch
+++ b/patches/api/0379-Add-EquipmentSlot-convenience-methods.patch
diff --git a/patches/api/0381-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0380-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
index 92640093f6..6d0cf289d9 100644
--- a/patches/api/0381-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
+++ b/patches/api/0380-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#swingHand(EquipmentSlot) convenience method
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ef13c72963af2356f37a724066fe5b42416dd3eb..d0ceef72c2691c441739a0100cb68504cbb3220e 100644
+index d083cffe0b61642bf4c4ea0fecc529090702042f..ab6ba48c76271f60fc51f758ff823e45be4bce93 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1201,5 +1201,23 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0382-Add-entity-knockback-API.patch b/patches/api/0381-Add-entity-knockback-API.patch
index 7b30a3759b..56310d9bef 100644
--- a/patches/api/0382-Add-entity-knockback-API.patch
+++ b/patches/api/0381-Add-entity-knockback-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index d0ceef72c2691c441739a0100cb68504cbb3220e..798bcc0fe7d21179df885d30d8e0dc7d6eee3b40 100644
+index ab6ba48c76271f60fc51f758ff823e45be4bce93..21ddbe3399b1b4a4d51c5a752fa72c5d8832b415 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1219,5 +1219,17 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0383-Added-EntityToggleSitEvent.patch b/patches/api/0382-Added-EntityToggleSitEvent.patch
index d5a8c46dc8..d5a8c46dc8 100644
--- a/patches/api/0383-Added-EntityToggleSitEvent.patch
+++ b/patches/api/0382-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0384-Add-Moving-Piston-API.patch b/patches/api/0383-Add-Moving-Piston-API.patch
index 8f889f1e3d..8f889f1e3d 100644
--- a/patches/api/0384-Add-Moving-Piston-API.patch
+++ b/patches/api/0383-Add-Moving-Piston-API.patch
diff --git a/patches/api/0385-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0384-Add-PrePlayerAttackEntityEvent.patch
index ac0ebedde7..ac0ebedde7 100644
--- a/patches/api/0385-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/api/0384-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0386-Add-Player-Warden-Warning-API.patch b/patches/api/0385-Add-Player-Warden-Warning-API.patch
index 1bc7d6a95a..1bc7d6a95a 100644
--- a/patches/api/0386-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0385-Add-Player-Warden-Warning-API.patch
diff --git a/patches/api/0387-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0386-More-vanilla-friendly-methods-to-update-trades.patch
index f13fdb5601..f13fdb5601 100644
--- a/patches/api/0387-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/api/0386-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/api/0388-Add-paper-dumplisteners-command.patch b/patches/api/0387-Add-paper-dumplisteners-command.patch
index a5d858851f..a5d858851f 100644
--- a/patches/api/0388-Add-paper-dumplisteners-command.patch
+++ b/patches/api/0387-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0389-ItemStack-damage-API.patch b/patches/api/0388-ItemStack-damage-API.patch
index 420415c28f..f0444dae84 100644
--- a/patches/api/0389-ItemStack-damage-API.patch
+++ b/patches/api/0388-ItemStack-damage-API.patch
@@ -8,7 +8,7 @@ to simulate damage done to an itemstack and all
 the logic associated with damaging them
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 798bcc0fe7d21179df885d30d8e0dc7d6eee3b40..5b32ab4f1260183627aed7ba832f3237e5665011 100644
+index 21ddbe3399b1b4a4d51c5a752fa72c5d8832b415..cb5ba5d115406d12a2af0811fcfbf510f836b03b 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1231,5 +1231,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0390-Add-Tick-TemporalUnit.patch b/patches/api/0389-Add-Tick-TemporalUnit.patch
index 562eb00082..562eb00082 100644
--- a/patches/api/0390-Add-Tick-TemporalUnit.patch
+++ b/patches/api/0389-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0391-Friction-API.patch b/patches/api/0390-Friction-API.patch
index 0129149291..013ab9a8d3 100644
--- a/patches/api/0391-Friction-API.patch
+++ b/patches/api/0390-Friction-API.patch
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..6eb88c664d873506372ad14075bfcbe4
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index d0bef15785493b512ff0f7414c1d58d38fead581..58017fce436cdbda255f7172fbdadb726d4b113c 100644
+index ced419f8655bff72f0257b639d5f7d73afe3c2e2..bcc6ba95bd21c7972865838c636a03f50b6c1f1a 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
 @@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
@@ -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 c0e31ebbb41bd3013fe4a1609dd9af754434736d..b6df5fd8eda6a30c119b3fa3844e6bb0425e2f39 100644
+index cb5ba5d115406d12a2af0811fcfbf510f836b03b..b9f98279789fe26181aa9c7aa253877d916034be 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0392-Player-Entity-Tracking-Events.patch b/patches/api/0391-Player-Entity-Tracking-Events.patch
index 3dfa72c922..3dfa72c922 100644
--- a/patches/api/0392-Player-Entity-Tracking-Events.patch
+++ b/patches/api/0391-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0393-Add-missing-Fluid-type.patch b/patches/api/0392-Add-missing-Fluid-type.patch
index c260bf8497..c260bf8497 100644
--- a/patches/api/0393-Add-missing-Fluid-type.patch
+++ b/patches/api/0392-Add-missing-Fluid-type.patch
diff --git a/patches/api/0394-fix-Instruments.patch b/patches/api/0393-fix-Instruments.patch
index 468dc80a34..468dc80a34 100644
--- a/patches/api/0394-fix-Instruments.patch
+++ b/patches/api/0393-fix-Instruments.patch
diff --git a/patches/api/0395-Add-BlockLockCheckEvent.patch b/patches/api/0394-Add-BlockLockCheckEvent.patch
index c5d560192c..c5d560192c 100644
--- a/patches/api/0395-Add-BlockLockCheckEvent.patch
+++ b/patches/api/0394-Add-BlockLockCheckEvent.patch
diff --git a/patches/api/0396-Add-Sneaking-API-for-Entities.patch b/patches/api/0395-Add-Sneaking-API-for-Entities.patch
index 224f784208..224f784208 100644
--- a/patches/api/0396-Add-Sneaking-API-for-Entities.patch
+++ b/patches/api/0395-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/api/0397-Improve-PortalEvents.patch b/patches/api/0396-Improve-PortalEvents.patch
index f7f53b19fc..f7f53b19fc 100644
--- a/patches/api/0397-Improve-PortalEvents.patch
+++ b/patches/api/0396-Improve-PortalEvents.patch
diff --git a/patches/api/0398-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/api/0397-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index de7e84ef8b..de7e84ef8b 100644
--- a/patches/api/0398-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/api/0397-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/api/0399-Flying-Fall-Damage-API.patch b/patches/api/0398-Flying-Fall-Damage-API.patch
index 3c619f5b43..3c619f5b43 100644
--- a/patches/api/0399-Flying-Fall-Damage-API.patch
+++ b/patches/api/0398-Flying-Fall-Damage-API.patch
diff --git a/patches/api/0400-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0399-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
index 3936bb4a92..3936bb4a92 100644
--- a/patches/api/0400-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
+++ b/patches/api/0399-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0401-Win-Screen-API.patch b/patches/api/0400-Win-Screen-API.patch
index 3863beaa63..3863beaa63 100644
--- a/patches/api/0401-Win-Screen-API.patch
+++ b/patches/api/0400-Win-Screen-API.patch
diff --git a/patches/api/0402-Add-Entity-Body-Yaw-API.patch b/patches/api/0401-Add-Entity-Body-Yaw-API.patch
index ebcecf2aca..ebcecf2aca 100644
--- a/patches/api/0402-Add-Entity-Body-Yaw-API.patch
+++ b/patches/api/0401-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/api/0403-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0402-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
index 1ae7f17da6..1ae7f17da6 100644
--- a/patches/api/0403-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
+++ b/patches/api/0402-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0404-Add-EntityFertilizeEggEvent.patch b/patches/api/0403-Add-EntityFertilizeEggEvent.patch
index 4ae6ff9f0f..4ae6ff9f0f 100644
--- a/patches/api/0404-Add-EntityFertilizeEggEvent.patch
+++ b/patches/api/0403-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0405-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0404-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 9dee250212..9dee250212 100644
--- a/patches/api/0405-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/api/0404-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0406-Add-Shearable-API.patch b/patches/api/0405-Add-Shearable-API.patch
index 4e49b17572..4e49b17572 100644
--- a/patches/api/0406-Add-Shearable-API.patch
+++ b/patches/api/0405-Add-Shearable-API.patch
diff --git a/patches/api/0407-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0406-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 27abcd1f93..27abcd1f93 100644
--- a/patches/api/0407-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/api/0406-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/api/0408-Add-Mob-Experience-reward-API.patch b/patches/api/0407-Add-Mob-Experience-reward-API.patch
index 2e3a09921e..2e3a09921e 100644
--- a/patches/api/0408-Add-Mob-Experience-reward-API.patch
+++ b/patches/api/0407-Add-Mob-Experience-reward-API.patch
diff --git a/patches/api/0409-Expand-PlayerItemMendEvent.patch b/patches/api/0408-Expand-PlayerItemMendEvent.patch
index 223922e05e..223922e05e 100644
--- a/patches/api/0409-Expand-PlayerItemMendEvent.patch
+++ b/patches/api/0408-Expand-PlayerItemMendEvent.patch
diff --git a/patches/api/0410-Add-transient-modifier-API.patch b/patches/api/0409-Add-transient-modifier-API.patch
index a32e4c86a9..a32e4c86a9 100644
--- a/patches/api/0410-Add-transient-modifier-API.patch
+++ b/patches/api/0409-Add-transient-modifier-API.patch
diff --git a/patches/api/0411-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0410-Properly-remove-the-experimental-smithing-inventory-.patch
index 650b013220..650b013220 100644
--- a/patches/api/0411-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/api/0410-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/api/0412-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0411-Add-method-to-remove-all-active-potion-effects.patch
index bf8ee9eb1b..f9f5110086 100644
--- a/patches/api/0412-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/api/0411-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 15d26b5d4fd55a29680f7485c80e33b7ce787fbe..f396c214e71efa2c46ad853e9d2c4b5048895917 100644
+index 2dbb61df25967739c5a8308d6d89be20136816ba..12926d36a409448ce5aaae955968dbc89825a2c5 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -625,6 +625,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0413-Folia-scheduler-and-owned-region-API.patch b/patches/api/0412-Folia-scheduler-and-owned-region-API.patch
index 8d194d5375..8d194d5375 100644
--- a/patches/api/0413-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/api/0412-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/api/0414-Add-event-for-player-editing-sign.patch b/patches/api/0413-Add-event-for-player-editing-sign.patch
index b534aebde9..b534aebde9 100644
--- a/patches/api/0414-Add-event-for-player-editing-sign.patch
+++ b/patches/api/0413-Add-event-for-player-editing-sign.patch
diff --git a/patches/api/0415-Add-Sign-getInteractableSideFor.patch b/patches/api/0414-Add-Sign-getInteractableSideFor.patch
index c339b5b034..1e085323ca 100644
--- a/patches/api/0415-Add-Sign-getInteractableSideFor.patch
+++ b/patches/api/0414-Add-Sign-getInteractableSideFor.patch
@@ -5,14 +5,13 @@ Subject: [PATCH] Add Sign#getInteractableSideFor
 
 
 diff --git a/src/main/java/org/bukkit/block/Sign.java b/src/main/java/org/bukkit/block/Sign.java
-index 2813f96bb13b9be28867d2c045a3003a18456879..94e8f319fe0413a10496d7e5bba70633054765f4 100644
+index 1fdb1144949adc3a2b5cbc3aca94d2f8e0c6d9ee..7983ccb54f5f358dea1ffb530b9cc5bd716fb9b1 100644
 --- a/src/main/java/org/bukkit/block/Sign.java
 +++ b/src/main/java/org/bukkit/block/Sign.java
-@@ -167,4 +167,35 @@ public interface Sign extends TileState, Colorable {
+@@ -187,4 +187,34 @@ public interface Sign extends TileState, Colorable {
       */
-     @NotNull
-     public SignSide getSide(@NotNull Side side);
-+
+     @Nullable
+     public Player getAllowedEditor();
 +    // Paper start - get side for player
 +    /**
 +     * Compute the side facing the specified entity.
diff --git a/patches/api/0416-Fix-BanList-API.patch b/patches/api/0415-Fix-BanList-API.patch
index 351f4dae16..351f4dae16 100644
--- a/patches/api/0416-Fix-BanList-API.patch
+++ b/patches/api/0415-Fix-BanList-API.patch
diff --git a/patches/api/0417-Add-whitelist-events.patch b/patches/api/0416-Add-whitelist-events.patch
index 75458e78df..75458e78df 100644
--- a/patches/api/0417-Add-whitelist-events.patch
+++ b/patches/api/0416-Add-whitelist-events.patch
diff --git a/patches/api/0418-API-for-updating-recipes-on-clients.patch b/patches/api/0417-API-for-updating-recipes-on-clients.patch
index c1665b9ba0..c1665b9ba0 100644
--- a/patches/api/0418-API-for-updating-recipes-on-clients.patch
+++ b/patches/api/0417-API-for-updating-recipes-on-clients.patch
diff --git a/patches/api/0419-Add-PlayerFailMoveEvent.patch b/patches/api/0418-Add-PlayerFailMoveEvent.patch
index c0687e2ae0..c0687e2ae0 100644
--- a/patches/api/0419-Add-PlayerFailMoveEvent.patch
+++ b/patches/api/0418-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0420-Fix-custom-statistic-criteria-creation.patch b/patches/api/0419-Fix-custom-statistic-criteria-creation.patch
index 4ce5967963..4ce5967963 100644
--- a/patches/api/0420-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/api/0419-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0421-SculkCatalyst-bloom-API.patch b/patches/api/0420-SculkCatalyst-bloom-API.patch
index 49d8c8c2bd..49d8c8c2bd 100644
--- a/patches/api/0421-SculkCatalyst-bloom-API.patch
+++ b/patches/api/0420-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0422-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0421-API-for-an-entity-s-scoreboard-name.patch
index 7be05d7421..7be05d7421 100644
--- a/patches/api/0422-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/api/0421-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/api/0423-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0422-Deprecate-and-replace-methods-with-old-StructureType.patch
index 177761f8cd..177761f8cd 100644
--- a/patches/api/0423-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/api/0422-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/api/0424-Add-Listing-API-for-Player.patch b/patches/api/0423-Add-Listing-API-for-Player.patch
index 609dd75c87..609dd75c87 100644
--- a/patches/api/0424-Add-Listing-API-for-Player.patch
+++ b/patches/api/0423-Add-Listing-API-for-Player.patch
diff --git a/patches/api/0425-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0424-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index 34d1940866..34d1940866 100644
--- a/patches/api/0425-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/api/0424-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0426-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0425-Fix-NPE-on-Boat-getStatus.patch
index 1cf6096a92..1cf6096a92 100644
--- a/patches/api/0426-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/api/0425-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0427-Expand-Pose-API.patch b/patches/api/0426-Expand-Pose-API.patch
index 7548f51038..7548f51038 100644
--- a/patches/api/0427-Expand-Pose-API.patch
+++ b/patches/api/0426-Expand-Pose-API.patch
diff --git a/patches/api/0428-MerchantRecipe-add-copy-constructor.patch b/patches/api/0427-MerchantRecipe-add-copy-constructor.patch
index 1c5ba2803c..1c5ba2803c 100644
--- a/patches/api/0428-MerchantRecipe-add-copy-constructor.patch
+++ b/patches/api/0427-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0429-More-DragonBattle-API.patch b/patches/api/0428-More-DragonBattle-API.patch
index e25208ec19..e25208ec19 100644
--- a/patches/api/0429-More-DragonBattle-API.patch
+++ b/patches/api/0428-More-DragonBattle-API.patch
diff --git a/patches/api/0430-Add-PlayerPickItemEvent.patch b/patches/api/0429-Add-PlayerPickItemEvent.patch
index 6dd0be80a8..6dd0be80a8 100644
--- a/patches/api/0430-Add-PlayerPickItemEvent.patch
+++ b/patches/api/0429-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0431-Allow-trident-custom-damage.patch b/patches/api/0430-Allow-trident-custom-damage.patch
index 870b735548..870b735548 100644
--- a/patches/api/0431-Allow-trident-custom-damage.patch
+++ b/patches/api/0430-Allow-trident-custom-damage.patch
diff --git a/patches/api/0432-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0431-Expose-hand-during-BlockCanBuildEvent.patch
index 97d99a40d2..97d99a40d2 100644
--- a/patches/api/0432-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/api/0431-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0433-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0432-Limit-setBurnTime-to-valid-short-values.patch
index 2faac56fd8..2faac56fd8 100644
--- a/patches/api/0433-Limit-setBurnTime-to-valid-short-values.patch
+++ b/patches/api/0432-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0434-Add-OfflinePlayer-isConnected.patch b/patches/api/0433-Add-OfflinePlayer-isConnected.patch
index 1b0749a7f1..f1e75ce3e4 100644
--- a/patches/api/0434-Add-OfflinePlayer-isConnected.patch
+++ b/patches/api/0433-Add-OfflinePlayer-isConnected.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add OfflinePlayer#isConnected
 This adds an alternative to OfflinePlayer#isOnline that returns true only if the same instance of the player is still online. This is generally more useful than isOnline as it allows you to determine if you have an instance of a Player that still exists. If a player relogs an old Player instance becomes unlinked leading to e.g. messages sent to the old player no longer arriving despite isOnline returning true. Checking against isConnected is more useful there to discard invalid instances.
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 9b84cb5abdf3db55cbc7ba19c8cd6955bf4fc5ec..bce07d84cafca677bb6fad78c21b82097f06430c 100644
+index ef6cb124adc98cb5231dc44e243450a2340f74af..abb5109ed08a3a651c2c27d4d17a3d49eb06da1e 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -24,10 +24,26 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
diff --git a/patches/api/0435-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0434-Add-titleOverride-to-InventoryOpenEvent.patch
index 68e755f010..68e755f010 100644
--- a/patches/api/0435-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/api/0434-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0436-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0435-Allow-proper-checking-of-empty-item-stacks.patch
index 716a6140d9..716a6140d9 100644
--- a/patches/api/0436-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/api/0435-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/api/0437-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0436-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
index e72f86be5d..e72f86be5d 100644
--- a/patches/api/0437-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
+++ b/patches/api/0436-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0438-Add-player-idle-duration-API.patch b/patches/api/0437-Add-player-idle-duration-API.patch
index 9c44c6b889..9c44c6b889 100644
--- a/patches/api/0438-Add-player-idle-duration-API.patch
+++ b/patches/api/0437-Add-player-idle-duration-API.patch
diff --git a/patches/api/0439-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0438-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 9528da025b..0481690ad4 100644
--- a/patches/api/0439-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/api/0438-Add-API-to-get-the-collision-shape-of-a-block-before.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add API to get the collision shape of a block before it's
 
 
 diff --git a/src/main/java/org/bukkit/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java
-index d30ac3edc475796cf7f1d7ea04f665eef4ce755f..647536e1f1a323447dc510b2406bb39c22083945 100644
+index 64188a78211195fe792eac427e483e1984f52318..fb4c7cf0f67f3e4227d17f6702ae7b7bf1c110ab 100644
 --- a/src/main/java/org/bukkit/block/data/BlockData.java
 +++ b/src/main/java/org/bukkit/block/data/BlockData.java
 @@ -205,6 +205,19 @@ public interface BlockData extends Cloneable {
diff --git a/patches/api/0440-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0439-Add-predicate-for-blocks-when-raytracing.patch
index 67d10e420e..67d10e420e 100644
--- a/patches/api/0440-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/api/0439-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/api/0441-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0440-Add-hand-to-fish-event-for-all-player-interactions.patch
index b431332b9a..b431332b9a 100644
--- a/patches/api/0441-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/api/0440-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0442-Add-UUID-attribute-modifier-API.patch b/patches/api/0441-Add-UUID-attribute-modifier-API.patch
index 251ae6e425..251ae6e425 100644
--- a/patches/api/0442-Add-UUID-attribute-modifier-API.patch
+++ b/patches/api/0441-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/api/0443-Expand-LingeringPotion-API.patch b/patches/api/0442-Expand-LingeringPotion-API.patch
index 40b5a5f547..40b5a5f547 100644
--- a/patches/api/0443-Expand-LingeringPotion-API.patch
+++ b/patches/api/0442-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0444-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0443-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
index 215fc0e435..0ac5bf3ef0 100644
--- a/patches/api/0444-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
+++ b/patches/api/0443-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
@@ -9,7 +9,7 @@ By removing this check we avoid unnecessarily allocating useless `ItemMeta` obje
 This is a leftover from when checking for the item's durability was "free" because the durability was stored in the `ItemStack` itself, this [was changed in Minecraft 1.13](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/commits/f8b2086d60942eb2cd7ac25a2a1408cb790c222c#src/main/java/org/bukkit/inventory/ItemStack.java).
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 0af73cc04edb93b9772136d4d808f657ea40e733..36e3fbc727cd748aa138f52976154ba32954cd87 100644
+index c3872213acc75d913580002cf70c2abb4ec69ca0..7adf54c561d64e6337af8a2d86f6b574b083edb5 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -295,7 +295,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0445-Add-Structure-check-API.patch b/patches/api/0444-Add-Structure-check-API.patch
index 693f5dbf09..693f5dbf09 100644
--- a/patches/api/0445-Add-Structure-check-API.patch
+++ b/patches/api/0444-Add-Structure-check-API.patch
diff --git a/patches/api/0446-add-missing-Experimental-annotations.patch b/patches/api/0445-add-missing-Experimental-annotations.patch
index 0cebb60f97..d8d8192ab3 100644
--- a/patches/api/0446-add-missing-Experimental-annotations.patch
+++ b/patches/api/0445-add-missing-Experimental-annotations.patch
@@ -579,10 +579,10 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
      ITEM_CHORUS_FRUIT_TELEPORT("item.chorus_fruit.teleport"),
      ITEM_CROP_PLANT("item.crop.plant"),
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 741c34b74811666c3b38e9d6fbb74b0a7bc64699..1137a21afa0283fa3d391415e98171e3c160aa1f 100644
+index dd509bd1f7e80a04a63d2ba6eca1ff845d12fb2d..8ca9c7c8d0d6138c825d765c270c29bce11fe09e 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -975,14 +975,17 @@ public interface Tag<T extends Keyed> extends Keyed {
+@@ -973,14 +973,17 @@ public interface Tag<T extends Keyed> extends Keyed {
      /**
       * Vanilla tag representing entities which deflect arrows.
       */
diff --git a/patches/api/0447-Add-more-scoreboard-API.patch b/patches/api/0446-Add-more-scoreboard-API.patch
index 201af36b0c..201af36b0c 100644
--- a/patches/api/0447-Add-more-scoreboard-API.patch
+++ b/patches/api/0446-Add-more-scoreboard-API.patch
diff --git a/patches/api/0448-Improve-Registry.patch b/patches/api/0447-Improve-Registry.patch
index da9c8aeaeb..da9c8aeaeb 100644
--- a/patches/api/0448-Improve-Registry.patch
+++ b/patches/api/0447-Improve-Registry.patch
diff --git a/patches/api/0449-Add-experience-points-API.patch b/patches/api/0448-Add-experience-points-API.patch
index eac15c7249..eac15c7249 100644
--- a/patches/api/0449-Add-experience-points-API.patch
+++ b/patches/api/0448-Add-experience-points-API.patch
diff --git a/patches/api/0450-Add-missing-InventoryType.patch b/patches/api/0449-Add-missing-InventoryType.patch
index 67b4504ad3..67b4504ad3 100644
--- a/patches/api/0450-Add-missing-InventoryType.patch
+++ b/patches/api/0449-Add-missing-InventoryType.patch
diff --git a/patches/api/0451-Add-drops-to-shear-events.patch b/patches/api/0450-Add-drops-to-shear-events.patch
index c87460e48d..c87460e48d 100644
--- a/patches/api/0451-Add-drops-to-shear-events.patch
+++ b/patches/api/0450-Add-drops-to-shear-events.patch
diff --git a/patches/api/0452-Add-HiddenPotionEffect-API.patch b/patches/api/0451-Add-HiddenPotionEffect-API.patch
index 29a1e75388..39585cefba 100644
--- a/patches/api/0452-Add-HiddenPotionEffect-API.patch
+++ b/patches/api/0451-Add-HiddenPotionEffect-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add HiddenPotionEffect API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index f396c214e71efa2c46ad853e9d2c4b5048895917..e6c78d1f4222badae27b49590c2f9be46608d5d1 100644
+index 12926d36a409448ce5aaae955968dbc89825a2c5..e67455efc84f1e06d3396291d104ce65fee4591b 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -559,6 +559,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0453-Add-PlayerShieldDisableEvent.patch b/patches/api/0452-Add-PlayerShieldDisableEvent.patch
index 29c7daa0e3..29c7daa0e3 100644
--- a/patches/api/0453-Add-PlayerShieldDisableEvent.patch
+++ b/patches/api/0452-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/api/0454-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0453-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
index 742314fff8..742314fff8 100644
--- a/patches/api/0454-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
+++ b/patches/api/0453-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
diff --git a/patches/api/0455-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0454-Add-BlockStateMeta-clearBlockState.patch
index 1a81132aa8..1a81132aa8 100644
--- a/patches/api/0455-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/api/0454-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/api/0456-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0455-Expose-LootTable-of-DecoratedPot.patch
index 42a8de4123..42a8de4123 100644
--- a/patches/api/0456-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/api/0455-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/api/0457-Add-ShulkerDuplicateEvent.patch b/patches/api/0456-Add-ShulkerDuplicateEvent.patch
index a0a81094ce..a0a81094ce 100644
--- a/patches/api/0457-Add-ShulkerDuplicateEvent.patch
+++ b/patches/api/0456-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/api/0458-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0457-Add-api-for-spawn-egg-texture-colors.patch
index 22ba7c25bf..22ba7c25bf 100644
--- a/patches/api/0458-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/api/0457-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/api/0459-Add-Lifecycle-Event-system.patch b/patches/api/0458-Add-Lifecycle-Event-system.patch
index 635d4a7325..635d4a7325 100644
--- a/patches/api/0459-Add-Lifecycle-Event-system.patch
+++ b/patches/api/0458-Add-Lifecycle-Event-system.patch
diff --git a/patches/api/0460-Conduit-API.patch b/patches/api/0459-Conduit-API.patch
index 57f43f96a3..57f43f96a3 100644
--- a/patches/api/0460-Conduit-API.patch
+++ b/patches/api/0459-Conduit-API.patch
diff --git a/patches/api/0461-ItemStack-Tooltip-API.patch b/patches/api/0460-ItemStack-Tooltip-API.patch
index 9aa55ce1a9..9aa55ce1a9 100644
--- a/patches/api/0461-ItemStack-Tooltip-API.patch
+++ b/patches/api/0460-ItemStack-Tooltip-API.patch
diff --git a/patches/api/0462-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0461-Add-getChunkSnapshot-includeLightData-parameter.patch
index 0437924b94..0437924b94 100644
--- a/patches/api/0462-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/api/0461-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/api/0463-Add-FluidState-API.patch b/patches/api/0462-Add-FluidState-API.patch
index 3235c393f5..3235c393f5 100644
--- a/patches/api/0463-Add-FluidState-API.patch
+++ b/patches/api/0462-Add-FluidState-API.patch
diff --git a/patches/api/0464-add-number-format-api.patch b/patches/api/0463-add-number-format-api.patch
index 6d32302ad0..6d32302ad0 100644
--- a/patches/api/0464-add-number-format-api.patch
+++ b/patches/api/0463-add-number-format-api.patch