453 files changed, 280 insertions, 136 deletions

diff --git a/patches/api/0053-Fix-upstream-javadocs.patch b/patches/api/0053-Fix-upstream-javadocs.patch
index dc20117029..d186537a3c 100644
--- a/patches/api/0053-Fix-upstream-javadocs.patch
+++ b/patches/api/0053-Fix-upstream-javadocs.patch
@@ -1719,6 +1719,32 @@ index b84b37fe27d84574dc5897285f1d9a1437bd322c..281ae60a6be7e39aab4f27b4c7de3d49
       *
       * @return Set containing all the channels that this client may accept.
       */
+diff --git a/src/main/java/org/bukkit/projectiles/ProjectileSource.java b/src/main/java/org/bukkit/projectiles/ProjectileSource.java
+index eabd8b926ec1c934cd7e77b7cc6adfae16771021..8557bfefaf02538dec95adb29734ae2cf50f3f8c 100644
+--- a/src/main/java/org/bukkit/projectiles/ProjectileSource.java
++++ b/src/main/java/org/bukkit/projectiles/ProjectileSource.java
+@@ -12,6 +12,10 @@ public interface ProjectileSource {
+ 
+     /**
+      * Launches a {@link Projectile} from the ProjectileSource.
++     * <p>
++     * The family of launchProjectile methods only promise the ability to launch projectile types
++     * that the {@link ProjectileSource} is capable of firing in vanilla.
++     * Any other types of projectiles *may* be implemented but are not part of the method contract.
+      *
+      * @param <T> a projectile subclass
+      * @param projectile class of the projectile to launch
+@@ -23,6 +27,10 @@ public interface ProjectileSource {
+     /**
+      * Launches a {@link Projectile} from the ProjectileSource with an
+      * initial velocity.
++     * <p>
++     * The family of launchProjectile methods only promise the ability to launch projectile types
++     * that the {@link ProjectileSource} is capable of firing in vanilla.
++     * Any other types of projectiles *may* be implemented but are not part of the method contract.
+      *
+      * @param <T> a projectile subclass
+      * @param projectile class of the projectile to launch
 diff --git a/src/main/java/org/bukkit/scoreboard/Objective.java b/src/main/java/org/bukkit/scoreboard/Objective.java
 index 22b1dc5fd4d453161a5ee520072f8e8f955b3a80..a625bcab8e77b05b3341a52c708fae1542b7e3d5 100644
 --- a/src/main/java/org/bukkit/scoreboard/Objective.java
diff --git a/patches/api/0338-More-Projectile-API.patch b/patches/api/0338-More-Projectile-API.patch
index ddb5200413..b94c7cf17a 100644
--- a/patches/api/0338-More-Projectile-API.patch
+++ b/patches/api/0338-More-Projectile-API.patch
@@ -5,6 +5,7 @@ Subject: [PATCH] More Projectile API
 
 Co-authored-by: Nassim Jahnke <[email protected]>
 Co-authored-by: SoSeDiK <[email protected]>
+Co-authored-by: MelnCat <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
 index 8bf9bf7940d2911486e9d3a4f688cfae3f6173f2..9bf4b86e730f3d066f6ebfd4e516caf78145479e 100644
@@ -486,3 +487,34 @@ index c8015ff610e3c1222cb368ea1d8a0c2f3785d9c7..02584eced96944a551140f8150c65a7c
 +    void setHasDealtDamage(boolean hasDealtDamage);
  }
  // Paper end
+diff --git a/src/main/java/org/bukkit/projectiles/ProjectileSource.java b/src/main/java/org/bukkit/projectiles/ProjectileSource.java
+index 8557bfefaf02538dec95adb29734ae2cf50f3f8c..03faf9a142f494e255258099a6b8831a0d4a879b 100644
+--- a/src/main/java/org/bukkit/projectiles/ProjectileSource.java
++++ b/src/main/java/org/bukkit/projectiles/ProjectileSource.java
+@@ -39,4 +39,26 @@ public interface ProjectileSource {
+      */
+     @NotNull
+     public <T extends Projectile> T launchProjectile(@NotNull Class<? extends T> projectile, @Nullable Vector velocity);
++    
++    // Paper start - add consumer to launchProjectile
++    /**
++     * Launches a {@link Projectile} from the ProjectileSource with an
++     * initial velocity, with the supplied function run before the
++     * entity is added to the world.
++     * <br>
++     * Note that when the function is run, the entity will not be actually in
++     * the world. Any operation involving such as teleporting the entity is undefined
++     * until after this function returns.
++     * <p>
++     * The family of launchProjectile methods only promise the ability to launch projectile types
++     * that the {@link ProjectileSource} is capable of firing in vanilla.
++     * Any other types of projectiles *may* be implemented but are not part of the method contract.
++     * @param <T> a projectile subclass
++     * @param projectile class of the projectile to launch
++     * @param velocity the velocity with which to launch
++     * @param function the function to be run before the entity is spawned
++     * @return the launched projectile
++     */
++    <T extends Projectile> @NotNull T launchProjectile(@NotNull Class<? extends T> projectile, @Nullable Vector velocity, java.util.function.@Nullable Consumer<? super T> function);
++    // Paper end - add consumer to launchProjectile
+ }
diff --git a/patches/api/0361-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0361-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
deleted file mode 100644
index 291761dadb..0000000000
--- a/patches/api/0361-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MelnCat <[email protected]>
-Date: Mon, 19 Sep 2022 14:04:13 -0700
-Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile
-
-
-diff --git a/src/main/java/org/bukkit/projectiles/ProjectileSource.java b/src/main/java/org/bukkit/projectiles/ProjectileSource.java
-index eabd8b926ec1c934cd7e77b7cc6adfae16771021..96ebd30d339060758e726e9e1e7428d1d0813c17 100644
---- a/src/main/java/org/bukkit/projectiles/ProjectileSource.java
-+++ b/src/main/java/org/bukkit/projectiles/ProjectileSource.java
-@@ -31,4 +31,23 @@ public interface ProjectileSource {
-      */
-     @NotNull
-     public <T extends Projectile> T launchProjectile(@NotNull Class<? extends T> projectile, @Nullable Vector velocity);
-+    
-+    // Paper start - add consumer to launchProjectile
-+    /**
-+     * Launches a {@link Projectile} from the ProjectileSource with an
-+     * initial velocity, with the supplied function run before the
-+     * entity is added to the world.
-+     * <br>
-+     * Note that when the function is run, the entity will not be actually in
-+     * the world. Any operation involving such as teleporting the entity is undefined
-+     * until after this function returns.
-+     *
-+     * @param <T> a projectile subclass
-+     * @param projectile class of the projectile to launch
-+     * @param velocity the velocity with which to launch
-+     * @param function the function to be run before the entity is spawned
-+     * @return the launched projectile
-+     */
-+    <T extends Projectile> @NotNull T launchProjectile(@NotNull Class<? extends T> projectile, @Nullable Vector velocity, java.util.function.@Nullable Consumer<? super T> function);
-+    // Paper end - add consumer to launchProjectile
- }
diff --git a/patches/api/0362-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0361-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
index 9b5ef25cf4..9b5ef25cf4 100644
--- a/patches/api/0362-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
+++ b/patches/api/0361-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
diff --git a/patches/api/0363-Add-getDrops-to-BlockState.patch b/patches/api/0362-Add-getDrops-to-BlockState.patch
index b28d1d5381..b28d1d5381 100644
--- a/patches/api/0363-Add-getDrops-to-BlockState.patch
+++ b/patches/api/0362-Add-getDrops-to-BlockState.patch
diff --git a/patches/api/0364-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0363-Add-PlayerInventorySlotChangeEvent.patch
index d76df6d87d..d76df6d87d 100644
--- a/patches/api/0364-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/api/0363-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/api/0365-Elder-Guardian-appearance-API.patch b/patches/api/0364-Elder-Guardian-appearance-API.patch
index 4c5b51b7a5..4c5b51b7a5 100644
--- a/patches/api/0365-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0364-Elder-Guardian-appearance-API.patch
diff --git a/patches/api/0366-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0365-Add-EquipmentSlot-convenience-methods.patch
index f7e2301f31..f7e2301f31 100644
--- a/patches/api/0366-Add-EquipmentSlot-convenience-methods.patch
+++ b/patches/api/0365-Add-EquipmentSlot-convenience-methods.patch
diff --git a/patches/api/0367-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0366-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
index 178ca5316c..178ca5316c 100644
--- a/patches/api/0367-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
+++ b/patches/api/0366-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
diff --git a/patches/api/0368-Add-entity-knockback-API.patch b/patches/api/0367-Add-entity-knockback-API.patch
index 0dbd403581..0dbd403581 100644
--- a/patches/api/0368-Add-entity-knockback-API.patch
+++ b/patches/api/0367-Add-entity-knockback-API.patch
diff --git a/patches/api/0369-Added-EntityToggleSitEvent.patch b/patches/api/0368-Added-EntityToggleSitEvent.patch
index d5a8c46dc8..d5a8c46dc8 100644
--- a/patches/api/0369-Added-EntityToggleSitEvent.patch
+++ b/patches/api/0368-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0370-Add-Moving-Piston-API.patch b/patches/api/0369-Add-Moving-Piston-API.patch
index 8f889f1e3d..8f889f1e3d 100644
--- a/patches/api/0370-Add-Moving-Piston-API.patch
+++ b/patches/api/0369-Add-Moving-Piston-API.patch
diff --git a/patches/api/0371-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0370-Add-PrePlayerAttackEntityEvent.patch
index ac0ebedde7..ac0ebedde7 100644
--- a/patches/api/0371-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/api/0370-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0372-Add-Player-Warden-Warning-API.patch b/patches/api/0371-Add-Player-Warden-Warning-API.patch
index d1728e9492..d1728e9492 100644
--- a/patches/api/0372-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0371-Add-Player-Warden-Warning-API.patch
diff --git a/patches/api/0373-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0372-More-vanilla-friendly-methods-to-update-trades.patch
index dcad21ff69..dcad21ff69 100644
--- a/patches/api/0373-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/api/0372-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/api/0374-Add-paper-dumplisteners-command.patch b/patches/api/0373-Add-paper-dumplisteners-command.patch
index 43d59a5c31..43d59a5c31 100644
--- a/patches/api/0374-Add-paper-dumplisteners-command.patch
+++ b/patches/api/0373-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0375-ItemStack-damage-API.patch b/patches/api/0374-ItemStack-damage-API.patch
index 2f8f215ed9..2f8f215ed9 100644
--- a/patches/api/0375-ItemStack-damage-API.patch
+++ b/patches/api/0374-ItemStack-damage-API.patch
diff --git a/patches/api/0376-Add-Tick-TemporalUnit.patch b/patches/api/0375-Add-Tick-TemporalUnit.patch
index 562eb00082..562eb00082 100644
--- a/patches/api/0376-Add-Tick-TemporalUnit.patch
+++ b/patches/api/0375-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0377-Friction-API.patch b/patches/api/0376-Friction-API.patch
index 7667486715..01f4286418 100644
--- a/patches/api/0377-Friction-API.patch
+++ b/patches/api/0376-Friction-API.patch
@@ -59,7 +59,7 @@ index ced419f8655bff72f0257b639d5f7d73afe3c2e2..bcc6ba95bd21c7972865838c636a03f5
      /**
       * Gets the item stack associated with this item drop.
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index c9c3b926c5bb408d964ed5acc9f95c8527837a25..7c027d7bbd6b8a1543fa92d44e99674925f093b3 100644
+index 9f3e2903c955f2a5d1b25825c49188df62d20cef..016529563381a674db8050cb328f9e8f16e72e93 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0378-Player-Entity-Tracking-Events.patch b/patches/api/0377-Player-Entity-Tracking-Events.patch
index 3dfa72c922..3dfa72c922 100644
--- a/patches/api/0378-Player-Entity-Tracking-Events.patch
+++ b/patches/api/0377-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0379-Add-missing-Fluid-type.patch b/patches/api/0378-Add-missing-Fluid-type.patch
index c260bf8497..c260bf8497 100644
--- a/patches/api/0379-Add-missing-Fluid-type.patch
+++ b/patches/api/0378-Add-missing-Fluid-type.patch
diff --git a/patches/api/0380-fix-Instruments.patch b/patches/api/0379-fix-Instruments.patch
index 468dc80a34..468dc80a34 100644
--- a/patches/api/0380-fix-Instruments.patch
+++ b/patches/api/0379-fix-Instruments.patch
diff --git a/patches/api/0381-Add-BlockLockCheckEvent.patch b/patches/api/0380-Add-BlockLockCheckEvent.patch
index 5ba41f5acf..5ba41f5acf 100644
--- a/patches/api/0381-Add-BlockLockCheckEvent.patch
+++ b/patches/api/0380-Add-BlockLockCheckEvent.patch
diff --git a/patches/api/0382-Add-Sneaking-API-for-Entities.patch b/patches/api/0381-Add-Sneaking-API-for-Entities.patch
index 5419ce7d3c..5419ce7d3c 100644
--- a/patches/api/0382-Add-Sneaking-API-for-Entities.patch
+++ b/patches/api/0381-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/api/0383-Improve-PortalEvents.patch b/patches/api/0382-Improve-PortalEvents.patch
index 88c76230fd..88c76230fd 100644
--- a/patches/api/0383-Improve-PortalEvents.patch
+++ b/patches/api/0382-Improve-PortalEvents.patch
diff --git a/patches/api/0384-Flying-Fall-Damage-API.patch b/patches/api/0383-Flying-Fall-Damage-API.patch
index 13493c2aa9..13493c2aa9 100644
--- a/patches/api/0384-Flying-Fall-Damage-API.patch
+++ b/patches/api/0383-Flying-Fall-Damage-API.patch
diff --git a/patches/api/0385-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0384-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
index 475ca65bbf..475ca65bbf 100644
--- a/patches/api/0385-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
+++ b/patches/api/0384-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0386-Win-Screen-API.patch b/patches/api/0385-Win-Screen-API.patch
index cdeea2f4f9..cdeea2f4f9 100644
--- a/patches/api/0386-Win-Screen-API.patch
+++ b/patches/api/0385-Win-Screen-API.patch
diff --git a/patches/api/0387-Add-Entity-Body-Yaw-API.patch b/patches/api/0386-Add-Entity-Body-Yaw-API.patch
index 17277b2e80..17277b2e80 100644
--- a/patches/api/0387-Add-Entity-Body-Yaw-API.patch
+++ b/patches/api/0386-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/api/0388-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0387-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
index c375206bf7..c375206bf7 100644
--- a/patches/api/0388-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
+++ b/patches/api/0387-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0389-Add-EntityFertilizeEggEvent.patch b/patches/api/0388-Add-EntityFertilizeEggEvent.patch
index 4ae6ff9f0f..4ae6ff9f0f 100644
--- a/patches/api/0389-Add-EntityFertilizeEggEvent.patch
+++ b/patches/api/0388-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0390-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0389-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 9dee250212..9dee250212 100644
--- a/patches/api/0390-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/api/0389-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0391-Add-Shearable-API.patch b/patches/api/0390-Add-Shearable-API.patch
index e39ebc2481..e39ebc2481 100644
--- a/patches/api/0391-Add-Shearable-API.patch
+++ b/patches/api/0390-Add-Shearable-API.patch
diff --git a/patches/api/0392-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0391-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 27abcd1f93..27abcd1f93 100644
--- a/patches/api/0392-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/api/0391-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/api/0393-Add-Mob-Experience-reward-API.patch b/patches/api/0392-Add-Mob-Experience-reward-API.patch
index 354d6d1eb4..354d6d1eb4 100644
--- a/patches/api/0393-Add-Mob-Experience-reward-API.patch
+++ b/patches/api/0392-Add-Mob-Experience-reward-API.patch
diff --git a/patches/api/0394-Expand-PlayerItemMendEvent.patch b/patches/api/0393-Expand-PlayerItemMendEvent.patch
index 95b15a4753..95b15a4753 100644
--- a/patches/api/0394-Expand-PlayerItemMendEvent.patch
+++ b/patches/api/0393-Expand-PlayerItemMendEvent.patch
diff --git a/patches/api/0395-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0394-Add-method-to-remove-all-active-potion-effects.patch
index 4106e532d8..a9d228f158 100644
--- a/patches/api/0395-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/api/0394-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index f5149d54d6cb5019f398718b9aa52bc3ab34a5ae..ad3717d963f28751d410e6688ae64a4c1175871d 100644
+index c610731928ac9b01b111a7ccf0340ad59fcfb867..4aab0144601788a7902c9fdabb68744d9e33a345 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -657,6 +657,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0396-Folia-scheduler-and-owned-region-API.patch b/patches/api/0395-Folia-scheduler-and-owned-region-API.patch
index a9911d3665..b07676cfef 100644
--- a/patches/api/0396-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/api/0395-Folia-scheduler-and-owned-region-API.patch
@@ -499,7 +499,7 @@ index 0000000000000000000000000000000000000000..a6b50c9d8af589cc4747e14d343d2045
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 556e8c6cf90af9c90ded18be013167fa440d6505..9265ee60edfb3df797e425e854c7d3c9c034a85c 100644
+index adc95cd1486791787950533ef8e4baaf5d3827cc..50efe16bb80c618c3dfae03b70c8c165183af8ec 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2672,6 +2672,141 @@ public final class Bukkit {
@@ -645,7 +645,7 @@ index 556e8c6cf90af9c90ded18be013167fa440d6505..9265ee60edfb3df797e425e854c7d3c9
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a859d7bc870e5ef16793c2da453c84685b78ee47..968a5e18a023c92158a753f6d8fce4b2d0f0de48 100644
+index 0648130a6ce2e08d96b05fde1cfd58c2bb24ae07..1b8d6a3333a4fa9155b79644e683e2343c134e12 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2333,4 +2333,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0397-Add-event-for-player-editing-sign.patch b/patches/api/0396-Add-event-for-player-editing-sign.patch
index ec38bf008b..ec38bf008b 100644
--- a/patches/api/0397-Add-event-for-player-editing-sign.patch
+++ b/patches/api/0396-Add-event-for-player-editing-sign.patch
diff --git a/patches/api/0398-More-Sign-Block-API.patch b/patches/api/0397-More-Sign-Block-API.patch
index 57b372521c..57b372521c 100644
--- a/patches/api/0398-More-Sign-Block-API.patch
+++ b/patches/api/0397-More-Sign-Block-API.patch
diff --git a/patches/api/0399-Fix-BanList-API.patch b/patches/api/0398-Fix-BanList-API.patch
index a9640f44a2..a9640f44a2 100644
--- a/patches/api/0399-Fix-BanList-API.patch
+++ b/patches/api/0398-Fix-BanList-API.patch
diff --git a/patches/api/0400-Add-whitelist-events.patch b/patches/api/0399-Add-whitelist-events.patch
index 75458e78df..75458e78df 100644
--- a/patches/api/0400-Add-whitelist-events.patch
+++ b/patches/api/0399-Add-whitelist-events.patch
diff --git a/patches/api/0401-API-for-updating-recipes-on-clients.patch b/patches/api/0400-API-for-updating-recipes-on-clients.patch
index 11b14673fa..4a98cf2e1e 100644
--- a/patches/api/0401-API-for-updating-recipes-on-clients.patch
+++ b/patches/api/0400-API-for-updating-recipes-on-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for updating recipes on clients
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9265ee60edfb3df797e425e854c7d3c9c034a85c..f2753ef7d53ff3ff3531eaea89e816d7d8ce8b15 100644
+index 50efe16bb80c618c3dfae03b70c8c165183af8ec..52c601328bbf5c1642aa620c8bb466a9d2d231be 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1004,6 +1004,26 @@ public final class Bukkit {
@@ -82,7 +82,7 @@ index 9265ee60edfb3df797e425e854c7d3c9c034a85c..f2753ef7d53ff3ff3531eaea89e816d7
       * Gets a list of command aliases defined in the server properties.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 968a5e18a023c92158a753f6d8fce4b2d0f0de48..b93359e86db14e3a680bcdd8d935e2692c8b64e0 100644
+index 1b8d6a3333a4fa9155b79644e683e2343c134e12..8ba2fbaab7428a42b506fd000fbc162f68ddaed1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -853,6 +853,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0402-Add-PlayerFailMoveEvent.patch b/patches/api/0401-Add-PlayerFailMoveEvent.patch
index c0687e2ae0..c0687e2ae0 100644
--- a/patches/api/0402-Add-PlayerFailMoveEvent.patch
+++ b/patches/api/0401-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0403-Fix-custom-statistic-criteria-creation.patch b/patches/api/0402-Fix-custom-statistic-criteria-creation.patch
index 5e3f26f4f3..5e3f26f4f3 100644
--- a/patches/api/0403-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/api/0402-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0404-SculkCatalyst-bloom-API.patch b/patches/api/0403-SculkCatalyst-bloom-API.patch
index 49d8c8c2bd..49d8c8c2bd 100644
--- a/patches/api/0404-SculkCatalyst-bloom-API.patch
+++ b/patches/api/0403-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0405-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0404-API-for-an-entity-s-scoreboard-name.patch
index 1fb9128be8..1fb9128be8 100644
--- a/patches/api/0405-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/api/0404-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/api/0406-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0405-Deprecate-and-replace-methods-with-old-StructureType.patch
index 72be0347a9..a832ca9f1d 100644
--- a/patches/api/0406-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/api/0405-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f2753ef7d53ff3ff3531eaea89e816d7d8ce8b15..7e70b9b34b170b1c00dd920fabc0e14ed4a14955 100644
+index 52c601328bbf5c1642aa620c8bb466a9d2d231be..c8fa12acaf52cd3923a7a8702ccc50cfdc9170a2 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -949,9 +949,6 @@ public final class Bukkit {
@@ -84,7 +84,7 @@ index f2753ef7d53ff3ff3531eaea89e816d7d8ce8b15..7e70b9b34b170b1c00dd920fabc0e14e
      /**
       * Reloads the server, refreshing settings and plugin information.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b93359e86db14e3a680bcdd8d935e2692c8b64e0..f2be9647e015761ef7f56331be932a39cb6a5e8b 100644
+index 8ba2fbaab7428a42b506fd000fbc162f68ddaed1..50ffca9bccfb582d58ccb13f0decf66e5d91aef3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -817,16 +817,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0407-Add-Listing-API-for-Player.patch b/patches/api/0406-Add-Listing-API-for-Player.patch
index 47a8946b80..47a8946b80 100644
--- a/patches/api/0407-Add-Listing-API-for-Player.patch
+++ b/patches/api/0406-Add-Listing-API-for-Player.patch
diff --git a/patches/api/0408-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0407-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index 34d1940866..34d1940866 100644
--- a/patches/api/0408-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/api/0407-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0409-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0408-Fix-NPE-on-Boat-getStatus.patch
index 1cf6096a92..1cf6096a92 100644
--- a/patches/api/0409-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/api/0408-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0410-Expand-Pose-API.patch b/patches/api/0409-Expand-Pose-API.patch
index a7ac9f7567..a7ac9f7567 100644
--- a/patches/api/0410-Expand-Pose-API.patch
+++ b/patches/api/0409-Expand-Pose-API.patch
diff --git a/patches/api/0411-MerchantRecipe-add-copy-constructor.patch b/patches/api/0410-MerchantRecipe-add-copy-constructor.patch
index 1c5ba2803c..1c5ba2803c 100644
--- a/patches/api/0411-MerchantRecipe-add-copy-constructor.patch
+++ b/patches/api/0410-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0412-More-DragonBattle-API.patch b/patches/api/0411-More-DragonBattle-API.patch
index e25208ec19..e25208ec19 100644
--- a/patches/api/0412-More-DragonBattle-API.patch
+++ b/patches/api/0411-More-DragonBattle-API.patch
diff --git a/patches/api/0413-Add-PlayerPickItemEvent.patch b/patches/api/0412-Add-PlayerPickItemEvent.patch
index 6dd0be80a8..6dd0be80a8 100644
--- a/patches/api/0413-Add-PlayerPickItemEvent.patch
+++ b/patches/api/0412-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0414-Allow-trident-custom-damage.patch b/patches/api/0413-Allow-trident-custom-damage.patch
index 870b735548..870b735548 100644
--- a/patches/api/0414-Allow-trident-custom-damage.patch
+++ b/patches/api/0413-Allow-trident-custom-damage.patch
diff --git a/patches/api/0415-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0414-Expose-hand-during-BlockCanBuildEvent.patch
index 97d99a40d2..97d99a40d2 100644
--- a/patches/api/0415-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/api/0414-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0416-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0415-Limit-setBurnTime-to-valid-short-values.patch
index 2faac56fd8..2faac56fd8 100644
--- a/patches/api/0416-Limit-setBurnTime-to-valid-short-values.patch
+++ b/patches/api/0415-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0417-Add-OfflinePlayer-isConnected.patch b/patches/api/0416-Add-OfflinePlayer-isConnected.patch
index 08e2f91095..08e2f91095 100644
--- a/patches/api/0417-Add-OfflinePlayer-isConnected.patch
+++ b/patches/api/0416-Add-OfflinePlayer-isConnected.patch
diff --git a/patches/api/0418-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0417-Add-titleOverride-to-InventoryOpenEvent.patch
index 68e755f010..68e755f010 100644
--- a/patches/api/0418-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/api/0417-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0419-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0418-Allow-proper-checking-of-empty-item-stacks.patch
index 9fe874ee2d..9fe874ee2d 100644
--- a/patches/api/0419-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/api/0418-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/api/0420-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0419-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
index e72f86be5d..e72f86be5d 100644
--- a/patches/api/0420-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
+++ b/patches/api/0419-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0421-Add-player-idle-duration-API.patch b/patches/api/0420-Add-player-idle-duration-API.patch
index 2fbfc5dc58..2fbfc5dc58 100644
--- a/patches/api/0421-Add-player-idle-duration-API.patch
+++ b/patches/api/0420-Add-player-idle-duration-API.patch
diff --git a/patches/api/0422-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0421-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 3bb30787dc..3bb30787dc 100644
--- a/patches/api/0422-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/api/0421-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/api/0423-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0422-Add-predicate-for-blocks-when-raytracing.patch
index 13d64df888..13d64df888 100644
--- a/patches/api/0423-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/api/0422-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/api/0424-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0423-Add-hand-to-fish-event-for-all-player-interactions.patch
index b431332b9a..b431332b9a 100644
--- a/patches/api/0424-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/api/0423-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0425-Attribute-Modifier-API-improvements.patch b/patches/api/0424-Attribute-Modifier-API-improvements.patch
index d4b0442c30..d4b0442c30 100644
--- a/patches/api/0425-Attribute-Modifier-API-improvements.patch
+++ b/patches/api/0424-Attribute-Modifier-API-improvements.patch
diff --git a/patches/api/0426-Expand-LingeringPotion-API.patch b/patches/api/0425-Expand-LingeringPotion-API.patch
index 40b5a5f547..40b5a5f547 100644
--- a/patches/api/0426-Expand-LingeringPotion-API.patch
+++ b/patches/api/0425-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0427-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0426-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
index bdb434071d..bdb434071d 100644
--- a/patches/api/0427-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
+++ b/patches/api/0426-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
diff --git a/patches/api/0428-Add-Structure-check-API.patch b/patches/api/0427-Add-Structure-check-API.patch
index e2d19afb32..e2d19afb32 100644
--- a/patches/api/0428-Add-Structure-check-API.patch
+++ b/patches/api/0427-Add-Structure-check-API.patch
diff --git a/patches/api/0429-Experimental-annotations-change.patch b/patches/api/0428-Experimental-annotations-change.patch
index 1b4b1cf589..1b4b1cf589 100644
--- a/patches/api/0429-Experimental-annotations-change.patch
+++ b/patches/api/0428-Experimental-annotations-change.patch
diff --git a/patches/api/0430-Add-more-scoreboard-API.patch b/patches/api/0429-Add-more-scoreboard-API.patch
index 201af36b0c..201af36b0c 100644
--- a/patches/api/0430-Add-more-scoreboard-API.patch
+++ b/patches/api/0429-Add-more-scoreboard-API.patch
diff --git a/patches/api/0431-Improve-Registry.patch b/patches/api/0430-Improve-Registry.patch
index 45bd41d64f..ebb0b7b8e8 100644
--- a/patches/api/0431-Improve-Registry.patch
+++ b/patches/api/0430-Improve-Registry.patch
@@ -49,7 +49,7 @@ index 62d2b3f950860dee0898d77b0a29635c3f9a7e23..98fdfc8978fea1937e31a7427433a192
      @Override
      public @NotNull String translationKey() {
 diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index 7870a796e719148a42d18f1497b56c0d8f651a43..ff82bf3ea959c78e71ec7b0972a2d472f20aaf04 100644
+index 04dfab3fb9a9a3bc7e69cb0c1f5346f3c7d87d72..82381ea98af1c9216a2989ea83ba4aa90ba69741 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
 @@ -367,6 +367,79 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
diff --git a/patches/api/0432-Add-experience-points-API.patch b/patches/api/0431-Add-experience-points-API.patch
index 9b489a9ded..9b489a9ded 100644
--- a/patches/api/0432-Add-experience-points-API.patch
+++ b/patches/api/0431-Add-experience-points-API.patch
diff --git a/patches/api/0433-Add-missing-InventoryType.patch b/patches/api/0432-Add-missing-InventoryType.patch
index 3735af5696..3735af5696 100644
--- a/patches/api/0433-Add-missing-InventoryType.patch
+++ b/patches/api/0432-Add-missing-InventoryType.patch
diff --git a/patches/api/0434-Add-drops-to-shear-events.patch b/patches/api/0433-Add-drops-to-shear-events.patch
index c87460e48d..c87460e48d 100644
--- a/patches/api/0434-Add-drops-to-shear-events.patch
+++ b/patches/api/0433-Add-drops-to-shear-events.patch
diff --git a/patches/api/0435-Add-HiddenPotionEffect-API.patch b/patches/api/0434-Add-HiddenPotionEffect-API.patch
index 281fad5e4b..03c31e4ff8 100644
--- a/patches/api/0435-Add-HiddenPotionEffect-API.patch
+++ b/patches/api/0434-Add-HiddenPotionEffect-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add HiddenPotionEffect API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ad3717d963f28751d410e6688ae64a4c1175871d..8369da45206d2606f0715f3d803163dd8028251e 100644
+index 4aab0144601788a7902c9fdabb68744d9e33a345..51a428473e702be3ab79bd1e579d1114f747791b 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -591,6 +591,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0436-Add-PlayerShieldDisableEvent.patch b/patches/api/0435-Add-PlayerShieldDisableEvent.patch
index 29c7daa0e3..29c7daa0e3 100644
--- a/patches/api/0436-Add-PlayerShieldDisableEvent.patch
+++ b/patches/api/0435-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/api/0437-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0436-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
index 93ba48c77c..93ba48c77c 100644
--- a/patches/api/0437-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
+++ b/patches/api/0436-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
diff --git a/patches/api/0438-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0437-Add-BlockStateMeta-clearBlockState.patch
index 7e8c47a8e2..7e8c47a8e2 100644
--- a/patches/api/0438-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/api/0437-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/api/0439-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0438-Expose-LootTable-of-DecoratedPot.patch
index 42a8de4123..42a8de4123 100644
--- a/patches/api/0439-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/api/0438-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/api/0440-Add-ShulkerDuplicateEvent.patch b/patches/api/0439-Add-ShulkerDuplicateEvent.patch
index a0a81094ce..a0a81094ce 100644
--- a/patches/api/0440-Add-ShulkerDuplicateEvent.patch
+++ b/patches/api/0439-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/api/0441-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0440-Add-api-for-spawn-egg-texture-colors.patch
index 996340cf25..996340cf25 100644
--- a/patches/api/0441-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/api/0440-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/api/0442-Add-Lifecycle-Event-system.patch b/patches/api/0441-Add-Lifecycle-Event-system.patch
index cd999b16ab..cd999b16ab 100644
--- a/patches/api/0442-Add-Lifecycle-Event-system.patch
+++ b/patches/api/0441-Add-Lifecycle-Event-system.patch
diff --git a/patches/api/0443-ItemStack-Tooltip-API.patch b/patches/api/0442-ItemStack-Tooltip-API.patch
index 90d49b0f02..90d49b0f02 100644
--- a/patches/api/0443-ItemStack-Tooltip-API.patch
+++ b/patches/api/0442-ItemStack-Tooltip-API.patch
diff --git a/patches/api/0444-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0443-Add-getChunkSnapshot-includeLightData-parameter.patch
index 9b950f9493..9b950f9493 100644
--- a/patches/api/0444-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/api/0443-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/api/0445-Add-FluidState-API.patch b/patches/api/0444-Add-FluidState-API.patch
index 3235c393f5..3235c393f5 100644
--- a/patches/api/0445-Add-FluidState-API.patch
+++ b/patches/api/0444-Add-FluidState-API.patch
diff --git a/patches/api/0446-add-number-format-api.patch b/patches/api/0445-add-number-format-api.patch
index 6d32302ad0..6d32302ad0 100644
--- a/patches/api/0446-add-number-format-api.patch
+++ b/patches/api/0445-add-number-format-api.patch
diff --git a/patches/api/0447-improve-BanList-types.patch b/patches/api/0446-improve-BanList-types.patch
index 56f652975a..47e1822e8b 100644
--- a/patches/api/0447-improve-BanList-types.patch
+++ b/patches/api/0446-improve-BanList-types.patch
@@ -68,7 +68,7 @@ index a77c0411a68a9bad33ddfb335b7a996a843e478c..739d9d3ec789e58c10c8d818a9ca59ce
          /**
           * Banned player names
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7e70b9b34b170b1c00dd920fabc0e14ed4a14955..419c056faf0d49d9b0435feb01252e87e227b9a9 100644
+index c8fa12acaf52cd3923a7a8702ccc50cfdc9170a2..e20e4239a5a1f952e1c70e899549989d5e42f73c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1663,11 +1663,27 @@ public final class Bukkit {
@@ -100,7 +100,7 @@ index 7e70b9b34b170b1c00dd920fabc0e14ed4a14955..419c056faf0d49d9b0435feb01252e87
      /**
       * Gets a set containing all player operators.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f2be9647e015761ef7f56331be932a39cb6a5e8b..5aa64ea39ebd92e5067c53cea49a8685c0b9eee4 100644
+index 50ffca9bccfb582d58ccb13f0decf66e5d91aef3..6246251caf2c6f025c824b8e7a944b8d48751fa1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1425,10 +1425,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0448-Suspicious-Effect-Entry-API.patch b/patches/api/0447-Suspicious-Effect-Entry-API.patch
index bcf3db2033..bcf3db2033 100644
--- a/patches/api/0448-Suspicious-Effect-Entry-API.patch
+++ b/patches/api/0447-Suspicious-Effect-Entry-API.patch
diff --git a/patches/api/0449-Fix-DamageSource-API.patch b/patches/api/0448-Fix-DamageSource-API.patch
index efe4403e2c..efe4403e2c 100644
--- a/patches/api/0449-Fix-DamageSource-API.patch
+++ b/patches/api/0448-Fix-DamageSource-API.patch
diff --git a/patches/api/0450-Expanded-Hopper-API.patch b/patches/api/0449-Expanded-Hopper-API.patch
index 51cb6dfee2..51cb6dfee2 100644
--- a/patches/api/0450-Expanded-Hopper-API.patch
+++ b/patches/api/0449-Expanded-Hopper-API.patch
diff --git a/patches/api/0451-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0450-Clone-mutables-to-prevent-unexpected-issues.patch
index 86b3ab4bcf..86b3ab4bcf 100644
--- a/patches/api/0451-Clone-mutables-to-prevent-unexpected-issues.patch
+++ b/patches/api/0450-Clone-mutables-to-prevent-unexpected-issues.patch
diff --git a/patches/api/0452-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0451-Add-BlockBreakProgressUpdateEvent.patch
index a2b5a83baf..a2b5a83baf 100644
--- a/patches/api/0452-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/api/0451-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/api/0453-Deprecate-ItemStack-setType.patch b/patches/api/0452-Deprecate-ItemStack-setType.patch
index cdb918bc11..cdb918bc11 100644
--- a/patches/api/0453-Deprecate-ItemStack-setType.patch
+++ b/patches/api/0452-Deprecate-ItemStack-setType.patch
diff --git a/patches/api/0454-Item-Mutation-Fixes.patch b/patches/api/0453-Item-Mutation-Fixes.patch
index ccd77b7fbc..ccd77b7fbc 100644
--- a/patches/api/0454-Item-Mutation-Fixes.patch
+++ b/patches/api/0453-Item-Mutation-Fixes.patch
diff --git a/patches/api/0455-API-for-checking-sent-chunks.patch b/patches/api/0454-API-for-checking-sent-chunks.patch
index a3844b5401..a3844b5401 100644
--- a/patches/api/0455-API-for-checking-sent-chunks.patch
+++ b/patches/api/0454-API-for-checking-sent-chunks.patch
diff --git a/patches/api/0456-Add-CartographyItemEvent.patch b/patches/api/0455-Add-CartographyItemEvent.patch
index 1f19663c9f..1f19663c9f 100644
--- a/patches/api/0456-Add-CartographyItemEvent.patch
+++ b/patches/api/0455-Add-CartographyItemEvent.patch
diff --git a/patches/api/0457-More-Raid-API.patch b/patches/api/0456-More-Raid-API.patch
index b365913e82..b365913e82 100644
--- a/patches/api/0457-More-Raid-API.patch
+++ b/patches/api/0456-More-Raid-API.patch
diff --git a/patches/api/0458-Fix-SpawnerEntry-Equipment-API.patch b/patches/api/0457-Fix-SpawnerEntry-Equipment-API.patch
index 0a16b34cd5..0a16b34cd5 100644
--- a/patches/api/0458-Fix-SpawnerEntry-Equipment-API.patch
+++ b/patches/api/0457-Fix-SpawnerEntry-Equipment-API.patch
diff --git a/patches/api/0459-Fix-ItemFlags.patch b/patches/api/0458-Fix-ItemFlags.patch
index a6301eff75..a6301eff75 100644
--- a/patches/api/0459-Fix-ItemFlags.patch
+++ b/patches/api/0458-Fix-ItemFlags.patch
diff --git a/patches/api/0460-Allow-modifying-library-loader-jars-bytecode.patch b/patches/api/0459-Allow-modifying-library-loader-jars-bytecode.patch
index 0c0311e790..0c0311e790 100644
--- a/patches/api/0460-Allow-modifying-library-loader-jars-bytecode.patch
+++ b/patches/api/0459-Allow-modifying-library-loader-jars-bytecode.patch
diff --git a/patches/api/0461-Add-hook-to-remap-library-jars.patch b/patches/api/0460-Add-hook-to-remap-library-jars.patch
index fe1609629e..fe1609629e 100644
--- a/patches/api/0461-Add-hook-to-remap-library-jars.patch
+++ b/patches/api/0460-Add-hook-to-remap-library-jars.patch
diff --git a/patches/api/0462-Add-GameMode-isInvulnerable.patch b/patches/api/0461-Add-GameMode-isInvulnerable.patch
index b4b81c5f52..b4b81c5f52 100644
--- a/patches/api/0462-Add-GameMode-isInvulnerable.patch
+++ b/patches/api/0461-Add-GameMode-isInvulnerable.patch
diff --git a/patches/api/0463-Expose-hasColor-to-leather-armor.patch b/patches/api/0462-Expose-hasColor-to-leather-armor.patch
index e2c609b4f0..e2c609b4f0 100644
--- a/patches/api/0463-Expose-hasColor-to-leather-armor.patch
+++ b/patches/api/0462-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/api/0464-Add-missing-wind-charge-damage-type.patch b/patches/api/0463-Add-missing-wind-charge-damage-type.patch
index a2cd416d60..a2cd416d60 100644
--- a/patches/api/0464-Add-missing-wind-charge-damage-type.patch
+++ b/patches/api/0463-Add-missing-wind-charge-damage-type.patch
diff --git a/patches/api/0465-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0464-Added-API-to-get-player-ha-proxy-address.patch
index b1702bee61..b1702bee61 100644
--- a/patches/api/0465-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/api/0464-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/api/0466-More-Chest-Block-API.patch b/patches/api/0465-More-Chest-Block-API.patch
index 1fc3614c74..1fc3614c74 100644
--- a/patches/api/0466-More-Chest-Block-API.patch
+++ b/patches/api/0465-More-Chest-Block-API.patch
diff --git a/patches/api/0467-Brigadier-based-command-API.patch b/patches/api/0466-Brigadier-based-command-API.patch
index 6e20f39837..6e20f39837 100644
--- a/patches/api/0467-Brigadier-based-command-API.patch
+++ b/patches/api/0466-Brigadier-based-command-API.patch
diff --git a/patches/api/0468-Fix-issues-with-recipe-API.patch b/patches/api/0467-Fix-issues-with-recipe-API.patch
index e20b55ebab..e20b55ebab 100644
--- a/patches/api/0468-Fix-issues-with-recipe-API.patch
+++ b/patches/api/0467-Fix-issues-with-recipe-API.patch
diff --git a/patches/api/0469-Fix-equipment-slot-and-group-API.patch b/patches/api/0468-Fix-equipment-slot-and-group-API.patch
index 81d91485d7..81d91485d7 100644
--- a/patches/api/0469-Fix-equipment-slot-and-group-API.patch
+++ b/patches/api/0468-Fix-equipment-slot-and-group-API.patch
diff --git a/patches/api/0470-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/api/0469-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 8a0f6e9468..8a0f6e9468 100644
--- a/patches/api/0470-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/api/0469-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/api/0471-General-ItemMeta-fixes.patch b/patches/api/0470-General-ItemMeta-fixes.patch
index e5a4527859..e5a4527859 100644
--- a/patches/api/0471-General-ItemMeta-fixes.patch
+++ b/patches/api/0470-General-ItemMeta-fixes.patch
diff --git a/patches/api/0472-Add-missing-fishing-event-state.patch b/patches/api/0471-Add-missing-fishing-event-state.patch
index 94cba543ec..94cba543ec 100644
--- a/patches/api/0472-Add-missing-fishing-event-state.patch
+++ b/patches/api/0471-Add-missing-fishing-event-state.patch
diff --git a/patches/api/0473-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/api/0472-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index 3efcc02654..3efcc02654 100644
--- a/patches/api/0473-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/api/0472-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/api/0474-Registry-Modification-API.patch b/patches/api/0473-Registry-Modification-API.patch
index 78231b787d..5362f96e91 100644
--- a/patches/api/0474-Registry-Modification-API.patch
+++ b/patches/api/0473-Registry-Modification-API.patch
@@ -795,7 +795,7 @@ index 0000000000000000000000000000000000000000..5fde17e97eddcd1d01ee39694c9159d0
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index ff82bf3ea959c78e71ec7b0972a2d472f20aaf04..1392a1295349cfc43fbc115c912c1995779ffe62 100644
+index 82381ea98af1c9216a2989ea83ba4aa90ba69741..d81f687cba38ec930c555b001afc0df93c21731b 100644
 --- a/src/main/java/org/bukkit/Registry.java
 +++ b/src/main/java/org/bukkit/Registry.java
 @@ -366,6 +366,27 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
diff --git a/patches/api/0475-Introduce-registry-entry-and-builders.patch b/patches/api/0474-Introduce-registry-entry-and-builders.patch
index 2251dfb44b..2251dfb44b 100644
--- a/patches/api/0475-Introduce-registry-entry-and-builders.patch
+++ b/patches/api/0474-Introduce-registry-entry-and-builders.patch
diff --git a/patches/api/0476-Proxy-ItemStack-to-CraftItemStack.patch b/patches/api/0475-Proxy-ItemStack-to-CraftItemStack.patch
index bd8435d922..bd8435d922 100644
--- a/patches/api/0476-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/patches/api/0475-Proxy-ItemStack-to-CraftItemStack.patch
diff --git a/patches/api/0477-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/api/0476-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
index 042b9e8600..042b9e8600 100644
--- a/patches/api/0477-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
+++ b/patches/api/0476-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
diff --git a/patches/api/0478-Fix-HelpCommand-searching.patch b/patches/api/0477-Fix-HelpCommand-searching.patch
index beac489e87..beac489e87 100644
--- a/patches/api/0478-Fix-HelpCommand-searching.patch
+++ b/patches/api/0477-Fix-HelpCommand-searching.patch
diff --git a/patches/api/0479-add-Plugin-getDataPath.patch b/patches/api/0478-add-Plugin-getDataPath.patch
index 5085e262a9..5085e262a9 100644
--- a/patches/api/0479-add-Plugin-getDataPath.patch
+++ b/patches/api/0478-add-Plugin-getDataPath.patch
diff --git a/patches/api/0480-Fix-PickupStatus-getting-reset.patch b/patches/api/0479-Fix-PickupStatus-getting-reset.patch
index 6473947708..6473947708 100644
--- a/patches/api/0480-Fix-PickupStatus-getting-reset.patch
+++ b/patches/api/0479-Fix-PickupStatus-getting-reset.patch
diff --git a/patches/api/0481-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0480-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 3dd2df1411..3dd2df1411 100644
--- a/patches/api/0481-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/api/0480-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/api/0482-Improve-StandardMessenger-exception-messages.patch b/patches/api/0481-Improve-StandardMessenger-exception-messages.patch
index db8286512a..db8286512a 100644
--- a/patches/api/0482-Improve-StandardMessenger-exception-messages.patch
+++ b/patches/api/0481-Improve-StandardMessenger-exception-messages.patch
diff --git a/patches/api/0483-Add-even-more-Enchantment-API.patch b/patches/api/0482-Add-even-more-Enchantment-API.patch
index c9813d353e..c9813d353e 100644
--- a/patches/api/0483-Add-even-more-Enchantment-API.patch
+++ b/patches/api/0482-Add-even-more-Enchantment-API.patch
diff --git a/patches/api/0484-Leashable-API.patch b/patches/api/0483-Leashable-API.patch
index e5b1a4857d..e5b1a4857d 100644
--- a/patches/api/0484-Leashable-API.patch
+++ b/patches/api/0483-Leashable-API.patch
diff --git a/patches/api/0485-Add-enchantment-seed-update-API.patch b/patches/api/0484-Add-enchantment-seed-update-API.patch
index 64bb3259ac..64bb3259ac 100644
--- a/patches/api/0485-Add-enchantment-seed-update-API.patch
+++ b/patches/api/0484-Add-enchantment-seed-update-API.patch
diff --git a/patches/api/0486-Deprecate-for-removal-all-OldEnum-related-methods.patch b/patches/api/0485-Deprecate-for-removal-all-OldEnum-related-methods.patch
index 00540ebb8d..00540ebb8d 100644
--- a/patches/api/0486-Deprecate-for-removal-all-OldEnum-related-methods.patch
+++ b/patches/api/0485-Deprecate-for-removal-all-OldEnum-related-methods.patch
diff --git a/patches/api/0487-Add-FeatureFlag-API.patch b/patches/api/0486-Add-FeatureFlag-API.patch
index e919666123..e919666123 100644
--- a/patches/api/0487-Add-FeatureFlag-API.patch
+++ b/patches/api/0486-Add-FeatureFlag-API.patch
diff --git a/patches/api/0488-Tag-Lifecycle-Events.patch b/patches/api/0487-Tag-Lifecycle-Events.patch
index d9fdf676e8..d9fdf676e8 100644
--- a/patches/api/0488-Tag-Lifecycle-Events.patch
+++ b/patches/api/0487-Tag-Lifecycle-Events.patch
diff --git a/patches/api/0489-Item-serialization-as-json.patch b/patches/api/0488-Item-serialization-as-json.patch
index d2951870a1..d2951870a1 100644
--- a/patches/api/0489-Item-serialization-as-json.patch
+++ b/patches/api/0488-Item-serialization-as-json.patch
diff --git a/patches/api/0490-create-TileStateInventoryHolder.patch b/patches/api/0489-create-TileStateInventoryHolder.patch
index 107bd2fd51..107bd2fd51 100644
--- a/patches/api/0490-create-TileStateInventoryHolder.patch
+++ b/patches/api/0489-create-TileStateInventoryHolder.patch
diff --git a/patches/server/0674-More-Projectile-API.patch b/patches/server/0674-More-Projectile-API.patch
index 97f7eb71ab..b526158a7f 100644
--- a/patches/server/0674-More-Projectile-API.patch
+++ b/patches/server/0674-More-Projectile-API.patch
@@ -20,9 +20,12 @@ public net.minecraft.world.entity.projectile.Projectile leftOwner
 public net.minecraft.world.entity.projectile.Projectile preOnHit(Lnet/minecraft/world/phys/HitResult;)V
 public net.minecraft.world.entity.projectile.Projectile canHitEntity(Lnet/minecraft/world/entity/Entity;)Z
 public net.minecraft.world.entity.projectile.FireworkRocketEntity getDefaultItem()Lnet/minecraft/world/item/ItemStack;
+public net.minecraft.world.item.CrossbowItem FIREWORK_POWER
 
 Co-authored-by: Nassim Jahnke <[email protected]>
 Co-authored-by: SoSeDiK <[email protected]>
+Co-authored-by: MelnCat <[email protected]>
+Co-authored-by: Lulu13022002 <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 index 5b7734020b496ade3740d92908ad2d399bfd55e6..e70ca1b2e6fbbc1f20e65429298d01b4ebd2dd29 100644
@@ -515,10 +518,27 @@ index 6e2f91423371ead9890095cf4b1e2299c4dcba28..9d8f4b7176e60180565e3134a14ecf19
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 097f03c83a90f476b74834407d2dcd0e98fe010a..741cc56304005c48b26966f617d282bae7a87ee6 100644
+index 097f03c83a90f476b74834407d2dcd0e98fe010a..877e3d20edba3fe2ea6b51d0b54ec8893bd112ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -596,7 +596,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -569,8 +569,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+     }
+ 
+     @Override
+-    @SuppressWarnings("unchecked")
+     public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity) {
++        // Paper start - launchProjectile consumer
++        return this.launchProjectile(projectile, velocity, null);
++    }
++
++    @Override
++    @SuppressWarnings("unchecked")
++    public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, java.util.function.Consumer<? super T> function) {
++        // Paper end - launchProjectile consumer
+         Preconditions.checkState(!this.getHandle().generation, "Cannot launch projectile during world generation");
+ 
+         net.minecraft.world.level.Level world = ((CraftWorld) this.getWorld()).getHandle();
+@@ -596,7 +603,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
              } else {
                  launch = new net.minecraft.world.entity.projectile.Arrow(world, this.getHandle(), new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.ARROW), null);
              }
@@ -527,7 +547,7 @@ index 097f03c83a90f476b74834407d2dcd0e98fe010a..741cc56304005c48b26966f617d282ba
          } else if (ThrownPotion.class.isAssignableFrom(projectile)) {
              if (LingeringPotion.class.isAssignableFrom(projectile)) {
                  launch = new net.minecraft.world.entity.projectile.ThrownPotion(world, this.getHandle());
-@@ -622,10 +622,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -622,10 +629,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
                  launch = new net.minecraft.world.entity.projectile.WitherSkull(world, this.getHandle(), vec);
              } else if (DragonFireball.class.isAssignableFrom(projectile)) {
                  launch = new net.minecraft.world.entity.projectile.DragonFireball(world, this.getHandle(), vec);
@@ -548,15 +568,47 @@ index 097f03c83a90f476b74834407d2dcd0e98fe010a..741cc56304005c48b26966f617d282ba
              } else {
                  launch = new LargeFireball(world, this.getHandle(), vec, 1);
              }
-@@ -650,7 +656,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -650,8 +663,26 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          } else if (Firework.class.isAssignableFrom(projectile)) {
              Location location = this.getEyeLocation();
  
 -            launch = new FireworkRocketEntity(world, net.minecraft.world.item.ItemStack.EMPTY, this.getHandle());
-+            launch = new FireworkRocketEntity(world, FireworkRocketEntity.getDefaultItem(), this.getHandle()); // Paper - pass correct default to rocket for data storage
-             launch.moveTo(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
+-            launch.moveTo(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
++            // Paper start - see CrossbowItem
++            launch = new FireworkRocketEntity(world, FireworkRocketEntity.getDefaultItem(), this.getHandle(), location.getX(), location.getY() - 0.15F, location.getZ(), true); // Paper - pass correct default to rocket for data storage & see CrossbowItem for regular launch without elytra boost
++
++            // Lifted from net.minecraft.world.item.ProjectileWeaponItem.shoot
++            float f2 = /* net.minecraft.world.item.enchantment.EnchantmentHelper.processProjectileSpread((ServerLevel) world, new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.CROSSBOW), this.getHandle(), 0.0F); */ 0; // Just shortcut this to 0, no need to do any calculations on a non existing stack
++            int projectileSize = 1;
++            int i = 0;
++
++            float f3 = projectileSize == 1 ? 0.0F : 2.0F * f2 / (float) (projectileSize - 1);
++            float f4 = (float) ((projectileSize - 1) % 2) * f3 / 2.0F;
++            float f5 = 1.0F;
++            float yaw = f4 + f5 * (float) ((i + 1) / 2) * f3;
++
++            // Lifted from net.minecraft.world.item.CrossbowItem.shootProjectile
++            Vec3 vec3 = this.getHandle().getUpVector(1.0F);
++            org.joml.Quaternionf quaternionf = new org.joml.Quaternionf().setAngleAxis((double)(yaw * (float) (Math.PI / 180.0)), vec3.x, vec3.y, vec3.z);
++            Vec3 vec32 = this.getHandle().getViewVector(1.0F);
++            org.joml.Vector3f vector3f = vec32.toVector3f().rotate(quaternionf);
++            ((FireworkRocketEntity) launch).shoot((double)vector3f.x(), (double)vector3f.y(), (double)vector3f.z(), net.minecraft.world.item.CrossbowItem.FIREWORK_POWER, 1.0F);
++            // Paper end
+         }
+ 
+         Preconditions.checkArgument(launch != null, "Projectile (%s) not supported", projectile.getName());
+@@ -659,6 +690,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+         if (velocity != null) {
+             ((T) launch.getBukkitEntity()).setVelocity(velocity);
          }
