Add Decorated Pot Cracked API (#11365)

433 files changed, 104 insertions, 61 deletions

diff --git a/patches/api/0335-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0335-Add-missing-block-data-API.patch
index 63a647706a..1675944429 100644
--- a/patches/api/0335-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/api/0335-Add-missing-block-data-API.patch
@@ -1,8 +1,13 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jake Potrebic <[email protected]>
 Date: Sat, 16 Oct 2021 22:57:10 -0700
-Subject: [PATCH] Add missing block data mins and maxes
+Subject: [PATCH] Add missing block data API
 
+General purpose patch adding missing getters/setters to BlockData and
+its child types.
+
+Co-authored-by: SoSeDiK <[email protected]>
+Co-authored-by: Fabrizio La Rosa <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/block/data/Levelled.java b/src/main/java/org/bukkit/block/data/Levelled.java
 index 5255538fecae6da413546be3adacd2a99f6c74e9..860f072dee391b300cb1629058a3f9c23dfd95e2 100644
@@ -22,6 +27,26 @@ index 5255538fecae6da413546be3adacd2a99f6c74e9..860f072dee391b300cb1629058a3f9c2
 +    int getMinimumLevel();
 +    // Paper end
  }
+diff --git a/src/main/java/org/bukkit/block/data/type/Bed.java b/src/main/java/org/bukkit/block/data/type/Bed.java
+index ed519bfebe5b921f60867a3900edfce9859058b6..6e7a456dc5e9bfc28a19029a3381e53fa6453d30 100644
+--- a/src/main/java/org/bukkit/block/data/type/Bed.java
++++ b/src/main/java/org/bukkit/block/data/type/Bed.java
+@@ -35,6 +35,15 @@ public interface Bed extends Directional {
+      */
+     boolean isOccupied();
+ 
++    // Paper start
++    /**
++     * Sets the value of the 'occupied' property.
++     *
++     * @param occupied the new 'occupied' value
++     */
++    void setOccupied(boolean occupied);
++    // Paper end
++
+     /**
+      * Horizontal half of a bed.
+      */
 diff --git a/src/main/java/org/bukkit/block/data/type/Candle.java b/src/main/java/org/bukkit/block/data/type/Candle.java
 index d4d08bd424f84523200d1a2012f4d37c07cc3497..7baccce27f2db2242f628ea92a9d040267caef75 100644
 --- a/src/main/java/org/bukkit/block/data/type/Candle.java
@@ -40,6 +65,28 @@ index d4d08bd424f84523200d1a2012f4d37c07cc3497..7baccce27f2db2242f628ea92a9d0402
 +    int getMinimumCandles();
 +    // Paper end
  }
+diff --git a/src/main/java/org/bukkit/block/data/type/DecoratedPot.java b/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
+index eb0ffa977450ef0c79caa78302cfe75ee35b34b7..b3d290dbfdcbadcbadcb54e6b414e423eba80cc6 100644
+--- a/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
++++ b/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
+@@ -4,4 +4,17 @@ import org.bukkit.block.data.Directional;
+ import org.bukkit.block.data.Waterlogged;
+ 
+ public interface DecoratedPot extends Directional, Waterlogged {
++    // Paper start - add missing block data api
++    /**
++     * @return whether the pot is cracked
++     */
++    public boolean isCracked();
++
++    /**
++     * Set whether the pot is cracked.
++     *
++     * @param cracked whether the pot is cracked
++     */
++    public void setCracked(boolean cracked);
++    // Paper end - add missing block data api
+ }
 diff --git a/src/main/java/org/bukkit/block/data/type/Leaves.java b/src/main/java/org/bukkit/block/data/type/Leaves.java
 index 3ea21dfad26222ee70fbc627595f54de1a28aa96..cd013a7c42648d819d1e91c7cf9f97a8190c1fad 100644
 --- a/src/main/java/org/bukkit/block/data/type/Leaves.java
