114 files changed, 196 insertions, 54 deletions
diff --git a/patches/api/0160-Turtle-API.patch b/patches/api/0160-Turtle-API.patch
index 06abb703f4..8d4767cd07 100644
--- a/patches/api/0160-Turtle-API.patch
+++ b/patches/api/0160-Turtle-API.patch
@@ -221,10 +221,10 @@ index 0000000000000000000000000000000000000000..abeb24fccda2acfdb0dfdadacb8fe688
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java
-index 0a4cd29930c2f1c28f5a3e6884c7dec45b5cac11..5375ea14097f4f10b2294488b92924a35a72d4d7 100644
+index 0a4cd29930c2f1c28f5a3e6884c7dec45b5cac11..8bee07c81172e189fab9b82b398983f509099474 100644
 --- a/src/main/java/org/bukkit/entity/Turtle.java
 +++ b/src/main/java/org/bukkit/entity/Turtle.java
-@@ -1,6 +1,55 @@
+@@ -1,6 +1,62 @@
  package org.bukkit.entity;
  
 +import org.bukkit.Location;
@@ -279,5 +279,12 @@ index 0a4cd29930c2f1c28f5a3e6884c7dec45b5cac11..5375ea14097f4f10b2294488b92924a3
 +     * @param hasEgg True if carrying egg
 +     */
 +    void setHasEgg(boolean hasEgg);
++
++    /**
++     * Returns whether the turtle is currently laying an egg.
++     *
++     * @return whether the turtle is laying an egg
++     */
++    boolean isLayingEgg();
 +    // Paper end
 +}
