Add more entity api (#7564)

410 files changed, 459 insertions, 163 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
diff --git a/patches/server/0276-Turtle-API.patch b/patches/server/0276-Turtle-API.patch
index 619fa7ebfc..fb6ff88d30 100644
--- a/patches/server/0276-Turtle-API.patch
+++ b/patches/server/0276-Turtle-API.patch
@@ -52,10 +52,10 @@ index ea1bb6924043dfd05452b793afd7651c867de5dc..1b0be28ebfd7ec2f978b5d87f6d26e4d
  
          @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-index ed08089f21c8958fc9fc7e6e73a2b6ff9108242c..a3849ebba14b47b33f1af57c47f94c02aebea232 100644
+index ed08089f21c8958fc9fc7e6e73a2b6ff9108242c..b78289dd6a71b962c02247af578e939bc97847c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-@@ -24,4 +24,36 @@ public class CraftTurtle extends CraftAnimals implements Turtle {
+@@ -24,4 +24,41 @@ public class CraftTurtle extends CraftAnimals implements Turtle {
      public EntityType getType() {
          return EntityType.TURTLE;
      }
@@ -90,5 +90,10 @@ index ed08089f21c8958fc9fc7e6e73a2b6ff9108242c..a3849ebba14b47b33f1af57c47f94c02
 +    public void setHasEgg(boolean hasEgg) {
 +        getHandle().setHasEgg(hasEgg);
 +    }
++
++    @Override
++    public boolean isLayingEgg() {
++        return this.getHandle().isLayingEgg();
++    }
 +    // Paper end
  }
diff --git a/patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0587-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 0c470fc8f2..0c470fc8f2 100644
--- a/patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0587-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0587-added-Wither-API.patch b/patches/server/0587-added-Wither-API.patch
deleted file mode 100644
index 80d4af7f38..0000000000
--- a/patches/server/0587-added-Wither-API.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Sun, 5 Jul 2020 15:39:19 -0700
-Subject: [PATCH] added Wither API
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 32b302aad0319ce3ee412912425c1c8db9979f8a..92734f767fde60351a179a88350a97b861be0e88 100644
---- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -84,6 +84,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
-         return entityliving.getMobType() != MobType.UNDEAD && entityliving.attackable();
-     };
-     private static final TargetingConditions TARGETING_CONDITIONS = TargetingConditions.forCombat().range(20.0D).selector(WitherBoss.LIVING_ENTITY_SELECTOR);
-+    // Paper start
-+    private boolean canPortal = false;
-+
-+    public void setCanTravelThroughPortals(boolean canPortal) { this.canPortal = canPortal; }
-+    // Paper end
- 
-     public WitherBoss(EntityType<? extends WitherBoss> type, Level world) {
-         super(type, world);
-@@ -602,7 +607,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
- 
-     @Override
-     public boolean canChangeDimensions() {
--        return false;
-+        return super.canChangeDimensions() && canPortal; // Paper
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index 640b0860fbe3412da32d03187e6f355ba8f099ea..299d5e47489cfe489ac130a33a08cdb29ba76d72 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-@@ -38,4 +38,31 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok
-     public BossBar getBossBar() {
-         return this.bossBar;
-     }
-+
-+    // Paper start
-+    @Override
-+    public boolean isCharged() {
-+        return getHandle().isPowered();
-+    }
-+
-+    @Override
-+    public int getInvulnerableTicks() {
-+        return getHandle().getInvulnerableTicks();
-+    }
-+
-+    @Override
-+    public void setInvulnerableTicks(int ticks) {
-+        getHandle().setInvulnerableTicks(ticks);
-+    }
-+
-+    @Override
-+    public boolean canTravelThroughPortals() {
-+        return getHandle().canChangeDimensions();
-+    }
-+
-+    @Override
-+    public void setCanTravelThroughPortals(boolean value) {
-+        getHandle().setCanTravelThroughPortals(value);
-+    }
-+    // Paper end
- }
diff --git a/patches/server/0589-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0588-Add-toggle-for-always-placing-the-dragon-egg.patch
index 544c347429..544c347429 100644
--- a/patches/server/0589-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0588-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0590-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0589-Added-PlayerStonecutterRecipeSelectEvent.patch
index c8cefc8ca5..c8cefc8ca5 100644
--- a/patches/server/0590-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0589-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0591-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0590-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 766d05e286..766d05e286 100644
--- a/patches/server/0591-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0590-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0592-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0591-Reset-shield-blocking-on-dimension-change.patch
index e80304d90b..e80304d90b 100644
--- a/patches/server/0592-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0591-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0593-add-DragonEggFormEvent.patch b/patches/server/0592-add-DragonEggFormEvent.patch
index ab3f7fd05b..ab3f7fd05b 100644
--- a/patches/server/0593-add-DragonEggFormEvent.patch
+++ b/patches/server/0592-add-DragonEggFormEvent.patch
diff --git a/patches/server/0594-EntityMoveEvent.patch b/patches/server/0593-EntityMoveEvent.patch
index 65856e82cd..65856e82cd 100644
--- a/patches/server/0594-EntityMoveEvent.patch
+++ b/patches/server/0593-EntityMoveEvent.patch
diff --git a/patches/server/0595-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0594-added-option-to-disable-pathfinding-updates-on-block.patch
index a03f8b0be8..a03f8b0be8 100644
--- a/patches/server/0595-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0594-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0596-Inline-shift-direction-fields.patch b/patches/server/0595-Inline-shift-direction-fields.patch
index aea372f6f4..aea372f6f4 100644
--- a/patches/server/0596-Inline-shift-direction-fields.patch
+++ b/patches/server/0595-Inline-shift-direction-fields.patch
diff --git a/patches/server/0597-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0596-Allow-adding-items-to-BlockDropItemEvent.patch
index fdd2359e10..fdd2359e10 100644
--- a/patches/server/0597-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0596-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0598-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0597-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 8cfe3357dc..8cfe3357dc 100644
--- a/patches/server/0598-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0597-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0599-living-entity-allow-attribute-registration.patch b/patches/server/0598-living-entity-allow-attribute-registration.patch
index 88cf7f15c6..88cf7f15c6 100644
--- a/patches/server/0599-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0598-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0600-fix-dead-slime-setSize-invincibility.patch b/patches/server/0599-fix-dead-slime-setSize-invincibility.patch
index 33ce1b72f2..33ce1b72f2 100644
--- a/patches/server/0600-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0599-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0601-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0600-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0601-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0600-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0602-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0601-Add-support-for-hex-color-codes-in-console.patch
index 4d129a981e..4d129a981e 100644
--- a/patches/server/0602-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/server/0601-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0603-Expose-Tracked-Players.patch b/patches/server/0602-Expose-Tracked-Players.patch
index ec9396cdd0..ec9396cdd0 100644
--- a/patches/server/0603-Expose-Tracked-Players.patch
+++ b/patches/server/0602-Expose-Tracked-Players.patch
diff --git a/patches/server/0604-Remove-streams-from-SensorNearest.patch b/patches/server/0603-Remove-streams-from-SensorNearest.patch
index 91ae33c411..91ae33c411 100644
--- a/patches/server/0604-Remove-streams-from-SensorNearest.patch
+++ b/patches/server/0603-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0605-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0604-Throw-proper-exception-on-empty-JsonList-file.patch
index e013e32526..e013e32526 100644
--- a/patches/server/0605-Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/server/0604-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0606-Improve-ServerGUI.patch b/patches/server/0605-Improve-ServerGUI.patch
index e573bd2f58..e573bd2f58 100644
--- a/patches/server/0606-Improve-ServerGUI.patch
+++ b/patches/server/0605-Improve-ServerGUI.patch
diff --git a/patches/server/0607-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0606-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
index 1099f41d55..1099f41d55 100644
--- a/patches/server/0607-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
+++ b/patches/server/0606-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0608-fix-converting-txt-to-json-file.patch b/patches/server/0607-fix-converting-txt-to-json-file.patch
index eb9cd86dd7..eb9cd86dd7 100644
--- a/patches/server/0608-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0607-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0609-Add-worldborder-events.patch b/patches/server/0608-Add-worldborder-events.patch
index 26898cfba0..26898cfba0 100644
--- a/patches/server/0609-Add-worldborder-events.patch
+++ b/patches/server/0608-Add-worldborder-events.patch
diff --git a/patches/server/0610-added-PlayerNameEntityEvent.patch b/patches/server/0609-added-PlayerNameEntityEvent.patch
index c1df33b717..c1df33b717 100644
--- a/patches/server/0610-added-PlayerNameEntityEvent.patch
+++ b/patches/server/0609-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0611-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0610-Prevent-grindstones-from-overstacking-items.patch
index 3719f82383..3719f82383 100644
--- a/patches/server/0611-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0610-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0612-Add-recipe-to-cook-events.patch b/patches/server/0611-Add-recipe-to-cook-events.patch
index 183bc80987..183bc80987 100644
--- a/patches/server/0612-Add-recipe-to-cook-events.patch
+++ b/patches/server/0611-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0613-Add-Block-isValidTool.patch b/patches/server/0612-Add-Block-isValidTool.patch
index 8442851de2..8442851de2 100644
--- a/patches/server/0613-Add-Block-isValidTool.patch
+++ b/patches/server/0612-Add-Block-isValidTool.patch
diff --git a/patches/server/0614-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0613-Allow-using-signs-inside-spawn-protection.patch
index 2134c6d27d..2134c6d27d 100644
--- a/patches/server/0614-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0613-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0615-Implement-Keyed-on-World.patch b/patches/server/0614-Implement-Keyed-on-World.patch
index 6c9519f39b..891f329487 100644
--- a/patches/server/0615-Implement-Keyed-on-World.patch
+++ b/patches/server/0614-Implement-Keyed-on-World.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Keyed on World
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6124142faeeb792c0f7f6c167f8da47af446cba9..153c2551544dffe36e836fa62f2752160e2cd64a 100644
+index 841d984292b7d3d7610a671b7f6192d6cbd48835..48e2d5e2b53e32af53387f2e63c67ff9e0a7c5bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1231,7 +1231,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0616-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0615-Add-fast-alternative-constructor-for-Rotations.patch
index d2a627b5b6..d2a627b5b6 100644
--- a/patches/server/0616-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0615-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0617-Item-Rarity-API.patch b/patches/server/0616-Item-Rarity-API.patch
index 29bd01b295..29bd01b295 100644
--- a/patches/server/0617-Item-Rarity-API.patch
+++ b/patches/server/0616-Item-Rarity-API.patch
diff --git a/patches/server/0618-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0617-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index ff46048dcd..ff46048dcd 100644
--- a/patches/server/0618-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0617-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0619-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0618-copy-TESign-isEditable-from-snapshots.patch
index 0cfc8f03a3..0cfc8f03a3 100644
--- a/patches/server/0619-copy-TESign-isEditable-from-snapshots.patch
+++ b/patches/server/0618-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0620-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0619-Drop-carried-item-when-player-has-disconnected.patch
index 26cffa4d21..26cffa4d21 100644
--- a/patches/server/0620-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0619-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0621-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0620-forced-whitelist-use-configurable-kick-message.patch
index 4a57708ea9..4a57708ea9 100644
--- a/patches/server/0621-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0620-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0622-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0621-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index a80d297e37..a80d297e37 100644
--- a/patches/server/0622-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0621-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0623-Entity-load-save-limit-per-chunk.patch b/patches/server/0622-Entity-load-save-limit-per-chunk.patch
index 177d06c8fc..177d06c8fc 100644
--- a/patches/server/0623-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0622-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0624-Expose-protocol-version.patch b/patches/server/0623-Expose-protocol-version.patch
index 3f69974e93..3f69974e93 100644
--- a/patches/server/0624-Expose-protocol-version.patch
+++ b/patches/server/0623-Expose-protocol-version.patch
diff --git a/patches/server/0625-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0624-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index 1935ce4852..1935ce4852 100644
--- a/patches/server/0625-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/server/0624-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0626-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0625-Enhance-console-tab-completions-for-brigadier-comman.patch
index 0fe6d987f6..aeffa16121 100644
--- a/patches/server/0626-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0625-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Enhance console tab completions for brigadier commands
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c75005b934271e4b8864d949052d56465571f011..4a7e4c2038dd4a7496ed4084a19f31a611ee319a 100644
+index 327e39646bd2ab398d9da582d4620052c3c92bc1..f06ba478f3ed7c333cba18c2443d62f0eb01d4d7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -106,6 +106,13 @@ public class PaperConfig {
diff --git a/patches/server/0627-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0626-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 7141d18a53..7141d18a53 100644
--- a/patches/server/0627-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0626-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0628-Add-bypass-host-check.patch b/patches/server/0627-Add-bypass-host-check.patch
index a9a87f8a74..5e9b983ad1 100644
--- a/patches/server/0628-Add-bypass-host-check.patch
+++ b/patches/server/0627-Add-bypass-host-check.patch
@@ -8,7 +8,7 @@ Paper.bypassHostCheck
 Seriously, fix your firewalls. -.-
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 54de844431cf9cc88d6e82014d5eb69babd7784c..b5b929a504164aefd2498cd9fad66a5c7aaf59e4 100644
+index 8060d6461835d5b5b4429e9b280d08eae4e435e9..f74b6d2110e51c76eeb1aea7665153509b6e6371 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -30,6 +30,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0629-Set-area-affect-cloud-rotation.patch b/patches/server/0628-Set-area-affect-cloud-rotation.patch
index b0f478a353..b0f478a353 100644
--- a/patches/server/0629-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0628-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0630-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0629-add-isDeeplySleeping-to-HumanEntity.patch
index 8c7bfe4fbb..8c7bfe4fbb 100644
--- a/patches/server/0630-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0629-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0631-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0630-Fix-duplicating-give-items-on-item-drop-cancel.patch
index 1fdb5f16ee..1fdb5f16ee 100644
--- a/patches/server/0631-Fix-duplicating-give-items-on-item-drop-cancel.patch
+++ b/patches/server/0630-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0632-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0631-add-consumeFuel-to-FurnaceBurnEvent.patch
index ffb9062039..ffb9062039 100644
--- a/patches/server/0632-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0631-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0633-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0632-add-get-set-drop-chance-to-EntityEquipment.patch
index 9720fcdaf4..9720fcdaf4 100644
--- a/patches/server/0633-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0632-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0634-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0633-fix-PigZombieAngerEvent-cancellation.patch
index 9b69dc24f2..9b69dc24f2 100644
--- a/patches/server/0634-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0633-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0635-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0634-Fix-checkReach-check-for-Shulker-boxes.patch
index e63651a68f..e63651a68f 100644
--- a/patches/server/0635-Fix-checkReach-check-for-Shulker-boxes.patch
+++ b/patches/server/0634-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0636-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0635-fix-PlayerItemHeldEvent-firing-twice.patch
index 7a332176ff..7a332176ff 100644
--- a/patches/server/0636-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0635-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0637-Added-PlayerDeepSleepEvent.patch b/patches/server/0636-Added-PlayerDeepSleepEvent.patch
index 00b71569b1..00b71569b1 100644
--- a/patches/server/0637-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0636-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0638-More-World-API.patch b/patches/server/0637-More-World-API.patch
index 3fac16090a..3fac16090a 100644
--- a/patches/server/0638-More-World-API.patch
+++ b/patches/server/0637-More-World-API.patch
diff --git a/patches/server/0639-Added-PlayerBedFailEnterEvent.patch b/patches/server/0638-Added-PlayerBedFailEnterEvent.patch
index 95b8821728..95b8821728 100644
--- a/patches/server/0639-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0638-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0640-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0639-Implement-methods-to-convert-between-Component-and-B.patch
index ad3e98c8b5..ad3e98c8b5 100644
--- a/patches/server/0640-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0639-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0641-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0640-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 576aa63f5a..576aa63f5a 100644
--- a/patches/server/0641-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0640-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0642-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0641-Introduce-beacon-activation-deactivation-events.patch
index 4858e0f40b..4858e0f40b 100644
--- a/patches/server/0642-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0641-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0643-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0642-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 5fff43eeb8..5fff43eeb8 100644
--- a/patches/server/0643-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0642-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0644-Add-Channel-initialization-listeners.patch b/patches/server/0643-Add-Channel-initialization-listeners.patch
index 1f7fe2772b..1f7fe2772b 100644
--- a/patches/server/0644-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0643-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0645-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0644-Send-empty-commands-if-tab-completion-is-disabled.patch
index 2b52bb5343..2b52bb5343 100644
--- a/patches/server/0645-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0644-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0646-Add-more-WanderingTrader-API.patch b/patches/server/0645-Add-more-WanderingTrader-API.patch
index 65d351d6df..65d351d6df 100644
--- a/patches/server/0646-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0645-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0647-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0646-Add-EntityBlockStorage-clearEntities.patch
index 4742b14dac..4742b14dac 100644
--- a/patches/server/0647-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0646-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0648-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0647-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index b53cff9d00..b53cff9d00 100644
--- a/patches/server/0648-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0647-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0649-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0648-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 0b88624654..0b88624654 100644
--- a/patches/server/0649-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0648-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0650-Inventory-close.patch b/patches/server/0649-Inventory-close.patch
index e7f478324a..e7f478324a 100644
--- a/patches/server/0650-Inventory-close.patch
+++ b/patches/server/0649-Inventory-close.patch
diff --git a/patches/server/0651-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0650-call-PortalCreateEvent-players-and-end-platform.patch
index ea0c797028..ea0c797028 100644
--- a/patches/server/0651-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/server/0650-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0652-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0651-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 9fc439f344..9fc439f344 100644
--- a/patches/server/0652-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0651-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0653-Fix-CraftPotionBrewer-cache.patch b/patches/server/0652-Fix-CraftPotionBrewer-cache.patch
index 2d8295382f..2d8295382f 100644
--- a/patches/server/0653-Fix-CraftPotionBrewer-cache.patch
+++ b/patches/server/0652-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0654-Add-basic-Datapack-API.patch b/patches/server/0653-Add-basic-Datapack-API.patch
index 70549c3014..70549c3014 100644
--- a/patches/server/0654-Add-basic-Datapack-API.patch
+++ b/patches/server/0653-Add-basic-Datapack-API.patch
diff --git a/patches/server/0655-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0654-Add-environment-variable-to-disable-server-gui.patch
index a8785b7a29..a8785b7a29 100644
--- a/patches/server/0655-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0654-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0656-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0655-additions-to-PlayerGameModeChangeEvent.patch
index 4f95b0914b..4f95b0914b 100644
--- a/patches/server/0656-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0655-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0657-ItemStack-repair-check-API.patch b/patches/server/0656-ItemStack-repair-check-API.patch
index 4663820353..4663820353 100644
--- a/patches/server/0657-ItemStack-repair-check-API.patch
+++ b/patches/server/0656-ItemStack-repair-check-API.patch
diff --git a/patches/server/0658-More-Enchantment-API.patch b/patches/server/0657-More-Enchantment-API.patch
index be8a7f96c7..be8a7f96c7 100644
--- a/patches/server/0658-More-Enchantment-API.patch
+++ b/patches/server/0657-More-Enchantment-API.patch
diff --git a/patches/server/0659-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0658-Fix-and-optimise-world-force-upgrading.patch
index 18f64f42aa..b110c0d528 100644
--- a/patches/server/0659-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0658-Fix-and-optimise-world-force-upgrading.patch
@@ -272,7 +272,7 @@ index 69dc1271be0a3f3f2fb4ce15981ed25d24dce785..1e0d261439255091a6f61485c0747231
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1cac02ba1eced8c1cda0de750dfe640acdca21c0..e2f647f3bdacd950ba098103d82a6f4f90794f36 100644
+index abb6b8f3b69826d69956a248770fc7b87745ba9a..5a2c5dc61580ff343ca96561fa56400c31995529 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -557,11 +557,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -357,7 +357,7 @@ index 4bc33c31d497aa7d69226ab870fd78902bedfd5b..089e8414c7bdc102ba0d914af576df1a
          return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cca74c494c089e8668750eead58b508e61689515..2256a680d4f53d143e4ebfd82221074a84a86fdc 100644
+index 486fe0d067dc11b42263b26592039e210acce06b..99a679945337f412fe7d1c51280b05b5b0bcfb5b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1192,12 +1192,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0660-Add-Mob-lookAt-API.patch b/patches/server/0659-Add-Mob-lookAt-API.patch
index 26b90782d2..26b90782d2 100644
--- a/patches/server/0660-Add-Mob-lookAt-API.patch
+++ b/patches/server/0659-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0661-Add-Unix-domain-socket-support.patch b/patches/server/0660-Add-Unix-domain-socket-support.patch
index b70b3641af..85d133844f 100644
--- a/patches/server/0661-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0660-Add-Unix-domain-socket-support.patch
@@ -107,7 +107,7 @@ index c36089ead51d2e7dc3369d5f9a1869f58ff5391c..bfa519b9335c960a5baec50b0da95d95
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index b5b929a504164aefd2498cd9fad66a5c7aaf59e4..97ee159867c4800c8fdec9a5fa42f648112be186 100644
+index f74b6d2110e51c76eeb1aea7665153509b6e6371..e76b9670213de966ee275e624e7ee5f673d3f210 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -44,6 +44,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0662-Add-EntityInsideBlockEvent.patch b/patches/server/0661-Add-EntityInsideBlockEvent.patch
index 2c221ccdeb..2c221ccdeb 100644
--- a/patches/server/0662-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0661-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0663-Attributes-API-for-item-defaults.patch b/patches/server/0662-Attributes-API-for-item-defaults.patch
index dd2a25bfc9..dd2a25bfc9 100644
--- a/patches/server/0663-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0662-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0664-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0663-Add-cause-to-Weather-ThunderChangeEvents.patch
index 74ac72ae3b..74ac72ae3b 100644
--- a/patches/server/0664-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0663-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0665-More-Lidded-Block-API.patch b/patches/server/0664-More-Lidded-Block-API.patch
index 5b7c8a3b64..5b7c8a3b64 100644
--- a/patches/server/0665-More-Lidded-Block-API.patch
+++ b/patches/server/0664-More-Lidded-Block-API.patch
diff --git a/patches/server/0666-Limit-item-frame-cursors-on-maps.patch b/patches/server/0665-Limit-item-frame-cursors-on-maps.patch
index dfc4282000..dfc4282000 100644
--- a/patches/server/0666-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0665-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0667-Add-PlayerKickEvent-causes.patch b/patches/server/0666-Add-PlayerKickEvent-causes.patch
index 5ee609de77..5ee609de77 100644
--- a/patches/server/0667-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0666-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0668-Add-PufferFishStateChangeEvent.patch b/patches/server/0667-Add-PufferFishStateChangeEvent.patch
index e15126884a..e15126884a 100644
--- a/patches/server/0668-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0667-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0669-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0668-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 2d2d6ea63a..2d2d6ea63a 100644
--- a/patches/server/0669-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0668-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0670-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0669-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
index 670063cc65..670063cc65 100644
--- a/patches/server/0670-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
+++ b/patches/server/0669-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0671-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0670-Add-option-to-fix-items-merging-through-walls.patch
index 362a1b16f3..362a1b16f3 100644
--- a/patches/server/0671-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0670-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0672-Add-BellRevealRaiderEvent.patch b/patches/server/0671-Add-BellRevealRaiderEvent.patch
index 587e0f0400..587e0f0400 100644
--- a/patches/server/0672-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0671-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0673-Fix-invulnerable-end-crystals.patch b/patches/server/0672-Fix-invulnerable-end-crystals.patch
index 69911150b1..69911150b1 100644
--- a/patches/server/0673-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0672-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0674-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0673-Add-ElderGuardianAppearanceEvent.patch
index 540926f9ef..540926f9ef 100644
--- a/patches/server/0674-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0673-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0675-Fix-dangerous-end-portal-logic.patch b/patches/server/0674-Fix-dangerous-end-portal-logic.patch
index 1be4e84ec5..1be4e84ec5 100644
--- a/patches/server/0675-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0674-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0676-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0675-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index c3c7f53663..c3c7f53663 100644
--- a/patches/server/0676-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0675-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0677-Make-item-validations-configurable.patch b/patches/server/0676-Make-item-validations-configurable.patch
index 1bff191b03..346b39da15 100644
--- a/patches/server/0677-Make-item-validations-configurable.patch
+++ b/patches/server/0676-Make-item-validations-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make item validations configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 4a7e4c2038dd4a7496ed4084a19f31a611ee319a..b33ece9a98f94d0c09b837bc95dbfab82ff6cabe 100644
+index f06ba478f3ed7c333cba18c2443d62f0eb01d4d7..86cd1409de5d367e9c48460c1b5bcc1554ecfa98 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -504,4 +504,19 @@ public class PaperConfig {
diff --git a/patches/server/0678-Line-Of-Sight-Changes.patch b/patches/server/0677-Line-Of-Sight-Changes.patch
index 28e1141d0b..28e1141d0b 100644
--- a/patches/server/0678-Line-Of-Sight-Changes.patch
+++ b/patches/server/0677-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0679-add-per-world-spawn-limits.patch b/patches/server/0678-add-per-world-spawn-limits.patch
index 68527d5cff..68527d5cff 100644
--- a/patches/server/0679-add-per-world-spawn-limits.patch
+++ b/patches/server/0678-add-per-world-spawn-limits.patch
diff --git a/patches/server/0680-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0679-Fix-PotionSplashEvent-for-water-splash-potions.patch
index 56f02dad6e..56f02dad6e 100644
--- a/patches/server/0680-Fix-PotionSplashEvent-for-water-splash-potions.patch
+++ b/patches/server/0679-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0681-Add-more-LimitedRegion-API.patch b/patches/server/0680-Add-more-LimitedRegion-API.patch
index e9e7611f99..e9e7611f99 100644
--- a/patches/server/0681-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0680-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0682-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0681-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 6ae023df0a..6ae023df0a 100644
--- a/patches/server/0682-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0681-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0683-Missing-Entity-Behavior-API.patch b/patches/server/0682-Missing-Entity-Behavior-API.patch
index 14dd0e40a3..b1edabe7e5 100644
--- a/patches/server/0683-Missing-Entity-Behavior-API.patch
+++ b/patches/server/0682-Missing-Entity-Behavior-API.patch
@@ -3,6 +3,8 @@ From: Owen1212055 <[email protected]>
 Date: Mon, 21 Jun 2021 23:56:07 -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/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 index cd278a859c87fc89c421378ffab1bd36a45bd65d..a726006888bbbdb290bcda3ac4fd45d68ba51b79 100644
@@ -35,6 +37,52 @@ index cd278a859c87fc89c421378ffab1bd36a45bd65d..a726006888bbbdb290bcda3ac4fd45d6
      public void setStanding(boolean angry) {
          if (angry) {
              this.setEating(false);
+diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+index 32b302aad0319ce3ee412912425c1c8db9979f8a..92734f767fde60351a179a88350a97b861be0e88 100644
+--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
++++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+@@ -84,6 +84,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+         return entityliving.getMobType() != MobType.UNDEAD && entityliving.attackable();
+     };
+     private static final TargetingConditions TARGETING_CONDITIONS = TargetingConditions.forCombat().range(20.0D).selector(WitherBoss.LIVING_ENTITY_SELECTOR);
++    // Paper start
++    private boolean canPortal = false;
++
++    public void setCanTravelThroughPortals(boolean canPortal) { this.canPortal = canPortal; }
++    // Paper end
+ 
+     public WitherBoss(EntityType<? extends WitherBoss> type, Level world) {
+         super(type, world);
+@@ -602,7 +607,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+ 
+     @Override
+     public boolean canChangeDimensions() {
+-        return false;
++        return super.canChangeDimensions() && canPortal; // Paper
+     }
+ 
+     @Override
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+index 4920f5465298b4da33b53f80b8af6220cb0e8ccc..411eb4d495907aa1d646673bf07d56ff01e52eee 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+@@ -429,6 +429,16 @@ public class EnderMan extends Monster implements NeutralMob {
+         this.entityData.set(EnderMan.DATA_STARED_AT, true);
+     }
+ 
++    // Paper start
++    public void setCreepy(boolean creepy) {
++        this.entityData.set(EnderMan.DATA_CREEPY, creepy);
++    }
++
++    public void setHasBeenStaredAt(boolean hasBeenStaredAt) {
++        this.entityData.set(EnderMan.DATA_STARED_AT, hasBeenStaredAt);
++    }
++    // Paper end
++
+     @Override
+     public boolean requiresCustomPersistence() {
+         return super.requiresCustomPersistence() || this.getCarriedBlock() != null;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 index f834e96c48cce6af65a65dafcdeb2cf0ea12763a..77a5f8339df5a46967713b51570735de828f0b49 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
@@ -52,6 +100,31 @@ index f834e96c48cce6af65a65dafcdeb2cf0ea12763a..77a5f8339df5a46967713b51570735de
      @Override
      protected boolean shouldDespawnInPeaceful() {
          return true;
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
+index a367f50b0e3fe9e7a1b87892a8c98e88bd678f6f..1b31b32d42eeb54680b902cd7e82d10ba7daa5d0 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
+@@ -105,6 +105,20 @@ public class ThrownTrident extends AbstractArrow {
+         return (Boolean) this.entityData.get(ThrownTrident.ID_FOIL);
+     }
+ 
++    // Paper start
++    public void setFoil(boolean foil) {
++        this.entityData.set(ThrownTrident.ID_FOIL, foil);
++    }
++
++    public int getLoyalty() {
++        return this.entityData.get(ThrownTrident.ID_LOYALTY);
++    }
++
++    public void setLoyalty(byte loyalty) {
++        this.entityData.set(ThrownTrident.ID_LOYALTY, loyalty);
++    }
++    // Paper end
++
+     @Nullable
+     @Override
+     protected EntityHitResult findHitEntity(Vec3 currentPosition, Vec3 nextPosition) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 index 254d4f2e45d7c8f572a4368eccd84560d4d0d836..299ab868252c8f326e3a56e878c9ee230c9635dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
@@ -123,6 +196,39 @@ index a4f909123de26d911aea7cd767d2315ed1f697c9..0eee53c068bca070a86645d0ba54fb1a
 +    }
 +    // Paper End - More cat api
  }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
+index ae669a970aa1f17ed786640de8a481364543c58e..acdc4e578d70f8121c8c6be7682ba1ecef7687cf 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
+@@ -39,6 +39,28 @@ public class CraftEnderman extends CraftMonster implements Enderman {
+         this.getHandle().setCarriedBlock(blockData == null ? null : ((CraftBlockData) blockData).getState());
+     }
+ 
++    // Paper start
++    @Override
++    public boolean isScreaming() {
++        return this.getHandle().isCreepy();
++    }
++
++    @Override
++    public void setScreaming(boolean screaming) {
++        this.getHandle().setCreepy(screaming);
++    }
++
++    @Override
++    public boolean hasBeenStaredAt() {
++        return this.getHandle().hasBeenStaredAt();
++    }
++
++    @Override
++    public void setHasBeenStaredAt(boolean hasBeenStaredAt) {
++        this.getHandle().setHasBeenStaredAt(hasBeenStaredAt);
++    }
++    // Paper end
++
+     @Override
+     public EnderMan getHandle() {
+         return (EnderMan) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
 index b647a5b9fdc1da61c4035d6f2cef7814033dc608..9795341efa748c2d94567e882cd5f26adf0f1591 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
@@ -287,3 +393,113 @@ index 2d2620dbb16aec850e8afda02174508a4be5a313..ba4e6deaaa725296be830324d2c64868
  
      public static Gene fromNms(net.minecraft.world.entity.animal.Panda.Gene gene) {
          Preconditions.checkArgument(gene != null, "Gene may not be null");
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java
+index da1488c9cae53bd554727c850da2192adda2478a..30a0eac179c86b0fe94a2a40b5bfcd3eee01e53b 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java
+@@ -23,4 +23,16 @@ public class CraftPolarBear extends CraftAnimals implements PolarBear {
+     public EntityType getType() {
+         return EntityType.POLAR_BEAR;
+     }
++
++    // Paper start
++    @Override
++    public boolean isStanding() {
++        return this.getHandle().isStanding();
++    }
++
++    @Override
++    public void setStanding(boolean standing) {
++        this.getHandle().setStanding(standing);
++    }
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java
+index 27a8a2b1e03254b1fc6fe8edc3ff77841a42f5f6..8d77b870fd9de69b57ae1affdfbd2a02f62e75c7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java
+@@ -58,4 +58,16 @@ public abstract class CraftRaider extends CraftMonster implements Raider {
+     public void setCanJoinRaid(boolean join) {
+         this.getHandle().setCanJoinRaid(join);
+     }
++
++    // Paper start
++    @Override
++    public boolean isCelebrating() {
++        return this.getHandle().isCelebrating();
++    }
++
++    @Override
++    public void setCelebrating(boolean celebrating) {
++        this.getHandle().setCelebrating(celebrating);
++    }
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
+index bf5b2fd6676c4430578db4cc6c603c501cc5e349..832981b07ef5c633ef00a382f56798ee87eec0df 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
+@@ -37,4 +37,27 @@ public class CraftTrident extends CraftArrow implements Trident {
+     public EntityType getType() {
+         return EntityType.TRIDENT;
+     }
++
++    // Paper start
++    @Override
++    public boolean hasGlint() {
++        return this.getHandle().isFoil();
++    }
++
++    @Override
++    public void setGlint(boolean glint) {
++        this.getHandle().setFoil(glint);
++    }
++
++    @Override
++    public int getLoyaltyLevel() {
++        return this.getHandle().getLoyalty();
++    }
++
++    @Override
++    public void setLoyaltyLevel(int loyaltyLevel) {
++        com.google.common.base.Preconditions.checkArgument(loyaltyLevel >= 0 && loyaltyLevel <= 127, "The loyalty level has to be between 0 and 127");
++        this.getHandle().setLoyalty((byte) loyaltyLevel);
++    }
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
+index 640b0860fbe3412da32d03187e6f355ba8f099ea..299d5e47489cfe489ac130a33a08cdb29ba76d72 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
+@@ -38,4 +38,31 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok
+     public BossBar getBossBar() {
+         return this.bossBar;
+     }
++
++    // Paper start
++    @Override
++    public boolean isCharged() {
++        return getHandle().isPowered();
++    }
++
++    @Override
++    public int getInvulnerableTicks() {
++        return getHandle().getInvulnerableTicks();
++    }
++
++    @Override
++    public void setInvulnerableTicks(int ticks) {
++        getHandle().setInvulnerableTicks(ticks);
++    }
++
++    @Override
++    public boolean canTravelThroughPortals() {
++        return getHandle().canChangeDimensions();
++    }
++
++    @Override
++    public void setCanTravelThroughPortals(boolean value) {
++        getHandle().setCanTravelThroughPortals(value);
++    }
++    // Paper end
+ }
diff --git a/patches/server/0684-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0683-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 61eab94f77..61eab94f77 100644
--- a/patches/server/0684-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0683-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0685-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0684-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 179e878420..179e878420 100644
--- a/patches/server/0685-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0684-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0686-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0685-Use-getChunkIfLoadedImmediately-in-places.patch
index 99213d6d81..99213d6d81 100644
--- a/patches/server/0686-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0685-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0687-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0686-Fix-commands-from-signs-not-firing-command-events.patch
index ae4da58c6b..ae4da58c6b 100644
--- a/patches/server/0687-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0686-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0688-Adds-PlayerArmSwingEvent.patch b/patches/server/0687-Adds-PlayerArmSwingEvent.patch
index 0ac17873c1..0ac17873c1 100644
--- a/patches/server/0688-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0687-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0689-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch
index 316e9e0de5..316e9e0de5 100644
--- a/patches/server/0689-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0690-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0689-Add-config-for-mobs-immune-to-default-effects.patch
index 1119d3551b..1119d3551b 100644
--- a/patches/server/0690-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0689-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0691-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0690-Fix-incorrect-message-for-outdated-client.patch
index 87ff34d0b8..1b0f3a3869 100644
--- a/patches/server/0691-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0690-Fix-incorrect-message-for-outdated-client.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix incorrect message for outdated client
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 97ee159867c4800c8fdec9a5fa42f648112be186..150050fb343ef6119204b7d5220207765a6937bc 100644
+index e76b9670213de966ee275e624e7ee5f673d3f210..e8a79277f3e57bc82d67ada6543c7f8665311bd3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -81,7 +81,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0692-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0691-Don-t-apply-cramming-damage-to-players.patch
index 2e2e9543af..2e2e9543af 100644
--- a/patches/server/0692-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0691-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0693-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0692-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 95d554e0ea..95d554e0ea 100644
--- a/patches/server/0693-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0692-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0694-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0693-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 8e69a76f25..8e69a76f25 100644
--- a/patches/server/0694-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0693-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0695-Stinger-API.patch b/patches/server/0694-Stinger-API.patch
index 33f8959315..33f8959315 100644
--- a/patches/server/0695-Stinger-API.patch
+++ b/patches/server/0694-Stinger-API.patch
diff --git a/patches/server/0696-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0695-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index 8d4fe001d2..8d4fe001d2 100644
--- a/patches/server/0696-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0695-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0697-Add-System.out-err-catcher.patch b/patches/server/0696-Add-System.out-err-catcher.patch
index 704b758183..dde83aa3c8 100644
--- a/patches/server/0697-Add-System.out-err-catcher.patch
+++ b/patches/server/0696-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..76d0d00cd6742991e3f3ec827a75ee87
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2256a680d4f53d143e4ebfd82221074a84a86fdc..1b2aec9215d82a8ad60439a8ac38651319c0bdef 100644
+index 99a679945337f412fe7d1c51280b05b5b0bcfb5b..0537f6661b145f4d0f8dd58dde45fb9eebb40561 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -282,6 +282,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0698-Fix-test-not-bootstrapping.patch b/patches/server/0697-Fix-test-not-bootstrapping.patch
index 5d0466c3b3..5d0466c3b3 100644
--- a/patches/server/0698-Fix-test-not-bootstrapping.patch
+++ b/patches/server/0697-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0699-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0698-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 10cd90749d..10cd90749d 100644
--- a/patches/server/0699-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0698-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0700-Improve-boat-collision-performance.patch b/patches/server/0699-Improve-boat-collision-performance.patch
index 24fc315296..24fc315296 100644
--- a/patches/server/0700-Improve-boat-collision-performance.patch
+++ b/patches/server/0699-Improve-boat-collision-performance.patch
diff --git a/patches/server/0701-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0700-Prevent-AFK-kick-while-watching-end-credits.patch
index 44c6dff957..44c6dff957 100644
--- a/patches/server/0701-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0700-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0702-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0701-Allow-skipping-writing-of-comments-to-server.propert.patch
index 6395f3f4a8..6395f3f4a8 100644
--- a/patches/server/0702-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0701-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0703-Add-PlayerSetSpawnEvent.patch b/patches/server/0702-Add-PlayerSetSpawnEvent.patch
index 2b8050b030..2b8050b030 100644
--- a/patches/server/0703-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0702-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0704-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0703-Make-hoppers-respect-inventory-max-stack-size.patch
index ea86736121..ea86736121 100644
--- a/patches/server/0704-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0703-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0705-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0704-Optimize-entity-tracker-passenger-checks.patch
index cf8b4494f3..cf8b4494f3 100644
--- a/patches/server/0705-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0704-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0706-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0705-Config-option-for-Piglins-guarding-chests.patch
index 4134b7a5f1..4134b7a5f1 100644
--- a/patches/server/0706-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0705-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0707-Added-EntityDamageItemEvent.patch b/patches/server/0706-Added-EntityDamageItemEvent.patch
index 0f5056e7ce..0f5056e7ce 100644
--- a/patches/server/0707-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0706-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0708-Optimize-indirect-passenger-iteration.patch b/patches/server/0707-Optimize-indirect-passenger-iteration.patch
index 3f6f8f2a1f..3f6f8f2a1f 100644
--- a/patches/server/0708-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0707-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0709-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0708-Fix-block-drops-position-losing-precision-millions-o.patch
index a32af5a891..a32af5a891 100644
--- a/patches/server/0709-Fix-block-drops-position-losing-precision-millions-o.patch
+++ b/patches/server/0708-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0710-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0709-Configurable-item-frame-map-cursor-update-interval.patch
index 8378741c11..8378741c11 100644
--- a/patches/server/0710-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0709-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0711-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0710-Make-EntityUnleashEvent-cancellable.patch
index 2d8246afff..2d8246afff 100644
--- a/patches/server/0711-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0710-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0712-Clear-bucket-NBT-after-dispense.patch b/patches/server/0711-Clear-bucket-NBT-after-dispense.patch
index 50f3155d75..50f3155d75 100644
--- a/patches/server/0712-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0711-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0713-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0712-Respect-despawn-rate-in-item-merge-check.patch
index 8967390e3e..8967390e3e 100644
--- a/patches/server/0713-Respect-despawn-rate-in-item-merge-check.patch
+++ b/patches/server/0712-Respect-despawn-rate-in-item-merge-check.patch
diff --git a/patches/server/0714-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0713-Change-EnderEye-target-without-changing-other-things.patch
index e4af6267df..e4af6267df 100644
--- a/patches/server/0714-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0713-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0715-Add-BlockBreakBlockEvent.patch b/patches/server/0714-Add-BlockBreakBlockEvent.patch
index b7f264d94f..b7f264d94f 100644
--- a/patches/server/0715-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0714-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0716-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0715-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 14e666a79e..14e666a79e 100644
--- a/patches/server/0716-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0715-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0717-More-CommandBlock-API.patch b/patches/server/0716-More-CommandBlock-API.patch
index daf682f8a0..daf682f8a0 100644
--- a/patches/server/0717-More-CommandBlock-API.patch
+++ b/patches/server/0716-More-CommandBlock-API.patch
diff --git a/patches/server/0718-Add-missing-team-sidebar-display-slots.patch b/patches/server/0717-Add-missing-team-sidebar-display-slots.patch
index 5581728a48..5581728a48 100644
--- a/patches/server/0718-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0717-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0719-Add-back-EntityPortalExitEvent.patch b/patches/server/0718-Add-back-EntityPortalExitEvent.patch
index a44e713ebd..a44e713ebd 100644
--- a/patches/server/0719-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0718-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0720-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0719-Add-methods-to-find-targets-for-lightning-strikes.patch
index 742d7716ff..742d7716ff 100644
--- a/patches/server/0720-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0719-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0721-Get-entity-default-attributes.patch b/patches/server/0720-Get-entity-default-attributes.patch
index 6ae983a717..6ae983a717 100644
--- a/patches/server/0721-Get-entity-default-attributes.patch
+++ b/patches/server/0720-Get-entity-default-attributes.patch
diff --git a/patches/server/0722-Left-handed-API.patch b/patches/server/0721-Left-handed-API.patch
index dd1acc7723..dd1acc7723 100644
--- a/patches/server/0722-Left-handed-API.patch
+++ b/patches/server/0721-Left-handed-API.patch
diff --git a/patches/server/0723-Add-advancement-display-API.patch b/patches/server/0722-Add-advancement-display-API.patch
index c2bd6b94c0..c2bd6b94c0 100644
--- a/patches/server/0723-Add-advancement-display-API.patch
+++ b/patches/server/0722-Add-advancement-display-API.patch
diff --git a/patches/server/0724-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0723-Add-ItemFactory-getMonsterEgg-API.patch
index f22d19fef2..f22d19fef2 100644
--- a/patches/server/0724-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/server/0723-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0725-Add-critical-damage-API.patch b/patches/server/0724-Add-critical-damage-API.patch
index ca4be99b06..ca4be99b06 100644
--- a/patches/server/0725-Add-critical-damage-API.patch
+++ b/patches/server/0724-Add-critical-damage-API.patch
diff --git a/patches/server/0726-Fix-issues-with-mob-conversion.patch b/patches/server/0725-Fix-issues-with-mob-conversion.patch
index 69feb4b3a4..69feb4b3a4 100644
--- a/patches/server/0726-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0725-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0727-Add-isCollidable-methods-to-various-places.patch b/patches/server/0726-Add-isCollidable-methods-to-various-places.patch
index 6e08b33501..6e08b33501 100644
--- a/patches/server/0727-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0726-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0728-Goat-ram-API.patch b/patches/server/0727-Goat-ram-API.patch
index f1fcff3a29..f1fcff3a29 100644
--- a/patches/server/0728-Goat-ram-API.patch
+++ b/patches/server/0727-Goat-ram-API.patch
diff --git a/patches/server/0729-Add-API-for-resetting-a-single-score.patch b/patches/server/0728-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9..c2e1fd93b9 100644
--- a/patches/server/0729-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0728-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0730-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0729-Add-Raw-Byte-Entity-Serialization.patch
index 39fb7967f8..d7e938d57a 100644
--- a/patches/server/0730-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0729-Add-Raw-Byte-Entity-Serialization.patch
@@ -45,7 +45,7 @@ index 23f3acdc37968ec76ffb57e022755c97ff02ff67..9e5f338d0bb64ac47a99cd08a2ab083d
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index a451cbbff84b8f156ba4de807f4927f7645c3363..e504554e606788b66725edb0ce98d3d6246e4fac 100644
+index 17e67d32522ddeb9a8db06089fb7b7f3ed894d4d..bda04a3a7865cfaf6eff7a40b3f12fa3145771e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -457,6 +457,30 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0731-Vanilla-command-permission-fixes.patch b/patches/server/0730-Vanilla-command-permission-fixes.patch
index d9b53520f4..d9b53520f4 100644
--- a/patches/server/0731-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0730-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0732-Make-CallbackExecutor-strict-again.patch b/patches/server/0731-Make-CallbackExecutor-strict-again.patch
index b1f2cffeba..d2fcbba34f 100644
--- a/patches/server/0732-Make-CallbackExecutor-strict-again.patch
+++ b/patches/server/0731-Make-CallbackExecutor-strict-again.patch
@@ -10,7 +10,7 @@ schedules. Effectively, use the callback executor as a tool of
 finding issues rather than hiding these issues.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 4f7894d9458733a5bf42e6d1094db2aaf5ae8ea0..7595f2bd6b26946e9f437dbd962a3b23e95a52b6 100644
+index 9d9312cb8e9681428f7ab1b1e6eb803fc558d651..edb35a483ae44073d560df1fe949aad60bf3d39d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -164,17 +164,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0733-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0732-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
index d2c7c618d7..d2c7c618d7 100644
--- a/patches/server/0733-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
+++ b/patches/server/0732-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0734-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0733-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index b4e5807041..b4e5807041 100644
--- a/patches/server/0734-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0733-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0735-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0734-Correctly-handle-recursion-for-chunkholder-updates.patch
index 48e805996a..48e805996a 100644
--- a/patches/server/0735-Correctly-handle-recursion-for-chunkholder-updates.patch
+++ b/patches/server/0734-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0736-Separate-lookup-locking-from-state-access-in-UserCac.patch b/patches/server/0735-Separate-lookup-locking-from-state-access-in-UserCac.patch
index 86c0e502fd..86c0e502fd 100644
--- a/patches/server/0736-Separate-lookup-locking-from-state-access-in-UserCac.patch
+++ b/patches/server/0735-Separate-lookup-locking-from-state-access-in-UserCac.patch
diff --git a/patches/server/0737-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0736-Fix-chunks-refusing-to-unload-at-low-TPS.patch
index 0ea9e0770d..0ea9e0770d 100644
--- a/patches/server/0737-Fix-chunks-refusing-to-unload-at-low-TPS.patch
+++ b/patches/server/0736-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0737-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
index a057742e50..477937d99b 100644
--- a/patches/server/0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
+++ b/patches/server/0737-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
@@ -8,7 +8,7 @@ Sync loading the chunk at this stage would cause it to load
 older data, as well as screwing our region state.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5602576dd8aea04fc233a801cce9bc14d27a55ec..3dc7e0188bc279f640e0c9655e49e85624742e85 100644
+index fdfac353fe9cf8509a08b5157ed0762c3a12f3e3..33eebcd8f3459fcdc51c0a327563a1abc3c1d432 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -313,6 +313,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0739-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0738-Do-not-allow-ticket-level-changes-when-updating-chun.patch
index d0f51016fc..d0f51016fc 100644
--- a/patches/server/0739-Do-not-allow-ticket-level-changes-when-updating-chun.patch
+++ b/patches/server/0738-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0740-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0739-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index 7654abc8b4..7654abc8b4 100644
--- a/patches/server/0740-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/server/0739-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0741-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0740-Log-when-the-async-catcher-is-tripped.patch
index bede76faf6..bede76faf6 100644
--- a/patches/server/0741-Log-when-the-async-catcher-is-tripped.patch
+++ b/patches/server/0740-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0742-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0741-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 906528460b..f36284ae0c 100644
--- a/patches/server/0742-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0741-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -293,7 +293,7 @@ index 1622450b53e0f0f48c3ca107e4d705b4ad29dadf..f6a225eed29eed364b7e2ea6bc85d55d
      public static void spawnCategoryForChunk(MobCategory group, ServerLevel world, LevelChunk chunk, NaturalSpawner.SpawnPredicate checker, NaturalSpawner.AfterSpawnCallback runner) {
          spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1b2aec9215d82a8ad60439a8ac38651319c0bdef..492f398a1c2dbe7b821dd40be1c1c6952f056c3a 100644
+index 0537f6661b145f4d0f8dd58dde45fb9eebb40561..eb3e8256f2ce62e1a2354c902226846c96b16ed9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2137,6 +2137,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0743-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0742-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
index e2c4416234..e2c4416234 100644
--- a/patches/server/0743-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
+++ b/patches/server/0742-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/0744-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0743-Sanitize-ResourceLocation-error-logging.patch
index ff7e0b7826..ff7e0b7826 100644
--- a/patches/server/0744-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0743-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0745-Optimise-general-POI-access.patch b/patches/server/0744-Optimise-general-POI-access.patch
index 7fa35796de..7fa35796de 100644
--- a/patches/server/0745-Optimise-general-POI-access.patch
+++ b/patches/server/0744-Optimise-general-POI-access.patch
diff --git a/patches/server/0746-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0745-Allow-controlled-flushing-for-network-manager.patch
index 9b061bed55..9b061bed55 100644
--- a/patches/server/0746-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/server/0745-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0747-Add-more-async-catchers.patch b/patches/server/0746-Add-more-async-catchers.patch
index f0813b3370..f0813b3370 100644
--- a/patches/server/0747-Add-more-async-catchers.patch
+++ b/patches/server/0746-Add-more-async-catchers.patch
diff --git a/patches/server/0748-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0747-Rewrite-entity-bounding-box-lookup-calls.patch
index 0a840e45df..0a840e45df 100644
--- a/patches/server/0748-Rewrite-entity-bounding-box-lookup-calls.patch
+++ b/patches/server/0747-Rewrite-entity-bounding-box-lookup-calls.patch
diff --git a/patches/server/0749-Optimise-chunk-tick-iteration.patch b/patches/server/0748-Optimise-chunk-tick-iteration.patch
index 7485f16502..4e6d8f0cb1 100644
--- a/patches/server/0749-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0748-Optimise-chunk-tick-iteration.patch
@@ -70,7 +70,7 @@ index fbfbe9adeca7364e6346c887616890bf968f38a1..bd43fbc8a93afa7604aa467392520ed7
              int i = 0;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 3dc7e0188bc279f640e0c9655e49e85624742e85..9c55ab3475397040ea3ae4a530c3ee3cb10bb899 100644
+index 33eebcd8f3459fcdc51c0a327563a1abc3c1d432..9b2c5fe2389c6baa239de4f7b479d9ca273e59cf 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -159,6 +159,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0750-Execute-chunk-tasks-mid-tick.patch b/patches/server/0749-Execute-chunk-tasks-mid-tick.patch
index 3705f009e8..3705f009e8 100644
--- a/patches/server/0750-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0749-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0751-Do-not-copy-visible-chunks.patch b/patches/server/0750-Do-not-copy-visible-chunks.patch
index fdcf7f41ba..fdcf7f41ba 100644
--- a/patches/server/0751-Do-not-copy-visible-chunks.patch
+++ b/patches/server/0750-Do-not-copy-visible-chunks.patch
diff --git a/patches/server/0752-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0751-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 5459269b64..5459269b64 100644
--- a/patches/server/0752-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0751-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0753-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0752-Custom-table-implementation-for-blockstate-state-loo.patch
index 9b556d7fe8..9b556d7fe8 100644
--- a/patches/server/0753-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0752-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0754-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0753-Detail-more-information-in-watchdog-dumps.patch
index 7d2d44d42b..7d2d44d42b 100644
--- a/patches/server/0754-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0753-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0755-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0754-Manually-inline-methods-in-BlockPosition.patch
index 6668339cba..6668339cba 100644
--- a/patches/server/0755-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0754-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0756-Distance-manager-tick-timings.patch b/patches/server/0755-Distance-manager-tick-timings.patch
index 69c8bf095e..69c8bf095e 100644
--- a/patches/server/0756-Distance-manager-tick-timings.patch
+++ b/patches/server/0755-Distance-manager-tick-timings.patch
diff --git a/patches/server/0757-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0756-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 7d081ee195..7d081ee195 100644
--- a/patches/server/0757-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0756-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0758-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0757-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index c3f6182749..c3f6182749 100644
--- a/patches/server/0758-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0757-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0759-Add-packet-limiter-config.patch b/patches/server/0758-Add-packet-limiter-config.patch
index 4647b9c71b..bd4772cc73 100644
--- a/patches/server/0759-Add-packet-limiter-config.patch
+++ b/patches/server/0758-Add-packet-limiter-config.patch
@@ -24,7 +24,7 @@ and an action can be defined: DROP or KICK
 If interval or rate are less-than 0, the limit is ignored
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b33ece9a98f94d0c09b837bc95dbfab82ff6cabe..52dcb9d05dd6ca449850b6ad3c50d8f4192f13bb 100644
+index 86cd1409de5d367e9c48460c1b5bcc1554ecfa98..1636a937ee29940954e4ce8dc7667cdd72c5ac68 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -519,4 +519,102 @@ public class PaperConfig {
diff --git a/patches/server/0760-Lag-compensate-block-breaking.patch b/patches/server/0759-Lag-compensate-block-breaking.patch
index ca2395eead..c4b6860616 100644
--- a/patches/server/0760-Lag-compensate-block-breaking.patch
+++ b/patches/server/0759-Lag-compensate-block-breaking.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Lag compensate block breaking
 Use time instead of ticks if ticks fall behind
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 52dcb9d05dd6ca449850b6ad3c50d8f4192f13bb..4444356a6bd44afdbe67593136c18b803a0ddd66 100644
+index 1636a937ee29940954e4ce8dc7667cdd72c5ac68..b2a5735c7f9f6d266c7c70325255465b0399fd15 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -617,4 +617,10 @@ public class PaperConfig {
diff --git a/patches/server/0761-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0760-Use-correct-LevelStem-registry-when-loading-default-.patch
index cea585163e..53e2e20e8f 100644
--- a/patches/server/0761-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/server/0760-Use-correct-LevelStem-registry-when-loading-default-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use correct LevelStem registry when loading default
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f37dfe1bd53567239bf69852e75f09440dc1628c..a9fce6bd112c06453b7f460f3d746e290dca5f4a 100644
+index ee33fd892e97e1ffea259a4f7974675923377d6b..dff3ce704d44d13a250b9a6ae1ec1768e4a8187a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -565,7 +565,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0762-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0761-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index c5bd6526f7..c5bd6526f7 100644
--- a/patches/server/0762-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0761-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0763-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0762-Consolidate-flush-calls-for-entity-tracker-packets.patch
index 4669941fb1..4669941fb1 100644
--- a/patches/server/0763-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/server/0762-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0764-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0763-Don-t-lookup-fluid-state-when-raytracing.patch
index eef7de0e32..eef7de0e32 100644
--- a/patches/server/0764-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0763-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0765-Time-scoreboard-search.patch b/patches/server/0764-Time-scoreboard-search.patch
index 48469b83af..48469b83af 100644
--- a/patches/server/0765-Time-scoreboard-search.patch
+++ b/patches/server/0764-Time-scoreboard-search.patch
diff --git a/patches/server/0766-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0765-Send-full-pos-packets-for-hard-colliding-entities.patch
index 87d034b685..8041aebdcf 100644
--- a/patches/server/0766-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0765-Send-full-pos-packets-for-hard-colliding-entities.patch
@@ -9,7 +9,7 @@ Configurable under
 `send-full-pos-for-hard-colliding-entities`
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 4444356a6bd44afdbe67593136c18b803a0ddd66..8c2065a906d9ad8bd0b480a675b76b38680088e0 100644
+index b2a5735c7f9f6d266c7c70325255465b0399fd15..0c5cb5251f9a3379a4c8bc21b3c87e71232e97e6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -623,4 +623,10 @@ public class PaperConfig {
diff --git a/patches/server/0767-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0766-Do-not-run-raytrace-logic-for-AIR.patch
index baedf55a9d..baedf55a9d 100644
--- a/patches/server/0767-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0766-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0768-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0767-Oprimise-map-impl-for-tracked-players.patch
index 7ee2e496b9..7ee2e496b9 100644
--- a/patches/server/0768-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0767-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0769-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0768-Optimise-BlockSoil-nearby-water-lookup.patch
index f3fe0f0f17..f3fe0f0f17 100644
--- a/patches/server/0769-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0768-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0770-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0769-Allow-removal-addition-of-entities-to-entity-ticklis.patch
index d68c8524e7..d68c8524e7 100644
--- a/patches/server/0770-Allow-removal-addition-of-entities-to-entity-ticklis.patch
+++ b/patches/server/0769-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0771-Optimise-random-block-ticking.patch b/patches/server/0770-Optimise-random-block-ticking.patch
index 1d0d60fbe6..1d0d60fbe6 100644
--- a/patches/server/0771-Optimise-random-block-ticking.patch
+++ b/patches/server/0770-Optimise-random-block-ticking.patch
diff --git a/patches/server/0772-Optimise-non-flush-packet-sending.patch b/patches/server/0771-Optimise-non-flush-packet-sending.patch
index f4d6e1b6b4..f4d6e1b6b4 100644
--- a/patches/server/0772-Optimise-non-flush-packet-sending.patch
+++ b/patches/server/0771-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0773-Optimise-nearby-player-lookups.patch b/patches/server/0772-Optimise-nearby-player-lookups.patch
index fe7448ae4f..f552ae79f5 100644
--- a/patches/server/0773-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0772-Optimise-nearby-player-lookups.patch
@@ -39,7 +39,7 @@ index bd43fbc8a93afa7604aa467392520ed7b30a1d83..1a7fc533afced7235162f81b2de8148c
      // Paper end - optimise anyPlayerCloseEnoughForSpawning
      long lastAutoSaveTime; // Paper - incremental autosave
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 34847448b9808dc52deb76f654fa2797adea25d9..9a269f0ab59b4ea2ce01957f89677d2f304ebf02 100644
+index af9b1fe737ab430861b4d0de33eec1325964c3a5..43373e6bbe20e467043e750e0d7a11cd5a0ea1bc 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -164,6 +164,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0774-Optimise-WorldServer-notify.patch b/patches/server/0773-Optimise-WorldServer-notify.patch
index a84a979c64..a84a979c64 100644
--- a/patches/server/0774-Optimise-WorldServer-notify.patch
+++ b/patches/server/0773-Optimise-WorldServer-notify.patch
diff --git a/patches/server/0775-Remove-streams-for-villager-AI.patch b/patches/server/0774-Remove-streams-for-villager-AI.patch
index 8257c2de40..8257c2de40 100644
--- a/patches/server/0775-Remove-streams-for-villager-AI.patch
+++ b/patches/server/0774-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0776-Rewrite-dataconverter-system.patch b/patches/server/0775-Rewrite-dataconverter-system.patch
index 89bdb29386..89bdb29386 100644
--- a/patches/server/0776-Rewrite-dataconverter-system.patch
+++ b/patches/server/0775-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0777-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0776-Use-Velocity-compression-and-cipher-natives.patch
index cb29c8b7b1..cb29c8b7b1 100644
--- a/patches/server/0777-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0776-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0778-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0777-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 5103d7a24c..5103d7a24c 100644
--- a/patches/server/0778-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0777-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0779-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0778-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
index 5c0a433617..5c0a433617 100644
--- a/patches/server/0779-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
+++ b/patches/server/0778-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
diff --git a/patches/server/0780-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0779-Async-catch-modifications-to-critical-entity-state.patch
index 305329fc53..305329fc53 100644
--- a/patches/server/0780-Async-catch-modifications-to-critical-entity-state.patch
+++ b/patches/server/0779-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0781-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0780-Fix-Bukkit-NamespacedKey-shenanigans.patch
index 8f152dd0e7..8f152dd0e7 100644
--- a/patches/server/0781-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0780-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0782-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0781-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 8dfad9ab0f..8dfad9ab0f 100644
--- a/patches/server/0782-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0781-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0783-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0782-Check-requirement-before-suggesting-root-nodes.patch
index da19d3f1ca..da19d3f1ca 100644
--- a/patches/server/0783-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0782-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0784-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0783-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 5f48d6b3b1..5f48d6b3b1 100644
--- a/patches/server/0784-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0783-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0785-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0784-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 31e987614a..31e987614a 100644
--- a/patches/server/0785-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0784-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0786-Ensure-valid-vehicle-status.patch b/patches/server/0785-Ensure-valid-vehicle-status.patch
index 5715c2ca86..5715c2ca86 100644
--- a/patches/server/0786-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0785-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0787-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0786-Prevent-softlocked-end-exit-portal-generation.patch
index 855c2ec833..855c2ec833 100644
--- a/patches/server/0787-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0786-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0788-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0787-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 2ce994e362..2ce994e362 100644
--- a/patches/server/0788-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0787-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0789-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0788-Don-t-log-debug-logging-being-disabled.patch
index 5bec880eb8..5bec880eb8 100644
--- a/patches/server/0789-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0788-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0790-Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/server/0789-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
index a29e839964..a29e839964 100644
--- a/patches/server/0790-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
+++ b/patches/server/0789-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
diff --git a/patches/server/0791-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0790-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0791-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0790-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0792-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0791-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
index 9672075382..dad671a3bd 100644
--- a/patches/server/0792-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
+++ b/patches/server/0791-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
@@ -12,7 +12,7 @@ time to save, as flush saving performs a full flush at
 the end anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b6a17bb19a45ccd4bfc4be5f177a792a9a3727f5..09d266afc606817309ba0ca795f0d86fff1fc127 100644
+index 952286cca1ce9e893f4a9e5939c552efe975abb4..9ba13ee1df980b9bd5318cefeb3412a8923b66a3 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -928,6 +928,16 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0793-Preserve-overstacked-loot.patch b/patches/server/0792-Preserve-overstacked-loot.patch
index 2d41e5c253..2d41e5c253 100644
--- a/patches/server/0793-Preserve-overstacked-loot.patch
+++ b/patches/server/0792-Preserve-overstacked-loot.patch
diff --git a/patches/server/0794-Update-head-rotation-in-missing-places.patch b/patches/server/0793-Update-head-rotation-in-missing-places.patch
index 2dd4efaae9..2dd4efaae9 100644
--- a/patches/server/0794-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0793-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0795-prevent-unintended-light-block-manipulation.patch b/patches/server/0794-prevent-unintended-light-block-manipulation.patch
index 08bd6164f5..08bd6164f5 100644
--- a/patches/server/0795-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0794-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0796-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch b/patches/server/0795-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
index 89603862f0..89603862f0 100644
--- a/patches/server/0796-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
+++ b/patches/server/0795-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
diff --git a/patches/server/0797-Fix-CraftCriteria-defaults-map.patch b/patches/server/0796-Fix-CraftCriteria-defaults-map.patch
index 11fce3ca24..11fce3ca24 100644
--- a/patches/server/0797-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0796-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0798-Fix-upstreams-block-state-factories.patch b/patches/server/0797-Fix-upstreams-block-state-factories.patch
index 4a88c25608..4a88c25608 100644
--- a/patches/server/0798-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0797-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0799-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0798-Add-config-option-for-logging-player-ip-addresses.patch
index cc81a11fff..b9207d7268 100644
--- a/patches/server/0799-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0798-Add-config-option-for-logging-player-ip-addresses.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for logging player ip addresses
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 8c2065a906d9ad8bd0b480a675b76b38680088e0..3916d3e7773f4a3b6d5c5347d6a12a707bffcdad 100644
+index 0c5cb5251f9a3379a4c8bc21b3c87e71232e97e6..6223c90932338070294e2241345ac76ef40d3412 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -91,6 +91,11 @@ public class PaperConfig {
diff --git a/patches/server/0800-Configurable-feature-seeds.patch b/patches/server/0799-Configurable-feature-seeds.patch
index 9a732207ea..9a732207ea 100644
--- a/patches/server/0800-Configurable-feature-seeds.patch
+++ b/patches/server/0799-Configurable-feature-seeds.patch
diff --git a/patches/server/0801-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0800-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
index 6e33709dbe..6e33709dbe 100644
--- a/patches/server/0801-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ b/patches/server/0800-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0802-Add-root-admin-user-detection.patch b/patches/server/0801-Add-root-admin-user-detection.patch
index 86c355de50..86c355de50 100644
--- a/patches/server/0802-Add-root-admin-user-detection.patch
+++ b/patches/server/0801-Add-root-admin-user-detection.patch
diff --git a/patches/server/0803-Always-allow-item-changing-in-Fireball.patch b/patches/server/0802-Always-allow-item-changing-in-Fireball.patch
index fe4cbf2ef1..fe4cbf2ef1 100644
--- a/patches/server/0803-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0802-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0804-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0803-don-t-attempt-to-teleport-dead-entities.patch
index 0d78c1bee5..0d78c1bee5 100644
--- a/patches/server/0804-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0803-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0805-Fix-anvil-prepare-event-not-working-with-zero-xp.patch b/patches/server/0804-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
index efa5aa2399..efa5aa2399 100644
--- a/patches/server/0805-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
+++ b/patches/server/0804-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
diff --git a/patches/server/0806-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0805-Prevent-excessive-velocity-through-repeated-crits.patch
index 4304993831..4304993831 100644
--- a/patches/server/0806-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0805-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0807-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0806-Remove-client-side-code-using-deprecated-for-removal.patch
index a11975f1ad..a11975f1ad 100644
--- a/patches/server/0807-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0806-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0808-Rewrite-the-light-engine.patch b/patches/server/0807-Rewrite-the-light-engine.patch
index a558bbc963..0ecc63685e 100644
--- a/patches/server/0808-Rewrite-the-light-engine.patch
+++ b/patches/server/0807-Rewrite-the-light-engine.patch
@@ -4432,7 +4432,7 @@ index 1a7fc533afced7235162f81b2de8148cef05414a..36b6e7295cf7484675c8c2b9624c1f6f
      private final DebugBuffer<ChunkHolder.ChunkSaveDebug> chunkToSaveHistory;
      public int oldTicketLevel;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 09d266afc606817309ba0ca795f0d86fff1fc127..24b2191d0d0e88b701492f4f42e31745f28975d2 100644
+index 9ba13ee1df980b9bd5318cefeb3412a8923b66a3..78aab9174f8359ffc38fb5a79930e541b5cd419e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -133,7 +133,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0809-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0808-Always-parse-protochunk-light-sources-unless-it-is-m.patch
index a1b655d7c1..a1b655d7c1 100644
--- a/patches/server/0809-Always-parse-protochunk-light-sources-unless-it-is-m.patch
+++ b/patches/server/0808-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0810-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0809-Fix-removing-recipes-from-RecipeIterator.patch
index 5784fd4dc3..5784fd4dc3 100644
--- a/patches/server/0810-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0809-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0811-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0810-Prevent-sending-oversized-item-data-in-equipment-and.patch
index e35fbc79b1..e35fbc79b1 100644
--- a/patches/server/0811-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0810-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0812-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0811-Hide-unnecessary-itemmeta-from-clients.patch
index 9231e57b2b..9231e57b2b 100644
--- a/patches/server/0812-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0811-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0813-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0812-Fix-kelp-modifier-changing-growth-for-other-crops.patch
index da0f208d4e..da0f208d4e 100644
--- a/patches/server/0813-Fix-kelp-modifier-changing-growth-for-other-crops.patch
+++ b/patches/server/0812-Fix-kelp-modifier-changing-growth-for-other-crops.patch
diff --git a/patches/server/0814-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0813-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 0e41fd2743..0e41fd2743 100644
--- a/patches/server/0814-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0813-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0815-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0814-Add-PlayerItemFrameChangeEvent.patch
index 464f2144c1..464f2144c1 100644
--- a/patches/server/0815-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0814-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0816-Add-player-health-update-API.patch b/patches/server/0815-Add-player-health-update-API.patch
index 133c17a922..133c17a922 100644
--- a/patches/server/0816-Add-player-health-update-API.patch
+++ b/patches/server/0815-Add-player-health-update-API.patch
diff --git a/patches/server/0817-Optimize-HashMapPalette.patch b/patches/server/0816-Optimize-HashMapPalette.patch
index ef1880895f..ef1880895f 100644
--- a/patches/server/0817-Optimize-HashMapPalette.patch
+++ b/patches/server/0816-Optimize-HashMapPalette.patch
diff --git a/patches/server/0818-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0817-Allow-delegation-to-vanilla-chunk-gen.patch
index fd3b042044..13bdd0f1d7 100644
--- a/patches/server/0818-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0817-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 492f398a1c2dbe7b821dd40be1c1c6952f056c3a..fba20c4228a34d4c956ce2a440eb6e495182f8f2 100644
+index eb3e8256f2ce62e1a2354c902226846c96b16ed9..e6163f2eab88fd1d77d5fb4878e2913c25df862c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2305,6 +2305,90 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0819-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0818-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 99a5334c59..99a5334c59 100644
--- a/patches/server/0819-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0818-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0820-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0819-Optimise-collision-checking-in-player-move-packet-ha.patch
index f33b2ef6aa..f33b2ef6aa 100644
--- a/patches/server/0820-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0819-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0821-Actually-unload-POI-data.patch b/patches/server/0820-Actually-unload-POI-data.patch
index a9863251a5..b23193ed6b 100644
--- a/patches/server/0821-Actually-unload-POI-data.patch
+++ b/patches/server/0820-Actually-unload-POI-data.patch
@@ -10,7 +10,7 @@ This patch also prevents the saving/unloading of POI data when
 world saving is disabled.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 24b2191d0d0e88b701492f4f42e31745f28975d2..9f367f3e33c6bad8b9df4f18559ebcd98a97c95c 100644
+index 78aab9174f8359ffc38fb5a79930e541b5cd419e..a29b97f941eadb1ede5db805d32f2917469cccb9 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -848,6 +848,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0822-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0821-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index c03eefb28c..c03eefb28c 100644
--- a/patches/server/0822-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0821-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0823-Update-Log4j.patch b/patches/server/0822-Update-Log4j.patch
index 1b301675ed..1b301675ed 100644
--- a/patches/server/0823-Update-Log4j.patch
+++ b/patches/server/0822-Update-Log4j.patch
diff --git a/patches/server/0824-Add-more-Campfire-API.patch b/patches/server/0823-Add-more-Campfire-API.patch
index 75cef9d65b..75cef9d65b 100644
--- a/patches/server/0824-Add-more-Campfire-API.patch
+++ b/patches/server/0823-Add-more-Campfire-API.patch
diff --git a/patches/server/0825-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0824-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 324e828c7c..324e828c7c 100644
--- a/patches/server/0825-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0824-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0826-Fix-tripwire-state-inconsistency.patch b/patches/server/0825-Fix-tripwire-state-inconsistency.patch
index ef3e8540d4..ef3e8540d4 100644
--- a/patches/server/0826-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0825-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0827-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0826-Fix-fluid-logging-on-Block-breakNaturally.patch
index 3d1428bea5..3d1428bea5 100644
--- a/patches/server/0827-Fix-fluid-logging-on-Block-breakNaturally.patch
+++ b/patches/server/0826-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0828-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0827-Forward-CraftEntity-in-teleport-command.patch
index 9eec59ce99..9eec59ce99 100644
--- a/patches/server/0828-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0827-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0829-Improve-scoreboard-entries.patch b/patches/server/0828-Improve-scoreboard-entries.patch
index 07b32e52e9..ee3bcefafe 100644
--- a/patches/server/0829-Improve-scoreboard-entries.patch
+++ b/patches/server/0828-Improve-scoreboard-entries.patch
@@ -24,7 +24,7 @@ index 6752cd9b3bc246fc2a7764df0d2b40d3e638fa62..c5cf800ab8cbb5ebcf1b06ad591f08be
      public void unregister() throws IllegalStateException {
          CraftScoreboard scoreboard = this.checkState();
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
-index 7b61a2be2be0bdf06592b65be9acd4cbbae5bf7f..152bd54ebd0b0eeee4f3f7faf0c3043d83c01cc1 100644
+index 944080939ceaf2db8bcd7d3c01f4b97440e35cc1..0102c475b6e49777c1e24c32e5eff2992e51c89f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
 @@ -234,4 +234,23 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
diff --git a/patches/server/0830-Entity-powdered-snow-API.patch b/patches/server/0829-Entity-powdered-snow-API.patch
index 7df19b80b9..7df19b80b9 100644
--- a/patches/server/0830-Entity-powdered-snow-API.patch
+++ b/patches/server/0829-Entity-powdered-snow-API.patch
diff --git a/patches/server/0831-Add-API-for-item-entity-health.patch b/patches/server/0830-Add-API-for-item-entity-health.patch
index c475b8fda1..c475b8fda1 100644
--- a/patches/server/0831-Add-API-for-item-entity-health.patch
+++ b/patches/server/0830-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0832-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0831-Fix-entity-type-tags-suggestions-in-selectors.patch
index 8e61b0d569..a007386ad1 100644
--- a/patches/server/0832-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0831-Fix-entity-type-tags-suggestions-in-selectors.patch
@@ -10,7 +10,7 @@ when if this was fixed on the client, that wouldn't be needed.
 Mojira Issue: https://bugs.mojang.com/browse/MC-235045
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3916d3e7773f4a3b6d5c5347d6a12a707bffcdad..04cb8282efae69aa62ae1dad4c39220f658ec575 100644
+index 6223c90932338070294e2241345ac76ef40d3412..d1868e8521ea923587f3364fc83e1aaa98dc0288 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -525,6 +525,11 @@ public class PaperConfig {
diff --git a/patches/server/0833-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0832-Configurable-max-block-light-for-monster-spawning.patch
index 6b5f660377..6b5f660377 100644
--- a/patches/server/0833-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0832-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0834-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0833-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 8ed1ba062d..8ed1ba062d 100644
--- a/patches/server/0834-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0833-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0835-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0834-Load-effect-amplifiers-greater-than-127-correctly.patch
index 83f5b4740d..83f5b4740d 100644
--- a/patches/server/0835-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0834-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0836-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 9f3ee548ee..9f3ee548ee 100644
--- a/patches/server/0836-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0837-Fix-bees-aging-inside-hives.patch b/patches/server/0836-Fix-bees-aging-inside-hives.patch
index c9303da67b..c9303da67b 100644
--- a/patches/server/0837-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0836-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0838-Bucketable-API.patch b/patches/server/0837-Bucketable-API.patch
index ff1194970a..ff1194970a 100644
--- a/patches/server/0838-Bucketable-API.patch
+++ b/patches/server/0837-Bucketable-API.patch
diff --git a/patches/server/0839-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0838-Check-player-world-in-endPortalSoundRadius.patch
index a632d3d594..a632d3d594 100644
--- a/patches/server/0839-Check-player-world-in-endPortalSoundRadius.patch
+++ b/patches/server/0838-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0840-Validate-usernames.patch b/patches/server/0839-Validate-usernames.patch
index 1b417d320d..2b952eef57 100644
--- a/patches/server/0840-Validate-usernames.patch
+++ b/patches/server/0839-Validate-usernames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 04cb8282efae69aa62ae1dad4c39220f658ec575..48eeeb832127f681f6cb8162cbe3954fc14bb47d 100644
+index d1868e8521ea923587f3364fc83e1aaa98dc0288..15ed7b66aefc5665ebbe81dc491f4944269ace14 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -493,6 +493,12 @@ public class PaperConfig {
diff --git a/patches/server/0841-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0840-Fix-saving-configs-with-more-long-comments.patch
index 7d52b01085..7d52b01085 100644
--- a/patches/server/0841-Fix-saving-configs-with-more-long-comments.patch
+++ b/patches/server/0840-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0842-Make-water-animal-spawn-height-configurable.patch b/patches/server/0841-Make-water-animal-spawn-height-configurable.patch
index 70d7bcd1a9..70d7bcd1a9 100644
--- a/patches/server/0842-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0841-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0843-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 3570231be3..ba7ebe0dba 100644
--- a/patches/server/0843-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a9fce6bd112c06453b7f460f3d746e290dca5f4a..7a3ca8968e4d2ea26ed20bb4c8d78ab12ee44258 100644
+index dff3ce704d44d13a250b9a6ae1ec1768e4a8187a..4eafa147edad4fe66fb419635c320a01186e7fea 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -584,7 +584,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index a9fce6bd112c06453b7f460f3d746e290dca5f4a..7a3ca8968e4d2ea26ed20bb4c8d78ab1
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fba20c4228a34d4c956ce2a440eb6e495182f8f2..2e803b3b5356c197be05999e9d4749a94041b258 100644
+index e6163f2eab88fd1d77d5fb4878e2913c25df862c..f4aa3096f8e40ac850caf567a0c14dcba74510ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1210,7 +1210,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0844-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0843-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 052a280f72..268a2c4acb 100644
--- a/patches/server/0844-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0843-Add-config-option-for-worlds-affected-by-time-cmd.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for worlds affected by time cmd
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 48eeeb832127f681f6cb8162cbe3954fc14bb47d..66501c3b0eb92d946ef77bbd3f36ebcc0d3023af 100644
+index 15ed7b66aefc5665ebbe81dc491f4944269ace14..b44d73d86e4105d31c8c8a3cd98661a3ec0adc9c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -645,4 +645,9 @@ public class PaperConfig {
diff --git a/patches/server/0845-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0844-Add-new-overload-to-PersistentDataContainer-has.patch
index d19f7179e1..d19f7179e1 100644
--- a/patches/server/0845-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/server/0844-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0846-Multiple-Entries-with-Scoreboards.patch b/patches/server/0845-Multiple-Entries-with-Scoreboards.patch
index 2f9e8e9118..2f9e8e9118 100644
--- a/patches/server/0846-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0845-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0847-Reset-placed-block-on-exception.patch b/patches/server/0846-Reset-placed-block-on-exception.patch
index 7666ecdfe1..7666ecdfe1 100644
--- a/patches/server/0847-Reset-placed-block-on-exception.patch
+++ b/patches/server/0846-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0848-Add-configurable-height-for-slime-spawn.patch b/patches/server/0847-Add-configurable-height-for-slime-spawn.patch
index 4491816842..4491816842 100644
--- a/patches/server/0848-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0847-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0849-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0848-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index a834180d50..a834180d50 100644
--- a/patches/server/0849-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0848-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0850-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0849-Fix-xp-reward-for-baby-zombies.patch
index 0c5733a372..0c5733a372 100644
--- a/patches/server/0850-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0849-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0851-Kick-on-main-for-illegal-chars.patch b/patches/server/0850-Kick-on-main-for-illegal-chars.patch
index f5c7e34afc..f5c7e34afc 100644
--- a/patches/server/0851-Kick-on-main-for-illegal-chars.patch
+++ b/patches/server/0850-Kick-on-main-for-illegal-chars.patch
diff --git a/patches/server/0852-Multi-Block-Change-API-Implementation.patch b/patches/server/0851-Multi-Block-Change-API-Implementation.patch
index c2863f8ade..c2863f8ade 100644
--- a/patches/server/0852-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0851-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0853-Fix-NotePlayEvent.patch b/patches/server/0852-Fix-NotePlayEvent.patch
index 3d7aa4d732..3d7aa4d732 100644
--- a/patches/server/0853-Fix-NotePlayEvent.patch
+++ b/patches/server/0852-Fix-NotePlayEvent.patch
diff --git a/patches/server/0854-Freeze-Tick-Lock-API.patch b/patches/server/0853-Freeze-Tick-Lock-API.patch
index e3599f4743..e3599f4743 100644
--- a/patches/server/0854-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0853-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0855-Dolphin-API.patch b/patches/server/0854-Dolphin-API.patch
index 4bb12a6785..4bb12a6785 100644
--- a/patches/server/0855-Dolphin-API.patch
+++ b/patches/server/0854-Dolphin-API.patch
diff --git a/patches/server/0856-More-PotionEffectType-API.patch b/patches/server/0855-More-PotionEffectType-API.patch
index 14fb482187..14fb482187 100644
--- a/patches/server/0856-More-PotionEffectType-API.patch
+++ b/patches/server/0855-More-PotionEffectType-API.patch
diff --git a/patches/server/0857-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0856-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 3b79f9947c..3b79f9947c 100644
--- a/patches/server/0857-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0856-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0858-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0857-API-for-creating-command-sender-which-forwards-feedb.patch
index 8123d804ba..aa0eae89a4 100644
--- a/patches/server/0858-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0857-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -123,7 +123,7 @@ index 0000000000000000000000000000000000000000..f7c86155ce0cfd9b4bf8a2b79d77a656
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2e803b3b5356c197be05999e9d4749a94041b258..32bc72e930b5876116a9e7da816ff11d8d44a410 100644
+index f4aa3096f8e40ac850caf567a0c14dcba74510ce..607b44cacb5788128f3546a5cb2671e64a13e7b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1976,6 +1976,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0859-Add-config-for-stronghold-seed.patch b/patches/server/0858-Add-config-for-stronghold-seed.patch
index 80cbff8309..97945d92cf 100644
--- a/patches/server/0859-Add-config-for-stronghold-seed.patch
+++ b/patches/server/0858-Add-config-for-stronghold-seed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for stronghold seed
 
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 6bbec801ecaa37f498d449639ad55626025d705c..2ad0642c97c0d38d401ede432bebac2bbd95166d 100644
+index 8bdf3ec461d870204452833bf6f65fe6c35595d8..ab64f85de0051fdd4ff2eaa376eeabce2670b466 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -223,7 +223,13 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource {
diff --git a/patches/server/0860-Implement-regenerateChunk.patch b/patches/server/0859-Implement-regenerateChunk.patch
index 21a5aa32b4..21a5aa32b4 100644
--- a/patches/server/0860-Implement-regenerateChunk.patch
+++ b/patches/server/0859-Implement-regenerateChunk.patch
diff --git a/patches/server/0861-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0860-Log-exceptions-thrown-during-chat-processing.patch
index 76bdbcdd9c..76bdbcdd9c 100644
--- a/patches/server/0861-Log-exceptions-thrown-during-chat-processing.patch
+++ b/patches/server/0860-Log-exceptions-thrown-during-chat-processing.patch
diff --git a/patches/server/0862-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0861-Fix-cancelled-powdered-snow-bucket-placement.patch
index 9a95fdb1d3..9a95fdb1d3 100644
--- a/patches/server/0862-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0861-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0863-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0862-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index b72e1c19b3..82fcd35c3f 100644
--- a/patches/server/0863-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0862-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 32bc72e930b5876116a9e7da816ff11d8d44a410..3b7b4a578346a162afbeb5781633c163d0c46177 100644
+index 607b44cacb5788128f3546a5cb2671e64a13e7b9..1e7d817479c58c7fc070322328fbff7d0cdc419b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2145,6 +2145,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0864-Add-GameEvent-tags.patch b/patches/server/0863-Add-GameEvent-tags.patch
index ad8dc46e85..ad8dc46e85 100644
--- a/patches/server/0864-Add-GameEvent-tags.patch
+++ b/patches/server/0863-Add-GameEvent-tags.patch
diff --git a/patches/server/0865-Replace-player-chunk-loader-system.patch b/patches/server/0864-Replace-player-chunk-loader-system.patch
index d1e864a14d..010edcd917 100644
--- a/patches/server/0865-Replace-player-chunk-loader-system.patch
+++ b/patches/server/0864-Replace-player-chunk-loader-system.patch
@@ -84,7 +84,7 @@ index 309dbf5fce3ce940d5e1b57d267b9d6b2c5ff5b6..5ba64e1083b7cb1eec64d1925095c6ca
          }));
  
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 66501c3b0eb92d946ef77bbd3f36ebcc0d3023af..153f07bac06093b43a1f5b0f8e1a46ffbe6407e5 100644
+index b44d73d86e4105d31c8c8a3cd98661a3ec0adc9c..c2286c3ef5b997e24dae04e24444b417851de919 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -650,4 +650,33 @@ public class PaperConfig {
diff --git a/patches/server/0866-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0865-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 17181993c9..17181993c9 100644
--- a/patches/server/0866-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0865-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0867-Replace-ticket-level-propagator.patch b/patches/server/0866-Replace-ticket-level-propagator.patch
index 03d6ba0cb1..03d6ba0cb1 100644
--- a/patches/server/0867-Replace-ticket-level-propagator.patch
+++ b/patches/server/0866-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0868-Furnace-RecipesUsed-API.patch b/patches/server/0867-Furnace-RecipesUsed-API.patch
index 2e6cf1c2fe..2e6cf1c2fe 100644
--- a/patches/server/0868-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0867-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0869-Configurable-sculk-sensor-listener-range.patch b/patches/server/0868-Configurable-sculk-sensor-listener-range.patch
index 2e9adfa399..2e9adfa399 100644
--- a/patches/server/0869-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0868-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0870-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0869-Add-missing-block-data-mins-and-maxes.patch
index 6f3d051671..6f3d051671 100644
--- a/patches/server/0870-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0869-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0871-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0870-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index e9b999758a..c9b0cee2b6 100644
--- a/patches/server/0871-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0870-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 153f07bac06093b43a1f5b0f8e1a46ffbe6407e5..a7ebf6d9f79ce50a90c3c903563e00a10607f9f2 100644
+index c2286c3ef5b997e24dae04e24444b417851de919..2becc9a274eddb1a01655f24f54d5cf72470580d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -679,4 +679,9 @@ public class PaperConfig {
@@ -24,7 +24,7 @@ index 153f07bac06093b43a1f5b0f8e1a46ffbe6407e5..a7ebf6d9f79ce50a90c3c903563e00a1
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 63c86ae637eabb07095a46852da530b53acb9ff3..3a0b022880e250fc8afeb74c18272573d08c4166 100644
+index b69af9a2f1a0e3d578aaade1fb040d3d4230a941..7ca233fa8a76a0734964957fcd8e09e7a44a39e8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -619,7 +619,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0872-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0871-Put-world-into-worldlist-before-initing-the-world.patch
index 7219e3d55f..b277ac14c6 100644
--- a/patches/server/0872-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0871-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3a0b022880e250fc8afeb74c18272573d08c4166..b1653735b2f5048d049c45dc57f74eb7edc15547 100644
+index 7ca233fa8a76a0734964957fcd8e09e7a44a39e8..05b834a99649e3f3e8e7759234006b1c0b799629 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -631,9 +631,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -23,7 +23,7 @@ index 3a0b022880e250fc8afeb74c18272573d08c4166..b1653735b2f5048d049c45dc57f74eb7
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 197668e1b8487ed5463d457c8738ba70813cace1..557121d00eb47c29779a1a076cbc4ba0f61a548a 100644
+index 4b86fb9ace58533c5d85aa05cc8a4af7644c66de..278a025f141b2011dc2b4e35e70a8013b918a33e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1248,10 +1248,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0873-Fix-Entity-Position-Desync.patch b/patches/server/0872-Fix-Entity-Position-Desync.patch
index 32aeaec69d..32aeaec69d 100644
--- a/patches/server/0873-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0872-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0874-Custom-Potion-Mixes.patch b/patches/server/0873-Custom-Potion-Mixes.patch
index 31003aba09..31003aba09 100644
--- a/patches/server/0874-Custom-Potion-Mixes.patch
+++ b/patches/server/0873-Custom-Potion-Mixes.patch
diff --git a/patches/server/0875-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0874-Fix-Fluid-tags-isTagged-method.patch
index 074d24ea76..95eeab8b2f 100644
--- a/patches/server/0875-Fix-Fluid-tags-isTagged-method.patch
+++ b/patches/server/0874-Fix-Fluid-tags-isTagged-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Fluid tags isTagged method
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/tag/CraftFluidTag.java b/src/main/java/org/bukkit/craftbukkit/tag/CraftFluidTag.java
-index f0fa928a66140293166dddc37eee50a2041560ed..eb29131934370ea2865f8feee93ec3cb5490c4b1 100644
+index 89cb1ec575c0f58e9934d98b056621348dbbe27a..cdd474e9b0363641839a66d3e61fec46c735879a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/tag/CraftFluidTag.java
 +++ b/src/main/java/org/bukkit/craftbukkit/tag/CraftFluidTag.java
 @@ -16,7 +16,7 @@ public class CraftFluidTag extends CraftTag<net.minecraft.world.level.material.F
@@ -18,7 +18,7 @@ index f0fa928a66140293166dddc37eee50a2041560ed..eb29131934370ea2865f8feee93ec3cb
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index e504554e606788b66725edb0ce98d3d6246e4fac..d50661d29608e2e805c24a9eb3dd5ce72134a14e 100644
+index bda04a3a7865cfaf6eff7a40b3f12fa3145771e9..41e7ca100073052b99c82fa6a82f8168e0135499 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -201,7 +201,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0876-Fix-World-locateNearestStructure.patch b/patches/server/0875-Fix-World-locateNearestStructure.patch
index 95d96b579b..95d96b579b 100644
--- a/patches/server/0876-Fix-World-locateNearestStructure.patch
+++ b/patches/server/0875-Fix-World-locateNearestStructure.patch
diff --git a/patches/server/0877-Force-close-world-loading-screen.patch b/patches/server/0876-Force-close-world-loading-screen.patch
index 24a6fd821f..24a6fd821f 100644
--- a/patches/server/0877-Force-close-world-loading-screen.patch
+++ b/patches/server/0876-Force-close-world-loading-screen.patch
diff --git a/patches/server/0878-Fix-falling-block-spawn-methods.patch b/patches/server/0877-Fix-falling-block-spawn-methods.patch
index 5ff117ee09..5ff117ee09 100644
--- a/patches/server/0878-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0877-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0879-Expose-furnace-minecart-push-values.patch b/patches/server/0878-Expose-furnace-minecart-push-values.patch
index 4086d94249..4086d94249 100644
--- a/patches/server/0879-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0878-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0880-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0879-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index b95d6ace5a..b95d6ace5a 100644
--- a/patches/server/0880-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0879-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0881-Fix-save-problems-on-shutdown.patch b/patches/server/0880-Fix-save-problems-on-shutdown.patch
index 97b9516f09..97b9516f09 100644
--- a/patches/server/0881-Fix-save-problems-on-shutdown.patch
+++ b/patches/server/0880-Fix-save-problems-on-shutdown.patch