diff --git a/patches/api/0367-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0366-Add-EquipmentSlot-convenience-methods.patch
index f7e2301f31..f7e2301f31 100644
--- a/patches/api/0367-Add-EquipmentSlot-convenience-methods.patch
+++ b/patches/api/0366-Add-EquipmentSlot-convenience-methods.patch
diff --git a/patches/api/0366-Allow-changing-bed-s-occupied-property.patch b/patches/api/0366-Allow-changing-bed-s-occupied-property.patch
deleted file mode 100644
index 8dfafd6d33..0000000000
--- a/patches/api/0366-Allow-changing-bed-s-occupied-property.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SoSeDiK <[email protected]>
-Date: Wed, 12 Oct 2022 00:36:55 +0300
-Subject: [PATCH] Allow changing bed's 'occupied' property
-
-
-diff --git a/src/main/java/org/bukkit/block/data/type/Bed.java b/src/main/java/org/bukkit/block/data/type/Bed.java
-index ed519bfebe5b921f60867a3900edfce9859058b6..6e7a456dc5e9bfc28a19029a3381e53fa6453d30 100644
---- a/src/main/java/org/bukkit/block/data/type/Bed.java
-+++ b/src/main/java/org/bukkit/block/data/type/Bed.java
-@@ -35,6 +35,15 @@ public interface Bed extends Directional {
-      */
-     boolean isOccupied();
- 
-+    // Paper start
-+    /**
-+     * Sets the value of the 'occupied' property.
-+     *
-+     * @param occupied the new 'occupied' value
-+     */
-+    void setOccupied(boolean occupied);
-+    // Paper end
-+
-     /**
-      * Horizontal half of a bed.
-      */
diff --git a/patches/api/0368-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0367-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
index b745878796..2a6826e5c3 100644
--- a/patches/api/0368-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
+++ b/patches/api/0367-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#swingHand(EquipmentSlot) convenience method
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 22428de50580f7b70d14484ba229aa271bfd7069..fc96043f799cf5d521d51ad4c74f8f8067bed754 100644
+index 0c7d96bc296b56dc9ff0ada89bb4d715716f8adc..fb62933d589ccbe4181a7b9633bb742ae35f68dd 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1331,4 +1331,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0369-Add-entity-knockback-API.patch b/patches/api/0368-Add-entity-knockback-API.patch
index fe9d0a85bb..33ebf42097 100644
--- a/patches/api/0369-Add-entity-knockback-API.patch
+++ b/patches/api/0368-Add-entity-knockback-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index fc96043f799cf5d521d51ad4c74f8f8067bed754..8dd993ce32686431e1c759d446a3620cb52f7ec1 100644
+index fb62933d589ccbe4181a7b9633bb742ae35f68dd..597a3b581cb6fa2605fd5916e5639c1020d688b7 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1351,4 +1351,18 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0370-Added-EntityToggleSitEvent.patch b/patches/api/0369-Added-EntityToggleSitEvent.patch
index d5a8c46dc8..d5a8c46dc8 100644
--- a/patches/api/0370-Added-EntityToggleSitEvent.patch
+++ b/patches/api/0369-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0371-Add-Moving-Piston-API.patch b/patches/api/0370-Add-Moving-Piston-API.patch
index 8f889f1e3d..8f889f1e3d 100644
--- a/patches/api/0371-Add-Moving-Piston-API.patch
+++ b/patches/api/0370-Add-Moving-Piston-API.patch
diff --git a/patches/api/0372-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0371-Add-PrePlayerAttackEntityEvent.patch
index ac0ebedde7..ac0ebedde7 100644
--- a/patches/api/0372-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/api/0371-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0373-Add-Player-Warden-Warning-API.patch b/patches/api/0372-Add-Player-Warden-Warning-API.patch
index d1728e9492..d1728e9492 100644
--- a/patches/api/0373-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0372-Add-Player-Warden-Warning-API.patch
diff --git a/patches/api/0374-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0373-More-vanilla-friendly-methods-to-update-trades.patch
index dcad21ff69..dcad21ff69 100644
--- a/patches/api/0374-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/api/0373-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/api/0375-Add-paper-dumplisteners-command.patch b/patches/api/0374-Add-paper-dumplisteners-command.patch
index 43d59a5c31..43d59a5c31 100644
--- a/patches/api/0375-Add-paper-dumplisteners-command.patch
+++ b/patches/api/0374-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0376-ItemStack-damage-API.patch b/patches/api/0375-ItemStack-damage-API.patch
index 1a38447711..9c25426479 100644
--- a/patches/api/0376-ItemStack-damage-API.patch
+++ b/patches/api/0375-ItemStack-damage-API.patch
@@ -8,7 +8,7 @@ to simulate damage done to an itemstack and all
 the logic associated with damaging them
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 8dd993ce32686431e1c759d446a3620cb52f7ec1..0d665a31152c9a667576f2e9d91ffec5304ce944 100644
+index 597a3b581cb6fa2605fd5916e5639c1020d688b7..c9c3b926c5bb408d964ed5acc9f95c8527837a25 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1365,4 +1365,53 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0377-Add-Tick-TemporalUnit.patch b/patches/api/0376-Add-Tick-TemporalUnit.patch
index 562eb00082..562eb00082 100644
--- a/patches/api/0377-Add-Tick-TemporalUnit.patch
+++ b/patches/api/0376-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0378-Friction-API.patch b/patches/api/0377-Friction-API.patch
index 23ae7abbae..7667486715 100644
--- a/patches/api/0378-Friction-API.patch
+++ b/patches/api/0377-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 0d665a31152c9a667576f2e9d91ffec5304ce944..a2c1cc7462564411db71a1e00222ef55633b49c8 100644
+index c9c3b926c5bb408d964ed5acc9f95c8527837a25..7c027d7bbd6b8a1543fa92d44e99674925f093b3 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/0379-Player-Entity-Tracking-Events.patch b/patches/api/0378-Player-Entity-Tracking-Events.patch
index 3dfa72c922..3dfa72c922 100644
--- a/patches/api/0379-Player-Entity-Tracking-Events.patch
+++ b/patches/api/0378-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0380-Add-missing-Fluid-type.patch b/patches/api/0379-Add-missing-Fluid-type.patch
index c260bf8497..c260bf8497 100644
--- a/patches/api/0380-Add-missing-Fluid-type.patch
+++ b/patches/api/0379-Add-missing-Fluid-type.patch
diff --git a/patches/api/0381-fix-Instruments.patch b/patches/api/0380-fix-Instruments.patch
index 468dc80a34..468dc80a34 100644
--- a/patches/api/0381-fix-Instruments.patch
+++ b/patches/api/0380-fix-Instruments.patch
diff --git a/patches/api/0382-Add-BlockLockCheckEvent.patch b/patches/api/0381-Add-BlockLockCheckEvent.patch
index 5ba41f5acf..5ba41f5acf 100644
--- a/patches/api/0382-Add-BlockLockCheckEvent.patch
+++ b/patches/api/0381-Add-BlockLockCheckEvent.patch
diff --git a/patches/api/0383-Add-Sneaking-API-for-Entities.patch b/patches/api/0382-Add-Sneaking-API-for-Entities.patch
index 5419ce7d3c..5419ce7d3c 100644
--- a/patches/api/0383-Add-Sneaking-API-for-Entities.patch
+++ b/patches/api/0382-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/api/0384-Improve-PortalEvents.patch b/patches/api/0383-Improve-PortalEvents.patch
index 88c76230fd..88c76230fd 100644
--- a/patches/api/0384-Improve-PortalEvents.patch
+++ b/patches/api/0383-Improve-PortalEvents.patch
diff --git a/patches/api/0385-Flying-Fall-Damage-API.patch b/patches/api/0384-Flying-Fall-Damage-API.patch
index 13493c2aa9..13493c2aa9 100644
--- a/patches/api/0385-Flying-Fall-Damage-API.patch
+++ b/patches/api/0384-Flying-Fall-Damage-API.patch
diff --git a/patches/api/0386-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0385-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
index 475ca65bbf..475ca65bbf 100644
--- a/patches/api/0386-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
+++ b/patches/api/0385-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0387-Win-Screen-API.patch b/patches/api/0386-Win-Screen-API.patch
index cdeea2f4f9..cdeea2f4f9 100644
--- a/patches/api/0387-Win-Screen-API.patch
+++ b/patches/api/0386-Win-Screen-API.patch
diff --git a/patches/api/0388-Add-Entity-Body-Yaw-API.patch b/patches/api/0387-Add-Entity-Body-Yaw-API.patch
index c0186ee4f1..9351e36f78 100644
--- a/patches/api/0388-Add-Entity-Body-Yaw-API.patch
+++ b/patches/api/0387-Add-Entity-Body-Yaw-API.patch
@@ -53,7 +53,7 @@ index 6dcaf7e9bc9afb708ab569e82f27c87833450ff1..a76e537c9b3b9519cd46894c90b750f0
  
      // Paper start - Collision API
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index a2c1cc7462564411db71a1e00222ef55633b49c8..4974540e8277011e4eb00f691a5f6f96d3dde20c 100644
+index 7c027d7bbd6b8a1543fa92d44e99674925f093b3..f5149d54d6cb5019f398718b9aa52bc3ab34a5ae 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1414,4 +1414,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0389-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0388-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
index c375206bf7..c375206bf7 100644
--- a/patches/api/0389-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
+++ b/patches/api/0388-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0390-Add-EntityFertilizeEggEvent.patch b/patches/api/0389-Add-EntityFertilizeEggEvent.patch
index 4ae6ff9f0f..4ae6ff9f0f 100644
--- a/patches/api/0390-Add-EntityFertilizeEggEvent.patch
+++ b/patches/api/0389-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0391-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0390-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 9dee250212..9dee250212 100644
--- a/patches/api/0391-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/api/0390-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0392-Add-Shearable-API.patch b/patches/api/0391-Add-Shearable-API.patch
index e39ebc2481..e39ebc2481 100644
--- a/patches/api/0392-Add-Shearable-API.patch
+++ b/patches/api/0391-Add-Shearable-API.patch
diff --git a/patches/api/0393-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0392-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 27abcd1f93..27abcd1f93 100644
--- a/patches/api/0393-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/api/0392-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/api/0394-Add-Mob-Experience-reward-API.patch b/patches/api/0393-Add-Mob-Experience-reward-API.patch
index 354d6d1eb4..354d6d1eb4 100644
--- a/patches/api/0394-Add-Mob-Experience-reward-API.patch
+++ b/patches/api/0393-Add-Mob-Experience-reward-API.patch
diff --git a/patches/api/0395-Expand-PlayerItemMendEvent.patch b/patches/api/0394-Expand-PlayerItemMendEvent.patch
index 95b15a4753..95b15a4753 100644
--- a/patches/api/0395-Expand-PlayerItemMendEvent.patch
+++ b/patches/api/0394-Expand-PlayerItemMendEvent.patch
diff --git a/patches/api/0396-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0395-Add-method-to-remove-all-active-potion-effects.patch
index 2b9703cf94..4106e532d8 100644
--- a/patches/api/0396-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/api/0395-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 4974540e8277011e4eb00f691a5f6f96d3dde20c..5de7651f673cba9782f88f46dc938274b37a38ec 100644
+index f5149d54d6cb5019f398718b9aa52bc3ab34a5ae..ad3717d963f28751d410e6688ae64a4c1175871d 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/0397-Folia-scheduler-and-owned-region-API.patch b/patches/api/0396-Folia-scheduler-and-owned-region-API.patch
index a9911d3665..a9911d3665 100644
--- a/patches/api/0397-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/api/0396-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/api/0398-Add-event-for-player-editing-sign.patch b/patches/api/0397-Add-event-for-player-editing-sign.patch
index ec38bf008b..ec38bf008b 100644
--- a/patches/api/0398-Add-event-for-player-editing-sign.patch
+++ b/patches/api/0397-Add-event-for-player-editing-sign.patch
diff --git a/patches/api/0399-More-Sign-Block-API.patch b/patches/api/0398-More-Sign-Block-API.patch
index 57b372521c..57b372521c 100644
--- a/patches/api/0399-More-Sign-Block-API.patch
+++ b/patches/api/0398-More-Sign-Block-API.patch
diff --git a/patches/api/0400-Fix-BanList-API.patch b/patches/api/0399-Fix-BanList-API.patch
index a9640f44a2..a9640f44a2 100644
--- a/patches/api/0400-Fix-BanList-API.patch
+++ b/patches/api/0399-Fix-BanList-API.patch
diff --git a/patches/api/0401-Add-whitelist-events.patch b/patches/api/0400-Add-whitelist-events.patch
index 75458e78df..75458e78df 100644
--- a/patches/api/0401-Add-whitelist-events.patch
+++ b/patches/api/0400-Add-whitelist-events.patch
diff --git a/patches/api/0402-API-for-updating-recipes-on-clients.patch b/patches/api/0401-API-for-updating-recipes-on-clients.patch
index 11b14673fa..11b14673fa 100644
--- a/patches/api/0402-API-for-updating-recipes-on-clients.patch
+++ b/patches/api/0401-API-for-updating-recipes-on-clients.patch
diff --git a/patches/api/0403-Add-PlayerFailMoveEvent.patch b/patches/api/0402-Add-PlayerFailMoveEvent.patch
index c0687e2ae0..c0687e2ae0 100644
--- a/patches/api/0403-Add-PlayerFailMoveEvent.patch
+++ b/patches/api/0402-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0404-Fix-custom-statistic-criteria-creation.patch b/patches/api/0403-Fix-custom-statistic-criteria-creation.patch
index 5e3f26f4f3..5e3f26f4f3 100644
--- a/patches/api/0404-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/api/0403-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0405-SculkCatalyst-bloom-API.patch b/patches/api/0404-SculkCatalyst-bloom-API.patch
index 49d8c8c2bd..49d8c8c2bd 100644
--- a/patches/api/0405-SculkCatalyst-bloom-API.patch
+++ b/patches/api/0404-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0406-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0405-API-for-an-entity-s-scoreboard-name.patch
index 1fb9128be8..1fb9128be8 100644
--- a/patches/api/0406-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/api/0405-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/api/0407-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0406-Deprecate-and-replace-methods-with-old-StructureType.patch
index 72be0347a9..72be0347a9 100644
--- a/patches/api/0407-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/api/0406-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/api/0408-Add-Listing-API-for-Player.patch b/patches/api/0407-Add-Listing-API-for-Player.patch
index 47a8946b80..47a8946b80 100644
--- a/patches/api/0408-Add-Listing-API-for-Player.patch
+++ b/patches/api/0407-Add-Listing-API-for-Player.patch
diff --git a/patches/api/0409-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0408-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index 34d1940866..34d1940866 100644
--- a/patches/api/0409-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/api/0408-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0410-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0409-Fix-NPE-on-Boat-getStatus.patch
index 1cf6096a92..1cf6096a92 100644
--- a/patches/api/0410-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/api/0409-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0411-Expand-Pose-API.patch b/patches/api/0410-Expand-Pose-API.patch
index a7ac9f7567..a7ac9f7567 100644
--- a/patches/api/0411-Expand-Pose-API.patch
+++ b/patches/api/0410-Expand-Pose-API.patch
diff --git a/patches/api/0412-MerchantRecipe-add-copy-constructor.patch b/patches/api/0411-MerchantRecipe-add-copy-constructor.patch
index 1c5ba2803c..1c5ba2803c 100644
--- a/patches/api/0412-MerchantRecipe-add-copy-constructor.patch
+++ b/patches/api/0411-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0413-More-DragonBattle-API.patch b/patches/api/0412-More-DragonBattle-API.patch
index e25208ec19..e25208ec19 100644
--- a/patches/api/0413-More-DragonBattle-API.patch
+++ b/patches/api/0412-More-DragonBattle-API.patch
diff --git a/patches/api/0414-Add-PlayerPickItemEvent.patch b/patches/api/0413-Add-PlayerPickItemEvent.patch
index 6dd0be80a8..6dd0be80a8 100644
--- a/patches/api/0414-Add-PlayerPickItemEvent.patch
+++ b/patches/api/0413-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0415-Allow-trident-custom-damage.patch b/patches/api/0414-Allow-trident-custom-damage.patch
index 870b735548..870b735548 100644
--- a/patches/api/0415-Allow-trident-custom-damage.patch
+++ b/patches/api/0414-Allow-trident-custom-damage.patch
diff --git a/patches/api/0416-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0415-Expose-hand-during-BlockCanBuildEvent.patch
index 97d99a40d2..97d99a40d2 100644
--- a/patches/api/0416-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/api/0415-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0417-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0416-Limit-setBurnTime-to-valid-short-values.patch
index 2faac56fd8..2faac56fd8 100644
--- a/patches/api/0417-Limit-setBurnTime-to-valid-short-values.patch
+++ b/patches/api/0416-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0418-Add-OfflinePlayer-isConnected.patch b/patches/api/0417-Add-OfflinePlayer-isConnected.patch
index 08e2f91095..08e2f91095 100644
--- a/patches/api/0418-Add-OfflinePlayer-isConnected.patch
+++ b/patches/api/0417-Add-OfflinePlayer-isConnected.patch
diff --git a/patches/api/0419-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0418-Add-titleOverride-to-InventoryOpenEvent.patch
index 68e755f010..68e755f010 100644
--- a/patches/api/0419-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/api/0418-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0420-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0419-Allow-proper-checking-of-empty-item-stacks.patch
index 9fe874ee2d..9fe874ee2d 100644
--- a/patches/api/0420-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/api/0419-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/api/0421-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0420-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
index e72f86be5d..e72f86be5d 100644
--- a/patches/api/0421-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
+++ b/patches/api/0420-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0422-Add-player-idle-duration-API.patch b/patches/api/0421-Add-player-idle-duration-API.patch
index 2fbfc5dc58..2fbfc5dc58 100644
--- a/patches/api/0422-Add-player-idle-duration-API.patch
+++ b/patches/api/0421-Add-player-idle-duration-API.patch
diff --git a/patches/api/0423-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0422-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 3bb30787dc..3bb30787dc 100644
--- a/patches/api/0423-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/api/0422-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/api/0424-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0423-Add-predicate-for-blocks-when-raytracing.patch
index 13d64df888..13d64df888 100644
--- a/patches/api/0424-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/api/0423-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/api/0425-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0424-Add-hand-to-fish-event-for-all-player-interactions.patch
index b431332b9a..b431332b9a 100644
--- a/patches/api/0425-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/api/0424-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0426-Attribute-Modifier-API-improvements.patch b/patches/api/0425-Attribute-Modifier-API-improvements.patch
index dc2fb7fbe6..acf67fcd39 100644
--- a/patches/api/0426-Attribute-Modifier-API-improvements.patch
+++ b/patches/api/0425-Attribute-Modifier-API-improvements.patch
@@ -70,7 +70,7 @@ index f08ee26cc4d479e1bfc5264b8cbe721315de91f2..f1fa86ddf1f50a357c9e94cc61261d8c
       * Remove a modifier from this instance.
       *
 diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-index c6b8700d258b859d246118868167497397010292..3808f76d49e24c20156c013f68e00efa9351f1a3 100644
+index ee39c0b83e558681e8b006172d34c98e2c83cda2..c57690798108e9f91f8c552f39dcc2b080fe1b61 100644
 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
 +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
 @@ -25,26 +25,32 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed {
diff --git a/patches/api/0427-Expand-LingeringPotion-API.patch b/patches/api/0426-Expand-LingeringPotion-API.patch
index 40b5a5f547..40b5a5f547 100644
--- a/patches/api/0427-Expand-LingeringPotion-API.patch
+++ b/patches/api/0426-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0428-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0427-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
index bdb434071d..bdb434071d 100644
--- a/patches/api/0428-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
+++ b/patches/api/0427-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
diff --git a/patches/api/0429-Add-Structure-check-API.patch b/patches/api/0428-Add-Structure-check-API.patch
index e2d19afb32..e2d19afb32 100644
--- a/patches/api/0429-Add-Structure-check-API.patch
+++ b/patches/api/0428-Add-Structure-check-API.patch
diff --git a/patches/api/0430-Experimental-annotations-change.patch b/patches/api/0429-Experimental-annotations-change.patch
index 9ea8f3a126..9ea8f3a126 100644
--- a/patches/api/0430-Experimental-annotations-change.patch
+++ b/patches/api/0429-Experimental-annotations-change.patch
diff --git a/patches/api/0431-Add-more-scoreboard-API.patch b/patches/api/0430-Add-more-scoreboard-API.patch
index 201af36b0c..201af36b0c 100644
--- a/patches/api/0431-Add-more-scoreboard-API.patch
+++ b/patches/api/0430-Add-more-scoreboard-API.patch
diff --git a/patches/api/0432-Improve-Registry.patch b/patches/api/0431-Improve-Registry.patch
index 1ae2f1b345..1ae2f1b345 100644
--- a/patches/api/0432-Improve-Registry.patch
+++ b/patches/api/0431-Improve-Registry.patch
diff --git a/patches/api/0433-Add-experience-points-API.patch b/patches/api/0432-Add-experience-points-API.patch
index 9b489a9ded..9b489a9ded 100644
--- a/patches/api/0433-Add-experience-points-API.patch
+++ b/patches/api/0432-Add-experience-points-API.patch
diff --git a/patches/api/0434-Add-missing-InventoryType.patch b/patches/api/0433-Add-missing-InventoryType.patch
index 34200f73ee..34200f73ee 100644
--- a/patches/api/0434-Add-missing-InventoryType.patch
+++ b/patches/api/0433-Add-missing-InventoryType.patch
diff --git a/patches/api/0435-Add-drops-to-shear-events.patch b/patches/api/0434-Add-drops-to-shear-events.patch
index c87460e48d..c87460e48d 100644
--- a/patches/api/0435-Add-drops-to-shear-events.patch
+++ b/patches/api/0434-Add-drops-to-shear-events.patch
diff --git a/patches/api/0436-Add-HiddenPotionEffect-API.patch b/patches/api/0435-Add-HiddenPotionEffect-API.patch
index 94799bbf65..281fad5e4b 100644
--- a/patches/api/0436-Add-HiddenPotionEffect-API.patch
+++ b/patches/api/0435-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 5de7651f673cba9782f88f46dc938274b37a38ec..5c29956c6db53440322330ff723c7087193641f1 100644
+index ad3717d963f28751d410e6688ae64a4c1175871d..8369da45206d2606f0715f3d803163dd8028251e 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/0437-Add-PlayerShieldDisableEvent.patch b/patches/api/0436-Add-PlayerShieldDisableEvent.patch
index 29c7daa0e3..29c7daa0e3 100644
--- a/patches/api/0437-Add-PlayerShieldDisableEvent.patch
+++ b/patches/api/0436-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/api/0438-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0437-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
index 93ba48c77c..93ba48c77c 100644
--- a/patches/api/0438-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
+++ b/patches/api/0437-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
diff --git a/patches/api/0439-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0438-Add-BlockStateMeta-clearBlockState.patch
index 7e8c47a8e2..7e8c47a8e2 100644
--- a/patches/api/0439-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/api/0438-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/api/0440-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0439-Expose-LootTable-of-DecoratedPot.patch
index 42a8de4123..42a8de4123 100644
--- a/patches/api/0440-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/api/0439-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/api/0441-Add-ShulkerDuplicateEvent.patch b/patches/api/0440-Add-ShulkerDuplicateEvent.patch
index a0a81094ce..a0a81094ce 100644
--- a/patches/api/0441-Add-ShulkerDuplicateEvent.patch
+++ b/patches/api/0440-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/api/0442-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0441-Add-api-for-spawn-egg-texture-colors.patch
index 996340cf25..996340cf25 100644
--- a/patches/api/0442-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/api/0441-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/api/0443-Add-Lifecycle-Event-system.patch b/patches/api/0442-Add-Lifecycle-Event-system.patch
index cd999b16ab..cd999b16ab 100644
--- a/patches/api/0443-Add-Lifecycle-Event-system.patch
+++ b/patches/api/0442-Add-Lifecycle-Event-system.patch
diff --git a/patches/api/0444-ItemStack-Tooltip-API.patch b/patches/api/0443-ItemStack-Tooltip-API.patch
index 90d49b0f02..90d49b0f02 100644
--- a/patches/api/0444-ItemStack-Tooltip-API.patch
+++ b/patches/api/0443-ItemStack-Tooltip-API.patch
diff --git a/patches/api/0445-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0444-Add-getChunkSnapshot-includeLightData-parameter.patch
index 9b950f9493..9b950f9493 100644
--- a/patches/api/0445-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/api/0444-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/api/0446-Add-FluidState-API.patch b/patches/api/0445-Add-FluidState-API.patch
index 3235c393f5..3235c393f5 100644
--- a/patches/api/0446-Add-FluidState-API.patch
+++ b/patches/api/0445-Add-FluidState-API.patch
diff --git a/patches/api/0447-add-number-format-api.patch b/patches/api/0446-add-number-format-api.patch
index 6d32302ad0..6d32302ad0 100644
--- a/patches/api/0447-add-number-format-api.patch
+++ b/patches/api/0446-add-number-format-api.patch
diff --git a/patches/api/0448-improve-BanList-types.patch b/patches/api/0447-improve-BanList-types.patch
index 56f652975a..56f652975a 100644
--- a/patches/api/0448-improve-BanList-types.patch
+++ b/patches/api/0447-improve-BanList-types.patch
diff --git a/patches/api/0449-Suspicious-Effect-Entry-API.patch b/patches/api/0448-Suspicious-Effect-Entry-API.patch
index bcf3db2033..bcf3db2033 100644
--- a/patches/api/0449-Suspicious-Effect-Entry-API.patch
+++ b/patches/api/0448-Suspicious-Effect-Entry-API.patch
diff --git a/patches/api/0450-Fix-DamageSource-API.patch b/patches/api/0449-Fix-DamageSource-API.patch
index efe4403e2c..efe4403e2c 100644
--- a/patches/api/0450-Fix-DamageSource-API.patch
+++ b/patches/api/0449-Fix-DamageSource-API.patch
diff --git a/patches/api/0451-Expanded-Hopper-API.patch b/patches/api/0450-Expanded-Hopper-API.patch
index 51cb6dfee2..51cb6dfee2 100644
--- a/patches/api/0451-Expanded-Hopper-API.patch
+++ b/patches/api/0450-Expanded-Hopper-API.patch
diff --git a/patches/api/0452-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0451-Clone-mutables-to-prevent-unexpected-issues.patch
index 86b3ab4bcf..86b3ab4bcf 100644
--- a/patches/api/0452-Clone-mutables-to-prevent-unexpected-issues.patch
+++ b/patches/api/0451-Clone-mutables-to-prevent-unexpected-issues.patch
diff --git a/patches/api/0453-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0452-Add-BlockBreakProgressUpdateEvent.patch
index a2b5a83baf..a2b5a83baf 100644
--- a/patches/api/0453-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/api/0452-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/api/0454-Deprecate-ItemStack-setType.patch b/patches/api/0453-Deprecate-ItemStack-setType.patch
index cdb918bc11..cdb918bc11 100644
--- a/patches/api/0454-Deprecate-ItemStack-setType.patch
+++ b/patches/api/0453-Deprecate-ItemStack-setType.patch
diff --git a/patches/api/0455-Item-Mutation-Fixes.patch b/patches/api/0454-Item-Mutation-Fixes.patch
index ccd77b7fbc..ccd77b7fbc 100644
--- a/patches/api/0455-Item-Mutation-Fixes.patch
+++ b/patches/api/0454-Item-Mutation-Fixes.patch
diff --git a/patches/api/0456-API-for-checking-sent-chunks.patch b/patches/api/0455-API-for-checking-sent-chunks.patch
index a3844b5401..a3844b5401 100644
--- a/patches/api/0456-API-for-checking-sent-chunks.patch
+++ b/patches/api/0455-API-for-checking-sent-chunks.patch
diff --git a/patches/api/0457-Add-CartographyItemEvent.patch b/patches/api/0456-Add-CartographyItemEvent.patch
index 1f19663c9f..1f19663c9f 100644
--- a/patches/api/0457-Add-CartographyItemEvent.patch
+++ b/patches/api/0456-Add-CartographyItemEvent.patch
diff --git a/patches/api/0458-More-Raid-API.patch b/patches/api/0457-More-Raid-API.patch
index b365913e82..b365913e82 100644
--- a/patches/api/0458-More-Raid-API.patch
+++ b/patches/api/0457-More-Raid-API.patch
diff --git a/patches/api/0459-Fix-SpawnerEntry-Equipment-API.patch b/patches/api/0458-Fix-SpawnerEntry-Equipment-API.patch
index 0a16b34cd5..0a16b34cd5 100644
--- a/patches/api/0459-Fix-SpawnerEntry-Equipment-API.patch
+++ b/patches/api/0458-Fix-SpawnerEntry-Equipment-API.patch
diff --git a/patches/api/0460-Fix-ItemFlags.patch b/patches/api/0459-Fix-ItemFlags.patch
index a6301eff75..a6301eff75 100644
--- a/patches/api/0460-Fix-ItemFlags.patch
+++ b/patches/api/0459-Fix-ItemFlags.patch
diff --git a/patches/api/0461-Allow-modifying-library-loader-jars-bytecode.patch b/patches/api/0460-Allow-modifying-library-loader-jars-bytecode.patch
index 0c0311e790..0c0311e790 100644
--- a/patches/api/0461-Allow-modifying-library-loader-jars-bytecode.patch
+++ b/patches/api/0460-Allow-modifying-library-loader-jars-bytecode.patch
diff --git a/patches/api/0462-Add-hook-to-remap-library-jars.patch b/patches/api/0461-Add-hook-to-remap-library-jars.patch
index fe1609629e..fe1609629e 100644
--- a/patches/api/0462-Add-hook-to-remap-library-jars.patch
+++ b/patches/api/0461-Add-hook-to-remap-library-jars.patch
diff --git a/patches/api/0463-Add-GameMode-isInvulnerable.patch b/patches/api/0462-Add-GameMode-isInvulnerable.patch
index b4b81c5f52..b4b81c5f52 100644
--- a/patches/api/0463-Add-GameMode-isInvulnerable.patch
+++ b/patches/api/0462-Add-GameMode-isInvulnerable.patch
diff --git a/patches/api/0464-Expose-hasColor-to-leather-armor.patch b/patches/api/0463-Expose-hasColor-to-leather-armor.patch
index e2c609b4f0..e2c609b4f0 100644
--- a/patches/api/0464-Expose-hasColor-to-leather-armor.patch
+++ b/patches/api/0463-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/api/0465-Add-missing-wind-charge-damage-type.patch b/patches/api/0464-Add-missing-wind-charge-damage-type.patch
index a2cd416d60..a2cd416d60 100644
--- a/patches/api/0465-Add-missing-wind-charge-damage-type.patch
+++ b/patches/api/0464-Add-missing-wind-charge-damage-type.patch
diff --git a/patches/api/0466-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0465-Added-API-to-get-player-ha-proxy-address.patch
index b1702bee61..b1702bee61 100644
--- a/patches/api/0466-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/api/0465-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/api/0467-More-Chest-Block-API.patch b/patches/api/0466-More-Chest-Block-API.patch
index 1fc3614c74..1fc3614c74 100644
--- a/patches/api/0467-More-Chest-Block-API.patch
+++ b/patches/api/0466-More-Chest-Block-API.patch
diff --git a/patches/api/0468-Brigadier-based-command-API.patch b/patches/api/0467-Brigadier-based-command-API.patch
index 6e20f39837..6e20f39837 100644
--- a/patches/api/0468-Brigadier-based-command-API.patch
+++ b/patches/api/0467-Brigadier-based-command-API.patch
diff --git a/patches/api/0469-Fix-issues-with-recipe-API.patch b/patches/api/0468-Fix-issues-with-recipe-API.patch
index e20b55ebab..e20b55ebab 100644
--- a/patches/api/0469-Fix-issues-with-recipe-API.patch
+++ b/patches/api/0468-Fix-issues-with-recipe-API.patch
diff --git a/patches/api/0470-Fix-equipment-slot-and-group-API.patch b/patches/api/0469-Fix-equipment-slot-and-group-API.patch
index 0601373657..b6b99f5eab 100644
--- a/patches/api/0470-Fix-equipment-slot-and-group-API.patch
+++ b/patches/api/0469-Fix-equipment-slot-and-group-API.patch
@@ -10,7 +10,7 @@ Adds the following:
 Co-authored-by: SoSeDiK <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-index 3808f76d49e24c20156c013f68e00efa9351f1a3..e14b64d3b178791dacc7849e97f2ed95f1919c55 100644
+index c57690798108e9f91f8c552f39dcc2b080fe1b61..bfa378fe3d074bafbc0af2c4d858e2a34d3126bd 100644
 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
 +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
 @@ -118,6 +118,7 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed {
@@ -22,7 +22,7 @@ index 3808f76d49e24c20156c013f68e00efa9351f1a3..e14b64d3b178791dacc7849e97f2ed95
          return slot == EquipmentSlotGroup.ANY ? null : slot.getExample();
      }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5c29956c6db53440322330ff723c7087193641f1..a1e54e9d14393a6c0ea57cca854071c5396d9717 100644
+index 8369da45206d2606f0715f3d803163dd8028251e..fcdc5fce88720cc926a3953d80b5045113d1516c 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1447,4 +1447,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0471-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/api/0470-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 8a0f6e9468..8a0f6e9468 100644
--- a/patches/api/0471-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/api/0470-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/api/0472-General-ItemMeta-fixes.patch b/patches/api/0471-General-ItemMeta-fixes.patch
index 34bd355a54..34bd355a54 100644
--- a/patches/api/0472-General-ItemMeta-fixes.patch
+++ b/patches/api/0471-General-ItemMeta-fixes.patch
diff --git a/patches/api/0473-Add-missing-fishing-event-state.patch b/patches/api/0472-Add-missing-fishing-event-state.patch
index 94cba543ec..94cba543ec 100644
--- a/patches/api/0473-Add-missing-fishing-event-state.patch
+++ b/patches/api/0472-Add-missing-fishing-event-state.patch
diff --git a/patches/api/0474-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/api/0473-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index 3efcc02654..3efcc02654 100644
--- a/patches/api/0474-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/api/0473-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/api/0475-Registry-Modification-API.patch b/patches/api/0474-Registry-Modification-API.patch
index 58de2e6b76..58de2e6b76 100644
--- a/patches/api/0475-Registry-Modification-API.patch
+++ b/patches/api/0474-Registry-Modification-API.patch
diff --git a/patches/api/0476-Introduce-registry-entry-and-builders.patch b/patches/api/0475-Introduce-registry-entry-and-builders.patch
index 44bdb4b36f..44bdb4b36f 100644
--- a/patches/api/0476-Introduce-registry-entry-and-builders.patch
+++ b/patches/api/0475-Introduce-registry-entry-and-builders.patch
diff --git a/patches/api/0477-Proxy-ItemStack-to-CraftItemStack.patch b/patches/api/0476-Proxy-ItemStack-to-CraftItemStack.patch
index bd8435d922..bd8435d922 100644
--- a/patches/api/0477-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/patches/api/0476-Proxy-ItemStack-to-CraftItemStack.patch
diff --git a/patches/api/0478-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/api/0477-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
index 042b9e8600..042b9e8600 100644
--- a/patches/api/0478-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
+++ b/patches/api/0477-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
diff --git a/patches/api/0479-Fix-HelpCommand-searching.patch b/patches/api/0478-Fix-HelpCommand-searching.patch
index beac489e87..beac489e87 100644
--- a/patches/api/0479-Fix-HelpCommand-searching.patch
+++ b/patches/api/0478-Fix-HelpCommand-searching.patch
diff --git a/patches/api/0480-add-Plugin-getDataPath.patch b/patches/api/0479-add-Plugin-getDataPath.patch
index 5085e262a9..5085e262a9 100644
--- a/patches/api/0480-add-Plugin-getDataPath.patch
+++ b/patches/api/0479-add-Plugin-getDataPath.patch
diff --git a/patches/api/0481-Fix-PickupStatus-getting-reset.patch b/patches/api/0480-Fix-PickupStatus-getting-reset.patch
index 6473947708..6473947708 100644
--- a/patches/api/0481-Fix-PickupStatus-getting-reset.patch
+++ b/patches/api/0480-Fix-PickupStatus-getting-reset.patch
diff --git a/patches/api/0482-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0481-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 3dd2df1411..3dd2df1411 100644
--- a/patches/api/0482-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/api/0481-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/api/0483-Improve-StandardMessenger-exception-messages.patch b/patches/api/0482-Improve-StandardMessenger-exception-messages.patch
index db8286512a..db8286512a 100644
--- a/patches/api/0483-Improve-StandardMessenger-exception-messages.patch
+++ b/patches/api/0482-Improve-StandardMessenger-exception-messages.patch
diff --git a/patches/api/0484-Add-even-more-Enchantment-API.patch b/patches/api/0483-Add-even-more-Enchantment-API.patch
index c9813d353e..c9813d353e 100644
--- a/patches/api/0484-Add-even-more-Enchantment-API.patch
+++ b/patches/api/0483-Add-even-more-Enchantment-API.patch
diff --git a/patches/api/0485-Leashable-API.patch b/patches/api/0484-Leashable-API.patch
index e5b1a4857d..e5b1a4857d 100644
--- a/patches/api/0485-Leashable-API.patch
+++ b/patches/api/0484-Leashable-API.patch
diff --git a/patches/api/0486-Add-enchantment-seed-update-API.patch b/patches/api/0485-Add-enchantment-seed-update-API.patch
index 64bb3259ac..64bb3259ac 100644
--- a/patches/api/0486-Add-enchantment-seed-update-API.patch
+++ b/patches/api/0485-Add-enchantment-seed-update-API.patch
diff --git a/patches/api/0487-Deprecate-for-removal-all-OldEnum-related-methods.patch b/patches/api/0486-Deprecate-for-removal-all-OldEnum-related-methods.patch
index 00540ebb8d..00540ebb8d 100644
--- a/patches/api/0487-Deprecate-for-removal-all-OldEnum-related-methods.patch
+++ b/patches/api/0486-Deprecate-for-removal-all-OldEnum-related-methods.patch
diff --git a/patches/api/0488-Add-FeatureFlag-API.patch b/patches/api/0487-Add-FeatureFlag-API.patch
index 946c294f8c..946c294f8c 100644
--- a/patches/api/0488-Add-FeatureFlag-API.patch
+++ b/patches/api/0487-Add-FeatureFlag-API.patch
diff --git a/patches/api/0489-Tag-Lifecycle-Events.patch b/patches/api/0488-Tag-Lifecycle-Events.patch
index d9fdf676e8..d9fdf676e8 100644
--- a/patches/api/0489-Tag-Lifecycle-Events.patch
+++ b/patches/api/0488-Tag-Lifecycle-Events.patch
diff --git a/patches/api/0490-Item-serialization-as-json.patch b/patches/api/0489-Item-serialization-as-json.patch
index d2951870a1..d2951870a1 100644
--- a/patches/api/0490-Item-serialization-as-json.patch
+++ b/patches/api/0489-Item-serialization-as-json.patch
diff --git a/patches/server/0668-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0668-Add-missing-block-data-API.patch
index fe8170196d..ace8c632a6 100644
--- a/patches/server/0668-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0668-Add-missing-block-data-API.patch
@@ -1,9 +1,30 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jake Potrebic <[email protected]>
 Date: Sat, 16 Oct 2021 22:57:31 -0700
-Subject: [PATCH] Add missing block data mins and maxes
+Subject: [PATCH] Add missing block data API
 
+General purpose patch adding missing getters/setters to BlockData and
+its child types.
 
+Co-authored-by: SoSeDiK <[email protected]>
+Co-authored-by: Fabrizio La Rosa <[email protected]>
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
+index 2ccf3fbe3f991b7a014cff3bcd424e6a81bc310a..e5450d3511389bf3bd6461fb6ec65ea82e4ae9f0 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
+@@ -51,4 +51,11 @@ public final class CraftBed extends org.bukkit.craftbukkit.block.data.CraftBlock
+     public java.util.Set<org.bukkit.block.BlockFace> getFaces() {
+         return this.getValues(CraftBed.FACING, org.bukkit.block.BlockFace.class);
+     }
++
++    // Paper start
++    @Override
++    public void setOccupied(boolean occupied) {
++        set(CraftBed.OCCUPIED, occupied);
++    }
++    // Paper end
+ }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCandle.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCandle.java
 index 2230160d5e04e979467a56346600436c1e5dd70c..08436bfeba2f35fb11b16c4f71f76e13c0d44b1a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCandle.java
@@ -58,6 +79,29 @@ index 7ce2e8b733bcd496dcfccb1ddfcb7c5c1b64052e..5ae27fc8f9d18bae949d335ea53e7e70
 +    }
 +    // Paper end
  }
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftDecoratedPot.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftDecoratedPot.java
+index 356230b9b266974e36d0508f8c239714d673504d..b7ea9a6fba6b4fc157dfcc4bee099871b8ad7380 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftDecoratedPot.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftDecoratedPot.java
+@@ -45,4 +45,18 @@ public final class CraftDecoratedPot extends org.bukkit.craftbukkit.block.data.C
+     public void setWaterlogged(boolean waterlogged) {
+         this.set(CraftDecoratedPot.WATERLOGGED, waterlogged);
+     }
++
++    // Paper start - add missing block data api
++    private static final net.minecraft.world.level.block.state.properties.BooleanProperty CRACKED = getBoolean(net.minecraft.world.level.block.DecoratedPotBlock.class, "cracked");
++
++    @Override
++    public boolean isCracked() {
++        return this.get(CraftDecoratedPot.CRACKED);
++    }
++
++    @Override
++    public void setCracked(final boolean cracked) {
++        this.set(CraftDecoratedPot.CRACKED, cracked);
++    }
++    // Paper end - add missing block data api
+ }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftFluids.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftFluids.java
 index 70d734fc71a4499bbf569b3908aa5fbbdf19e6a0..1af5fe48c5861077555e6bdeb6312859b7b37eb2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftFluids.java