diff --git a/patches/api/0262-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch
index 4331e880bb..4331e880bb 100644
--- a/patches/api/0262-Added-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0261-added-Wither-API.patch b/patches/api/0261-added-Wither-API.patch
deleted file mode 100644
index dbfc15a42c..0000000000
--- a/patches/api/0261-added-Wither-API.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Sun, 5 Jul 2020 15:39:40 -0700
-Subject: [PATCH] added Wither API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java
-index 426d3693317cd303d35d8203026b528d87e401d5..8c95cd6933f11076de936854f379e6fc8600b525 100644
---- a/src/main/java/org/bukkit/entity/Wither.java
-+++ b/src/main/java/org/bukkit/entity/Wither.java
-@@ -6,4 +6,34 @@ import com.destroystokyo.paper.entity.RangedEntity;
-  * Represents a Wither boss
-  */
- public interface Wither extends Monster, Boss, RangedEntity { // Paper
-+    // Paper start
-+    /**
-+     * @return whether the wither is charged
-+     */
-+    boolean isCharged();
-+
-+    /**
-+     * @return ticks the wither is invulnerable for
-+     */
-+    int getInvulnerableTicks();
-+
-+    /**
-+     * Sets for how long in the future, the wither should be invulnerable.
-+     *
-+     * @param ticks ticks the wither is invulnerable for
-+     */
-+    void setInvulnerableTicks(int ticks);
-+
-+    /**
-+     * @return whether the wither can travel through portals
-+     */
-+    boolean canTravelThroughPortals();
-+
-+    /**
-+     * Sets whether the wither can travel through portals.
-+     *
-+     * @param value whether the wither can travel through portals
-+     */
-+    void setCanTravelThroughPortals(boolean value);
-+    // Paper end
- }
diff --git a/patches/api/0263-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch
index ce446c46fe..ce446c46fe 100644
--- a/patches/api/0263-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 75aa758140..75aa758140 100644
--- a/patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/0265-add-DragonEggFormEvent.patch b/patches/api/0264-add-DragonEggFormEvent.patch
index c465295e88..c465295e88 100644
--- a/patches/api/0265-add-DragonEggFormEvent.patch
+++ b/patches/api/0264-add-DragonEggFormEvent.patch
diff --git a/patches/api/0266-EntityMoveEvent.patch b/patches/api/0265-EntityMoveEvent.patch
index 2855c3bdef..2855c3bdef 100644
--- a/patches/api/0266-EntityMoveEvent.patch
+++ b/patches/api/0265-EntityMoveEvent.patch
diff --git a/patches/api/0267-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch
index 984da00f52..984da00f52 100644
--- a/patches/api/0267-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0268-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index bbb81fdcf6..bbb81fdcf6 100644
--- a/patches/api/0268-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/0269-living-entity-allow-attribute-registration.patch b/patches/api/0268-living-entity-allow-attribute-registration.patch
index e7ded6dabb..e7ded6dabb 100644
--- a/patches/api/0269-living-entity-allow-attribute-registration.patch
+++ b/patches/api/0268-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0270-Add-missing-effects.patch b/patches/api/0269-Add-missing-effects.patch
index 8f72589e1e..8f72589e1e 100644
--- a/patches/api/0270-Add-missing-effects.patch
+++ b/patches/api/0269-Add-missing-effects.patch
diff --git a/patches/api/0271-Expose-Tracked-Players.patch b/patches/api/0270-Expose-Tracked-Players.patch
index a66875419d..a66875419d 100644
--- a/patches/api/0271-Expose-Tracked-Players.patch
+++ b/patches/api/0270-Expose-Tracked-Players.patch
diff --git a/patches/api/0272-Cache-the-result-of-Material-isBlock.patch b/patches/api/0271-Cache-the-result-of-Material-isBlock.patch
index 02ac041b83..02ac041b83 100644
--- a/patches/api/0272-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/api/0271-Cache-the-result-of-Material-isBlock.patch
diff --git a/patches/api/0273-Add-worldborder-events.patch b/patches/api/0272-Add-worldborder-events.patch
index 09c3770e16..09c3770e16 100644
--- a/patches/api/0273-Add-worldborder-events.patch
+++ b/patches/api/0272-Add-worldborder-events.patch
diff --git a/patches/api/0274-added-PlayerNameEntityEvent.patch b/patches/api/0273-added-PlayerNameEntityEvent.patch
index a38082f8e8..a38082f8e8 100644
--- a/patches/api/0274-added-PlayerNameEntityEvent.patch
+++ b/patches/api/0273-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0275-Add-recipe-to-cook-events.patch b/patches/api/0274-Add-recipe-to-cook-events.patch
index b0b34773c0..b0b34773c0 100644
--- a/patches/api/0275-Add-recipe-to-cook-events.patch
+++ b/patches/api/0274-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0276-Add-Block-isValidTool.patch b/patches/api/0275-Add-Block-isValidTool.patch
index 50dd2f43cb..50dd2f43cb 100644
--- a/patches/api/0276-Add-Block-isValidTool.patch
+++ b/patches/api/0275-Add-Block-isValidTool.patch
diff --git a/patches/api/0277-Implement-Keyed-on-World.patch b/patches/api/0276-Implement-Keyed-on-World.patch
index 86b1e2d5ef..5de0465b32 100644
--- a/patches/api/0277-Implement-Keyed-on-World.patch
+++ b/patches/api/0276-Implement-Keyed-on-World.patch
@@ -28,7 +28,7 @@ index 0aa141c590cf61a1fc99bec4cf8d5590a3ab6519..c8ea04b06d7178c6cc992a9a1b0355a7
      /**
       * Gets the map from the given item ID.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b1cfea011efa985f644328486196edf5c73e72cd..67c6443c5639beafade19bc39932f30bf1001a8d 100644
+index 76e42cc79bf3f7e677e06f136fd6c1fe0d94f260..75aba8c3db5198c11e0bb9c262388632a47d93e6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -673,6 +673,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0278-Item-Rarity-API.patch b/patches/api/0277-Item-Rarity-API.patch
index 102250b8b9..102250b8b9 100644
--- a/patches/api/0278-Item-Rarity-API.patch
+++ b/patches/api/0277-Item-Rarity-API.patch
diff --git a/patches/api/0279-Expose-protocol-version.patch b/patches/api/0278-Expose-protocol-version.patch
index d50d6d888a..d50d6d888a 100644
--- a/patches/api/0279-Expose-protocol-version.patch
+++ b/patches/api/0278-Expose-protocol-version.patch
diff --git a/patches/api/0280-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/api/0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index 70c19ffd10..70c19ffd10 100644
--- a/patches/api/0280-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/api/0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/api/0281-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch
index cf7ca8b27c..cf7ca8b27c 100644
--- a/patches/api/0281-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0282-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch
index 6c8b681cd9..6c8b681cd9 100644
--- a/patches/api/0282-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0283-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch
index 83995d7a94..83995d7a94 100644
--- a/patches/api/0283-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/api/0284-Added-PlayerDeepSleepEvent.patch b/patches/api/0283-Added-PlayerDeepSleepEvent.patch
index d8dccca755..d8dccca755 100644
--- a/patches/api/0284-Added-PlayerDeepSleepEvent.patch
+++ b/patches/api/0283-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0285-More-World-API.patch b/patches/api/0284-More-World-API.patch
index d963c90cf3..d963c90cf3 100644
--- a/patches/api/0285-More-World-API.patch
+++ b/patches/api/0284-More-World-API.patch
diff --git a/patches/api/0286-Added-PlayerBedFailEnterEvent.patch b/patches/api/0285-Added-PlayerBedFailEnterEvent.patch
index a622f2b98f..a622f2b98f 100644
--- a/patches/api/0286-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/api/0285-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0287-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0286-Introduce-beacon-activation-deactivation-events.patch
index c2f0577191..c2f0577191 100644
--- a/patches/api/0287-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/api/0286-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0288-PlayerMoveEvent-Improvements.patch b/patches/api/0287-PlayerMoveEvent-Improvements.patch
index 33cf16e54b..33cf16e54b 100644
--- a/patches/api/0288-PlayerMoveEvent-Improvements.patch
+++ b/patches/api/0287-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0289-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 63b477d865..63b477d865 100644
--- a/patches/api/0289-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0290-Add-more-WanderingTrader-API.patch b/patches/api/0289-Add-more-WanderingTrader-API.patch
index 99045d4949..99045d4949 100644
--- a/patches/api/0290-Add-more-WanderingTrader-API.patch
+++ b/patches/api/0289-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0291-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0290-Add-EntityBlockStorage-clearEntities.patch
index 7032ba6155..7032ba6155 100644
--- a/patches/api/0291-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/api/0290-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0292-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 16af3a7728..16af3a7728 100644
--- a/patches/api/0292-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0293-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 655cc86658..655cc86658 100644
--- a/patches/api/0293-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0294-Inventory-close.patch b/patches/api/0293-Inventory-close.patch
index 9b5cbb7dfe..9b5cbb7dfe 100644
--- a/patches/api/0294-Inventory-close.patch
+++ b/patches/api/0293-Inventory-close.patch
diff --git a/patches/api/0295-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 16cdba8016..16cdba8016 100644
--- a/patches/api/0295-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0296-Add-basic-Datapack-API.patch b/patches/api/0295-Add-basic-Datapack-API.patch
index 0069bae1d4..522d3a11c0 100644
--- a/patches/api/0296-Add-basic-Datapack-API.patch
+++ b/patches/api/0295-Add-basic-Datapack-API.patch
@@ -89,7 +89,7 @@ index c8ea04b06d7178c6cc992a9a1b0355a70a035152..7732d26277ca8b845898cb01c7623a2f
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 67c6443c5639beafade19bc39932f30bf1001a8d..ca4a9428e89b084436ef43099974ae7684648776 100644
+index 75aba8c3db5198c11e0bb9c262388632a47d93e6..1d2970dc4d18122e95db8cc9830aa5c41a59e24b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1961,5 +1961,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0297-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch
index b2e65ae490..b2e65ae490 100644
--- a/patches/api/0297-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0298-ItemStack-repair-check-API.patch b/patches/api/0297-ItemStack-repair-check-API.patch
index ce9919df14..ce9919df14 100644
--- a/patches/api/0298-ItemStack-repair-check-API.patch
+++ b/patches/api/0297-ItemStack-repair-check-API.patch
diff --git a/patches/api/0299-More-Enchantment-API.patch b/patches/api/0298-More-Enchantment-API.patch
index 504aeb1f51..504aeb1f51 100644
--- a/patches/api/0299-More-Enchantment-API.patch
+++ b/patches/api/0298-More-Enchantment-API.patch
diff --git a/patches/api/0300-List-all-missing-hard-depends-not-just-first.patch b/patches/api/0299-List-all-missing-hard-depends-not-just-first.patch
index 995528e860..995528e860 100644
--- a/patches/api/0300-List-all-missing-hard-depends-not-just-first.patch
+++ b/patches/api/0299-List-all-missing-hard-depends-not-just-first.patch
diff --git a/patches/api/0301-Add-Mob-lookAt-API.patch b/patches/api/0300-Add-Mob-lookAt-API.patch
index 26177f2369..26177f2369 100644
--- a/patches/api/0301-Add-Mob-lookAt-API.patch
+++ b/patches/api/0300-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0302-ItemStack-editMeta.patch b/patches/api/0301-ItemStack-editMeta.patch
index 91702f8c01..91702f8c01 100644
--- a/patches/api/0302-ItemStack-editMeta.patch
+++ b/patches/api/0301-ItemStack-editMeta.patch
diff --git a/patches/api/0303-Add-EntityInsideBlockEvent.patch b/patches/api/0302-Add-EntityInsideBlockEvent.patch
index 26c188e7a0..26c188e7a0 100644
--- a/patches/api/0303-Add-EntityInsideBlockEvent.patch
+++ b/patches/api/0302-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0304-Attributes-API-for-item-defaults.patch b/patches/api/0303-Attributes-API-for-item-defaults.patch
index 58f5631c96..58f5631c96 100644
--- a/patches/api/0304-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0303-Attributes-API-for-item-defaults.patch
diff --git a/patches/api/0305-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch
index 8e5d45d87b..8e5d45d87b 100644
--- a/patches/api/0305-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0306-More-Lidded-Block-API.patch b/patches/api/0305-More-Lidded-Block-API.patch
index ca6b5ed744..ca6b5ed744 100644
--- a/patches/api/0306-More-Lidded-Block-API.patch
+++ b/patches/api/0305-More-Lidded-Block-API.patch
diff --git a/patches/api/0307-Add-PlayerKickEvent-causes.patch b/patches/api/0306-Add-PlayerKickEvent-causes.patch
index 8977bbbb31..8977bbbb31 100644
--- a/patches/api/0307-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0306-Add-PlayerKickEvent-causes.patch
diff --git a/patches/api/0308-Add-PufferFishStateChangeEvent.patch b/patches/api/0307-Add-PufferFishStateChangeEvent.patch
index c3014534d3..c3014534d3 100644
--- a/patches/api/0308-Add-PufferFishStateChangeEvent.patch
+++ b/patches/api/0307-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0309-Add-BellRevealRaiderEvent.patch b/patches/api/0308-Add-BellRevealRaiderEvent.patch
index 8b0ee3e5b4..8b0ee3e5b4 100644
--- a/patches/api/0309-Add-BellRevealRaiderEvent.patch
+++ b/patches/api/0308-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0310-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0309-Add-ElderGuardianAppearanceEvent.patch
index 8d925d10ac..8d925d10ac 100644
--- a/patches/api/0310-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/api/0309-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0311-Add-more-line-of-sight-methods.patch b/patches/api/0310-Add-more-line-of-sight-methods.patch
index 28e2128eee..28e2128eee 100644
--- a/patches/api/0311-Add-more-line-of-sight-methods.patch
+++ b/patches/api/0310-Add-more-line-of-sight-methods.patch
diff --git a/patches/api/0312-Add-more-LimitedRegion-API.patch b/patches/api/0311-Add-more-LimitedRegion-API.patch
index 292f95c890..292f95c890 100644
--- a/patches/api/0312-Add-more-LimitedRegion-API.patch
+++ b/patches/api/0311-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0313-Missing-Entity-Behavior-API.patch b/patches/api/0312-Missing-Entity-Behavior-API.patch
index 4e3e31610d..0d01b16877 100644
--- a/patches/api/0313-Missing-Entity-Behavior-API.patch
+++ b/patches/api/0312-Missing-Entity-Behavior-API.patch
@@ -3,6 +3,8 @@ From: Owen1212055 <[email protected]>
 Date: Fri, 28 May 2021 21:06:59 -0400
 Subject: [PATCH] Missing Entity Behavior API
 
+Co-authored-by: Nassim Jahnke <[email protected]>
+Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java
 index 0d88dce9978243a1f995c5fb448c5d71b01136eb..cad47139de57642fb3bb483e7a5acaa7fea78cb4 100644
@@ -108,6 +110,47 @@ index c2a566b864c82ffb094b7334d9e6e25a1bfc87d1..c340fecb61bac66baf0f44189d21bc85
 +    public boolean isHeadUp();
 +    // Paper End - More cat api
  }
+diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java
+index 821c690f8a32918bdb284ffec4af98f411f76ccc..f4664855f22ba9d6c5aa1db4f8551fe28b7d980c 100644
+--- a/src/main/java/org/bukkit/entity/Enderman.java
++++ b/src/main/java/org/bukkit/entity/Enderman.java
+@@ -50,4 +50,36 @@ public interface Enderman extends Monster {
+      * @param blockData data to set the carried block to, or null to remove
+      */
+     public void setCarriedBlock(@Nullable BlockData blockData);
++
++    // Paper start
++    /**
++     * Returns whether the enderman is screaming/angry.
++     *
++     * @return whether the enderman is screaming
++     */
++    boolean isScreaming();
++
++    /**
++     * Sets whether the enderman is screaming/angry.
++     *
++     * @param screaming whether the enderman is screaming
++     */
++    void setScreaming(boolean screaming);
++
++    /**
++     * Returns whether the enderman has been stared at.
++     * If set to true, players will hear an ambient sound.
++     *
++     * @return whether the enderman has been stared at
++     */
++    boolean hasBeenStaredAt();
++
++    /**
++     * Sets whether the enderman has been stared at.
++     * If set to true, players will hear an ambient sound.
++     *
++     * @param hasBeenStaredAt whether the enderman has been stared at
++     */
++    void setHasBeenStaredAt(boolean hasBeenStaredAt);
++    // Paper end
+ }
 diff --git a/src/main/java/org/bukkit/entity/Fox.java b/src/main/java/org/bukkit/entity/Fox.java
 index 498e182846b81d50b3a594254e8b341fb23e8763..3826363a1954afcddaadec7f96ac18300f8e89e9 100644
 --- a/src/main/java/org/bukkit/entity/Fox.java