++        // Paper start - launchProjectile consumer
++        if (function != null) {
++            function.accept((T) launch.getBukkitEntity());
++        }
++        // Paper end - launchProjectile consumer
  
+         world.addFreshEntity(launch);
+         return (T) launch.getBukkitEntity();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java
 index 70cbc6c668c60e9d608ca7013b72f9b916c05c2d..47633f05b4fab1dcabc2117e7645fe6d6949622a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java
@@ -812,3 +864,140 @@ index e8a455eb5e17bcfcae3f03664f2b47773fbdf37e..08178a88ba7d0881a6c2843eef24a846
          return ((CraftItemType<?>) CraftItemType.minecraftToBukkitNew(item.getItem())).getItemMeta(item);
      }
  
+diff --git a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
+index 8b57044518fbb0fd507da6ae3ff12b99eff70b37..e3312df146b942568ccee6595ae609c7d6a4f68f 100644
+--- a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
++++ b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
+@@ -56,90 +56,68 @@ public class CraftBlockProjectileSource implements BlockProjectileSource {
+ 
+     @Override
+     public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity) {
++        // Paper start - launchProjectile consumer
++        return this.launchProjectile(projectile, velocity, null);
++    }
++
++    @Override
++    public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, java.util.function.Consumer<? super T> function) {
++        // Paper end - launchProjectile consumer
+         Preconditions.checkArgument(this.getBlock().getType() == Material.DISPENSER, "Block is no longer dispenser");
+-        // Copied from BlockDispenser.dispense()
+-        BlockSource sourceblock = new BlockSource((ServerLevel) this.dispenserBlock.getLevel(), this.dispenserBlock.getBlockPos(), this.dispenserBlock.getBlockState(), this.dispenserBlock);
+-        // Copied from DispenseBehaviorProjectile
+-        Position iposition = DispenserBlock.getDispensePosition(sourceblock);
+-        Direction enumdirection = (Direction) sourceblock.state().getValue(DispenserBlock.FACING);
+-        net.minecraft.world.level.Level world = this.dispenserBlock.getLevel();
+-        net.minecraft.world.entity.Entity launch = null;
+ 
++        // Paper start - rewrite whole method to match ProjectileDispenseBehavior
++        net.minecraft.world.item.Item item = null;
+         if (Snowball.class.isAssignableFrom(projectile)) {
+-            launch = new net.minecraft.world.entity.projectile.Snowball(world, iposition.x(), iposition.y(), iposition.z());
++            item = net.minecraft.world.item.Items.SNOWBALL;
+         } else if (Egg.class.isAssignableFrom(projectile)) {
+-            launch = new ThrownEgg(world, iposition.x(), iposition.y(), iposition.z());
+-        } else if (EnderPearl.class.isAssignableFrom(projectile)) {
+-            launch = new ThrownEnderpearl(world, null);
+-            launch.setPos(iposition.x(), iposition.y(), iposition.z());
++            item = net.minecraft.world.item.Items.EGG;
+         } else if (ThrownExpBottle.class.isAssignableFrom(projectile)) {
+-            launch = new ThrownExperienceBottle(world, iposition.x(), iposition.y(), iposition.z());
++            item = net.minecraft.world.item.Items.EXPERIENCE_BOTTLE;
+         } else if (ThrownPotion.class.isAssignableFrom(projectile)) {
+             if (LingeringPotion.class.isAssignableFrom(projectile)) {
+-                launch = new net.minecraft.world.entity.projectile.ThrownPotion(world, iposition.x(), iposition.y(), iposition.z());
+-                ((net.minecraft.world.entity.projectile.ThrownPotion) launch).setItem(CraftItemStack.asNMSCopy(new ItemStack(org.bukkit.Material.LINGERING_POTION, 1)));
++                item = net.minecraft.world.item.Items.LINGERING_POTION;
+             } else {
+-                launch = new net.minecraft.world.entity.projectile.ThrownPotion(world, iposition.x(), iposition.y(), iposition.z());
+-                ((net.minecraft.world.entity.projectile.ThrownPotion) launch).setItem(CraftItemStack.asNMSCopy(new ItemStack(org.bukkit.Material.SPLASH_POTION, 1)));
++                item = net.minecraft.world.item.Items.SPLASH_POTION;
+             }
+         } else if (AbstractArrow.class.isAssignableFrom(projectile)) {
+-            if (TippedArrow.class.isAssignableFrom(projectile)) {
+-                launch = new net.minecraft.world.entity.projectile.Arrow(world, iposition.x(), iposition.y(), iposition.z(), new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.ARROW), null);
+-                ((Arrow) launch.getBukkitEntity()).setBasePotionType(PotionType.WATER);
+-            } else if (SpectralArrow.class.isAssignableFrom(projectile)) {
+-                launch = new net.minecraft.world.entity.projectile.SpectralArrow(world, iposition.x(), iposition.y(), iposition.z(), new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.SPECTRAL_ARROW), null);
++            if (SpectralArrow.class.isAssignableFrom(projectile)) {
++                item = net.minecraft.world.item.Items.SPECTRAL_ARROW;
+             } else {
+-                launch = new net.minecraft.world.entity.projectile.Arrow(world, iposition.x(), iposition.y(), iposition.z(), new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.ARROW), null);
+-            }
+-            ((net.minecraft.world.entity.projectile.AbstractArrow) launch).pickup = net.minecraft.world.entity.projectile.AbstractArrow.Pickup.ALLOWED;
+-            ((net.minecraft.world.entity.projectile.AbstractArrow) launch).projectileSource = this;
+-        } else if (Fireball.class.isAssignableFrom(projectile)) {
+-            double d0 = iposition.x() + (double) ((float) enumdirection.getStepX() * 0.3F);
+-            double d1 = iposition.y() + (double) ((float) enumdirection.getStepY() * 0.3F);
+-            double d2 = iposition.z() + (double) ((float) enumdirection.getStepZ() * 0.3F);
+-            RandomSource random = world.random;
+-            double d3 = random.nextGaussian() * 0.05D + (double) enumdirection.getStepX();
+-            double d4 = random.nextGaussian() * 0.05D + (double) enumdirection.getStepY();
+-            double d5 = random.nextGaussian() * 0.05D + (double) enumdirection.getStepZ();
+-
+-            if (SmallFireball.class.isAssignableFrom(projectile)) {
+-                launch = new net.minecraft.world.entity.projectile.SmallFireball(world, null, new Vec3(d0, d1, d2));
+-            } else if (WitherSkull.class.isAssignableFrom(projectile)) {
+-                launch = EntityType.WITHER_SKULL.create(world);
+-                launch.setPos(d0, d1, d2);
+-
+-                ((AbstractHurtingProjectile) launch).assignDirectionalMovement(new Vec3(d3, d4, d5), 0.1D);
+-            } else {
+-                launch = EntityType.FIREBALL.create(world);
+-                launch.setPos(d0, d1, d2);
+-
+-                ((AbstractHurtingProjectile) launch).assignDirectionalMovement(new Vec3(d3, d4, d5), 0.1D);
++                item = net.minecraft.world.item.Items.ARROW;
+             }
++        } else if (org.bukkit.entity.WindCharge.class.isAssignableFrom(projectile)) {
++            item = net.minecraft.world.item.Items.WIND_CHARGE;
++        } else if (org.bukkit.entity.Firework.class.isAssignableFrom(projectile)) {
++            item = net.minecraft.world.item.Items.FIREWORK_ROCKET;
++        } else if (SmallFireball.class.isAssignableFrom(projectile)) {
++            item = net.minecraft.world.item.Items.FIRE_CHARGE;
++        }
+ 
+-            ((AbstractHurtingProjectile) launch).projectileSource = this;
++        if (!(item instanceof net.minecraft.world.item.ProjectileItem projectileItem)) {
++            throw new IllegalArgumentException("Projectile '%s' is not supported".formatted(projectile.getSimpleName()));
+         }
+ 
+-        Preconditions.checkArgument(launch != null, "Projectile not supported");
++        net.minecraft.world.item.ProjectileItem.DispenseConfig config = projectileItem.createDispenseConfig();
++        net.minecraft.world.level.block.state.BlockState state = this.dispenserBlock.getBlockState();
++        net.minecraft.world.level.Level world = this.dispenserBlock.getLevel();
++        BlockSource pointer = new BlockSource((ServerLevel) world, this.dispenserBlock.getBlockPos(), state, this.dispenserBlock); // copied from DispenseBlock#dispenseFrom
++        Direction facing = state.getValue(DispenserBlock.FACING);
++        Position pos = config.positionFunction().getDispensePosition(pointer, facing);
+ 
+-        if (launch instanceof net.minecraft.world.entity.projectile.Projectile) {
+-            if (launch instanceof ThrowableProjectile) {
+-                ((ThrowableProjectile) launch).projectileSource = this;
+-            }
+-            // Values from DispenseBehaviorProjectile
+-            float a = 6.0F;
+-            float b = 1.1F;
+-            if (launch instanceof net.minecraft.world.entity.projectile.ThrownPotion || launch instanceof ThrownExpBottle) {
+-                // Values from respective DispenseBehavior classes
+-                a *= 0.5F;
+-                b *= 1.25F;
+-            }
+-            // Copied from DispenseBehaviorProjectile
+-            ((net.minecraft.world.entity.projectile.Projectile) launch).shoot((double) enumdirection.getStepX(), (double) ((float) enumdirection.getStepY() + 0.1F), (double) enumdirection.getStepZ(), b, a);
+-        }
++        net.minecraft.world.entity.projectile.Projectile launch = projectileItem.asProjectile(world, pos, new net.minecraft.world.item.ItemStack(item), facing);
++        // some projectile are not shoot and doesn't rely on the config for power/uncertainty
++        projectileItem.shoot(launch, facing.getStepX(), facing.getStepY(), facing.getStepZ(), config.power(), config.uncertainty());
++        launch.projectileSource = this;
++        // Paper end
+ 
+         if (velocity != null) {
+             ((T) launch.getBukkitEntity()).setVelocity(velocity);
+         }
++        // Paper start
++        if (function != null) {
++            function.accept((T) launch.getBukkitEntity());
++        }
++        // Paper end
+ 
+         world.addFreshEntity(launch);
+         return (T) launch.getBukkitEntity();
diff --git a/patches/server/0739-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0739-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
deleted file mode 100644
index 9a55defb23..0000000000
--- a/patches/server/0739-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MelnCat <[email protected]>
-Date: Mon, 19 Sep 2022 14:16:10 -0700
-Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 741cc56304005c48b26966f617d282bae7a87ee6..e6727100c3ec18a32e08d027cd1b4c39b913d554 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -569,8 +569,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     }
- 
-     @Override
--    @SuppressWarnings("unchecked")
-     public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity) {
-+        // Paper start - launchProjectile consumer
-+        return this.launchProjectile(projectile, velocity, null);
-+    }
-+
-+    @Override
-+    @SuppressWarnings("unchecked")
-+    public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, java.util.function.Consumer<? super T> function) {
-+        // Paper end - launchProjectile consumer
-         Preconditions.checkState(!this.getHandle().generation, "Cannot launch projectile during world generation");
- 
-         net.minecraft.world.level.Level world = ((CraftWorld) this.getWorld()).getHandle();
-@@ -665,6 +672,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         if (velocity != null) {
-             ((T) launch.getBukkitEntity()).setVelocity(velocity);
-         }
-+        // Paper start - launchProjectile consumer
-+        if (function != null) {
-+            function.accept((T) launch.getBukkitEntity());
-+        }
-+        // Paper end - launchProjectile consumer
- 
-         world.addFreshEntity(launch);
-         return (T) launch.getBukkitEntity();
-diff --git a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
-index 8b57044518fbb0fd507da6ae3ff12b99eff70b37..2a6c4a74ff065110bb09b528f2d5f80b560a587a 100644
---- a/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
-+++ b/src/main/java/org/bukkit/craftbukkit/projectiles/CraftBlockProjectileSource.java
-@@ -56,6 +56,13 @@ public class CraftBlockProjectileSource implements BlockProjectileSource {
- 
-     @Override
-     public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity) {
-+        // Paper start - launchProjectile consumer
-+        return this.launchProjectile(projectile, velocity, null);
-+    }
-+
-+    @Override
-+    public <T extends Projectile> T launchProjectile(Class<? extends T> projectile, Vector velocity, java.util.function.Consumer<? super T> function) {
-+        // Paper end - launchProjectile consumer
-         Preconditions.checkArgument(this.getBlock().getType() == Material.DISPENSER, "Block is no longer dispenser");
-         // Copied from BlockDispenser.dispense()
-         BlockSource sourceblock = new BlockSource((ServerLevel) this.dispenserBlock.getLevel(), this.dispenserBlock.getBlockPos(), this.dispenserBlock.getBlockState(), this.dispenserBlock);
-@@ -140,6 +147,11 @@ public class CraftBlockProjectileSource implements BlockProjectileSource {
-         if (velocity != null) {
-             ((T) launch.getBukkitEntity()).setVelocity(velocity);
-         }
-+        // Paper start
-+        if (function != null) {
-+            function.accept((T) launch.getBukkitEntity());
-+        }
-+        // Paper end
- 
-         world.addFreshEntity(launch);
-         return (T) launch.getBukkitEntity();
diff --git a/patches/server/0740-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0739-Call-BlockPhysicsEvent-more-often.patch
index 1839fbe711..1839fbe711 100644
--- a/patches/server/0740-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0739-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0741-Configurable-chat-thread-limit.patch b/patches/server/0740-Configurable-chat-thread-limit.patch
index 57178397ba..57178397ba 100644
--- a/patches/server/0741-Configurable-chat-thread-limit.patch
+++ b/patches/server/0740-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0742-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0741-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index aaf56a3c17..aaf56a3c17 100644
--- a/patches/server/0742-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0741-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0743-fix-Jigsaw-block-kicking-user.patch b/patches/server/0742-fix-Jigsaw-block-kicking-user.patch
index 6e1aef94c8..6e1aef94c8 100644
--- a/patches/server/0743-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0742-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0744-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0743-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 8653ffd786..8653ffd786 100644
--- a/patches/server/0744-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0743-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0745-Add-getDrops-to-BlockState.patch b/patches/server/0744-Add-getDrops-to-BlockState.patch
index ea12f69bde..ea12f69bde 100644
--- a/patches/server/0745-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0744-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0746-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0745-Fix-a-bunch-of-vanilla-bugs.patch
index 7813123f49..7813123f49 100644
--- a/patches/server/0746-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0745-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0747-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0746-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 4de44632f0..4de44632f0 100644
--- a/patches/server/0747-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0746-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0748-Fix-custom-piglin-loved-items.patch b/patches/server/0747-Fix-custom-piglin-loved-items.patch
index a09a51f7ea..a09a51f7ea 100644
--- a/patches/server/0748-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0747-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0749-EntityPickupItemEvent-fixes.patch b/patches/server/0748-EntityPickupItemEvent-fixes.patch
index 91c0eac860..91c0eac860 100644
--- a/patches/server/0749-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0748-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0750-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0749-Correctly-handle-interactions-with-items-on-cooldown.patch
index b7fa362a4b..b7fa362a4b 100644
--- a/patches/server/0750-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0749-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0751-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0750-Add-PlayerInventorySlotChangeEvent.patch
index 0f6a75faa3..0f6a75faa3 100644
--- a/patches/server/0751-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0750-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0752-Elder-Guardian-appearance-API.patch b/patches/server/0751-Elder-Guardian-appearance-API.patch
index fd1cef6a09..fd1cef6a09 100644
--- a/patches/server/0752-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0751-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0753-Add-entity-knockback-API.patch b/patches/server/0752-Add-entity-knockback-API.patch
index 0e9f0b0fd8..b50878265d 100644
--- a/patches/server/0753-Add-entity-knockback-API.patch
+++ b/patches/server/0752-Add-entity-knockback-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index f6999207658253699ca8f8df8bfa19f39cd59f86..8babdfe0c6bd921f95cf55313197d576035b0891 100644
+index 877e3d20edba3fe2ea6b51d0b54ec8893bd112ed..2a7fffa71106327d0ffee632408d45faaec76702 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1109,4 +1109,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1127,4 +1127,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          throw new UnsupportedOperationException("Cannot set the hurt direction on a non player");
      }
      // Paper end - hurt direction API
diff --git a/patches/server/0754-Detect-headless-JREs.patch b/patches/server/0753-Detect-headless-JREs.patch
index 5ba28913a8..5ba28913a8 100644
--- a/patches/server/0754-Detect-headless-JREs.patch
+++ b/patches/server/0753-Detect-headless-JREs.patch
diff --git a/patches/server/0755-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0754-fix-entity-vehicle-collision-event-not-called.patch
index e2f922a2a1..e2f922a2a1 100644
--- a/patches/server/0755-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0754-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0756-Add-EntityToggleSitEvent.patch b/patches/server/0755-Add-EntityToggleSitEvent.patch
index 0ed0b95562..0ed0b95562 100644
--- a/patches/server/0756-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0755-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0757-Add-fire-tick-delay-option.patch b/patches/server/0756-Add-fire-tick-delay-option.patch
index 2ad454d1c6..2ad454d1c6 100644
--- a/patches/server/0757-Add-fire-tick-delay-option.patch
+++ b/patches/server/0756-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0758-Add-Moving-Piston-API.patch b/patches/server/0757-Add-Moving-Piston-API.patch
index e3d3955822..e3d3955822 100644
--- a/patches/server/0758-Add-Moving-Piston-API.patch
+++ b/patches/server/0757-Add-Moving-Piston-API.patch
diff --git a/patches/server/0759-Ignore-impossible-spawn-tick.patch b/patches/server/0758-Ignore-impossible-spawn-tick.patch
index f046102ceb..f046102ceb 100644
--- a/patches/server/0759-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0758-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0760-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch b/patches/server/0759-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
index 2fe35c8b32..2fe35c8b32 100644
--- a/patches/server/0760-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
+++ b/patches/server/0759-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
diff --git a/patches/server/0761-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0760-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index cd0b3b2cc7..cd0b3b2cc7 100644
--- a/patches/server/0761-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0760-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0762-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0761-Add-PrePlayerAttackEntityEvent.patch
index b0f3a07890..b0f3a07890 100644
--- a/patches/server/0762-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0761-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0763-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0762-ensure-reset-EnderDragon-boss-event-name.patch
index e2a769583d..e2a769583d 100644
--- a/patches/server/0763-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0762-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0764-Add-Player-Warden-Warning-API.patch b/patches/server/0763-Add-Player-Warden-Warning-API.patch
index bbb7bff753..bbb7bff753 100644
--- a/patches/server/0764-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0763-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0765-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0764-More-vanilla-friendly-methods-to-update-trades.patch
index 5c30d5f82c..5c30d5f82c 100644
--- a/patches/server/0765-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0764-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0766-Add-paper-dumplisteners-command.patch b/patches/server/0765-Add-paper-dumplisteners-command.patch
index aabb60033d..aabb60033d 100644
--- a/patches/server/0766-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0765-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0767-check-global-player-list-where-appropriate.patch b/patches/server/0766-check-global-player-list-where-appropriate.patch
index cc1aa7af3e..cc1aa7af3e 100644
--- a/patches/server/0767-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0766-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0768-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0767-Fix-async-entity-add-due-to-fungus-trees.patch
index 2a7830d952..2a7830d952 100644
--- a/patches/server/0768-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0767-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0769-ItemStack-damage-API.patch b/patches/server/0768-ItemStack-damage-API.patch
index 0faf3b2da5..1233d5fea9 100644
--- a/patches/server/0769-ItemStack-damage-API.patch
+++ b/patches/server/0768-ItemStack-damage-API.patch
@@ -53,10 +53,10 @@ index bee59df6a8f30416f94c1a4fbd5e2629336e842f..e64cc91b416bbbefe6aadf1c6b685346
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 8babdfe0c6bd921f95cf55313197d576035b0891..f1d2a1610649779da09a76ede7fdfa14658c82ba 100644
+index 2a7fffa71106327d0ffee632408d45faaec76702..2332f40fed84510741e63073aaf0a18aab85303e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1117,4 +1117,48 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1135,4 +1135,48 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          this.getHandle().knockback(strength, directionX, directionZ);
      };
      // Paper end - knockback API
diff --git a/patches/server/0770-Friction-API.patch b/patches/server/0769-Friction-API.patch
index e90915cb3e..dc735c46bb 100644
--- a/patches/server/0770-Friction-API.patch
+++ b/patches/server/0769-Friction-API.patch
@@ -133,10 +133,10 @@ index 1a291dd8a287db30e71dcb315599fc4b038764c4..30d62ee4d5cd2ddacb8783b5bbbf475d
      public int getHealth() {
          return this.getHandle().health;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index f1d2a1610649779da09a76ede7fdfa14658c82ba..7afa1fdc9e2cd517c8e173275b2882666e720bcf 100644
+index 2332f40fed84510741e63073aaf0a18aab85303e..516ea1ec9ae5069c3c0e4708f62164a91960b627 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1161,4 +1161,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1179,4 +1179,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          nmsStack.hurtAndBreak(amount, this.getHandle(), slot, true);
      }
      // Paper end - ItemStack damage API
diff --git a/patches/server/0771-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0770-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 03be2495a7..03be2495a7 100644
--- a/patches/server/0771-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0770-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0772-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0771-Fix-premature-player-kicks-on-shutdown.patch
index 034840341e..034840341e 100644
--- a/patches/server/0772-Fix-premature-player-kicks-on-shutdown.patch
+++ b/patches/server/0771-Fix-premature-player-kicks-on-shutdown.patch
diff --git a/patches/server/0773-Sync-offhand-slot-in-menus.patch b/patches/server/0772-Sync-offhand-slot-in-menus.patch
index f613fba84b..f613fba84b 100644
--- a/patches/server/0773-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0772-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0774-Player-Entity-Tracking-Events.patch b/patches/server/0773-Player-Entity-Tracking-Events.patch
index ceec0058a6..ceec0058a6 100644
--- a/patches/server/0774-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0773-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0775-Limit-pet-look-distance.patch b/patches/server/0774-Limit-pet-look-distance.patch
index 983f861539..983f861539 100644
--- a/patches/server/0775-Limit-pet-look-distance.patch
+++ b/patches/server/0774-Limit-pet-look-distance.patch
diff --git a/patches/server/0776-fix-Instruments.patch b/patches/server/0775-fix-Instruments.patch
index c2cffdb2b5..c2cffdb2b5 100644
--- a/patches/server/0776-fix-Instruments.patch
+++ b/patches/server/0775-fix-Instruments.patch
diff --git a/patches/server/0777-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0776-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 420107d5c3..420107d5c3 100644
--- a/patches/server/0777-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0776-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0778-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0777-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 8b797606ed..8b797606ed 100644
--- a/patches/server/0778-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0777-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0779-Add-BlockLockCheckEvent.patch b/patches/server/0778-Add-BlockLockCheckEvent.patch
index 31fba739ae..31fba739ae 100644
--- a/patches/server/0779-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0778-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0780-Add-Sneaking-API-for-Entities.patch b/patches/server/0779-Add-Sneaking-API-for-Entities.patch
index aaee22c056..aaee22c056 100644
--- a/patches/server/0780-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0779-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0781-Improve-logging-and-errors.patch b/patches/server/0780-Improve-logging-and-errors.patch
index d2ccc7abed..d2ccc7abed 100644
--- a/patches/server/0781-Improve-logging-and-errors.patch
+++ b/patches/server/0780-Improve-logging-and-errors.patch
diff --git a/patches/server/0782-Improve-PortalEvents.patch b/patches/server/0781-Improve-PortalEvents.patch
index bb191a7362..bb191a7362 100644
--- a/patches/server/0782-Improve-PortalEvents.patch
+++ b/patches/server/0781-Improve-PortalEvents.patch
diff --git a/patches/server/0783-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0782-Add-config-option-for-spider-worldborder-climbing.patch
index 71e3939753..71e3939753 100644
--- a/patches/server/0783-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0782-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0784-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0783-Add-missing-SpigotConfig-logCommands-check.patch
index 9c86e0000a..9c86e0000a 100644
--- a/patches/server/0784-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0783-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0785-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0784-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0785-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0784-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0786-Flying-Fall-Damage.patch b/patches/server/0785-Flying-Fall-Damage.patch
index cee20a07da..cee20a07da 100644
--- a/patches/server/0786-Flying-Fall-Damage.patch
+++ b/patches/server/0785-Flying-Fall-Damage.patch
diff --git a/patches/server/0787-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0786-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 80118a6499..80118a6499 100644
--- a/patches/server/0787-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0786-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0788-config-for-disabling-entity-tag-tags.patch b/patches/server/0787-config-for-disabling-entity-tag-tags.patch
index aabc1e1a31..aabc1e1a31 100644
--- a/patches/server/0788-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0787-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0789-Use-single-player-info-update-packet-on-join.patch b/patches/server/0788-Use-single-player-info-update-packet-on-join.patch
index bbf8785310..bbf8785310 100644
--- a/patches/server/0789-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0788-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0790-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0789-Correctly-shrink-items-during-EntityResurrectEvent.patch
index e7b31c3642..e7b31c3642 100644
--- a/patches/server/0790-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0789-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0791-Win-Screen-API.patch b/patches/server/0790-Win-Screen-API.patch
index 567b2236d9..567b2236d9 100644
--- a/patches/server/0791-Win-Screen-API.patch
+++ b/patches/server/0790-Win-Screen-API.patch
diff --git a/patches/server/0792-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0791-Remove-CraftItemStack-setAmount-null-assignment.patch
index 5b5c421ff2..5b5c421ff2 100644
--- a/patches/server/0792-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0791-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0793-Fix-force-opening-enchantment-tables.patch b/patches/server/0792-Fix-force-opening-enchantment-tables.patch
index 89326fc719..89326fc719 100644
--- a/patches/server/0793-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0792-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0794-Add-Entity-Body-Yaw-API.patch b/patches/server/0793-Add-Entity-Body-Yaw-API.patch
index a4f9c0231a..c1be71053d 100644
--- a/patches/server/0794-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0793-Add-Entity-Body-Yaw-API.patch
@@ -43,10 +43,10 @@ index ac513d3162a0794f226abc80bff21c799fe5802c..7c7501b4b21530d0641774f64e87d7d1
      @Override
      public boolean isInvisible() {  // Paper - moved up from LivingEntity
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7afa1fdc9e2cd517c8e173275b2882666e720bcf..563da83fe7159aa5bc8e5387734ee502045b3f15 100644
+index 516ea1ec9ae5069c3c0e4708f62164a91960b627..a50803a9b41cf3c0b081eb6b786f952dd0ed284f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1174,4 +1174,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1192,4 +1192,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          this.getHandle().frictionState = state;
      }
      // Paper end - friction API
diff --git a/patches/server/0795-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0794-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 962917dab8..962917dab8 100644
--- a/patches/server/0795-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0794-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0796-Add-EntityFertilizeEggEvent.patch b/patches/server/0795-Add-EntityFertilizeEggEvent.patch
index 07253994cb..07253994cb 100644
--- a/patches/server/0796-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0795-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0797-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0796-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index b804a77828..b804a77828 100644
--- a/patches/server/0797-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0796-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0798-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0797-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 85321a4a5b..85321a4a5b 100644
--- a/patches/server/0798-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0797-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0799-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0798-Correctly-handle-ArmorStand-invisibility.patch
index 34b66d686a..34b66d686a 100644
--- a/patches/server/0799-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0798-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0800-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0799-Fix-advancement-triggers-for-entity-damage.patch
index 94c53ab61c..94c53ab61c 100644
--- a/patches/server/0800-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0799-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0801-Fix-text-display-error-on-spawn.patch b/patches/server/0800-Fix-text-display-error-on-spawn.patch
index 7f64cfe6d9..7f64cfe6d9 100644
--- a/patches/server/0801-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0800-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0802-Fix-inventories-returning-null-Locations.patch b/patches/server/0801-Fix-inventories-returning-null-Locations.patch
index 23413d6b03..23413d6b03 100644
--- a/patches/server/0802-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0801-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0803-Add-Shearable-API.patch b/patches/server/0802-Add-Shearable-API.patch
index 069dcbaf2e..069dcbaf2e 100644
--- a/patches/server/0803-Add-Shearable-API.patch
+++ b/patches/server/0802-Add-Shearable-API.patch
diff --git a/patches/server/0804-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0803-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 254a94df3a..254a94df3a 100644
--- a/patches/server/0804-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0803-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0805-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0804-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index d90e599897..d90e599897 100644
--- a/patches/server/0805-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0804-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0806-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0805-Treat-sequence-violations-like-they-should-be.patch
index e0fce8efce..e0fce8efce 100644
--- a/patches/server/0806-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0805-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0807-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0806-Prevent-causing-expired-keys-from-impacting-new-join.patch
index ee811c8ba6..ee811c8ba6 100644
--- a/patches/server/0807-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0806-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0808-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0807-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 3306163498..3306163498 100644
--- a/patches/server/0808-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0807-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0809-Use-array-for-gamerule-storage.patch b/patches/server/0808-Use-array-for-gamerule-storage.patch
index 194ff8f15b..194ff8f15b 100644
--- a/patches/server/0809-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0808-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0810-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0809-Fix-a-couple-of-upstream-bed-issues.patch
index 665db524c5..665db524c5 100644
--- a/patches/server/0810-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0809-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0811-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0810-Fix-demo-flag-not-enabling-demo-mode.patch
index d64dd23e37..d64dd23e37 100644
--- a/patches/server/0811-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0810-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0812-Add-Mob-Experience-reward-API.patch b/patches/server/0811-Add-Mob-Experience-reward-API.patch
index f82f765beb..f82f765beb 100644
--- a/patches/server/0812-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0811-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0813-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0812-Break-redstone-on-top-of-trap-doors-early.patch
index 11c427e808..11c427e808 100644
--- a/patches/server/0813-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0812-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0814-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0813-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index becde16ce8..becde16ce8 100644
--- a/patches/server/0814-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0813-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0815-More-accurate-isInOpenWater-impl.patch b/patches/server/0814-More-accurate-isInOpenWater-impl.patch
index 6e110094dd..6e110094dd 100644
--- a/patches/server/0815-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0814-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0816-Expand-PlayerItemMendEvent.patch b/patches/server/0815-Expand-PlayerItemMendEvent.patch
index 289fae7adb..289fae7adb 100644
--- a/patches/server/0816-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0815-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0817-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0816-Refresh-ProjectileSource-for-projectiles.patch
index 59deace234..59deace234 100644
--- a/patches/server/0817-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0816-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0818-Add-transient-modifier-API.patch b/patches/server/0817-Add-transient-modifier-API.patch
index 36cc0a030a..36cc0a030a 100644
--- a/patches/server/0818-Add-transient-modifier-API.patch
+++ b/patches/server/0817-Add-transient-modifier-API.patch
diff --git a/patches/server/0819-Fix-block-place-logic.patch b/patches/server/0818-Fix-block-place-logic.patch
index accea4ee7c..accea4ee7c 100644
--- a/patches/server/0819-Fix-block-place-logic.patch
+++ b/patches/server/0818-Fix-block-place-logic.patch
diff --git a/patches/server/0820-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0819-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index c44ec5216d..c44ec5216d 100644
--- a/patches/server/0820-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0819-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0821-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0820-Call-BlockGrowEvent-for-missing-blocks.patch
index 895a528de8..895a528de8 100644
--- a/patches/server/0821-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0820-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0822-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0821-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 0eb4dc7f69..0eb4dc7f69 100644
--- a/patches/server/0822-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0821-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0823-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0822-fix-MapLike-spam-for-missing-key-selector.patch
index 2bd3b889f1..2bd3b889f1 100644
--- a/patches/server/0823-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0822-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0824-Fix-sniffer-removeExploredLocation.patch b/patches/server/0823-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0824-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0823-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0825-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0824-Add-method-to-remove-all-active-potion-effects.patch
index beee87ef9d..4e1ece1a04 100644
--- a/patches/server/0825-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0824-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a5d30e5657edd7d71ea521f81faa6d3088164291..6c44aaef8f09b2a10183dba751557ac5c6233a87 100644
+index a50803a9b41cf3c0b081eb6b786f952dd0ed284f..0398ba2cac2b69111ce7c5f9e5680119dd27c6cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -563,6 +563,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0826-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0825-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index ed5525cfda..ed5525cfda 100644
--- a/patches/server/0826-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0825-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0827-Add-event-for-player-editing-sign.patch b/patches/server/0826-Add-event-for-player-editing-sign.patch
index df5567a67f..df5567a67f 100644
--- a/patches/server/0827-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0826-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0828-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0827-Only-tick-item-frames-if-players-can-see-it.patch
index bf73ba4a5c..bf73ba4a5c 100644
--- a/patches/server/0828-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0827-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0829-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0828-Fix-cmd-permission-levels-for-command-blocks.patch
index 5167eee08c..5167eee08c 100644
--- a/patches/server/0829-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0828-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0830-Add-option-to-disable-block-updates.patch b/patches/server/0829-Add-option-to-disable-block-updates.patch
index 8fe599472e..8fe599472e 100644
--- a/patches/server/0830-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0829-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0831-Call-missing-BlockDispenseEvent.patch b/patches/server/0830-Call-missing-BlockDispenseEvent.patch
index ca534e4617..ca534e4617 100644
--- a/patches/server/0831-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0830-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0832-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0831-Don-t-load-chunks-for-supporting-block-checks.patch
index db2c15729d..db2c15729d 100644
--- a/patches/server/0832-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0831-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0833-Optimize-player-lookups-for-beacons.patch b/patches/server/0832-Optimize-player-lookups-for-beacons.patch
index 1c203c23a6..1c203c23a6 100644
--- a/patches/server/0833-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0832-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0834-More-Sign-Block-API.patch b/patches/server/0833-More-Sign-Block-API.patch
index 3be6f4e353..3be6f4e353 100644
--- a/patches/server/0834-More-Sign-Block-API.patch
+++ b/patches/server/0833-More-Sign-Block-API.patch
diff --git a/patches/server/0835-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0834-fix-item-meta-for-tadpole-buckets.patch
index b367979963..b367979963 100644
--- a/patches/server/0835-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0834-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0836-Fix-BanList-API.patch b/patches/server/0835-Fix-BanList-API.patch
index 352a89b454..352a89b454 100644
--- a/patches/server/0836-Fix-BanList-API.patch
+++ b/patches/server/0835-Fix-BanList-API.patch
diff --git a/patches/server/0837-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0836-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 5f51eb317c..5f51eb317c 100644
--- a/patches/server/0837-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0836-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0838-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0837-Fix-possible-NPE-on-painting-creation.patch
index dc3838be94..dc3838be94 100644
--- a/patches/server/0838-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0837-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0839-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0838-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 6785f755ab..6785f755ab 100644
--- a/patches/server/0839-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0838-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0840-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0839-ExperienceOrb-should-call-EntitySpawnEvent.patch
index b70d980d31..b70d980d31 100644
--- a/patches/server/0840-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0839-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0841-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0840-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 301b345fb9..301b345fb9 100644
--- a/patches/server/0841-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0840-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0842-Add-whitelist-events.patch b/patches/server/0841-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0842-Add-whitelist-events.patch
+++ b/patches/server/0841-Add-whitelist-events.patch
diff --git a/patches/server/0843-Implement-PlayerFailMoveEvent.patch b/patches/server/0842-Implement-PlayerFailMoveEvent.patch
index 6a55a3af38..6a55a3af38 100644
--- a/patches/server/0843-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0842-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0844-Folia-scheduler-and-owned-region-API.patch b/patches/server/0843-Folia-scheduler-and-owned-region-API.patch
index ee5d5c140f..ee5d5c140f 100644
--- a/patches/server/0844-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0843-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0845-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0844-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0845-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0844-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0846-API-for-updating-recipes-on-clients.patch b/patches/server/0845-API-for-updating-recipes-on-clients.patch
index 54f4e830b0..54f4e830b0 100644
--- a/patches/server/0846-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0845-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0847-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0846-Fix-rotation-when-spawning-display-entities.patch
index 7491ff60fe..7491ff60fe 100644
--- a/patches/server/0847-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0846-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0848-Only-capture-actual-tree-growth.patch b/patches/server/0847-Only-capture-actual-tree-growth.patch
index aef612bcaa..aef612bcaa 100644
--- a/patches/server/0848-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0847-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0849-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0848-Use-correct-source-for-mushroom-block-spread-event.patch
index a295e29bcb..a295e29bcb 100644
--- a/patches/server/0849-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0848-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0850-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0849-Respect-randomizeData-on-more-entities-when-spawning.patch
index d04e8bf4f6..d04e8bf4f6 100644
--- a/patches/server/0850-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0849-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0851-Use-correct-seed-on-api-world-load.patch b/patches/server/0850-Use-correct-seed-on-api-world-load.patch
index 764833c01d..764833c01d 100644
--- a/patches/server/0851-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0850-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0852-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0851-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 2f19c9d94a..2f19c9d94a 100644
--- a/patches/server/0852-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0851-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0853-Cache-map-ids-on-item-frames.patch b/patches/server/0852-Cache-map-ids-on-item-frames.patch
index 65e3e3499f..65e3e3499f 100644
--- a/patches/server/0853-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0852-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0854-Fix-custom-statistic-criteria-creation.patch b/patches/server/0853-Fix-custom-statistic-criteria-creation.patch
index a3e8b66e3a..a3e8b66e3a 100644
--- a/patches/server/0854-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0853-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0855-Bandaid-fix-for-Effect.patch b/patches/server/0854-Bandaid-fix-for-Effect.patch
index d7a85ce5c8..d7a85ce5c8 100644
--- a/patches/server/0855-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0854-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0856-SculkCatalyst-bloom-API.patch b/patches/server/0855-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0856-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0855-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0857-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0856-API-for-an-entity-s-scoreboard-name.patch
index ac804a3ed5..ac804a3ed5 100644
--- a/patches/server/0857-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0856-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0858-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0857-Deprecate-and-replace-methods-with-old-StructureType.patch
index d34d5b18df..d34d5b18df 100644
--- a/patches/server/0858-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0857-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0859-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0858-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 5725b805f0..5725b805f0 100644
--- a/patches/server/0859-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0858-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0860-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0859-Properly-handle-BlockBreakEvent-isDropItems.patch
index 75a746ca81..75a746ca81 100644
--- a/patches/server/0860-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0859-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0861-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0860-Fire-entity-death-event-for-ender-dragon.patch
index 66624e354c..66624e354c 100644
--- a/patches/server/0861-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0860-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0862-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0861-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 4b7085d831..4b7085d831 100644
--- a/patches/server/0862-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0861-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0863-Add-Listing-API-for-Player.patch b/patches/server/0862-Add-Listing-API-for-Player.patch
index bd96c74d58..bd96c74d58 100644
--- a/patches/server/0863-Add-Listing-API-for-Player.patch
+++ b/patches/server/0862-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0864-Configurable-Region-Compression-Format.patch b/patches/server/0863-Configurable-Region-Compression-Format.patch
index 64a52a4ea2..64a52a4ea2 100644
--- a/patches/server/0864-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0863-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0865-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0864-Add-BlockFace-to-BlockDamageEvent.patch
index 749d93224e..749d93224e 100644
--- a/patches/server/0865-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0864-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0866-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0865-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0866-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0865-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0867-Expand-Pose-API.patch b/patches/server/0866-Expand-Pose-API.patch
index 1a9699d342..1a9699d342 100644
--- a/patches/server/0867-Expand-Pose-API.patch
+++ b/patches/server/0866-Expand-Pose-API.patch
diff --git a/patches/server/0868-More-DragonBattle-API.patch b/patches/server/0867-More-DragonBattle-API.patch
index b7b58f6c99..b7b58f6c99 100644
--- a/patches/server/0868-More-DragonBattle-API.patch
+++ b/patches/server/0867-More-DragonBattle-API.patch
diff --git a/patches/server/0869-Add-PlayerPickItemEvent.patch b/patches/server/0868-Add-PlayerPickItemEvent.patch
index b2bfa9ea75..b2bfa9ea75 100644
--- a/patches/server/0869-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0868-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0870-Allow-trident-custom-damage.patch b/patches/server/0869-Allow-trident-custom-damage.patch
index 95137bd7d5..95137bd7d5 100644
--- a/patches/server/0870-Allow-trident-custom-damage.patch
+++ b/patches/server/0869-Allow-trident-custom-damage.patch
diff --git a/patches/server/0871-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0870-Expose-hand-in-BlockCanBuildEvent.patch
index 4abc7e9fc5..4abc7e9fc5 100644
--- a/patches/server/0871-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0870-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0872-Optimize-nearest-structure-border-iteration.patch b/patches/server/0871-Optimize-nearest-structure-border-iteration.patch
index df5f60c52c..df5f60c52c 100644
--- a/patches/server/0872-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0871-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0873-Implement-OfflinePlayer-isConnected.patch b/patches/server/0872-Implement-OfflinePlayer-isConnected.patch
index 199101506f..199101506f 100644
--- a/patches/server/0873-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0872-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0874-Fix-slot-desync.patch b/patches/server/0873-Fix-slot-desync.patch
index aa5a024985..aa5a024985 100644
--- a/patches/server/0874-Fix-slot-desync.patch
+++ b/patches/server/0873-Fix-slot-desync.patch
diff --git a/patches/server/0875-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0874-Add-titleOverride-to-InventoryOpenEvent.patch
index ee17679934..ee17679934 100644
--- a/patches/server/0875-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0874-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0876-Configure-sniffer-egg-hatch-time.patch b/patches/server/0875-Configure-sniffer-egg-hatch-time.patch
index 7def55b1f7..7def55b1f7 100644
--- a/patches/server/0876-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0875-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0877-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0876-Do-crystal-portal-proximity-check-before-entity-look.patch
index ee3855f2b8..ee3855f2b8 100644
--- a/patches/server/0877-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0876-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0878-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0877-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0878-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0877-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0879-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0878-Add-slot-sanity-checks-in-container-clicks.patch
index 3be07bcfa2..3be07bcfa2 100644
--- a/patches/server/0879-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0878-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0880-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0879-Call-BlockRedstoneEvents-for-lecterns.patch
index 2c76754071..2c76754071 100644
--- a/patches/server/0880-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0879-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0881-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0880-Allow-proper-checking-of-empty-item-stacks.patch
index c578a2c3c2..c578a2c3c2 100644
--- a/patches/server/0881-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0880-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0882-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0881-Fix-silent-equipment-change-for-mobs.patch
index 793470108f..793470108f 100644
--- a/patches/server/0882-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0881-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0883-Fix-spigot-s-Forced-Stats.patch b/patches/server/0882-Fix-spigot-s-Forced-Stats.patch
index 554f1f8844..554f1f8844 100644
--- a/patches/server/0883-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0882-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0884-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0883-Add-missing-InventoryHolders-to-inventories.patch
index d058564174..d058564174 100644
--- a/patches/server/0884-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0883-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0885-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0884-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index ab4d61b97a..ab4d61b97a 100644
--- a/patches/server/0885-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0884-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0886-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0885-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0886-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0885-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0887-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0886-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e1f2934daa..e1f2934daa 100644
--- a/patches/server/0887-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0886-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0888-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0887-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0888-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0887-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0889-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0888-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0889-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0888-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0890-Fix-missing-map-initialize-event-call.patch b/patches/server/0889-Fix-missing-map-initialize-event-call.patch
index c95f6abbf7..c95f6abbf7 100644
--- a/patches/server/0890-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0889-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0891-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0890-Update-entity-data-when-attaching-firework-to-entity.patch
index f2c094976f..f2c094976f 100644
--- a/patches/server/0891-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0890-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0892-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0891-Fix-UnsafeValues-loadAdvancement.patch
index c1cfc35cc9..c1cfc35cc9 100644
--- a/patches/server/0892-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0891-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0893-Add-player-idle-duration-API.patch b/patches/server/0892-Add-player-idle-duration-API.patch
index 0713bbba0b..0713bbba0b 100644
--- a/patches/server/0893-Add-player-idle-duration-API.patch
+++ b/patches/server/0892-Add-player-idle-duration-API.patch
diff --git a/patches/server/0894-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0893-Don-t-check-if-we-can-see-non-visible-entities.patch
index 5d9fbe505f..5d9fbe505f 100644
--- a/patches/server/0894-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0893-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0895-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0894-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 5abf7cda2c..5abf7cda2c 100644
--- a/patches/server/0895-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0894-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0896-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0895-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 6839ae5814..6839ae5814 100644
--- a/patches/server/0896-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0895-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0897-Optimize-VarInts.patch b/patches/server/0896-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0897-Optimize-VarInts.patch
+++ b/patches/server/0896-Optimize-VarInts.patch
diff --git a/patches/server/0898-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0897-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index f0fcc8b9eb..f0fcc8b9eb 100644
--- a/patches/server/0898-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0897-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0899-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0898-Add-predicate-for-blocks-when-raytracing.patch
index 43a753b5c2..43a753b5c2 100644
--- a/patches/server/0899-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0898-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0900-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0899-Broadcast-take-item-packets-with-collector-as-source.patch
index 740ea621a7..740ea621a7 100644
--- a/patches/server/0900-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0899-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0901-Expand-LingeringPotion-API.patch b/patches/server/0900-Expand-LingeringPotion-API.patch
index fdd0abf668..fdd0abf668 100644
--- a/patches/server/0901-Expand-LingeringPotion-API.patch
+++ b/patches/server/0900-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0902-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0901-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index da48750747..da48750747 100644
--- a/patches/server/0902-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0901-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0903-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0902-Add-hand-to-fish-event-for-all-player-interactions.patch
index dd3e5bba44..dd3e5bba44 100644
--- a/patches/server/0903-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0902-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0904-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0903-Fix-several-issues-with-EntityBreedEvent.patch
index 6a97d9fb9e..6a97d9fb9e 100644
--- a/patches/server/0904-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0903-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0905-Add-UUID-attribute-modifier-API.patch b/patches/server/0904-Add-UUID-attribute-modifier-API.patch
index 4b5e695553..4b5e695553 100644
--- a/patches/server/0905-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0904-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0906-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0905-Fix-missing-event-call-for-entity-teleport-API.patch
index d567759368..d567759368 100644
--- a/patches/server/0906-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0905-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0907-Lazily-create-LootContext-for-criterions.patch b/patches/server/0906-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0907-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0906-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0908-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0907-Don-t-fire-sync-events-during-worldgen.patch
index 6d438fe4c5..6d438fe4c5 100644
--- a/patches/server/0908-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0907-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0909-Add-Structure-check-API.patch b/patches/server/0908-Add-Structure-check-API.patch
index 6f901b1c7f..6f901b1c7f 100644
--- a/patches/server/0909-Add-Structure-check-API.patch
+++ b/patches/server/0908-Add-Structure-check-API.patch
diff --git a/patches/server/0910-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0909-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index 32e393d2a8..32e393d2a8 100644
--- a/patches/server/0910-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0909-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0911-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0910-Restore-vanilla-entity-drops-behavior.patch
index 7636320903..7636320903 100644
--- a/patches/server/0911-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0910-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0912-Dont-resend-blocks-on-interactions.patch b/patches/server/0911-Dont-resend-blocks-on-interactions.patch
index 74650cebfd..74650cebfd 100644
--- a/patches/server/0912-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0911-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0913-add-more-scoreboard-API.patch b/patches/server/0912-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0913-add-more-scoreboard-API.patch
+++ b/patches/server/0912-add-more-scoreboard-API.patch
diff --git a/patches/server/0914-Improve-Registry.patch b/patches/server/0913-Improve-Registry.patch
index bd6287869d..bd6287869d 100644
--- a/patches/server/0914-Improve-Registry.patch
+++ b/patches/server/0913-Improve-Registry.patch
diff --git a/patches/server/0915-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0914-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index d0dc04a7eb..d0dc04a7eb 100644
--- a/patches/server/0915-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0914-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0916-Add-experience-points-API.patch b/patches/server/0915-Add-experience-points-API.patch
index fc30446016..fc30446016 100644
--- a/patches/server/0916-Add-experience-points-API.patch
+++ b/patches/server/0915-Add-experience-points-API.patch
diff --git a/patches/server/0917-Add-drops-to-shear-events.patch b/patches/server/0916-Add-drops-to-shear-events.patch
index 7e5645cd5f..7e5645cd5f 100644
--- a/patches/server/0917-Add-drops-to-shear-events.patch
+++ b/patches/server/0916-Add-drops-to-shear-events.patch
diff --git a/patches/server/0918-Add-PlayerShieldDisableEvent.patch b/patches/server/0917-Add-PlayerShieldDisableEvent.patch
index 5bbd9b6ff6..5bbd9b6ff6 100644
--- a/patches/server/0918-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0917-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0919-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0918-Validate-ResourceLocation-in-NBT-reading.patch
index 48e7f7dede..48e7f7dede 100644
--- a/patches/server/0919-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0918-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0920-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0919-Properly-handle-experience-dropping-on-block-break.patch
index c5ffca5d89..c5ffca5d89 100644
--- a/patches/server/0920-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0919-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0921-Fixup-NamespacedKey-handling.patch b/patches/server/0920-Fixup-NamespacedKey-handling.patch
index f5d990944b..f5d990944b 100644
--- a/patches/server/0921-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0920-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0922-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0921-Expose-LootTable-of-DecoratedPot.patch
index afa86977a9..afa86977a9 100644
--- a/patches/server/0922-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0921-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0923-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0922-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 37c0ef0eef..37c0ef0eef 100644
--- a/patches/server/0923-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0922-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0924-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0923-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 95e1104a25..95e1104a25 100644
--- a/patches/server/0924-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0923-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0925-Add-ShulkerDuplicateEvent.patch b/patches/server/0924-Add-ShulkerDuplicateEvent.patch
index de864137e2..de864137e2 100644
--- a/patches/server/0925-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/0924-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0926-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0925-Add-api-for-spawn-egg-texture-colors.patch
index f8a65ad281..f8a65ad281 100644
--- a/patches/server/0926-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0925-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/0927-Add-Lifecycle-Event-system.patch b/patches/server/0926-Add-Lifecycle-Event-system.patch
index 8cd7f2852f..8cd7f2852f 100644
--- a/patches/server/0927-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0926-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/0928-ItemStack-Tooltip-API.patch b/patches/server/0927-ItemStack-Tooltip-API.patch
index bdec7c8b91..bdec7c8b91 100644
--- a/patches/server/0928-ItemStack-Tooltip-API.patch
+++ b/patches/server/0927-ItemStack-Tooltip-API.patch
diff --git a/patches/server/0929-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0928-Add-getChunkSnapshot-includeLightData-parameter.patch
index 54aa35539f..54aa35539f 100644
--- a/patches/server/0929-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/0928-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0930-Add-FluidState-API.patch b/patches/server/0929-Add-FluidState-API.patch
index aac0912819..aac0912819 100644
--- a/patches/server/0930-Add-FluidState-API.patch
+++ b/patches/server/0929-Add-FluidState-API.patch
diff --git a/patches/server/0931-add-number-format-api.patch b/patches/server/0930-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0931-add-number-format-api.patch
+++ b/patches/server/0930-add-number-format-api.patch
diff --git a/patches/server/0932-improve-BanList-types.patch b/patches/server/0931-improve-BanList-types.patch
index 23a08cbe55..23a08cbe55 100644
--- a/patches/server/0932-improve-BanList-types.patch
+++ b/patches/server/0931-improve-BanList-types.patch
diff --git a/patches/server/0933-Expanded-Hopper-API.patch b/patches/server/0932-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0933-Expanded-Hopper-API.patch
+++ b/patches/server/0932-Expanded-Hopper-API.patch
diff --git a/patches/server/0934-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0933-Add-BlockBreakProgressUpdateEvent.patch
index 3481a288ee..3481a288ee 100644
--- a/patches/server/0934-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0933-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0935-Deprecate-ItemStack-setType.patch b/patches/server/0934-Deprecate-ItemStack-setType.patch
index e0a6acc747..e0a6acc747 100644
--- a/patches/server/0935-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0934-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0936-Add-CartographyItemEvent.patch b/patches/server/0935-Add-CartographyItemEvent.patch
index 9e48767381..9e48767381 100644
--- a/patches/server/0936-Add-CartographyItemEvent.patch
+++ b/patches/server/0935-Add-CartographyItemEvent.patch
diff --git a/patches/server/0937-More-Raid-API.patch b/patches/server/0936-More-Raid-API.patch
index e218d301b5..e218d301b5 100644
--- a/patches/server/0937-More-Raid-API.patch
+++ b/patches/server/0936-More-Raid-API.patch
diff --git a/patches/server/0938-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0937-Add-onboarding-message-for-initial-server-start.patch
index 5bb4e9d2fc..5bb4e9d2fc 100644
--- a/patches/server/0938-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0937-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/0939-Configurable-max-block-fluid-ticks.patch b/patches/server/0938-Configurable-max-block-fluid-ticks.patch
index 2d7a50b998..2d7a50b998 100644
--- a/patches/server/0939-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0938-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0940-Fix-bees-aging-inside-hives.patch b/patches/server/0939-Fix-bees-aging-inside-hives.patch
index 400ede1160..400ede1160 100644
--- a/patches/server/0940-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0939-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0941-Disable-memory-reserve-allocating.patch b/patches/server/0940-Disable-memory-reserve-allocating.patch
index ea801f5092..ea801f5092 100644
--- a/patches/server/0941-Disable-memory-reserve-allocating.patch
+++ b/patches/server/0940-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0942-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0941-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index d98b3aeccc..d98b3aeccc 100644
--- a/patches/server/0942-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/0941-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0943-Fix-DamageSource-API.patch b/patches/server/0942-Fix-DamageSource-API.patch
index f92badc241..f92badc241 100644
--- a/patches/server/0943-Fix-DamageSource-API.patch
+++ b/patches/server/0942-Fix-DamageSource-API.patch
diff --git a/patches/server/0944-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0943-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index 8e09c4fb05..8e09c4fb05 100644
--- a/patches/server/0944-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/server/0943-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0945-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0944-Fix-possible-StackOverflowError-for-some-dispenses.patch
index 5351dde83c..5351dde83c 100644
--- a/patches/server/0945-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/0944-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0946-Improve-tag-parser-handling.patch b/patches/server/0945-Improve-tag-parser-handling.patch
index 9ffa70e388..9ffa70e388 100644
--- a/patches/server/0946-Improve-tag-parser-handling.patch
+++ b/patches/server/0945-Improve-tag-parser-handling.patch
diff --git a/patches/server/0947-Item-Mutation-Fixes.patch b/patches/server/0946-Item-Mutation-Fixes.patch
index bad3be61f9..bad3be61f9 100644
--- a/patches/server/0947-Item-Mutation-Fixes.patch
+++ b/patches/server/0946-Item-Mutation-Fixes.patch
diff --git a/patches/server/0948-Per-world-ticks-per-spawn-settings.patch b/patches/server/0947-Per-world-ticks-per-spawn-settings.patch
index 0d7c9ea5b4..0d7c9ea5b4 100644
--- a/patches/server/0948-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0947-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0949-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0948-Properly-track-the-changed-item-from-dispense-events.patch
index 2dc797fea7..2dc797fea7 100644
--- a/patches/server/0949-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/0948-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0950-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0949-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 12dc4db2ff..12dc4db2ff 100644
--- a/patches/server/0950-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0949-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0951-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/0950-Fix-tripwire-disarming-not-working-as-intended.patch
index fa7f6bde06..fa7f6bde06 100644
--- a/patches/server/0951-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/server/0950-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/0952-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0951-Add-config-for-mobs-immune-to-default-effects.patch
index 74dd1a1360..74dd1a1360 100644
--- a/patches/server/0952-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0951-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0953-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/0952-Deep-clone-nbt-tags-in-PDC.patch
index f559f0cd9d..f559f0cd9d 100644
--- a/patches/server/0953-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/server/0952-Deep-clone-nbt-tags-in-PDC.patch
diff --git a/patches/server/0954-Support-old-UUID-format-for-NBT.patch b/patches/server/0953-Support-old-UUID-format-for-NBT.patch
index 68ff8a5255..68ff8a5255 100644
--- a/patches/server/0954-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0953-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0955-Fix-shield-disable-inconsistency.patch b/patches/server/0954-Fix-shield-disable-inconsistency.patch
index 61614305d9..61614305d9 100644
--- a/patches/server/0955-Fix-shield-disable-inconsistency.patch
+++ b/patches/server/0954-Fix-shield-disable-inconsistency.patch
diff --git a/patches/server/0956-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0955-Handle-Large-Packets-disconnecting-client.patch
index ea20a101a7..ea20a101a7 100644
--- a/patches/server/0956-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0955-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0957-Fix-ItemFlags.patch b/patches/server/0956-Fix-ItemFlags.patch
index 46e55a9780..46e55a9780 100644
--- a/patches/server/0957-Fix-ItemFlags.patch
+++ b/patches/server/0956-Fix-ItemFlags.patch
diff --git a/patches/server/0958-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0957-Fix-helmet-damage-reduction-inconsistencies.patch
index a8b503a8ea..a8b503a8ea 100644
--- a/patches/server/0958-Fix-helmet-damage-reduction-inconsistencies.patch
+++ b/patches/server/0957-Fix-helmet-damage-reduction-inconsistencies.patch
diff --git a/patches/server/0959-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/0958-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index 2965a66127..2965a66127 100644
--- a/patches/server/0959-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/0958-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/patches/server/0960-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/0959-improve-checking-handled-tags-in-itemmeta.patch
index 0d027cd582..0d027cd582 100644
--- a/patches/server/0960-improve-checking-handled-tags-in-itemmeta.patch
+++ b/patches/server/0959-improve-checking-handled-tags-in-itemmeta.patch
diff --git a/patches/server/0961-General-ItemMeta-fixes.patch b/patches/server/0960-General-ItemMeta-fixes.patch
index c16ea28c5e..c16ea28c5e 100644
--- a/patches/server/0961-General-ItemMeta-fixes.patch
+++ b/patches/server/0960-General-ItemMeta-fixes.patch
diff --git a/patches/server/0962-Expose-hasColor-to-leather-armor.patch b/patches/server/0961-Expose-hasColor-to-leather-armor.patch
index fb4dc944de..fb4dc944de 100644
--- a/patches/server/0962-Expose-hasColor-to-leather-armor.patch
+++ b/patches/server/0961-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/server/0963-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/0962-Added-API-to-get-player-ha-proxy-address.patch
index 3f8c3f63b4..3f8c3f63b4 100644
--- a/patches/server/0963-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/server/0962-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/server/0964-More-Chest-Block-API.patch b/patches/server/0963-More-Chest-Block-API.patch
index 020d97d086..020d97d086 100644
--- a/patches/server/0964-More-Chest-Block-API.patch
+++ b/patches/server/0963-More-Chest-Block-API.patch
diff --git a/patches/server/0965-Print-data-component-type-on-encoding-error.patch b/patches/server/0964-Print-data-component-type-on-encoding-error.patch
index a60bdfee87..a60bdfee87 100644
--- a/patches/server/0965-Print-data-component-type-on-encoding-error.patch
+++ b/patches/server/0964-Print-data-component-type-on-encoding-error.patch
diff --git a/patches/server/0966-Brigadier-based-command-API.patch b/patches/server/0965-Brigadier-based-command-API.patch
index 876063208b..876063208b 100644
--- a/patches/server/0966-Brigadier-based-command-API.patch
+++ b/patches/server/0965-Brigadier-based-command-API.patch
diff --git a/patches/server/0967-Fix-issues-with-Recipe-API.patch b/patches/server/0966-Fix-issues-with-Recipe-API.patch
index bb85dca687..bb85dca687 100644
--- a/patches/server/0967-Fix-issues-with-Recipe-API.patch
+++ b/patches/server/0966-Fix-issues-with-Recipe-API.patch
diff --git a/patches/server/0968-Fix-equipment-slot-and-group-API.patch b/patches/server/0967-Fix-equipment-slot-and-group-API.patch
index 017d4a02be..34fd77dcd9 100644
--- a/patches/server/0968-Fix-equipment-slot-and-group-API.patch
+++ b/patches/server/0967-Fix-equipment-slot-and-group-API.patch
@@ -10,10 +10,10 @@ Adds the following:
 Co-authored-by: SoSeDiK <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d3bbf5dea0d26603f76293ebf64a86366f5ad3a1..d759a2adc77e35d66a1ff1c9f227cded6f0e9963 100644
+index 0398ba2cac2b69111ce7c5f9e5680119dd27c6cf..7e280955067169f63f15162e9cad1e86e824a8e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1193,4 +1193,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1211,4 +1211,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          this.getHandle().setYBodyRot(bodyYaw);
      }
      // Paper end - body yaw API