diff --git a/patches/server/0756-Add-entity-knockback-API.patch b/patches/server/0755-Add-entity-knockback-API.patch
index e69cd1ea90..e69cd1ea90 100644
--- a/patches/server/0756-Add-entity-knockback-API.patch
+++ b/patches/server/0755-Add-entity-knockback-API.patch
diff --git a/patches/server/0755-Allow-changing-bed-s-occupied-property.patch b/patches/server/0755-Allow-changing-bed-s-occupied-property.patch
deleted file mode 100644
index d8b51d7f0b..0000000000
--- a/patches/server/0755-Allow-changing-bed-s-occupied-property.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SoSeDiK <[email protected]>
-Date: Wed, 12 Oct 2022 00:36:55 +0300
-Subject: [PATCH] Allow changing bed's 'occupied' property
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
-index 2ccf3fbe3f991b7a014cff3bcd424e6a81bc310a..e5450d3511389bf3bd6461fb6ec65ea82e4ae9f0 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
-@@ -51,4 +51,11 @@ public final class CraftBed extends org.bukkit.craftbukkit.block.data.CraftBlock
-     public java.util.Set<org.bukkit.block.BlockFace> getFaces() {
-         return this.getValues(CraftBed.FACING, org.bukkit.block.BlockFace.class);
-     }
-+
-+    // Paper start
-+    @Override
-+    public void setOccupied(boolean occupied) {
-+        set(CraftBed.OCCUPIED, occupied);
-+    }
-+    // Paper end
- }
diff --git a/patches/server/0757-Detect-headless-JREs.patch b/patches/server/0756-Detect-headless-JREs.patch
index 5ba28913a8..5ba28913a8 100644
--- a/patches/server/0757-Detect-headless-JREs.patch
+++ b/patches/server/0756-Detect-headless-JREs.patch
diff --git a/patches/server/0758-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0757-fix-entity-vehicle-collision-event-not-called.patch
index e39b0eaf22..e39b0eaf22 100644
--- a/patches/server/0758-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0757-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0759-Add-EntityToggleSitEvent.patch b/patches/server/0758-Add-EntityToggleSitEvent.patch
index 0ed0b95562..0ed0b95562 100644
--- a/patches/server/0759-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0758-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0760-Add-fire-tick-delay-option.patch b/patches/server/0759-Add-fire-tick-delay-option.patch
index 2ad454d1c6..2ad454d1c6 100644
--- a/patches/server/0760-Add-fire-tick-delay-option.patch
+++ b/patches/server/0759-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0761-Add-Moving-Piston-API.patch b/patches/server/0760-Add-Moving-Piston-API.patch
index e3d3955822..e3d3955822 100644
--- a/patches/server/0761-Add-Moving-Piston-API.patch
+++ b/patches/server/0760-Add-Moving-Piston-API.patch
diff --git a/patches/server/0762-Ignore-impossible-spawn-tick.patch b/patches/server/0761-Ignore-impossible-spawn-tick.patch
index f046102ceb..f046102ceb 100644
--- a/patches/server/0762-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0761-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0763-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch b/patches/server/0762-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
index 2fe35c8b32..2fe35c8b32 100644
--- a/patches/server/0763-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
+++ b/patches/server/0762-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
diff --git a/patches/server/0764-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0763-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index cd0b3b2cc7..cd0b3b2cc7 100644
--- a/patches/server/0764-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0763-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0765-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0764-Add-PrePlayerAttackEntityEvent.patch
index b0f3a07890..b0f3a07890 100644
--- a/patches/server/0765-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0764-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0766-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0765-ensure-reset-EnderDragon-boss-event-name.patch
index e2a769583d..e2a769583d 100644
--- a/patches/server/0766-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0765-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0767-Add-Player-Warden-Warning-API.patch b/patches/server/0766-Add-Player-Warden-Warning-API.patch
index 4d0bbf78c3..4d0bbf78c3 100644
--- a/patches/server/0767-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0766-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0768-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0767-More-vanilla-friendly-methods-to-update-trades.patch
index 5c30d5f82c..5c30d5f82c 100644
--- a/patches/server/0768-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0767-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0769-Add-paper-dumplisteners-command.patch b/patches/server/0768-Add-paper-dumplisteners-command.patch
index aabb60033d..aabb60033d 100644
--- a/patches/server/0769-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0768-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0770-check-global-player-list-where-appropriate.patch b/patches/server/0769-check-global-player-list-where-appropriate.patch
index 94286fbda9..94286fbda9 100644
--- a/patches/server/0770-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0769-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0771-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0770-Fix-async-entity-add-due-to-fungus-trees.patch
index 2a7830d952..2a7830d952 100644
--- a/patches/server/0771-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0770-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0772-ItemStack-damage-API.patch b/patches/server/0771-ItemStack-damage-API.patch
index 2f71087902..2f71087902 100644
--- a/patches/server/0772-ItemStack-damage-API.patch
+++ b/patches/server/0771-ItemStack-damage-API.patch
diff --git a/patches/server/0773-Friction-API.patch b/patches/server/0772-Friction-API.patch
index cae3c2376e..cae3c2376e 100644
--- a/patches/server/0773-Friction-API.patch
+++ b/patches/server/0772-Friction-API.patch
diff --git a/patches/server/0774-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0773-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 5bc45a7af4..5bc45a7af4 100644
--- a/patches/server/0774-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0773-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0775-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0774-Fix-premature-player-kicks-on-shutdown.patch
index d3dbe3d230..d3dbe3d230 100644
--- a/patches/server/0775-Fix-premature-player-kicks-on-shutdown.patch
+++ b/patches/server/0774-Fix-premature-player-kicks-on-shutdown.patch
diff --git a/patches/server/0776-Sync-offhand-slot-in-menus.patch b/patches/server/0775-Sync-offhand-slot-in-menus.patch
index f613fba84b..f613fba84b 100644
--- a/patches/server/0776-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0775-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0777-Player-Entity-Tracking-Events.patch b/patches/server/0776-Player-Entity-Tracking-Events.patch
index ceec0058a6..ceec0058a6 100644
--- a/patches/server/0777-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0776-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0778-Limit-pet-look-distance.patch b/patches/server/0777-Limit-pet-look-distance.patch
index 983f861539..983f861539 100644
--- a/patches/server/0778-Limit-pet-look-distance.patch
+++ b/patches/server/0777-Limit-pet-look-distance.patch
diff --git a/patches/server/0779-fix-Instruments.patch b/patches/server/0778-fix-Instruments.patch
index 1426590363..1426590363 100644
--- a/patches/server/0779-fix-Instruments.patch
+++ b/patches/server/0778-fix-Instruments.patch
diff --git a/patches/server/0780-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0779-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 420107d5c3..420107d5c3 100644
--- a/patches/server/0780-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0779-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0781-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0780-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 8b797606ed..8b797606ed 100644
--- a/patches/server/0781-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0780-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0782-Add-BlockLockCheckEvent.patch b/patches/server/0781-Add-BlockLockCheckEvent.patch
index 31fba739ae..31fba739ae 100644
--- a/patches/server/0782-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0781-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0783-Add-Sneaking-API-for-Entities.patch b/patches/server/0782-Add-Sneaking-API-for-Entities.patch
index aaee22c056..aaee22c056 100644
--- a/patches/server/0783-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0782-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0784-Improve-logging-and-errors.patch b/patches/server/0783-Improve-logging-and-errors.patch
index d2ccc7abed..d2ccc7abed 100644
--- a/patches/server/0784-Improve-logging-and-errors.patch
+++ b/patches/server/0783-Improve-logging-and-errors.patch
diff --git a/patches/server/0785-Improve-PortalEvents.patch b/patches/server/0784-Improve-PortalEvents.patch
index bb191a7362..bb191a7362 100644
--- a/patches/server/0785-Improve-PortalEvents.patch
+++ b/patches/server/0784-Improve-PortalEvents.patch
diff --git a/patches/server/0786-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0785-Add-config-option-for-spider-worldborder-climbing.patch
index 71e3939753..71e3939753 100644
--- a/patches/server/0786-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0785-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0787-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0786-Add-missing-SpigotConfig-logCommands-check.patch
index 9c86e0000a..9c86e0000a 100644
--- a/patches/server/0787-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0786-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0788-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0787-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0788-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0787-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0789-Flying-Fall-Damage.patch b/patches/server/0788-Flying-Fall-Damage.patch
index d82a7d6a41..d82a7d6a41 100644
--- a/patches/server/0789-Flying-Fall-Damage.patch
+++ b/patches/server/0788-Flying-Fall-Damage.patch
diff --git a/patches/server/0790-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0789-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 80118a6499..80118a6499 100644
--- a/patches/server/0790-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0789-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0791-config-for-disabling-entity-tag-tags.patch b/patches/server/0790-config-for-disabling-entity-tag-tags.patch
index aabc1e1a31..aabc1e1a31 100644
--- a/patches/server/0791-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0790-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0792-Use-single-player-info-update-packet-on-join.patch b/patches/server/0791-Use-single-player-info-update-packet-on-join.patch
index 086e834d77..086e834d77 100644
--- a/patches/server/0792-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0791-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0793-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0792-Correctly-shrink-items-during-EntityResurrectEvent.patch
index c1db8cbcae..c1db8cbcae 100644
--- a/patches/server/0793-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0792-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0794-Win-Screen-API.patch b/patches/server/0793-Win-Screen-API.patch
index 9089ea0503..9089ea0503 100644
--- a/patches/server/0794-Win-Screen-API.patch
+++ b/patches/server/0793-Win-Screen-API.patch
diff --git a/patches/server/0795-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0794-Remove-CraftItemStack-setAmount-null-assignment.patch
index 5b5c421ff2..5b5c421ff2 100644
--- a/patches/server/0795-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0794-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0796-Fix-force-opening-enchantment-tables.patch b/patches/server/0795-Fix-force-opening-enchantment-tables.patch
index db009af8c8..db009af8c8 100644
--- a/patches/server/0796-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0795-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0797-Add-Entity-Body-Yaw-API.patch b/patches/server/0796-Add-Entity-Body-Yaw-API.patch
index 53523e2ba9..53523e2ba9 100644
--- a/patches/server/0797-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0796-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0798-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0797-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 962917dab8..962917dab8 100644
--- a/patches/server/0798-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0797-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0799-Add-EntityFertilizeEggEvent.patch b/patches/server/0798-Add-EntityFertilizeEggEvent.patch
index f940f43c54..f940f43c54 100644
--- a/patches/server/0799-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0798-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0800-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0799-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 99130d8f1a..99130d8f1a 100644
--- a/patches/server/0800-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0799-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0801-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0800-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 85321a4a5b..85321a4a5b 100644
--- a/patches/server/0801-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0800-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0802-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0801-Correctly-handle-ArmorStand-invisibility.patch
index 34b66d686a..34b66d686a 100644
--- a/patches/server/0802-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0801-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0803-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0802-Fix-advancement-triggers-for-entity-damage.patch
index ea0459da7d..ea0459da7d 100644
--- a/patches/server/0803-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0802-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0804-Fix-text-display-error-on-spawn.patch b/patches/server/0803-Fix-text-display-error-on-spawn.patch
index 7f64cfe6d9..7f64cfe6d9 100644
--- a/patches/server/0804-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0803-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0805-Fix-inventories-returning-null-Locations.patch b/patches/server/0804-Fix-inventories-returning-null-Locations.patch
index 23413d6b03..23413d6b03 100644
--- a/patches/server/0805-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0804-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0806-Add-Shearable-API.patch b/patches/server/0805-Add-Shearable-API.patch
index 069dcbaf2e..069dcbaf2e 100644
--- a/patches/server/0806-Add-Shearable-API.patch
+++ b/patches/server/0805-Add-Shearable-API.patch
diff --git a/patches/server/0807-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0806-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 254a94df3a..254a94df3a 100644
--- a/patches/server/0807-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0806-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0808-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0807-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index d90e599897..d90e599897 100644
--- a/patches/server/0808-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0807-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0809-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0808-Treat-sequence-violations-like-they-should-be.patch
index e0fce8efce..e0fce8efce 100644
--- a/patches/server/0809-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0808-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0810-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0809-Prevent-causing-expired-keys-from-impacting-new-join.patch
index ee811c8ba6..ee811c8ba6 100644
--- a/patches/server/0810-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0809-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0811-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0810-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 3306163498..3306163498 100644
--- a/patches/server/0811-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0810-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0812-Use-array-for-gamerule-storage.patch b/patches/server/0811-Use-array-for-gamerule-storage.patch
index 194ff8f15b..194ff8f15b 100644
--- a/patches/server/0812-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0811-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0813-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0812-Fix-a-couple-of-upstream-bed-issues.patch
index 665db524c5..665db524c5 100644
--- a/patches/server/0813-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0812-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0814-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0813-Fix-demo-flag-not-enabling-demo-mode.patch
index d64dd23e37..d64dd23e37 100644
--- a/patches/server/0814-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0813-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0815-Add-Mob-Experience-reward-API.patch b/patches/server/0814-Add-Mob-Experience-reward-API.patch
index f82f765beb..f82f765beb 100644
--- a/patches/server/0815-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0814-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0816-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0815-Break-redstone-on-top-of-trap-doors-early.patch
index 11c427e808..11c427e808 100644
--- a/patches/server/0816-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0815-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0817-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0816-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index becde16ce8..becde16ce8 100644
--- a/patches/server/0817-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0816-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0818-More-accurate-isInOpenWater-impl.patch b/patches/server/0817-More-accurate-isInOpenWater-impl.patch
index 6e110094dd..6e110094dd 100644
--- a/patches/server/0818-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0817-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0819-Expand-PlayerItemMendEvent.patch b/patches/server/0818-Expand-PlayerItemMendEvent.patch
index 6c302fd085..6c302fd085 100644
--- a/patches/server/0819-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0818-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0820-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0819-Refresh-ProjectileSource-for-projectiles.patch
index 4a5117fd04..4a5117fd04 100644
--- a/patches/server/0820-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0819-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0821-Add-transient-modifier-API.patch b/patches/server/0820-Add-transient-modifier-API.patch
index 36cc0a030a..36cc0a030a 100644
--- a/patches/server/0821-Add-transient-modifier-API.patch
+++ b/patches/server/0820-Add-transient-modifier-API.patch
diff --git a/patches/server/0822-Fix-block-place-logic.patch b/patches/server/0821-Fix-block-place-logic.patch
index accea4ee7c..accea4ee7c 100644
--- a/patches/server/0822-Fix-block-place-logic.patch
+++ b/patches/server/0821-Fix-block-place-logic.patch
diff --git a/patches/server/0823-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0822-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index e37c1ac015..e37c1ac015 100644
--- a/patches/server/0823-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0822-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0824-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0823-Call-BlockGrowEvent-for-missing-blocks.patch
index 895a528de8..895a528de8 100644
--- a/patches/server/0824-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0823-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0825-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0824-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 51cff24583..51cff24583 100644
--- a/patches/server/0825-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0824-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0826-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0825-fix-MapLike-spam-for-missing-key-selector.patch
index 2bd3b889f1..2bd3b889f1 100644
--- a/patches/server/0826-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0825-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0827-Fix-sniffer-removeExploredLocation.patch b/patches/server/0826-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0827-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0826-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0828-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0827-Add-method-to-remove-all-active-potion-effects.patch
index eb810dfef5..eb810dfef5 100644
--- a/patches/server/0828-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0827-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0829-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0828-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index ed5525cfda..ed5525cfda 100644
--- a/patches/server/0829-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0828-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0830-Add-event-for-player-editing-sign.patch b/patches/server/0829-Add-event-for-player-editing-sign.patch
index f2582476f3..f2582476f3 100644
--- a/patches/server/0830-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0829-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0831-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0830-Only-tick-item-frames-if-players-can-see-it.patch
index bf73ba4a5c..bf73ba4a5c 100644
--- a/patches/server/0831-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0830-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0832-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0831-Fix-cmd-permission-levels-for-command-blocks.patch
index 5167eee08c..5167eee08c 100644
--- a/patches/server/0832-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0831-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0833-Add-option-to-disable-block-updates.patch b/patches/server/0832-Add-option-to-disable-block-updates.patch
index 8fe599472e..8fe599472e 100644
--- a/patches/server/0833-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0832-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0834-Call-missing-BlockDispenseEvent.patch b/patches/server/0833-Call-missing-BlockDispenseEvent.patch
index 1ee26b1b62..1ee26b1b62 100644
--- a/patches/server/0834-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0833-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0835-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0834-Don-t-load-chunks-for-supporting-block-checks.patch
index db2c15729d..db2c15729d 100644
--- a/patches/server/0835-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0834-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0836-Optimize-player-lookups-for-beacons.patch b/patches/server/0835-Optimize-player-lookups-for-beacons.patch
index 1c203c23a6..1c203c23a6 100644
--- a/patches/server/0836-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0835-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0837-More-Sign-Block-API.patch b/patches/server/0836-More-Sign-Block-API.patch
index 3be6f4e353..3be6f4e353 100644
--- a/patches/server/0837-More-Sign-Block-API.patch
+++ b/patches/server/0836-More-Sign-Block-API.patch
diff --git a/patches/server/0838-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0837-fix-item-meta-for-tadpole-buckets.patch
index b367979963..b367979963 100644
--- a/patches/server/0838-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0837-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0839-Fix-BanList-API.patch b/patches/server/0838-Fix-BanList-API.patch
index 0b3b2d80aa..0b3b2d80aa 100644
--- a/patches/server/0839-Fix-BanList-API.patch
+++ b/patches/server/0838-Fix-BanList-API.patch
diff --git a/patches/server/0840-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0839-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 5f51eb317c..5f51eb317c 100644
--- a/patches/server/0840-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0839-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0841-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0840-Fix-possible-NPE-on-painting-creation.patch
index dc3838be94..dc3838be94 100644
--- a/patches/server/0841-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0840-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0842-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0841-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 6785f755ab..6785f755ab 100644
--- a/patches/server/0842-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0841-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0843-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0842-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 8199743d6f..8199743d6f 100644
--- a/patches/server/0843-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0842-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0844-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0843-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 301b345fb9..301b345fb9 100644
--- a/patches/server/0844-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0843-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0845-Add-whitelist-events.patch b/patches/server/0844-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0845-Add-whitelist-events.patch
+++ b/patches/server/0844-Add-whitelist-events.patch
diff --git a/patches/server/0846-Implement-PlayerFailMoveEvent.patch b/patches/server/0845-Implement-PlayerFailMoveEvent.patch
index 6a55a3af38..6a55a3af38 100644
--- a/patches/server/0846-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0845-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0847-Folia-scheduler-and-owned-region-API.patch b/patches/server/0846-Folia-scheduler-and-owned-region-API.patch
index 3b6c47e313..3b6c47e313 100644
--- a/patches/server/0847-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0846-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0848-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0847-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0848-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0847-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0849-API-for-updating-recipes-on-clients.patch b/patches/server/0848-API-for-updating-recipes-on-clients.patch
index 8f795d23d6..8f795d23d6 100644
--- a/patches/server/0849-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0848-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0850-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0849-Fix-rotation-when-spawning-display-entities.patch
index 7491ff60fe..7491ff60fe 100644
--- a/patches/server/0850-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0849-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0851-Only-capture-actual-tree-growth.patch b/patches/server/0850-Only-capture-actual-tree-growth.patch
index 202a25604c..202a25604c 100644
--- a/patches/server/0851-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0850-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0852-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0851-Use-correct-source-for-mushroom-block-spread-event.patch
index a295e29bcb..a295e29bcb 100644
--- a/patches/server/0852-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0851-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0853-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0852-Respect-randomizeData-on-more-entities-when-spawning.patch
index d04e8bf4f6..d04e8bf4f6 100644
--- a/patches/server/0853-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0852-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0854-Use-correct-seed-on-api-world-load.patch b/patches/server/0853-Use-correct-seed-on-api-world-load.patch
index 8b0db66674..8b0db66674 100644
--- a/patches/server/0854-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0853-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0855-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0854-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 2f19c9d94a..2f19c9d94a 100644
--- a/patches/server/0855-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0854-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0856-Cache-map-ids-on-item-frames.patch b/patches/server/0855-Cache-map-ids-on-item-frames.patch
index 65e3e3499f..65e3e3499f 100644
--- a/patches/server/0856-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0855-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0857-Fix-custom-statistic-criteria-creation.patch b/patches/server/0856-Fix-custom-statistic-criteria-creation.patch
index a3e8b66e3a..a3e8b66e3a 100644
--- a/patches/server/0857-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0856-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0858-Bandaid-fix-for-Effect.patch b/patches/server/0857-Bandaid-fix-for-Effect.patch
index d0958234c1..d0958234c1 100644
--- a/patches/server/0858-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0857-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0859-SculkCatalyst-bloom-API.patch b/patches/server/0858-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0859-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0858-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0860-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0859-API-for-an-entity-s-scoreboard-name.patch
index ac804a3ed5..ac804a3ed5 100644
--- a/patches/server/0860-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0859-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0861-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0860-Deprecate-and-replace-methods-with-old-StructureType.patch
index 253aafa7b4..253aafa7b4 100644
--- a/patches/server/0861-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0860-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0862-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0861-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 5725b805f0..5725b805f0 100644
--- a/patches/server/0862-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0861-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0863-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0862-Properly-handle-BlockBreakEvent-isDropItems.patch
index 75a746ca81..75a746ca81 100644
--- a/patches/server/0863-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0862-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0864-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0863-Fire-entity-death-event-for-ender-dragon.patch
index 66624e354c..66624e354c 100644
--- a/patches/server/0864-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0863-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0865-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0864-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 4b7085d831..4b7085d831 100644
--- a/patches/server/0865-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0864-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0866-Add-Listing-API-for-Player.patch b/patches/server/0865-Add-Listing-API-for-Player.patch
index 400b0f504b..400b0f504b 100644
--- a/patches/server/0866-Add-Listing-API-for-Player.patch
+++ b/patches/server/0865-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0867-Configurable-Region-Compression-Format.patch b/patches/server/0866-Configurable-Region-Compression-Format.patch
index 64a52a4ea2..64a52a4ea2 100644
--- a/patches/server/0867-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0866-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0868-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0867-Add-BlockFace-to-BlockDamageEvent.patch
index 28fdbf6dc6..28fdbf6dc6 100644
--- a/patches/server/0868-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0867-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0869-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0868-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0869-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0868-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0870-Expand-Pose-API.patch b/patches/server/0869-Expand-Pose-API.patch
index 1a9699d342..1a9699d342 100644
--- a/patches/server/0870-Expand-Pose-API.patch
+++ b/patches/server/0869-Expand-Pose-API.patch
diff --git a/patches/server/0871-More-DragonBattle-API.patch b/patches/server/0870-More-DragonBattle-API.patch
index b7b58f6c99..b7b58f6c99 100644
--- a/patches/server/0871-More-DragonBattle-API.patch
+++ b/patches/server/0870-More-DragonBattle-API.patch
diff --git a/patches/server/0872-Add-PlayerPickItemEvent.patch b/patches/server/0871-Add-PlayerPickItemEvent.patch
index b2bfa9ea75..b2bfa9ea75 100644
--- a/patches/server/0872-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0871-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0873-Allow-trident-custom-damage.patch b/patches/server/0872-Allow-trident-custom-damage.patch
index 95137bd7d5..95137bd7d5 100644
--- a/patches/server/0873-Allow-trident-custom-damage.patch
+++ b/patches/server/0872-Allow-trident-custom-damage.patch
diff --git a/patches/server/0874-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0873-Expose-hand-in-BlockCanBuildEvent.patch
index 4abc7e9fc5..4abc7e9fc5 100644
--- a/patches/server/0874-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0873-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0875-Optimize-nearest-structure-border-iteration.patch b/patches/server/0874-Optimize-nearest-structure-border-iteration.patch
index df5f60c52c..df5f60c52c 100644
--- a/patches/server/0875-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0874-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0876-Implement-OfflinePlayer-isConnected.patch b/patches/server/0875-Implement-OfflinePlayer-isConnected.patch
index acca20cfce..acca20cfce 100644
--- a/patches/server/0876-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0875-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0877-Fix-slot-desync.patch b/patches/server/0876-Fix-slot-desync.patch
index aa5a024985..aa5a024985 100644
--- a/patches/server/0877-Fix-slot-desync.patch
+++ b/patches/server/0876-Fix-slot-desync.patch
diff --git a/patches/server/0878-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0877-Add-titleOverride-to-InventoryOpenEvent.patch
index 707a896b95..707a896b95 100644
--- a/patches/server/0878-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0877-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0879-Configure-sniffer-egg-hatch-time.patch b/patches/server/0878-Configure-sniffer-egg-hatch-time.patch
index 7def55b1f7..7def55b1f7 100644
--- a/patches/server/0879-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0878-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0880-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0879-Do-crystal-portal-proximity-check-before-entity-look.patch
index ee3855f2b8..ee3855f2b8 100644
--- a/patches/server/0880-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0879-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0881-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0880-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0881-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0880-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0882-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0881-Add-slot-sanity-checks-in-container-clicks.patch
index 3be07bcfa2..3be07bcfa2 100644
--- a/patches/server/0882-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0881-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0883-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0882-Call-BlockRedstoneEvents-for-lecterns.patch
index 2c76754071..2c76754071 100644
--- a/patches/server/0883-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0882-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0884-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0883-Allow-proper-checking-of-empty-item-stacks.patch
index c578a2c3c2..c578a2c3c2 100644
--- a/patches/server/0884-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0883-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0885-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0884-Fix-silent-equipment-change-for-mobs.patch
index 793470108f..793470108f 100644
--- a/patches/server/0885-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0884-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0886-Fix-spigot-s-Forced-Stats.patch b/patches/server/0885-Fix-spigot-s-Forced-Stats.patch
index 554f1f8844..554f1f8844 100644
--- a/patches/server/0886-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0885-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0887-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0886-Add-missing-InventoryHolders-to-inventories.patch
index d058564174..d058564174 100644
--- a/patches/server/0887-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0886-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0888-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0887-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index ab4d61b97a..ab4d61b97a 100644
--- a/patches/server/0888-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0887-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0889-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0888-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0889-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0888-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0890-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0889-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e1f2934daa..e1f2934daa 100644
--- a/patches/server/0890-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0889-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0891-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0890-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0891-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0890-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0892-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0891-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0892-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0891-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0893-Fix-missing-map-initialize-event-call.patch b/patches/server/0892-Fix-missing-map-initialize-event-call.patch
index c95f6abbf7..c95f6abbf7 100644
--- a/patches/server/0893-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0892-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0894-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0893-Update-entity-data-when-attaching-firework-to-entity.patch
index f2c094976f..f2c094976f 100644
--- a/patches/server/0894-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0893-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0895-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0894-Fix-UnsafeValues-loadAdvancement.patch
index c1cfc35cc9..c1cfc35cc9 100644
--- a/patches/server/0895-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0894-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0896-Add-player-idle-duration-API.patch b/patches/server/0895-Add-player-idle-duration-API.patch
index 5f04d05fbe..5f04d05fbe 100644
--- a/patches/server/0896-Add-player-idle-duration-API.patch
+++ b/patches/server/0895-Add-player-idle-duration-API.patch
diff --git a/patches/server/0897-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0896-Don-t-check-if-we-can-see-non-visible-entities.patch
index 5d9fbe505f..5d9fbe505f 100644
--- a/patches/server/0897-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0896-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0898-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0897-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 5abf7cda2c..5abf7cda2c 100644
--- a/patches/server/0898-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0897-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0899-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0898-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index a266132ac4..a266132ac4 100644
--- a/patches/server/0899-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0898-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0900-Optimize-VarInts.patch b/patches/server/0899-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0900-Optimize-VarInts.patch
+++ b/patches/server/0899-Optimize-VarInts.patch
diff --git a/patches/server/0901-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0900-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index f0fcc8b9eb..f0fcc8b9eb 100644
--- a/patches/server/0901-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0900-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0902-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0901-Add-predicate-for-blocks-when-raytracing.patch
index 43a753b5c2..43a753b5c2 100644
--- a/patches/server/0902-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0901-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0903-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0902-Broadcast-take-item-packets-with-collector-as-source.patch
index d065041118..d065041118 100644
--- a/patches/server/0903-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0902-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0904-Expand-LingeringPotion-API.patch b/patches/server/0903-Expand-LingeringPotion-API.patch
index fdd0abf668..fdd0abf668 100644
--- a/patches/server/0904-Expand-LingeringPotion-API.patch
+++ b/patches/server/0903-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0905-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0904-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index da48750747..da48750747 100644
--- a/patches/server/0905-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0904-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0906-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0905-Add-hand-to-fish-event-for-all-player-interactions.patch
index dd3e5bba44..dd3e5bba44 100644
--- a/patches/server/0906-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0905-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0907-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0906-Fix-several-issues-with-EntityBreedEvent.patch
index 6a97d9fb9e..6a97d9fb9e 100644
--- a/patches/server/0907-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0906-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0908-Add-UUID-attribute-modifier-API.patch b/patches/server/0907-Add-UUID-attribute-modifier-API.patch
index 4b5e695553..4b5e695553 100644
--- a/patches/server/0908-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0907-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0909-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0908-Fix-missing-event-call-for-entity-teleport-API.patch
index d567759368..d567759368 100644
--- a/patches/server/0909-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0908-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0910-Lazily-create-LootContext-for-criterions.patch b/patches/server/0909-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0910-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0909-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0911-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0910-Don-t-fire-sync-events-during-worldgen.patch
index 5f8998389a..5f8998389a 100644
--- a/patches/server/0911-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0910-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0912-Add-Structure-check-API.patch b/patches/server/0911-Add-Structure-check-API.patch
index 6f901b1c7f..6f901b1c7f 100644
--- a/patches/server/0912-Add-Structure-check-API.patch
+++ b/patches/server/0911-Add-Structure-check-API.patch
diff --git a/patches/server/0913-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0912-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index 32e393d2a8..32e393d2a8 100644
--- a/patches/server/0913-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0912-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0914-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0913-Restore-vanilla-entity-drops-behavior.patch
index 765b6340a4..765b6340a4 100644
--- a/patches/server/0914-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0913-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0915-Dont-resend-blocks-on-interactions.patch b/patches/server/0914-Dont-resend-blocks-on-interactions.patch
index ce903f155f..ce903f155f 100644
--- a/patches/server/0915-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0914-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0916-add-more-scoreboard-API.patch b/patches/server/0915-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0916-add-more-scoreboard-API.patch
+++ b/patches/server/0915-add-more-scoreboard-API.patch
diff --git a/patches/server/0917-Improve-Registry.patch b/patches/server/0916-Improve-Registry.patch
index bebb963725..bebb963725 100644
--- a/patches/server/0917-Improve-Registry.patch
+++ b/patches/server/0916-Improve-Registry.patch
diff --git a/patches/server/0918-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0917-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index c899162e3b..c899162e3b 100644
--- a/patches/server/0918-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0917-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0919-Add-experience-points-API.patch b/patches/server/0918-Add-experience-points-API.patch
index 4abb3e0697..4abb3e0697 100644
--- a/patches/server/0919-Add-experience-points-API.patch
+++ b/patches/server/0918-Add-experience-points-API.patch
diff --git a/patches/server/0920-Add-drops-to-shear-events.patch b/patches/server/0919-Add-drops-to-shear-events.patch
index b19f491bf1..b19f491bf1 100644
--- a/patches/server/0920-Add-drops-to-shear-events.patch
+++ b/patches/server/0919-Add-drops-to-shear-events.patch
diff --git a/patches/server/0921-Add-PlayerShieldDisableEvent.patch b/patches/server/0920-Add-PlayerShieldDisableEvent.patch
index 5bbd9b6ff6..5bbd9b6ff6 100644
--- a/patches/server/0921-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0920-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0922-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0921-Validate-ResourceLocation-in-NBT-reading.patch
index 6373db1e81..6373db1e81 100644
--- a/patches/server/0922-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0921-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0923-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0922-Properly-handle-experience-dropping-on-block-break.patch
index c5ffca5d89..c5ffca5d89 100644
--- a/patches/server/0923-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0922-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0924-Fixup-NamespacedKey-handling.patch b/patches/server/0923-Fixup-NamespacedKey-handling.patch
index ac021fa175..ac021fa175 100644
--- a/patches/server/0924-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0923-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0925-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0924-Expose-LootTable-of-DecoratedPot.patch
index afa86977a9..afa86977a9 100644
--- a/patches/server/0925-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0924-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0926-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0925-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 37c0ef0eef..37c0ef0eef 100644
--- a/patches/server/0926-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0925-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0927-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0926-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index ace1ed6898..ace1ed6898 100644
--- a/patches/server/0927-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0926-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0928-Add-ShulkerDuplicateEvent.patch b/patches/server/0927-Add-ShulkerDuplicateEvent.patch
index de864137e2..de864137e2 100644
--- a/patches/server/0928-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/0927-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0929-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0928-Add-api-for-spawn-egg-texture-colors.patch
index f8a65ad281..f8a65ad281 100644
--- a/patches/server/0929-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0928-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/0930-Add-Lifecycle-Event-system.patch b/patches/server/0929-Add-Lifecycle-Event-system.patch
index 4e40ae8cf8..4e40ae8cf8 100644
--- a/patches/server/0930-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0929-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/0931-ItemStack-Tooltip-API.patch b/patches/server/0930-ItemStack-Tooltip-API.patch
index bdec7c8b91..bdec7c8b91 100644
--- a/patches/server/0931-ItemStack-Tooltip-API.patch
+++ b/patches/server/0930-ItemStack-Tooltip-API.patch
diff --git a/patches/server/0932-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0931-Add-getChunkSnapshot-includeLightData-parameter.patch
index 54aa35539f..54aa35539f 100644
--- a/patches/server/0932-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/0931-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0933-Add-FluidState-API.patch b/patches/server/0932-Add-FluidState-API.patch
index aac0912819..aac0912819 100644
--- a/patches/server/0933-Add-FluidState-API.patch
+++ b/patches/server/0932-Add-FluidState-API.patch
diff --git a/patches/server/0934-add-number-format-api.patch b/patches/server/0933-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0934-add-number-format-api.patch
+++ b/patches/server/0933-add-number-format-api.patch
diff --git a/patches/server/0935-improve-BanList-types.patch b/patches/server/0934-improve-BanList-types.patch
index 408fdc3fbe..408fdc3fbe 100644
--- a/patches/server/0935-improve-BanList-types.patch
+++ b/patches/server/0934-improve-BanList-types.patch
diff --git a/patches/server/0936-Expanded-Hopper-API.patch b/patches/server/0935-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0936-Expanded-Hopper-API.patch
+++ b/patches/server/0935-Expanded-Hopper-API.patch
diff --git a/patches/server/0937-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0936-Add-BlockBreakProgressUpdateEvent.patch
index 3481a288ee..3481a288ee 100644
--- a/patches/server/0937-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0936-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0938-Deprecate-ItemStack-setType.patch b/patches/server/0937-Deprecate-ItemStack-setType.patch
index e0a6acc747..e0a6acc747 100644
--- a/patches/server/0938-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0937-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0939-Add-CartographyItemEvent.patch b/patches/server/0938-Add-CartographyItemEvent.patch
index 9e48767381..9e48767381 100644
--- a/patches/server/0939-Add-CartographyItemEvent.patch
+++ b/patches/server/0938-Add-CartographyItemEvent.patch
diff --git a/patches/server/0940-More-Raid-API.patch b/patches/server/0939-More-Raid-API.patch
index e218d301b5..e218d301b5 100644
--- a/patches/server/0940-More-Raid-API.patch
+++ b/patches/server/0939-More-Raid-API.patch
diff --git a/patches/server/0941-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0940-Add-onboarding-message-for-initial-server-start.patch
index d3fb21c7a3..d3fb21c7a3 100644
--- a/patches/server/0941-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0940-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/0942-Configurable-max-block-fluid-ticks.patch b/patches/server/0941-Configurable-max-block-fluid-ticks.patch
index 2d7a50b998..2d7a50b998 100644
--- a/patches/server/0942-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0941-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0943-Fix-bees-aging-inside-hives.patch b/patches/server/0942-Fix-bees-aging-inside-hives.patch
index 400ede1160..400ede1160 100644
--- a/patches/server/0943-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0942-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0944-Disable-memory-reserve-allocating.patch b/patches/server/0943-Disable-memory-reserve-allocating.patch
index ea801f5092..ea801f5092 100644
--- a/patches/server/0944-Disable-memory-reserve-allocating.patch
+++ b/patches/server/0943-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0945-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0944-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index d98b3aeccc..d98b3aeccc 100644
--- a/patches/server/0945-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/0944-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0946-Fix-DamageSource-API.patch b/patches/server/0945-Fix-DamageSource-API.patch
index 234e784901..234e784901 100644
--- a/patches/server/0946-Fix-DamageSource-API.patch
+++ b/patches/server/0945-Fix-DamageSource-API.patch
diff --git a/patches/server/0947-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0946-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index 8e09c4fb05..8e09c4fb05 100644
--- a/patches/server/0947-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/server/0946-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0948-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0947-Fix-possible-StackOverflowError-for-some-dispenses.patch
index 5351dde83c..5351dde83c 100644
--- a/patches/server/0948-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/0947-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0949-Improve-tag-parser-handling.patch b/patches/server/0948-Improve-tag-parser-handling.patch
index 9ffa70e388..9ffa70e388 100644
--- a/patches/server/0949-Improve-tag-parser-handling.patch
+++ b/patches/server/0948-Improve-tag-parser-handling.patch
diff --git a/patches/server/0950-Item-Mutation-Fixes.patch b/patches/server/0949-Item-Mutation-Fixes.patch
index bad3be61f9..bad3be61f9 100644
--- a/patches/server/0950-Item-Mutation-Fixes.patch
+++ b/patches/server/0949-Item-Mutation-Fixes.patch
diff --git a/patches/server/0951-Per-world-ticks-per-spawn-settings.patch b/patches/server/0950-Per-world-ticks-per-spawn-settings.patch
index 0d7c9ea5b4..0d7c9ea5b4 100644
--- a/patches/server/0951-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0950-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0952-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0951-Properly-track-the-changed-item-from-dispense-events.patch
index 2dc797fea7..2dc797fea7 100644
--- a/patches/server/0952-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/0951-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0953-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0952-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 12dc4db2ff..12dc4db2ff 100644
--- a/patches/server/0953-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0952-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0954-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/0953-Fix-tripwire-disarming-not-working-as-intended.patch
index fa7f6bde06..fa7f6bde06 100644
--- a/patches/server/0954-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/server/0953-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/0955-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0954-Add-config-for-mobs-immune-to-default-effects.patch
index 74dd1a1360..74dd1a1360 100644
--- a/patches/server/0955-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0954-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0956-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/0955-Deep-clone-nbt-tags-in-PDC.patch
index f559f0cd9d..f559f0cd9d 100644
--- a/patches/server/0956-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/server/0955-Deep-clone-nbt-tags-in-PDC.patch
diff --git a/patches/server/0957-Support-old-UUID-format-for-NBT.patch b/patches/server/0956-Support-old-UUID-format-for-NBT.patch
index 68ff8a5255..68ff8a5255 100644
--- a/patches/server/0957-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0956-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0958-Fix-shield-disable-inconsistency.patch b/patches/server/0957-Fix-shield-disable-inconsistency.patch
index 624805ae3f..624805ae3f 100644
--- a/patches/server/0958-Fix-shield-disable-inconsistency.patch
+++ b/patches/server/0957-Fix-shield-disable-inconsistency.patch
diff --git a/patches/server/0959-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0958-Handle-Large-Packets-disconnecting-client.patch
index ea20a101a7..ea20a101a7 100644
--- a/patches/server/0959-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0958-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0960-Fix-ItemFlags.patch b/patches/server/0959-Fix-ItemFlags.patch
index 46e55a9780..46e55a9780 100644
--- a/patches/server/0960-Fix-ItemFlags.patch
+++ b/patches/server/0959-Fix-ItemFlags.patch
diff --git a/patches/server/0961-Fix-Player-setBlockUpdate.patch b/patches/server/0960-Fix-Player-setBlockUpdate.patch
index 7986fb5a2b..7986fb5a2b 100644
--- a/patches/server/0961-Fix-Player-setBlockUpdate.patch
+++ b/patches/server/0960-Fix-Player-setBlockUpdate.patch
diff --git a/patches/server/0962-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0961-Fix-helmet-damage-reduction-inconsistencies.patch
index a9182bdd0a..a9182bdd0a 100644
--- a/patches/server/0962-Fix-helmet-damage-reduction-inconsistencies.patch
+++ b/patches/server/0961-Fix-helmet-damage-reduction-inconsistencies.patch
diff --git a/patches/server/0963-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/0962-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index 97824d33ba..97824d33ba 100644
--- a/patches/server/0963-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/0962-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/patches/server/0964-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/0963-improve-checking-handled-tags-in-itemmeta.patch
index 3bc62d037f..3bc62d037f 100644
--- a/patches/server/0964-improve-checking-handled-tags-in-itemmeta.patch
+++ b/patches/server/0963-improve-checking-handled-tags-in-itemmeta.patch
diff --git a/patches/server/0965-General-ItemMeta-fixes.patch b/patches/server/0964-General-ItemMeta-fixes.patch
index 17b7102b0e..17b7102b0e 100644
--- a/patches/server/0965-General-ItemMeta-fixes.patch
+++ b/patches/server/0964-General-ItemMeta-fixes.patch
diff --git a/patches/server/0966-Expose-hasColor-to-leather-armor.patch b/patches/server/0965-Expose-hasColor-to-leather-armor.patch
index fb4dc944de..fb4dc944de 100644
--- a/patches/server/0966-Expose-hasColor-to-leather-armor.patch
+++ b/patches/server/0965-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/server/0967-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/0966-Added-API-to-get-player-ha-proxy-address.patch
index b6dcd8397a..b6dcd8397a 100644
--- a/patches/server/0967-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/server/0966-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/server/0968-More-Chest-Block-API.patch b/patches/server/0967-More-Chest-Block-API.patch
index 020d97d086..020d97d086 100644
--- a/patches/server/0968-More-Chest-Block-API.patch
+++ b/patches/server/0967-More-Chest-Block-API.patch
diff --git a/patches/server/0969-Print-data-component-type-on-encoding-error.patch b/patches/server/0968-Print-data-component-type-on-encoding-error.patch
index a60bdfee87..a60bdfee87 100644
--- a/patches/server/0969-Print-data-component-type-on-encoding-error.patch
+++ b/patches/server/0968-Print-data-component-type-on-encoding-error.patch
diff --git a/patches/server/0970-Brigadier-based-command-API.patch b/patches/server/0969-Brigadier-based-command-API.patch
index 5572d1d741..5572d1d741 100644
--- a/patches/server/0970-Brigadier-based-command-API.patch
+++ b/patches/server/0969-Brigadier-based-command-API.patch
diff --git a/patches/server/0971-Fix-issues-with-Recipe-API.patch b/patches/server/0970-Fix-issues-with-Recipe-API.patch
index bb85dca687..bb85dca687 100644
--- a/patches/server/0971-Fix-issues-with-Recipe-API.patch
+++ b/patches/server/0970-Fix-issues-with-Recipe-API.patch
diff --git a/patches/server/0972-Fix-equipment-slot-and-group-API.patch b/patches/server/0971-Fix-equipment-slot-and-group-API.patch
index 7e3f35d33c..7e3f35d33c 100644
--- a/patches/server/0972-Fix-equipment-slot-and-group-API.patch
+++ b/patches/server/0971-Fix-equipment-slot-and-group-API.patch
diff --git a/patches/server/0973-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/0972-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 8b39d13b43..8b39d13b43 100644
--- a/patches/server/0973-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/server/0972-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/server/0974-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0973-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 493ba5347b..493ba5347b 100644
--- a/patches/server/0974-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0973-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0975-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/0974-Prevent-NPE-if-hooked-entity-was-cleared.patch
index 8d3547db93..8d3547db93 100644
--- a/patches/server/0975-Prevent-NPE-if-hooked-entity-was-cleared.patch
+++ b/patches/server/0974-Prevent-NPE-if-hooked-entity-was-cleared.patch
diff --git a/patches/server/0976-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/0975-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
index fa5579fdaa..fa5579fdaa 100644
--- a/patches/server/0976-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
+++ b/patches/server/0975-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
diff --git a/patches/server/0977-Add-missing-fishing-event-state.patch b/patches/server/0976-Add-missing-fishing-event-state.patch
index 6ad1a92dd0..6ad1a92dd0 100644
--- a/patches/server/0977-Add-missing-fishing-event-state.patch
+++ b/patches/server/0976-Add-missing-fishing-event-state.patch
diff --git a/patches/server/0978-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0977-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index 23a507f4bf..23a507f4bf 100644
--- a/patches/server/0978-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/server/0977-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/server/0979-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/server/0978-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
index 1abf467e7e..1abf467e7e 100644
--- a/patches/server/0979-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
+++ b/patches/server/0978-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
diff --git a/patches/server/0980-Adopt-MaterialRerouting.patch b/patches/server/0979-Adopt-MaterialRerouting.patch
index e6473ef21a..e6473ef21a 100644
--- a/patches/server/0980-Adopt-MaterialRerouting.patch
+++ b/patches/server/0979-Adopt-MaterialRerouting.patch
diff --git a/patches/server/0981-Suspicious-Effect-Entry-API.patch b/patches/server/0980-Suspicious-Effect-Entry-API.patch
index bc26031199..bc26031199 100644
--- a/patches/server/0981-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/0980-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0982-check-if-itemstack-is-stackable-first.patch b/patches/server/0981-check-if-itemstack-is-stackable-first.patch
index 8e11960bdd..8e11960bdd 100644
--- a/patches/server/0982-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/0981-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0983-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0982-Fix-removing-recipes-from-RecipeIterator.patch
index 461c3eb854..461c3eb854 100644
--- a/patches/server/0983-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0982-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0984-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0983-Configurable-damage-tick-when-blocking-with-shield.patch
index 24d7eefdb2..24d7eefdb2 100644
--- a/patches/server/0984-Configurable-damage-tick-when-blocking-with-shield.patch
+++ b/patches/server/0983-Configurable-damage-tick-when-blocking-with-shield.patch
diff --git a/patches/server/0985-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0984-Properly-remove-the-experimental-smithing-inventory-.patch
index 9ede88caa7..9ede88caa7 100644
--- a/patches/server/0985-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/server/0984-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/server/0986-Moonrise-optimisation-patches.patch b/patches/server/0985-Moonrise-optimisation-patches.patch
index c30296978a..c30296978a 100644
--- a/patches/server/0986-Moonrise-optimisation-patches.patch
+++ b/patches/server/0985-Moonrise-optimisation-patches.patch
diff --git a/patches/server/0987-Rewrite-dataconverter-system.patch b/patches/server/0986-Rewrite-dataconverter-system.patch
index c973389ac9..c973389ac9 100644
--- a/patches/server/0987-Rewrite-dataconverter-system.patch
+++ b/patches/server/0986-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0988-disable-forced-empty-world-ticks.patch b/patches/server/0987-disable-forced-empty-world-ticks.patch
index 4e5fea24f6..4e5fea24f6 100644
--- a/patches/server/0988-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0987-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0989-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0988-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 3046e40be7..3046e40be7 100644
--- a/patches/server/0989-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0988-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0990-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0989-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index ccc8786fd8..ccc8786fd8 100644
--- a/patches/server/0990-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0989-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0991-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0990-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 505082cbed..505082cbed 100644
--- a/patches/server/0991-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0990-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0992-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0991-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index f51a3d8642..f51a3d8642 100644
--- a/patches/server/0992-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0991-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0993-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0992-Allow-Saving-of-Oversized-Chunks.patch
index 4eef25929e..4eef25929e 100644
--- a/patches/server/0993-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0992-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0994-Flat-bedrock-generator-settings.patch b/patches/server/0993-Flat-bedrock-generator-settings.patch
index da68e7d65b..da68e7d65b 100644
--- a/patches/server/0994-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0993-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0995-Entity-Activation-Range-2.0.patch b/patches/server/0994-Entity-Activation-Range-2.0.patch
index 8ce6ec4ca8..8ce6ec4ca8 100644
--- a/patches/server/0995-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0994-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0996-Optional-per-player-mob-spawns.patch b/patches/server/0995-Optional-per-player-mob-spawns.patch
index fee5589666..fee5589666 100644
--- a/patches/server/0996-Optional-per-player-mob-spawns.patch
+++ b/patches/server/0995-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/0997-Anti-Xray.patch b/patches/server/0996-Anti-Xray.patch
index 7e3f9656a3..7e3f9656a3 100644
--- a/patches/server/0997-Anti-Xray.patch
+++ b/patches/server/0996-Anti-Xray.patch
diff --git a/patches/server/0998-Eigencraft-redstone-implementation.patch b/patches/server/0997-Eigencraft-redstone-implementation.patch
index b3e3db6504..b3e3db6504 100644
--- a/patches/server/0998-Eigencraft-redstone-implementation.patch
+++ b/patches/server/0997-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0999-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0998-Add-Alternate-Current-redstone-implementation.patch
index 8e8dac3c75..8e8dac3c75 100644
--- a/patches/server/0999-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0998-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1000-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0999-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 29e8f09721..29e8f09721 100644
--- a/patches/server/1000-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0999-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/1001-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1000-Use-Velocity-compression-and-cipher-natives.patch
index 290a54a80c..290a54a80c 100644
--- a/patches/server/1001-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/1000-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1002-Optimize-Collision-to-not-load-chunks.patch b/patches/server/1001-Optimize-Collision-to-not-load-chunks.patch
index c37176cd37..c37176cd37 100644
--- a/patches/server/1002-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/1001-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/1003-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/1002-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 65f5e3531e..65f5e3531e 100644
--- a/patches/server/1003-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/1002-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/1004-Optimize-Hoppers.patch b/patches/server/1003-Optimize-Hoppers.patch
index 7dfa38282a..7dfa38282a 100644
--- a/patches/server/1004-Optimize-Hoppers.patch
+++ b/patches/server/1003-Optimize-Hoppers.patch
diff --git a/patches/server/1005-Entity-load-save-limit-per-chunk.patch b/patches/server/1004-Entity-load-save-limit-per-chunk.patch
index 9a5959e34f..9a5959e34f 100644
--- a/patches/server/1005-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/1004-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1006-Optimize-Voxel-Shape-Merging.patch b/patches/server/1005-Optimize-Voxel-Shape-Merging.patch
index 114ee7cb28..114ee7cb28 100644
--- a/patches/server/1006-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/1005-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1007-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1006-Optimize-Bit-Operations-by-inlining.patch
index b7d93a56b9..b7d93a56b9 100644
--- a/patches/server/1007-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/1006-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1008-Remove-streams-from-hot-code.patch b/patches/server/1007-Remove-streams-from-hot-code.patch
index 4c6d94f7bf..4c6d94f7bf 100644
--- a/patches/server/1008-Remove-streams-from-hot-code.patch
+++ b/patches/server/1007-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 6fc4445bbf..6fc4445bbf 100644
--- a/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1010-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1009-Custom-table-implementation-for-blockstate-state-loo.patch
index 96d90abea3..96d90abea3 100644
--- a/patches/server/1010-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1009-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1011-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1010-Fix-entity-type-tags-suggestions-in-selectors.patch
index 7892753fc2..7892753fc2 100644
--- a/patches/server/1011-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1010-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1012-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1011-Handle-Oversized-block-entities-in-chunks.patch
index d3283fd63f..d3283fd63f 100644
--- a/patches/server/1012-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1011-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1013-API-for-checking-sent-chunks.patch b/patches/server/1012-API-for-checking-sent-chunks.patch
index 4b57b79874..4b57b79874 100644
--- a/patches/server/1013-API-for-checking-sent-chunks.patch
+++ b/patches/server/1012-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1014-Check-distance-in-entity-interactions.patch b/patches/server/1013-Check-distance-in-entity-interactions.patch
index d6e268091d..d6e268091d 100644
--- a/patches/server/1014-Check-distance-in-entity-interactions.patch
+++ b/patches/server/1013-Check-distance-in-entity-interactions.patch
diff --git a/patches/server/1015-Configurable-Sand-Duping.patch b/patches/server/1014-Configurable-Sand-Duping.patch
index cbc52697db..cbc52697db 100644
--- a/patches/server/1015-Configurable-Sand-Duping.patch
+++ b/patches/server/1014-Configurable-Sand-Duping.patch
diff --git a/patches/server/1016-Optimise-general-POI-access.patch b/patches/server/1015-Optimise-general-POI-access.patch
index b3636fe591..b3636fe591 100644
--- a/patches/server/1016-Optimise-general-POI-access.patch
+++ b/patches/server/1015-Optimise-general-POI-access.patch
diff --git a/patches/server/1017-Improve-performance-of-mass-crafts.patch b/patches/server/1016-Improve-performance-of-mass-crafts.patch
index 15701b21e0..15701b21e0 100644
--- a/patches/server/1017-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1016-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1018-Properly-resend-entities.patch b/patches/server/1017-Properly-resend-entities.patch
index 3745ddb216..3745ddb216 100644
--- a/patches/server/1018-Properly-resend-entities.patch
+++ b/patches/server/1017-Properly-resend-entities.patch
diff --git a/patches/server/1019-Registry-Modification-API.patch b/patches/server/1018-Registry-Modification-API.patch
index 8a2f279596..8a2f279596 100644
--- a/patches/server/1019-Registry-Modification-API.patch
+++ b/patches/server/1018-Registry-Modification-API.patch
diff --git a/patches/server/1020-Add-registry-entry-and-builders.patch b/patches/server/1019-Add-registry-entry-and-builders.patch
index 9125594884..9125594884 100644
--- a/patches/server/1020-Add-registry-entry-and-builders.patch
+++ b/patches/server/1019-Add-registry-entry-and-builders.patch
diff --git a/patches/server/1021-Improved-Watchdog-Support.patch b/patches/server/1020-Improved-Watchdog-Support.patch
index 798fa8624a..798fa8624a 100644
--- a/patches/server/1021-Improved-Watchdog-Support.patch
+++ b/patches/server/1020-Improved-Watchdog-Support.patch
diff --git a/patches/server/1022-Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/1021-Proxy-ItemStack-to-CraftItemStack.patch
index 51d86f8f5b..51d86f8f5b 100644
--- a/patches/server/1022-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/patches/server/1021-Proxy-ItemStack-to-CraftItemStack.patch
diff --git a/patches/server/1023-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/server/1022-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
index 430f84e5a5..430f84e5a5 100644
--- a/patches/server/1023-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
+++ b/patches/server/1022-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
diff --git a/patches/server/1024-Prioritize-Minecraft-commands-in-function-parsing-an.patch b/patches/server/1023-Prioritize-Minecraft-commands-in-function-parsing-an.patch
index 6e36d9a7b3..6e36d9a7b3 100644
--- a/patches/server/1024-Prioritize-Minecraft-commands-in-function-parsing-an.patch
+++ b/patches/server/1023-Prioritize-Minecraft-commands-in-function-parsing-an.patch
diff --git a/patches/server/1025-optimize-dirt-and-snow-spreading.patch b/patches/server/1024-optimize-dirt-and-snow-spreading.patch
index 49de7fcab9..49de7fcab9 100644
--- a/patches/server/1025-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/1024-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1026-Fix-NPE-for-Jukebox-setRecord.patch b/patches/server/1025-Fix-NPE-for-Jukebox-setRecord.patch
index e15a77ee75..e15a77ee75 100644
--- a/patches/server/1026-Fix-NPE-for-Jukebox-setRecord.patch
+++ b/patches/server/1025-Fix-NPE-for-Jukebox-setRecord.patch
diff --git a/patches/server/1027-Fix-CraftWorld-isChunkGenerated.patch b/patches/server/1026-Fix-CraftWorld-isChunkGenerated.patch
index c402325cb5..c402325cb5 100644
--- a/patches/server/1027-Fix-CraftWorld-isChunkGenerated.patch
+++ b/patches/server/1026-Fix-CraftWorld-isChunkGenerated.patch
diff --git a/patches/server/1028-fix-horse-inventories.patch b/patches/server/1027-fix-horse-inventories.patch
index 9737a4fa71..9737a4fa71 100644
--- a/patches/server/1028-fix-horse-inventories.patch
+++ b/patches/server/1027-fix-horse-inventories.patch
diff --git a/patches/server/1029-Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/server/1028-Only-call-EntityDamageEvents-before-actuallyHurt.patch
index f6b8cc3f6b..f6b8cc3f6b 100644
--- a/patches/server/1029-Only-call-EntityDamageEvents-before-actuallyHurt.patch
+++ b/patches/server/1028-Only-call-EntityDamageEvents-before-actuallyHurt.patch
diff --git a/patches/server/1030-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1029-Fix-entity-tracker-desync-when-new-players-are-added.patch
index f767b9ab91..f767b9ab91 100644
--- a/patches/server/1030-Fix-entity-tracker-desync-when-new-players-are-added.patch
+++ b/patches/server/1029-Fix-entity-tracker-desync-when-new-players-are-added.patch
diff --git a/patches/server/1031-Lag-compensation-ticks.patch b/patches/server/1030-Lag-compensation-ticks.patch
index cea51f3b38..cea51f3b38 100644
--- a/patches/server/1031-Lag-compensation-ticks.patch
+++ b/patches/server/1030-Lag-compensation-ticks.patch
diff --git a/patches/server/1032-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1031-Detail-more-information-in-watchdog-dumps.patch
index 1806b418e3..1806b418e3 100644
--- a/patches/server/1032-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1031-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/1033-Write-SavedData-IO-async.patch b/patches/server/1032-Write-SavedData-IO-async.patch
index cceb676e45..cceb676e45 100644
--- a/patches/server/1033-Write-SavedData-IO-async.patch
+++ b/patches/server/1032-Write-SavedData-IO-async.patch
diff --git a/patches/server/1034-Correctly-call-PlayerItemBreakEvent.patch b/patches/server/1033-Correctly-call-PlayerItemBreakEvent.patch
index 378457e6e4..378457e6e4 100644
--- a/patches/server/1034-Correctly-call-PlayerItemBreakEvent.patch
+++ b/patches/server/1033-Correctly-call-PlayerItemBreakEvent.patch
diff --git a/patches/server/1035-Add-ItemType-getItemRarity.patch b/patches/server/1034-Add-ItemType-getItemRarity.patch
index 35ebf5036b..35ebf5036b 100644
--- a/patches/server/1035-Add-ItemType-getItemRarity.patch
+++ b/patches/server/1034-Add-ItemType-getItemRarity.patch
diff --git a/patches/server/1036-Incremental-chunk-and-player-saving.patch b/patches/server/1035-Incremental-chunk-and-player-saving.patch
index 667fed509e..667fed509e 100644
--- a/patches/server/1036-Incremental-chunk-and-player-saving.patch
+++ b/patches/server/1035-Incremental-chunk-and-player-saving.patch
diff --git a/patches/server/1037-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1036-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 114443675b..114443675b 100644
--- a/patches/server/1037-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1036-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1038-Bundle-spark.patch b/patches/server/1037-Bundle-spark.patch
index 24b9c208b8..46102122ae 100644
--- a/patches/server/1038-Bundle-spark.patch
+++ b/patches/server/1037-Bundle-spark.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Bundle spark
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1a734293c9416f13324bb0edf8f950c9029f8bc4..5e68a68d1ff920eb743795ae2048064a244a761c 100644
+index 4f6136ae3ac4890b21a5fb3f69f9c1474a0773d1..32832deabc39be99ae0d69fe81439b86789f09e4 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -61,6 +61,10 @@ dependencies {
diff --git a/patches/server/1039-Add-plugin-info-at-startup.patch b/patches/server/1038-Add-plugin-info-at-startup.patch
index 051309bbed..051309bbed 100644
--- a/patches/server/1039-Add-plugin-info-at-startup.patch
+++ b/patches/server/1038-Add-plugin-info-at-startup.patch
diff --git a/patches/server/1040-Make-interaction-leniency-distance-configurable.patch b/patches/server/1039-Make-interaction-leniency-distance-configurable.patch
index c0f7fc9fdc..c0f7fc9fdc 100644
--- a/patches/server/1040-Make-interaction-leniency-distance-configurable.patch
+++ b/patches/server/1039-Make-interaction-leniency-distance-configurable.patch
diff --git a/patches/server/1041-Fix-PickupStatus-getting-reset.patch b/patches/server/1040-Fix-PickupStatus-getting-reset.patch
index 2a772419ce..2a772419ce 100644
--- a/patches/server/1041-Fix-PickupStatus-getting-reset.patch
+++ b/patches/server/1040-Fix-PickupStatus-getting-reset.patch
diff --git a/patches/server/1042-Check-for-block-type-in-SculkSensorBlock-canActivate.patch b/patches/server/1041-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
index c56c52b165..c56c52b165 100644
--- a/patches/server/1042-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
+++ b/patches/server/1041-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
diff --git a/patches/server/1043-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/server/1042-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 3ff8343ca9..3ff8343ca9 100644
--- a/patches/server/1043-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/server/1042-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/server/1044-Configuration-for-horizontal-only-item-merging.patch b/patches/server/1043-Configuration-for-horizontal-only-item-merging.patch
index 1c45d3f2f0..1c45d3f2f0 100644
--- a/patches/server/1044-Configuration-for-horizontal-only-item-merging.patch
+++ b/patches/server/1043-Configuration-for-horizontal-only-item-merging.patch
diff --git a/patches/server/1045-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1044-Optimise-collision-checking-in-player-move-packet-ha.patch
index 2caf83aaca..2caf83aaca 100644
--- a/patches/server/1045-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1044-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1046-Add-skipping-world-symlink-scan.patch b/patches/server/1045-Add-skipping-world-symlink-scan.patch
index edbbf7edf8..edbbf7edf8 100644
--- a/patches/server/1046-Add-skipping-world-symlink-scan.patch
+++ b/patches/server/1045-Add-skipping-world-symlink-scan.patch
diff --git a/patches/server/1047-Add-even-more-Enchantment-API.patch b/patches/server/1046-Add-even-more-Enchantment-API.patch
index dfc79b5b19..dfc79b5b19 100644
--- a/patches/server/1047-Add-even-more-Enchantment-API.patch
+++ b/patches/server/1046-Add-even-more-Enchantment-API.patch
diff --git a/patches/server/1048-Leashable-API.patch b/patches/server/1047-Leashable-API.patch
index b93323b964..b93323b964 100644
--- a/patches/server/1048-Leashable-API.patch
+++ b/patches/server/1047-Leashable-API.patch
diff --git a/patches/server/1049-Fix-CraftBukkit-drag-system.patch b/patches/server/1048-Fix-CraftBukkit-drag-system.patch
index fe2da46cc5..fe2da46cc5 100644
--- a/patches/server/1049-Fix-CraftBukkit-drag-system.patch
+++ b/patches/server/1048-Fix-CraftBukkit-drag-system.patch
diff --git a/patches/server/1050-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch b/patches/server/1049-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
index 052376aaeb..052376aaeb 100644
--- a/patches/server/1050-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
+++ b/patches/server/1049-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
diff --git a/patches/server/1051-Remove-set-damage-lootable-item-function-from-compas.patch b/patches/server/1050-Remove-set-damage-lootable-item-function-from-compas.patch
index ac0c0e3513..ac0c0e3513 100644
--- a/patches/server/1051-Remove-set-damage-lootable-item-function-from-compas.patch
+++ b/patches/server/1050-Remove-set-damage-lootable-item-function-from-compas.patch
diff --git a/patches/server/1052-Properly-destroy-placed-blocks-on-the-end-platform.patch b/patches/server/1051-Properly-destroy-placed-blocks-on-the-end-platform.patch
index 9bbeddc476..9bbeddc476 100644
--- a/patches/server/1052-Properly-destroy-placed-blocks-on-the-end-platform.patch
+++ b/patches/server/1051-Properly-destroy-placed-blocks-on-the-end-platform.patch
diff --git a/patches/server/1053-Add-enchantment-seed-update-API.patch b/patches/server/1052-Add-enchantment-seed-update-API.patch
index f66f062401..f66f062401 100644
--- a/patches/server/1053-Add-enchantment-seed-update-API.patch
+++ b/patches/server/1052-Add-enchantment-seed-update-API.patch
diff --git a/patches/server/1054-Fix-synchronise-sending-chat-to-client-with-updating.patch b/patches/server/1053-Fix-synchronise-sending-chat-to-client-with-updating.patch
index e4eb40db0f..e4eb40db0f 100644
--- a/patches/server/1054-Fix-synchronise-sending-chat-to-client-with-updating.patch
+++ b/patches/server/1053-Fix-synchronise-sending-chat-to-client-with-updating.patch
diff --git a/patches/server/1055-Fix-InventoryOpenEvent-cancellation.patch b/patches/server/1054-Fix-InventoryOpenEvent-cancellation.patch
index 4e5e1eb19f..4e5e1eb19f 100644
--- a/patches/server/1055-Fix-InventoryOpenEvent-cancellation.patch
+++ b/patches/server/1054-Fix-InventoryOpenEvent-cancellation.patch
diff --git a/patches/server/1056-Fire-BlockExpEvent-on-grindstone-use.patch b/patches/server/1055-Fire-BlockExpEvent-on-grindstone-use.patch
index 58783e8acd..58783e8acd 100644
--- a/patches/server/1056-Fire-BlockExpEvent-on-grindstone-use.patch
+++ b/patches/server/1055-Fire-BlockExpEvent-on-grindstone-use.patch
diff --git a/patches/server/1057-Check-dead-flag-in-isAlive.patch b/patches/server/1056-Check-dead-flag-in-isAlive.patch
index c7bca0ad14..c7bca0ad14 100644
--- a/patches/server/1057-Check-dead-flag-in-isAlive.patch
+++ b/patches/server/1056-Check-dead-flag-in-isAlive.patch
diff --git a/patches/server/1058-Add-FeatureFlag-API.patch b/patches/server/1057-Add-FeatureFlag-API.patch
index 5f3aa9ba14..5f3aa9ba14 100644
--- a/patches/server/1058-Add-FeatureFlag-API.patch
+++ b/patches/server/1057-Add-FeatureFlag-API.patch
diff --git a/patches/server/1059-Tag-Lifecycle-Events.patch b/patches/server/1058-Tag-Lifecycle-Events.patch
index 547a10d9e3..547a10d9e3 100644
--- a/patches/server/1059-Tag-Lifecycle-Events.patch
+++ b/patches/server/1058-Tag-Lifecycle-Events.patch
diff --git a/patches/server/1060-Item-serialization-as-json.patch b/patches/server/1059-Item-serialization-as-json.patch
index 988bbbea45..988bbbea45 100644
--- a/patches/server/1060-Item-serialization-as-json.patch
+++ b/patches/server/1059-Item-serialization-as-json.patch