@@ -357,3 +400,140 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..1dcc2c8f4899da029af8b1c1b2ff1b5e
 +    boolean isSitting();
 +    // Paper end - Panda API
  }
+diff --git a/src/main/java/org/bukkit/entity/PolarBear.java b/src/main/java/org/bukkit/entity/PolarBear.java
+index 479f7a7c54c85cb685f56e60906650d1989c03ff..60267ee382de80fab86b440ff72a2455f427d148 100644
+--- a/src/main/java/org/bukkit/entity/PolarBear.java
++++ b/src/main/java/org/bukkit/entity/PolarBear.java
+@@ -3,4 +3,21 @@ package org.bukkit.entity;
+ /**
+  * Represents a polar bear.
+  */
+-public interface PolarBear extends Animals {}
++// Paper start
++public interface PolarBear extends Animals {
++
++    /**
++     * Returns whether the polar bear is standing.
++     *
++     * @return whether the polar bear is standing
++     */
++    boolean isStanding();
++
++    /**
++     * Sets whether the polar bear is standing.
++     *
++     * @param standing whether the polar bear should be standing
++     */
++    void setStanding(boolean standing);
++}
++// Paper end
+diff --git a/src/main/java/org/bukkit/entity/Raider.java b/src/main/java/org/bukkit/entity/Raider.java
+index 9a99b8ca1ec9c3c88b29275c88b1221e1b22bcef..756b4a7794ea0905abd4e4fe777f69ffe36658f5 100644
+--- a/src/main/java/org/bukkit/entity/Raider.java
++++ b/src/main/java/org/bukkit/entity/Raider.java
+@@ -47,4 +47,20 @@ public interface Raider extends Monster {
+      * @param join CanJoinRaid status
+      */
+     void setCanJoinRaid(boolean join);
++
++    // Paper start
++    /**
++     * Returns whether the raider is celebrating a raid victory.
++     *
++     * @return whether the raider is celebrating a raid victory
++     */
++    boolean isCelebrating();
++
++    /**
++     * Sets whether the raider is celebrating a raid victory.
++     *
++     * @param celebrating whether the raider is celebrating a raid victory
++     */
++    void setCelebrating(boolean celebrating);
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/entity/Trident.java b/src/main/java/org/bukkit/entity/Trident.java
+index 28cdb3b544572ba7aeb9061e3163e3895ac7d4e6..c8015ff610e3c1222cb368ea1d8a0c2f3785d9c7 100644
+--- a/src/main/java/org/bukkit/entity/Trident.java
++++ b/src/main/java/org/bukkit/entity/Trident.java
+@@ -3,4 +3,40 @@ package org.bukkit.entity;
+ /**
+  * Represents a thrown trident.
+  */
+-public interface Trident extends AbstractArrow, ThrowableProjectile { }
++// Paper start
++public interface Trident extends AbstractArrow, ThrowableProjectile {
++
++    /**
++     * Returns whether the trident has an enchanted glow.
++     * This can be separate from the underlying item having any enchantments.
++     *
++     * @return whether the trident has an enchanted glow
++     */
++    boolean hasGlint();
++
++    /**
++     * Sets whether the trident has an enchanted glow.
++     * This is separate from the underlying item having any enchantments.
++     *
++     * @param glint whether the trident should have an enchanted glow
++     */
++    void setGlint(boolean glint);
++
++    /**
++     * Returns the loyalty level of the trident.
++     * This can be separate from the underlying item's enchantments.
++     *
++     * @return loyalty level of the trident
++     */
++    int getLoyaltyLevel();
++
++    /**
++     * Sets the loyalty level of the trident.
++     * This is separate from the underlying item's enchantments.
++     *
++     * @param loyaltyLevel loyalty level
++     * @throws IllegalArgumentException if the loyalty level is lower than 0 or greater than 127
++     */
++    void setLoyaltyLevel(int loyaltyLevel);
++}
++// Paper end
+diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java
+index 426d3693317cd303d35d8203026b528d87e401d5..8c95cd6933f11076de936854f379e6fc8600b525 100644
+--- a/src/main/java/org/bukkit/entity/Wither.java
++++ b/src/main/java/org/bukkit/entity/Wither.java
+@@ -6,4 +6,34 @@ import com.destroystokyo.paper.entity.RangedEntity;
+  * Represents a Wither boss
+  */
+ public interface Wither extends Monster, Boss, RangedEntity { // Paper
++    // Paper start
++    /**
++     * @return whether the wither is charged
++     */
++    boolean isCharged();
++
++    /**
++     * @return ticks the wither is invulnerable for
++     */
++    int getInvulnerableTicks();
++
++    /**
++     * Sets for how long in the future, the wither should be invulnerable.
++     *
++     * @param ticks ticks the wither is invulnerable for
++     */
++    void setInvulnerableTicks(int ticks);
++
++    /**
++     * @return whether the wither can travel through portals
++     */
++    boolean canTravelThroughPortals();
++
++    /**
++     * Sets whether the wither can travel through portals.
++     *
++     * @param value whether the wither can travel through portals
++     */
++    void setCanTravelThroughPortals(boolean value);
++    // Paper end
+ }
diff --git a/patches/api/0314-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0313-Add-Git-information-to-version-command-on-startup.patch
index ef7aa8edda..ef7aa8edda 100644
--- a/patches/api/0314-Add-Git-information-to-version-command-on-startup.patch
+++ b/patches/api/0313-Add-Git-information-to-version-command-on-startup.patch
diff --git a/patches/api/0315-Adds-PlayerArmSwingEvent.patch b/patches/api/0314-Adds-PlayerArmSwingEvent.patch
index 75e45a71f8..75e45a71f8 100644
--- a/patches/api/0315-Adds-PlayerArmSwingEvent.patch
+++ b/patches/api/0314-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/0316-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0315-Add-PlayerSignCommandPreprocessEvent.patch
index fd095653a3..fd095653a3 100644
--- a/patches/api/0316-Add-PlayerSignCommandPreprocessEvent.patch
+++ b/patches/api/0315-Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/0317-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0316-fix-empty-array-elements-in-command-arguments.patch
index 0a2b106d87..0a2b106d87 100644
--- a/patches/api/0317-fix-empty-array-elements-in-command-arguments.patch
+++ b/patches/api/0316-fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/0318-Stinger-API.patch b/patches/api/0317-Stinger-API.patch
index 12373dc546..12373dc546 100644
--- a/patches/api/0318-Stinger-API.patch
+++ b/patches/api/0317-Stinger-API.patch
diff --git a/patches/api/0319-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0318-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 66137f29d0..66137f29d0 100644
--- a/patches/api/0319-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/api/0318-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/0320-Add-PlayerSetSpawnEvent.patch b/patches/api/0319-Add-PlayerSetSpawnEvent.patch
index 9144c45497..9144c45497 100644
--- a/patches/api/0320-Add-PlayerSetSpawnEvent.patch
+++ b/patches/api/0319-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/0321-Added-EntityDamageItemEvent.patch b/patches/api/0320-Added-EntityDamageItemEvent.patch
index 8bbe79f9f3..8bbe79f9f3 100644
--- a/patches/api/0321-Added-EntityDamageItemEvent.patch
+++ b/patches/api/0320-Added-EntityDamageItemEvent.patch
diff --git a/patches/api/0322-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0321-Make-EntityUnleashEvent-cancellable.patch
index e99584c277..e99584c277 100644
--- a/patches/api/0322-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/api/0321-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/0323-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0322-Change-EnderEye-target-without-changing-other-things.patch
index d8e53593ae..d8e53593ae 100644
--- a/patches/api/0323-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/api/0322-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/0324-Add-BlockBreakBlockEvent.patch b/patches/api/0323-Add-BlockBreakBlockEvent.patch
index dfd13b1355..dfd13b1355 100644
--- a/patches/api/0324-Add-BlockBreakBlockEvent.patch
+++ b/patches/api/0323-Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/0325-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0324-Add-helpers-for-left-right-click-to-Action.patch
index 9dac2fe612..9dac2fe612 100644
--- a/patches/api/0325-Add-helpers-for-left-right-click-to-Action.patch
+++ b/patches/api/0324-Add-helpers-for-left-right-click-to-Action.patch
diff --git a/patches/api/0326-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0325-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 0a0b5515e3..0a0b5515e3 100644
--- a/patches/api/0326-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/api/0325-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/api/0327-More-CommandBlock-API.patch b/patches/api/0326-More-CommandBlock-API.patch
index 242270eb12..242270eb12 100644
--- a/patches/api/0327-More-CommandBlock-API.patch
+++ b/patches/api/0326-More-CommandBlock-API.patch
diff --git a/patches/api/0328-Fix-plugin-provides-load-order.patch b/patches/api/0327-Fix-plugin-provides-load-order.patch
index 83c8568dff..83c8568dff 100644
--- a/patches/api/0328-Fix-plugin-provides-load-order.patch
+++ b/patches/api/0327-Fix-plugin-provides-load-order.patch
diff --git a/patches/api/0329-Add-missing-team-sidebar-display-slots.patch b/patches/api/0328-Add-missing-team-sidebar-display-slots.patch
index 1d400fa49e..1d400fa49e 100644
--- a/patches/api/0329-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/api/0328-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/0330-add-back-EntityPortalExitEvent.patch b/patches/api/0329-add-back-EntityPortalExitEvent.patch
index 5a153e2345..5a153e2345 100644
--- a/patches/api/0330-add-back-EntityPortalExitEvent.patch
+++ b/patches/api/0329-add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/0331-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch
index bba1626898..bba1626898 100644
--- a/patches/api/0331-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/api/0332-Get-entity-default-attributes.patch b/patches/api/0331-Get-entity-default-attributes.patch
index 12f3ed8dcb..12f3ed8dcb 100644
--- a/patches/api/0332-Get-entity-default-attributes.patch
+++ b/patches/api/0331-Get-entity-default-attributes.patch
diff --git a/patches/api/0333-Left-handed-API.patch b/patches/api/0332-Left-handed-API.patch
index c6c9f1b39f..c6c9f1b39f 100644
--- a/patches/api/0333-Left-handed-API.patch
+++ b/patches/api/0332-Left-handed-API.patch
diff --git a/patches/api/0334-Add-advancement-display-API.patch b/patches/api/0333-Add-advancement-display-API.patch
index fc21e58ed8..fc21e58ed8 100644
--- a/patches/api/0334-Add-advancement-display-API.patch
+++ b/patches/api/0333-Add-advancement-display-API.patch
diff --git a/patches/api/0335-Add-ItemFactory-getMonsterEgg-API.patch b/patches/api/0334-Add-ItemFactory-getMonsterEgg-API.patch
index fcdc759ea7..fcdc759ea7 100644
--- a/patches/api/0335-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/api/0334-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/api/0336-Add-critical-damage-API.patch b/patches/api/0335-Add-critical-damage-API.patch
index 3a9d1f8070..3a9d1f8070 100644
--- a/patches/api/0336-Add-critical-damage-API.patch
+++ b/patches/api/0335-Add-critical-damage-API.patch
diff --git a/patches/api/0337-Fix-issues-with-mob-conversion.patch b/patches/api/0336-Fix-issues-with-mob-conversion.patch
index 8ee1c49162..8ee1c49162 100644
--- a/patches/api/0337-Fix-issues-with-mob-conversion.patch
+++ b/patches/api/0336-Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/0338-Add-isCollidable-methods-to-various-places.patch b/patches/api/0337-Add-isCollidable-methods-to-various-places.patch
index ac6c443e6a..ac6c443e6a 100644
--- a/patches/api/0338-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/api/0337-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/api/0339-Goat-ram-API.patch b/patches/api/0338-Goat-ram-API.patch
index 69694887ac..69694887ac 100644
--- a/patches/api/0339-Goat-ram-API.patch
+++ b/patches/api/0338-Goat-ram-API.patch
diff --git a/patches/api/0340-Add-API-for-resetting-a-single-score.patch b/patches/api/0339-Add-API-for-resetting-a-single-score.patch
index 997ebf42f6..997ebf42f6 100644
--- a/patches/api/0340-Add-API-for-resetting-a-single-score.patch
+++ b/patches/api/0339-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/api/0341-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0340-Add-Raw-Byte-Entity-Serialization.patch
index c610203889..d71e8a9daf 100644
--- a/patches/api/0341-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/api/0340-Add-Raw-Byte-Entity-Serialization.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 329612597a2cdf556f5ca970f5409e1c77a5d911..ec8328ecd1d4d555d1f411c70f15347cd7aacf67 100644
+index 54b0fe21d3b6379e6550a3b1dc81c2a44e7699da..b39d1474210da1974d7e95f10daaf496a9330442 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -112,6 +112,14 @@ public interface UnsafeValues {
diff --git a/patches/api/0342-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0341-Add-PlayerItemFrameChangeEvent.patch
index a62e452bb4..a62e452bb4 100644
--- a/patches/api/0342-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/api/0341-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/api/0343-Add-player-health-update-API.patch b/patches/api/0342-Add-player-health-update-API.patch
index 44fc6fdbf0..44fc6fdbf0 100644
--- a/patches/api/0343-Add-player-health-update-API.patch
+++ b/patches/api/0342-Add-player-health-update-API.patch
diff --git a/patches/api/0344-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch
index 554fdecaf1..be873543de 100644
--- a/patches/api/0344-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -34,7 +34,7 @@ index 2af2a948dc9c0d4ad28fccb1c9a2b28d5db99203..416d402b7e885ccc9b187a8e8111da23
       * Creates a boss bar instance to display to players. The progress
       * defaults to 1.0
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ca4a9428e89b084436ef43099974ae7684648776..32f84a04add01a244e4abba4c7e1c1183aa62db1 100644
+index 1d2970dc4d18122e95db8cc9830aa5c41a59e24b..d90026c9331321ca749f7090b76c21b4608b2ee8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1553,6 +1553,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0345-Add-more-Campfire-API.patch b/patches/api/0344-Add-more-Campfire-API.patch
index 80cdc0bb39..80cdc0bb39 100644
--- a/patches/api/0345-Add-more-Campfire-API.patch
+++ b/patches/api/0344-Add-more-Campfire-API.patch
diff --git a/patches/api/0346-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0345-Move-VehicleCollisionEvent-HandlerList-up.patch
index 8fa566d54a..8fa566d54a 100644
--- a/patches/api/0346-Move-VehicleCollisionEvent-HandlerList-up.patch
+++ b/patches/api/0345-Move-VehicleCollisionEvent-HandlerList-up.patch
diff --git a/patches/api/0347-Improve-scoreboard-entries.patch b/patches/api/0346-Improve-scoreboard-entries.patch
index c608060558..34c175dad7 100644
--- a/patches/api/0347-Improve-scoreboard-entries.patch
+++ b/patches/api/0346-Improve-scoreboard-entries.patch
@@ -37,7 +37,7 @@ index 75acd6f8f3d774bb79e8e513125e801c5569a244..b93b1b0428d11589605c8edf5c053369
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/scoreboard/Scoreboard.java b/src/main/java/org/bukkit/scoreboard/Scoreboard.java
-index f7754ab421c7b452a53c28d1e2fafdccfbba24bf..9a395b138be3f6fa9a52639f0ac4070c23f7d77c 100644
+index 1ada91d790abedbc9b3aeb6e96467a0d78560f15..fc3456bb79f2fe1504359455b937c162780110c2 100644
 --- a/src/main/java/org/bukkit/scoreboard/Scoreboard.java
 +++ b/src/main/java/org/bukkit/scoreboard/Scoreboard.java
 @@ -163,9 +163,8 @@ public interface Scoreboard {
diff --git a/patches/api/0348-Entity-powdered-snow-API.patch b/patches/api/0347-Entity-powdered-snow-API.patch
index 88414bd4ef..88414bd4ef 100644
--- a/patches/api/0348-Entity-powdered-snow-API.patch
+++ b/patches/api/0347-Entity-powdered-snow-API.patch
diff --git a/patches/api/0349-Add-API-for-item-entity-health.patch b/patches/api/0348-Add-API-for-item-entity-health.patch
index 913f679ec0..913f679ec0 100644
--- a/patches/api/0349-Add-API-for-item-entity-health.patch
+++ b/patches/api/0348-Add-API-for-item-entity-health.patch
diff --git a/patches/api/0350-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0349-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index f094cdc255..f094cdc255 100644
--- a/patches/api/0350-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/api/0349-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0351-Bucketable-API.patch b/patches/api/0350-Bucketable-API.patch
index 26dbdc9f5d..26dbdc9f5d 100644
--- a/patches/api/0351-Bucketable-API.patch
+++ b/patches/api/0350-Bucketable-API.patch
diff --git a/patches/api/0352-System-prop-for-default-config-comment-parsing.patch b/patches/api/0351-System-prop-for-default-config-comment-parsing.patch
index c28a3f9b5f..c28a3f9b5f 100644
--- a/patches/api/0352-System-prop-for-default-config-comment-parsing.patch
+++ b/patches/api/0351-System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/api/0353-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0352-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 9b189fc918..9b189fc918 100644
--- a/patches/api/0353-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/api/0352-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/api/0354-Remove-upstream-snakeyaml-fix.patch b/patches/api/0353-Remove-upstream-snakeyaml-fix.patch
index b5ecceb7b4..b5ecceb7b4 100644
--- a/patches/api/0354-Remove-upstream-snakeyaml-fix.patch
+++ b/patches/api/0353-Remove-upstream-snakeyaml-fix.patch
diff --git a/patches/api/0355-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/api/0354-Add-new-overload-to-PersistentDataContainer-has.patch
index 73c49a2fc8..73c49a2fc8 100644
--- a/patches/api/0355-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/api/0354-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/api/0356-Multiple-Entries-with-Scoreboards.patch b/patches/api/0355-Multiple-Entries-with-Scoreboards.patch
index e1d867d054..e1d867d054 100644
--- a/patches/api/0356-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/api/0355-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/api/0357-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0356-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index c56c240b80..c56c240b80 100644
--- a/patches/api/0357-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/api/0356-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0358-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0357-Warn-on-strange-EventHandler-return-types.patch
index 29026c1725..29026c1725 100644
--- a/patches/api/0358-Warn-on-strange-EventHandler-return-types.patch
+++ b/patches/api/0357-Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/api/0359-Multi-Block-Change-API.patch b/patches/api/0358-Multi-Block-Change-API.patch
index 9589081363..9589081363 100644
--- a/patches/api/0359-Multi-Block-Change-API.patch
+++ b/patches/api/0358-Multi-Block-Change-API.patch
diff --git a/patches/api/0360-Fix-NotePlayEvent.patch b/patches/api/0359-Fix-NotePlayEvent.patch
index a474627df0..a474627df0 100644
--- a/patches/api/0360-Fix-NotePlayEvent.patch
+++ b/patches/api/0359-Fix-NotePlayEvent.patch
diff --git a/patches/api/0361-Freeze-Tick-Lock-API.patch b/patches/api/0360-Freeze-Tick-Lock-API.patch
index 9f42a812f8..9f42a812f8 100644
--- a/patches/api/0361-Freeze-Tick-Lock-API.patch
+++ b/patches/api/0360-Freeze-Tick-Lock-API.patch
diff --git a/patches/api/0362-Dolphin-API.patch b/patches/api/0361-Dolphin-API.patch
index 73beed437b..73beed437b 100644
--- a/patches/api/0362-Dolphin-API.patch
+++ b/patches/api/0361-Dolphin-API.patch
diff --git a/patches/api/0363-More-PotionEffectType-API.patch b/patches/api/0362-More-PotionEffectType-API.patch
index 6340f5fd9d..6340f5fd9d 100644
--- a/patches/api/0363-More-PotionEffectType-API.patch
+++ b/patches/api/0362-More-PotionEffectType-API.patch
diff --git a/patches/api/0364-Expand-the-Registry-API.patch b/patches/api/0363-Expand-the-Registry-API.patch
index 87956152ec..87956152ec 100644
--- a/patches/api/0364-Expand-the-Registry-API.patch
+++ b/patches/api/0363-Expand-the-Registry-API.patch
diff --git a/patches/api/0365-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch
index 36ab64333c..69107d315e 100644
--- a/patches/api/0365-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -30,7 +30,7 @@ index 416d402b7e885ccc9b187a8e8111da2378197b45..795f8c0aa3929f6de4b4ea4b139bef8b
       * Gets the folder that contains all of the various {@link World}s.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 32f84a04add01a244e4abba4c7e1c1183aa62db1..a62c27777672eff1c488517b37876e3a44a2d57d 100644
+index d90026c9331321ca749f7090b76c21b4608b2ee8..79120b42a3993beda1e3474fa4b722402e9d849f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1151,6 +1151,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0366-Implement-regenerateChunk.patch b/patches/api/0365-Implement-regenerateChunk.patch
index fe3631f741..fe3631f741 100644
--- a/patches/api/0366-Implement-regenerateChunk.patch
+++ b/patches/api/0365-Implement-regenerateChunk.patch
diff --git a/patches/api/0367-Don-t-load-plugins-prefixed-with-a-dot.patch b/patches/api/0366-Don-t-load-plugins-prefixed-with-a-dot.patch
index 1aaa39f50b..1aaa39f50b 100644
--- a/patches/api/0367-Don-t-load-plugins-prefixed-with-a-dot.patch
+++ b/patches/api/0366-Don-t-load-plugins-prefixed-with-a-dot.patch
diff --git a/patches/api/0368-Add-GameEvent-tags.patch b/patches/api/0367-Add-GameEvent-tags.patch
index 668a199030..668a199030 100644
--- a/patches/api/0368-Add-GameEvent-tags.patch
+++ b/patches/api/0367-Add-GameEvent-tags.patch
diff --git a/patches/api/0369-Furnace-RecipesUsed-API.patch b/patches/api/0368-Furnace-RecipesUsed-API.patch
index 7fed82db21..7fed82db21 100644
--- a/patches/api/0369-Furnace-RecipesUsed-API.patch
+++ b/patches/api/0368-Furnace-RecipesUsed-API.patch
diff --git a/patches/api/0370-Configurable-sculk-sensor-listener-range.patch b/patches/api/0369-Configurable-sculk-sensor-listener-range.patch
index b1ad0cdb5b..b1ad0cdb5b 100644
--- a/patches/api/0370-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/api/0369-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/api/0371-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0370-Add-missing-block-data-mins-and-maxes.patch
index 1ce2b605c4..1ce2b605c4 100644
--- a/patches/api/0371-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/api/0370-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0372-Custom-Potion-Mixes.patch b/patches/api/0371-Custom-Potion-Mixes.patch
index 9ec547303b..55a3c3f3e3 100644
--- a/patches/api/0372-Custom-Potion-Mixes.patch
+++ b/patches/api/0371-Custom-Potion-Mixes.patch
@@ -122,7 +122,7 @@ index 795f8c0aa3929f6de4b4ea4b139bef8b672ab97a..944f9b87a11472ac6d7e328acc00bf09
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a62c27777672eff1c488517b37876e3a44a2d57d..cca362e54d6ff4a5a1e60f85a7eb1b3d222d3d48 100644
+index 79120b42a3993beda1e3474fa4b722402e9d849f..f63587cfa651a3893d2efa3730dc80f271d56b1c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1995,5 +1995,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0373-Expose-furnace-minecart-push-values.patch b/patches/api/0372-Expose-furnace-minecart-push-values.patch
index 3d8c2336e7..3d8c2336e7 100644
--- a/patches/api/0373-Expose-furnace-minecart-push-values.patch
+++ b/patches/api/0372-Expose-furnace-minecart-push-values.patch