diff --git a/patches/server/0969-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/0968-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 8b39d13b43..8b39d13b43 100644
--- a/patches/server/0969-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/server/0968-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/server/0970-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0969-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 121b75eca6..121b75eca6 100644
--- a/patches/server/0970-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0969-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0971-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/0970-Prevent-NPE-if-hooked-entity-was-cleared.patch
index 8d3547db93..8d3547db93 100644
--- a/patches/server/0971-Prevent-NPE-if-hooked-entity-was-cleared.patch
+++ b/patches/server/0970-Prevent-NPE-if-hooked-entity-was-cleared.patch
diff --git a/patches/server/0972-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/0971-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
index cee7f11394..cee7f11394 100644
--- a/patches/server/0972-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
+++ b/patches/server/0971-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
diff --git a/patches/server/0973-Add-missing-fishing-event-state.patch b/patches/server/0972-Add-missing-fishing-event-state.patch
index 6ad1a92dd0..6ad1a92dd0 100644
--- a/patches/server/0973-Add-missing-fishing-event-state.patch
+++ b/patches/server/0972-Add-missing-fishing-event-state.patch
diff --git a/patches/server/0974-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0973-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index 23a507f4bf..23a507f4bf 100644
--- a/patches/server/0974-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/server/0973-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/server/0975-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/server/0974-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
index 1abf467e7e..1abf467e7e 100644
--- a/patches/server/0975-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
+++ b/patches/server/0974-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
diff --git a/patches/server/0976-Adopt-MaterialRerouting.patch b/patches/server/0975-Adopt-MaterialRerouting.patch
index e6473ef21a..e6473ef21a 100644
--- a/patches/server/0976-Adopt-MaterialRerouting.patch
+++ b/patches/server/0975-Adopt-MaterialRerouting.patch
diff --git a/patches/server/0977-Suspicious-Effect-Entry-API.patch b/patches/server/0976-Suspicious-Effect-Entry-API.patch
index bc26031199..bc26031199 100644
--- a/patches/server/0977-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/0976-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0978-check-if-itemstack-is-stackable-first.patch b/patches/server/0977-check-if-itemstack-is-stackable-first.patch
index 8e11960bdd..8e11960bdd 100644
--- a/patches/server/0978-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/0977-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0979-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0978-Fix-removing-recipes-from-RecipeIterator.patch
index 461c3eb854..461c3eb854 100644
--- a/patches/server/0979-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0978-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0980-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0979-Configurable-damage-tick-when-blocking-with-shield.patch
index 7f58a8291d..7f58a8291d 100644
--- a/patches/server/0980-Configurable-damage-tick-when-blocking-with-shield.patch
+++ b/patches/server/0979-Configurable-damage-tick-when-blocking-with-shield.patch
diff --git a/patches/server/0981-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0980-Properly-remove-the-experimental-smithing-inventory-.patch
index 9ede88caa7..9ede88caa7 100644
--- a/patches/server/0981-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/server/0980-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/server/0982-Moonrise-optimisation-patches.patch b/patches/server/0981-Moonrise-optimisation-patches.patch
index 9bafe4f99f..9bafe4f99f 100644
--- a/patches/server/0982-Moonrise-optimisation-patches.patch
+++ b/patches/server/0981-Moonrise-optimisation-patches.patch
diff --git a/patches/server/0983-Rewrite-dataconverter-system.patch b/patches/server/0982-Rewrite-dataconverter-system.patch
index c973389ac9..c973389ac9 100644
--- a/patches/server/0983-Rewrite-dataconverter-system.patch
+++ b/patches/server/0982-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0984-disable-forced-empty-world-ticks.patch b/patches/server/0983-disable-forced-empty-world-ticks.patch
index 4e5fea24f6..4e5fea24f6 100644
--- a/patches/server/0984-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0983-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 3046e40be7..3046e40be7 100644
--- a/patches/server/0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 30dde1fadd..30dde1fadd 100644
--- a/patches/server/0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 761c57c8f2..761c57c8f2 100644
--- a/patches/server/0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index f51a3d8642..f51a3d8642 100644
--- a/patches/server/0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0988-Allow-Saving-of-Oversized-Chunks.patch
index 4eef25929e..4eef25929e 100644
--- a/patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0988-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0990-Flat-bedrock-generator-settings.patch b/patches/server/0989-Flat-bedrock-generator-settings.patch
index da68e7d65b..da68e7d65b 100644
--- a/patches/server/0990-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0989-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0991-Entity-Activation-Range-2.0.patch b/patches/server/0990-Entity-Activation-Range-2.0.patch
index 6430108bbd..6430108bbd 100644
--- a/patches/server/0991-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0990-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0992-Optional-per-player-mob-spawns.patch b/patches/server/0991-Optional-per-player-mob-spawns.patch
index fee5589666..fee5589666 100644
--- a/patches/server/0992-Optional-per-player-mob-spawns.patch
+++ b/patches/server/0991-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/0993-Anti-Xray.patch b/patches/server/0992-Anti-Xray.patch
index c7253f3697..c7253f3697 100644
--- a/patches/server/0993-Anti-Xray.patch
+++ b/patches/server/0992-Anti-Xray.patch
diff --git a/patches/server/0994-Eigencraft-redstone-implementation.patch b/patches/server/0993-Eigencraft-redstone-implementation.patch
index b3e3db6504..b3e3db6504 100644
--- a/patches/server/0994-Eigencraft-redstone-implementation.patch
+++ b/patches/server/0993-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0995-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0994-Add-Alternate-Current-redstone-implementation.patch
index 8e8dac3c75..8e8dac3c75 100644
--- a/patches/server/0995-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0994-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 29e8f09721..29e8f09721 100644
--- a/patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0997-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0996-Use-Velocity-compression-and-cipher-natives.patch
index bfac334a58..bfac334a58 100644
--- a/patches/server/0997-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0996-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0998-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0997-Optimize-Collision-to-not-load-chunks.patch
index 43e8bded47..43e8bded47 100644
--- a/patches/server/0998-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0997-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 65f5e3531e..65f5e3531e 100644
--- a/patches/server/0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/1000-Optimize-Hoppers.patch b/patches/server/0999-Optimize-Hoppers.patch
index 46ee4f4df0..46ee4f4df0 100644
--- a/patches/server/1000-Optimize-Hoppers.patch
+++ b/patches/server/0999-Optimize-Hoppers.patch
diff --git a/patches/server/1001-Entity-load-save-limit-per-chunk.patch b/patches/server/1000-Entity-load-save-limit-per-chunk.patch
index 9a5959e34f..9a5959e34f 100644
--- a/patches/server/1001-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/1000-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1002-Optimize-Voxel-Shape-Merging.patch b/patches/server/1001-Optimize-Voxel-Shape-Merging.patch
index 114ee7cb28..114ee7cb28 100644
--- a/patches/server/1002-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/1001-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1003-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1002-Optimize-Bit-Operations-by-inlining.patch
index b7d93a56b9..b7d93a56b9 100644
--- a/patches/server/1003-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/1002-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1004-Remove-streams-from-hot-code.patch b/patches/server/1003-Remove-streams-from-hot-code.patch
index 4c6d94f7bf..4c6d94f7bf 100644
--- a/patches/server/1004-Remove-streams-from-hot-code.patch
+++ b/patches/server/1003-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1004-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 6fc4445bbf..6fc4445bbf 100644
--- a/patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/1004-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1006-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1005-Custom-table-implementation-for-blockstate-state-loo.patch
index 96d90abea3..96d90abea3 100644
--- a/patches/server/1006-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1005-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1007-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1006-Fix-entity-type-tags-suggestions-in-selectors.patch
index 7892753fc2..7892753fc2 100644
--- a/patches/server/1007-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1006-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1008-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1007-Handle-Oversized-block-entities-in-chunks.patch
index d3283fd63f..d3283fd63f 100644
--- a/patches/server/1008-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1007-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1009-API-for-checking-sent-chunks.patch b/patches/server/1008-API-for-checking-sent-chunks.patch
index 1ff508b727..1ff508b727 100644
--- a/patches/server/1009-API-for-checking-sent-chunks.patch
+++ b/patches/server/1008-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1010-Check-distance-in-entity-interactions.patch b/patches/server/1009-Check-distance-in-entity-interactions.patch
index 95e8e99b56..95e8e99b56 100644
--- a/patches/server/1010-Check-distance-in-entity-interactions.patch
+++ b/patches/server/1009-Check-distance-in-entity-interactions.patch
diff --git a/patches/server/1011-Configurable-Sand-Duping.patch b/patches/server/1010-Configurable-Sand-Duping.patch
index cbc52697db..cbc52697db 100644
--- a/patches/server/1011-Configurable-Sand-Duping.patch
+++ b/patches/server/1010-Configurable-Sand-Duping.patch
diff --git a/patches/server/1012-Optimise-general-POI-access.patch b/patches/server/1011-Optimise-general-POI-access.patch
index b3636fe591..b3636fe591 100644
--- a/patches/server/1012-Optimise-general-POI-access.patch
+++ b/patches/server/1011-Optimise-general-POI-access.patch
diff --git a/patches/server/1013-Improve-performance-of-mass-crafts.patch b/patches/server/1012-Improve-performance-of-mass-crafts.patch
index 15701b21e0..15701b21e0 100644
--- a/patches/server/1013-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1012-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1014-Properly-resend-entities.patch b/patches/server/1013-Properly-resend-entities.patch
index 148750ed59..148750ed59 100644
--- a/patches/server/1014-Properly-resend-entities.patch
+++ b/patches/server/1013-Properly-resend-entities.patch
diff --git a/patches/server/1015-Registry-Modification-API.patch b/patches/server/1014-Registry-Modification-API.patch
index fcef6c24fd..fcef6c24fd 100644
--- a/patches/server/1015-Registry-Modification-API.patch
+++ b/patches/server/1014-Registry-Modification-API.patch
diff --git a/patches/server/1016-Add-registry-entry-and-builders.patch b/patches/server/1015-Add-registry-entry-and-builders.patch
index a37a06a160..a37a06a160 100644
--- a/patches/server/1016-Add-registry-entry-and-builders.patch
+++ b/patches/server/1015-Add-registry-entry-and-builders.patch
diff --git a/patches/server/1017-Improved-Watchdog-Support.patch b/patches/server/1016-Improved-Watchdog-Support.patch
index 4c18803565..4c18803565 100644
--- a/patches/server/1017-Improved-Watchdog-Support.patch
+++ b/patches/server/1016-Improved-Watchdog-Support.patch
diff --git a/patches/server/1018-Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/1017-Proxy-ItemStack-to-CraftItemStack.patch
index 0e609e40fd..0e609e40fd 100644
--- a/patches/server/1018-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/patches/server/1017-Proxy-ItemStack-to-CraftItemStack.patch
diff --git a/patches/server/1019-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/server/1018-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
index 31fdc957f8..31fdc957f8 100644
--- a/patches/server/1019-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
+++ b/patches/server/1018-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
diff --git a/patches/server/1020-Prioritize-Minecraft-commands-in-function-parsing-an.patch b/patches/server/1019-Prioritize-Minecraft-commands-in-function-parsing-an.patch
index 6e36d9a7b3..6e36d9a7b3 100644
--- a/patches/server/1020-Prioritize-Minecraft-commands-in-function-parsing-an.patch
+++ b/patches/server/1019-Prioritize-Minecraft-commands-in-function-parsing-an.patch
diff --git a/patches/server/1021-optimize-dirt-and-snow-spreading.patch b/patches/server/1020-optimize-dirt-and-snow-spreading.patch
index 49de7fcab9..49de7fcab9 100644
--- a/patches/server/1021-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/1020-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1022-Fix-NPE-for-Jukebox-setRecord.patch b/patches/server/1021-Fix-NPE-for-Jukebox-setRecord.patch
index e15a77ee75..e15a77ee75 100644
--- a/patches/server/1022-Fix-NPE-for-Jukebox-setRecord.patch
+++ b/patches/server/1021-Fix-NPE-for-Jukebox-setRecord.patch
diff --git a/patches/server/1023-Fix-CraftWorld-isChunkGenerated.patch b/patches/server/1022-Fix-CraftWorld-isChunkGenerated.patch
index c402325cb5..c402325cb5 100644
--- a/patches/server/1023-Fix-CraftWorld-isChunkGenerated.patch
+++ b/patches/server/1022-Fix-CraftWorld-isChunkGenerated.patch
diff --git a/patches/server/1024-fix-horse-inventories.patch b/patches/server/1023-fix-horse-inventories.patch
index 9737a4fa71..9737a4fa71 100644
--- a/patches/server/1024-fix-horse-inventories.patch
+++ b/patches/server/1023-fix-horse-inventories.patch
diff --git a/patches/server/1025-Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/server/1024-Only-call-EntityDamageEvents-before-actuallyHurt.patch
index e1393a8173..e1393a8173 100644
--- a/patches/server/1025-Only-call-EntityDamageEvents-before-actuallyHurt.patch
+++ b/patches/server/1024-Only-call-EntityDamageEvents-before-actuallyHurt.patch
diff --git a/patches/server/1026-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1025-Fix-entity-tracker-desync-when-new-players-are-added.patch
index f767b9ab91..f767b9ab91 100644
--- a/patches/server/1026-Fix-entity-tracker-desync-when-new-players-are-added.patch
+++ b/patches/server/1025-Fix-entity-tracker-desync-when-new-players-are-added.patch
diff --git a/patches/server/1027-Lag-compensation-ticks.patch b/patches/server/1026-Lag-compensation-ticks.patch
index aa8b7f2d46..aa8b7f2d46 100644
--- a/patches/server/1027-Lag-compensation-ticks.patch
+++ b/patches/server/1026-Lag-compensation-ticks.patch
diff --git a/patches/server/1028-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1027-Detail-more-information-in-watchdog-dumps.patch
index cddaca3e53..cddaca3e53 100644
--- a/patches/server/1028-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1027-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/1029-Write-SavedData-IO-async.patch b/patches/server/1028-Write-SavedData-IO-async.patch
index cceb676e45..cceb676e45 100644
--- a/patches/server/1029-Write-SavedData-IO-async.patch
+++ b/patches/server/1028-Write-SavedData-IO-async.patch
diff --git a/patches/server/1030-Add-ItemType-getItemRarity.patch b/patches/server/1029-Add-ItemType-getItemRarity.patch
index 35ebf5036b..35ebf5036b 100644
--- a/patches/server/1030-Add-ItemType-getItemRarity.patch
+++ b/patches/server/1029-Add-ItemType-getItemRarity.patch
diff --git a/patches/server/1031-Incremental-chunk-and-player-saving.patch b/patches/server/1030-Incremental-chunk-and-player-saving.patch
index 8c2a39d8fe..8c2a39d8fe 100644
--- a/patches/server/1031-Incremental-chunk-and-player-saving.patch
+++ b/patches/server/1030-Incremental-chunk-and-player-saving.patch
diff --git a/patches/server/1032-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1031-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 114443675b..114443675b 100644
--- a/patches/server/1032-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1031-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1033-Bundle-spark.patch b/patches/server/1032-Bundle-spark.patch
index 0a5655b71e..0a5655b71e 100644
--- a/patches/server/1033-Bundle-spark.patch
+++ b/patches/server/1032-Bundle-spark.patch
diff --git a/patches/server/1034-Add-plugin-info-at-startup.patch b/patches/server/1033-Add-plugin-info-at-startup.patch
index 051309bbed..051309bbed 100644
--- a/patches/server/1034-Add-plugin-info-at-startup.patch
+++ b/patches/server/1033-Add-plugin-info-at-startup.patch
diff --git a/patches/server/1035-Make-interaction-leniency-distance-configurable.patch b/patches/server/1034-Make-interaction-leniency-distance-configurable.patch
index c0f7fc9fdc..c0f7fc9fdc 100644
--- a/patches/server/1035-Make-interaction-leniency-distance-configurable.patch
+++ b/patches/server/1034-Make-interaction-leniency-distance-configurable.patch
diff --git a/patches/server/1036-Fix-PickupStatus-getting-reset.patch b/patches/server/1035-Fix-PickupStatus-getting-reset.patch
index a952f8a688..a952f8a688 100644
--- a/patches/server/1036-Fix-PickupStatus-getting-reset.patch
+++ b/patches/server/1035-Fix-PickupStatus-getting-reset.patch
diff --git a/patches/server/1037-Check-for-block-type-in-SculkSensorBlock-canActivate.patch b/patches/server/1036-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
index c56c52b165..c56c52b165 100644
--- a/patches/server/1037-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
+++ b/patches/server/1036-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
diff --git a/patches/server/1038-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/server/1037-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 8347a4c5c4..8347a4c5c4 100644
--- a/patches/server/1038-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/server/1037-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/server/1039-Configuration-for-horizontal-only-item-merging.patch b/patches/server/1038-Configuration-for-horizontal-only-item-merging.patch
index 76e790b082..76e790b082 100644
--- a/patches/server/1039-Configuration-for-horizontal-only-item-merging.patch
+++ b/patches/server/1038-Configuration-for-horizontal-only-item-merging.patch
diff --git a/patches/server/1040-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1039-Optimise-collision-checking-in-player-move-packet-ha.patch
index 2caf83aaca..2caf83aaca 100644
--- a/patches/server/1040-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1039-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1041-Add-skipping-world-symlink-scan.patch b/patches/server/1040-Add-skipping-world-symlink-scan.patch
index edbbf7edf8..edbbf7edf8 100644
--- a/patches/server/1041-Add-skipping-world-symlink-scan.patch
+++ b/patches/server/1040-Add-skipping-world-symlink-scan.patch
diff --git a/patches/server/1042-Add-even-more-Enchantment-API.patch b/patches/server/1041-Add-even-more-Enchantment-API.patch
index dfc79b5b19..dfc79b5b19 100644
--- a/patches/server/1042-Add-even-more-Enchantment-API.patch
+++ b/patches/server/1041-Add-even-more-Enchantment-API.patch
diff --git a/patches/server/1043-Leashable-API.patch b/patches/server/1042-Leashable-API.patch
index d058d2f2da..0450da40fd 100644
--- a/patches/server/1043-Leashable-API.patch
+++ b/patches/server/1042-Leashable-API.patch
@@ -74,10 +74,10 @@ index e33b1b6fd50a4eea57500cc00dba20d6edcab75d..01a9660de65688b7c1a4f9dafcb65077
      public CraftBoat(CraftServer server, net.minecraft.world.entity.vehicle.Boat entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d759a2adc77e35d66a1ff1c9f227cded6f0e9963..6fc0d13a308b70e78bf0e24a3d33f90f5bac97ff 100644
+index 7e280955067169f63f15162e9cad1e86e824a8e5..4750df7354ccb5afd0910efe0415f3a2eb19a546 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -759,43 +759,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -777,43 +777,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
  
      @Override
      public boolean isLeashed() {
diff --git a/patches/server/1044-Fix-CraftBukkit-drag-system.patch b/patches/server/1043-Fix-CraftBukkit-drag-system.patch
index fe2da46cc5..fe2da46cc5 100644
--- a/patches/server/1044-Fix-CraftBukkit-drag-system.patch
+++ b/patches/server/1043-Fix-CraftBukkit-drag-system.patch
diff --git a/patches/server/1045-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch b/patches/server/1044-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
index 052376aaeb..052376aaeb 100644
--- a/patches/server/1045-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
+++ b/patches/server/1044-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
diff --git a/patches/server/1046-Remove-set-damage-lootable-item-function-from-compas.patch b/patches/server/1045-Remove-set-damage-lootable-item-function-from-compas.patch
index ac0c0e3513..ac0c0e3513 100644
--- a/patches/server/1046-Remove-set-damage-lootable-item-function-from-compas.patch
+++ b/patches/server/1045-Remove-set-damage-lootable-item-function-from-compas.patch
diff --git a/patches/server/1047-Properly-destroy-placed-blocks-on-the-end-platform.patch b/patches/server/1046-Properly-destroy-placed-blocks-on-the-end-platform.patch
index 9bbeddc476..9bbeddc476 100644
--- a/patches/server/1047-Properly-destroy-placed-blocks-on-the-end-platform.patch
+++ b/patches/server/1046-Properly-destroy-placed-blocks-on-the-end-platform.patch
diff --git a/patches/server/1048-Add-enchantment-seed-update-API.patch b/patches/server/1047-Add-enchantment-seed-update-API.patch
index f66f062401..f66f062401 100644
--- a/patches/server/1048-Add-enchantment-seed-update-API.patch
+++ b/patches/server/1047-Add-enchantment-seed-update-API.patch
diff --git a/patches/server/1049-Fix-synchronise-sending-chat-to-client-with-updating.patch b/patches/server/1048-Fix-synchronise-sending-chat-to-client-with-updating.patch
index e4eb40db0f..e4eb40db0f 100644
--- a/patches/server/1049-Fix-synchronise-sending-chat-to-client-with-updating.patch
+++ b/patches/server/1048-Fix-synchronise-sending-chat-to-client-with-updating.patch
diff --git a/patches/server/1050-Fix-InventoryOpenEvent-cancellation.patch b/patches/server/1049-Fix-InventoryOpenEvent-cancellation.patch
index e63dbfd2aa..e63dbfd2aa 100644
--- a/patches/server/1050-Fix-InventoryOpenEvent-cancellation.patch
+++ b/patches/server/1049-Fix-InventoryOpenEvent-cancellation.patch
diff --git a/patches/server/1051-Fire-BlockExpEvent-on-grindstone-use.patch b/patches/server/1050-Fire-BlockExpEvent-on-grindstone-use.patch
index 58783e8acd..58783e8acd 100644
--- a/patches/server/1051-Fire-BlockExpEvent-on-grindstone-use.patch
+++ b/patches/server/1050-Fire-BlockExpEvent-on-grindstone-use.patch
diff --git a/patches/server/1052-Check-dead-flag-in-isAlive.patch b/patches/server/1051-Check-dead-flag-in-isAlive.patch
index e00e21c5b9..e00e21c5b9 100644
--- a/patches/server/1052-Check-dead-flag-in-isAlive.patch
+++ b/patches/server/1051-Check-dead-flag-in-isAlive.patch
diff --git a/patches/server/1053-Add-FeatureFlag-API.patch b/patches/server/1052-Add-FeatureFlag-API.patch
index 5f3aa9ba14..5f3aa9ba14 100644
--- a/patches/server/1053-Add-FeatureFlag-API.patch
+++ b/patches/server/1052-Add-FeatureFlag-API.patch
diff --git a/patches/server/1054-Tag-Lifecycle-Events.patch b/patches/server/1053-Tag-Lifecycle-Events.patch
index 547a10d9e3..547a10d9e3 100644
--- a/patches/server/1054-Tag-Lifecycle-Events.patch
+++ b/patches/server/1053-Tag-Lifecycle-Events.patch
diff --git a/patches/server/1055-Item-serialization-as-json.patch b/patches/server/1054-Item-serialization-as-json.patch
index 988bbbea45..988bbbea45 100644
--- a/patches/server/1055-Item-serialization-as-json.patch
+++ b/patches/server/1054-Item-serialization-as-json.patch
diff --git a/patches/server/1056-Validate-slot-in-PlayerInventory-setSlot.patch b/patches/server/1055-Validate-slot-in-PlayerInventory-setSlot.patch
index 51eb36e240..51eb36e240 100644
--- a/patches/server/1056-Validate-slot-in-PlayerInventory-setSlot.patch
+++ b/patches/server/1055-Validate-slot-in-PlayerInventory-setSlot.patch
diff --git a/patches/server/1057-Remove-wall-time-unused-skip-tick-protection.patch b/patches/server/1056-Remove-wall-time-unused-skip-tick-protection.patch
index e2d5d9dcab..e2d5d9dcab 100644
--- a/patches/server/1057-Remove-wall-time-unused-skip-tick-protection.patch
+++ b/patches/server/1056-Remove-wall-time-unused-skip-tick-protection.patch
diff --git a/patches/server/1058-Disable-pretty-printing-for-advancement-saving.patch b/patches/server/1057-Disable-pretty-printing-for-advancement-saving.patch
index e954fc53fa..9a966bd656 100644
--- a/patches/server/1058-Disable-pretty-printing-for-advancement-saving.patch
+++ b/patches/server/1057-Disable-pretty-printing-for-advancement-saving.patch
@@ -8,7 +8,7 @@ Not sure why advancements even had pretty printing enabled.
 My best guess was by accident on mojang's part, especially since stats json files don't have pretty printing.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index 9fabf9322..862a4bf00 100644
+index 9fabf9322acd663c4452b562494e74aa42eb19da..862a4bf003b7f810fb57dbcd150a1417c902b633 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
 @@ -50,7 +50,7 @@ import org.slf4j.Logger;