deprecate our ItemRarity API

540 files changed, 210 insertions, 252 deletions

diff --git a/patches/api/0262-Improve-Item-Rarity-API.patch b/patches/api/0262-Improve-Item-Rarity-API.patch
new file mode 100644
index 0000000000..539f61725e
--- /dev/null
+++ b/patches/api/0262-Improve-Item-Rarity-API.patch
@@ -0,0 +1,131 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Fri, 12 Mar 2021 17:09:40 -0800
+Subject: [PATCH] Improve Item Rarity API
+
+
+diff --git a/src/main/java/io/papermc/paper/inventory/ItemRarity.java b/src/main/java/io/papermc/paper/inventory/ItemRarity.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..f1cd5a4f37eee8975ac3d0421b524afcf644fafd
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/inventory/ItemRarity.java
+@@ -0,0 +1,32 @@
++package io.papermc.paper.inventory;
++
++import net.kyori.adventure.text.format.NamedTextColor;
++import net.kyori.adventure.text.format.TextColor;
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * @deprecated use {@link org.bukkit.inventory.ItemRarity} with {@link org.bukkit.inventory.meta.ItemMeta#getRarity()}
++ */
++@Deprecated(forRemoval = true, since = "1.20.5")
++public enum ItemRarity {
++
++    COMMON(NamedTextColor.WHITE),
++    UNCOMMON(NamedTextColor.YELLOW),
++    RARE(NamedTextColor.AQUA),
++    EPIC(NamedTextColor.LIGHT_PURPLE);
++
++    TextColor color;
++
++    ItemRarity(TextColor color) {
++        this.color = color;
++    }
++
++    /**
++     * Gets the color formatting associated with the rarity.
++     * @return
++     */
++    @NotNull
++    public TextColor getColor() {
++        return color;
++    }
++}
+diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
+index 3ee36de0ee975dc300e594b17d0dc2c06edf2a16..2ce1d9239d08c799d53873563646f933211a902e 100644
+--- a/src/main/java/org/bukkit/Material.java
++++ b/src/main/java/org/bukkit/Material.java
+@@ -4748,6 +4748,19 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+             return Bukkit.getUnsafe().getBlockTranslationKey(this);
+         }
+     }
++
++    /**
++     * Returns the item rarity for the item. The Material <b>MUST</b> be an Item not a block.
++     * Use {@link #isItem()} before this.
++     *
++     * @return the item rarity
++     * @deprecated use {@link org.bukkit.inventory.meta.ItemMeta#hasRarity()} and {@link org.bukkit.inventory.meta.ItemMeta#getRarity()}
++     */
++    @NotNull
++    @Deprecated(forRemoval = true, since = "1.20.5")
++    public io.papermc.paper.inventory.ItemRarity getItemRarity() {
++        return new org.bukkit.inventory.ItemStack(this).getRarity();
++    }
+     // Paper end
+ 
+     /**
+diff --git a/src/main/java/org/bukkit/inventory/ItemRarity.java b/src/main/java/org/bukkit/inventory/ItemRarity.java
+index e7931f73f10fe35ebd5fe4a04b036d53bb117ebd..cbce835ed6d44e5b8c9aaae4e36a77f8e5bed45f 100644
+--- a/src/main/java/org/bukkit/inventory/ItemRarity.java
++++ b/src/main/java/org/bukkit/inventory/ItemRarity.java
+@@ -9,17 +9,32 @@ public enum ItemRarity {
+     /**
+      * White item name.
+      */
+-    COMMON,
++    COMMON(net.kyori.adventure.text.format.NamedTextColor.WHITE), // Paper
+     /**
+      * Yellow item name.
+      */
+-    UNCOMMON,
++    UNCOMMON(net.kyori.adventure.text.format.NamedTextColor.YELLOW), // Paper
+     /**
+      * Aqua item name.
+      */
+-    RARE,
++    RARE(net.kyori.adventure.text.format.NamedTextColor.AQUA), // Paper
+     /**
+      * Light purple item name.
+      */
+-    EPIC;
++    EPIC(net.kyori.adventure.text.format.NamedTextColor.LIGHT_PURPLE); // Paper
++    // Paper start - improve ItemRarity
++    private final net.kyori.adventure.text.format.NamedTextColor color;
++    ItemRarity(final net.kyori.adventure.text.format.NamedTextColor color) {
++        this.color = color;
++    }
++
++    /**
++     * Gets the color formatting associated with this rarity.
++     *
++     * @return the color
++     */
++    public net.kyori.adventure.text.format.@org.jetbrains.annotations.NotNull TextColor color() {
++        return this.color;
++    }
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
+index 96b6052c198454f06f877fc7cda85a98c0ddba7c..f9b0b463f9920524eab7f328bc456a30eebc6910 100644
+--- a/src/main/java/org/bukkit/inventory/ItemStack.java
++++ b/src/main/java/org/bukkit/inventory/ItemStack.java
+@@ -888,5 +888,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+     public @NotNull String translationKey() {
+         return Bukkit.getUnsafe().getTranslationKey(this);
+     }
++
++    /**
++     * Gets the item rarity of the itemstack. The rarity can change based on enchantments.
++     *
++     * @return the itemstack rarity
++     * @deprecated Use {@link ItemMeta#hasRarity()} and {@link ItemMeta#getRarity()}
++     */
++    @NotNull
++    @Deprecated(forRemoval = true, since = "1.20.5")
++    public io.papermc.paper.inventory.ItemRarity getRarity() {
++        return io.papermc.paper.inventory.ItemRarity.valueOf(this.getItemMeta().getRarity().name());
++    }
+     // Paper end
+ }
diff --git a/patches/api/0262-Item-Rarity-API.patch b/patches/api/0262-Item-Rarity-API.patch
deleted file mode 100644
index 42bb22f799..0000000000
--- a/patches/api/0262-Item-Rarity-API.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Fri, 12 Mar 2021 17:09:40 -0800
-Subject: [PATCH] Item Rarity API
-
-
-diff --git a/src/main/java/io/papermc/paper/inventory/ItemRarity.java b/src/main/java/io/papermc/paper/inventory/ItemRarity.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db20272cc2734
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/inventory/ItemRarity.java
-@@ -0,0 +1,28 @@
-+package io.papermc.paper.inventory;
-+
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import net.kyori.adventure.text.format.TextColor;
-+import org.jetbrains.annotations.NotNull;
-+
-+public enum ItemRarity {
-+
-+    COMMON(NamedTextColor.WHITE),
-+    UNCOMMON(NamedTextColor.YELLOW),
-+    RARE(NamedTextColor.AQUA),
-+    EPIC(NamedTextColor.LIGHT_PURPLE);
-+
-+    TextColor color;
-+
-+    ItemRarity(TextColor color) {
-+        this.color = color;
-+    }
-+
-+    /**
-+     * Gets the color formatting associated with the rarity.
-+     * @return
-+     */
-+    @NotNull
-+    public TextColor getColor() {
-+        return color;
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 3ee36de0ee975dc300e594b17d0dc2c06edf2a16..7c14a272156cefe6d69e41fec6892891646e0985 100644
---- a/src/main/java/org/bukkit/Material.java
-+++ b/src/main/java/org/bukkit/Material.java
-@@ -4748,6 +4748,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-             return Bukkit.getUnsafe().getBlockTranslationKey(this);
-         }
-     }
-+
-+    /**
-+     * Returns the item rarity for the item. The Material <b>MUST</b> be an Item not a block.
-+     * Use {@link #isItem()} before this.
-+     *
-+     * @return the item rarity
-+     */
-+    @NotNull
-+    public io.papermc.paper.inventory.ItemRarity getItemRarity() {
-+        return Bukkit.getUnsafe().getItemRarity(this);
-+    }
-     // Paper end
- 
-     /**
-diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 5de86f8cd3cc7f7e8ebc4a22d3921273378704f2..c423204eaf3252c9fc1a3af1214ec70ed712fb80 100644
---- a/src/main/java/org/bukkit/UnsafeValues.java
-+++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -169,5 +169,22 @@ public interface UnsafeValues {
-      * Just don't use it.
-      */
-     @org.jetbrains.annotations.NotNull String getMainLevelName();
-+
-+    /**
-+     * Gets the item rarity of a material. The material <b>MUST</b> be an item.
-+     * Use {@link Material#isItem()} before this.
-+     *
-+     * @param material the material to get the rarity of
-+     * @return the item rarity
-+     */
-+    public io.papermc.paper.inventory.ItemRarity getItemRarity(Material material);
-+
-+    /**
-+     * Gets the item rarity of the itemstack. The rarity can change based on enchantements.
-+     *
-+     * @param itemStack the itemstack to get the rarity of
-+     * @return the itemstack rarity
-+     */
-+    public io.papermc.paper.inventory.ItemRarity getItemStackRarity(ItemStack itemStack);
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 96b6052c198454f06f877fc7cda85a98c0ddba7c..069c644f03286ba62d521754d825e81934e1e6d6 100644
---- a/src/main/java/org/bukkit/inventory/ItemStack.java
-+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -888,5 +888,15 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
-     public @NotNull String translationKey() {
-         return Bukkit.getUnsafe().getTranslationKey(this);
-     }
-+
-+    /**
-+     * Gets the item rarity of the itemstack. The rarity can change based on enchantements.
-+     *
-+     * @return the itemstack rarity
-+     */
-+    @NotNull
-+    public io.papermc.paper.inventory.ItemRarity getRarity() {
-+        return Bukkit.getUnsafe().getItemStackRarity(this);
-+    }
-     // Paper end
- }
diff --git a/patches/api/0263-Expose-protocol-version.patch b/patches/api/0263-Expose-protocol-version.patch
index 3fbc03ad3e..0450fa0966 100644
--- a/patches/api/0263-Expose-protocol-version.patch
+++ b/patches/api/0263-Expose-protocol-version.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index c423204eaf3252c9fc1a3af1214ec70ed712fb80..42e4983051062f2fd3b595487cf8093440b41bba 100644
+index 5de86f8cd3cc7f7e8ebc4a22d3921273378704f2..a874faec93468c83fc475b60629fc36f933bd11c 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -186,5 +186,12 @@ public interface UnsafeValues {
-      * @return the itemstack rarity
+@@ -169,5 +169,12 @@ public interface UnsafeValues {
+      * Just don't use it.
       */
-     public io.papermc.paper.inventory.ItemRarity getItemStackRarity(ItemStack itemStack);
+     @org.jetbrains.annotations.NotNull String getMainLevelName();
 +
 +    /**
 +     * Returns the server's protocol version.
diff --git a/patches/api/0280-ItemStack-repair-check-API.patch b/patches/api/0280-ItemStack-repair-check-API.patch
index fbfec478f2..95046ce219 100644
--- a/patches/api/0280-ItemStack-repair-check-API.patch
+++ b/patches/api/0280-ItemStack-repair-check-API.patch
@@ -5,13 +5,14 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 42e4983051062f2fd3b595487cf8093440b41bba..057f4db9cb6b686ab941ec5d3e6ca23dcfbd845f 100644
+index a874faec93468c83fc475b60629fc36f933bd11c..4130481843c9e0b847bd656622b0c1107ac1297b 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -187,6 +187,16 @@ public interface UnsafeValues {
+@@ -176,5 +176,15 @@ public interface UnsafeValues {
+      * @return the server's protocol version
       */
-     public io.papermc.paper.inventory.ItemRarity getItemStackRarity(ItemStack itemStack);
- 
+     int getProtocolVersion();
++
 +    /**
 +     * Checks if an itemstack can be repaired with another itemstack.
 +     * Returns false if either argument's type is not an item ({@link Material#isItem()}).
@@ -21,17 +22,15 @@ index 42e4983051062f2fd3b595487cf8093440b41bba..057f4db9cb6b686ab941ec5d3e6ca23d
 +     * @return true if valid repair, false if not
 +     */
 +    public boolean isValidRepairItemStack(@org.jetbrains.annotations.NotNull ItemStack itemToBeRepaired, @org.jetbrains.annotations.NotNull ItemStack repairMaterial);
-+
-     /**
-      * Returns the server's protocol version.
-      *
+     // Paper end
+ }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 069c644f03286ba62d521754d825e81934e1e6d6..51f3f387af28bb733e2a20c7befd1070768103b2 100644
+index f9b0b463f9920524eab7f328bc456a30eebc6910..2fb521dc2b4d991f56288e2faba978d9d7d29a0b 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -898,5 +898,27 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -900,5 +900,27 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
      public io.papermc.paper.inventory.ItemRarity getRarity() {
-         return Bukkit.getUnsafe().getItemStackRarity(this);
+         return io.papermc.paper.inventory.ItemRarity.valueOf(this.getItemMeta().getRarity().name());
      }
 +
 +    /**
diff --git a/patches/api/0283-ItemStack-editMeta.patch b/patches/api/0283-ItemStack-editMeta.patch
index 49647ecfde..5d71277d19 100644
--- a/patches/api/0283-ItemStack-editMeta.patch
+++ b/patches/api/0283-ItemStack-editMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack#editMeta
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 51f3f387af28bb733e2a20c7befd1070768103b2..0f3ef975293d0e970a35fd6845f8bf911e933169 100644
+index 2fb521dc2b4d991f56288e2faba978d9d7d29a0b..455e633edc19d29559e66b1d52c532ef1a0fa8df 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -558,6 +558,50 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0285-Attributes-API-for-item-defaults.patch b/patches/api/0285-Attributes-API-for-item-defaults.patch
index 1445309f84..947bae94d8 100644
--- a/patches/api/0285-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0285-Attributes-API-for-item-defaults.patch
@@ -6,12 +6,12 @@ Subject: [PATCH] Attributes API for item defaults
 (Now replaced by upstream's API)
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 7c14a272156cefe6d69e41fec6892891646e0985..eb9e0eb1aa6e203ff6f896b177ee60c8afacc62d 100644
+index 2ce1d9239d08c799d53873563646f933211a902e..401645f5e0dfe6c9a0d082b5a76112a882b058ee 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4759,6 +4759,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4761,6 +4761,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      public io.papermc.paper.inventory.ItemRarity getItemRarity() {
-         return Bukkit.getUnsafe().getItemRarity(this);
+         return new org.bukkit.inventory.ItemStack(this).getRarity();
      }
 +
 +    /**
diff --git a/patches/api/0312-Get-entity-default-attributes.patch b/patches/api/0312-Get-entity-default-attributes.patch
index 8c11a9af7f..f0dd49bec9 100644
--- a/patches/api/0312-Get-entity-default-attributes.patch
+++ b/patches/api/0312-Get-entity-default-attributes.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Get entity default attributes
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 057f4db9cb6b686ab941ec5d3e6ca23dcfbd845f..900b502a400bb99a2131305812e48acfeb8b94a1 100644
+index 4130481843c9e0b847bd656622b0c1107ac1297b..a846f3c6e8dceb90e42db903b8be2c248f2f9d5c 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -203,5 +203,22 @@ public interface UnsafeValues {
-      * @return the server's protocol version
+@@ -186,5 +186,22 @@ public interface UnsafeValues {
+      * @return true if valid repair, false if not
       */
-     int getProtocolVersion();
+     public boolean isValidRepairItemStack(@org.jetbrains.annotations.NotNull ItemStack itemToBeRepaired, @org.jetbrains.annotations.NotNull ItemStack repairMaterial);
 +
 +    /**
 +     * Checks if the entity represented by the namespaced key has default attributes.
diff --git a/patches/api/0317-Add-isCollidable-methods-to-various-places.patch b/patches/api/0317-Add-isCollidable-methods-to-various-places.patch
index a5f9888bf8..d4627b4000 100644
--- a/patches/api/0317-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/api/0317-Add-isCollidable-methods-to-various-places.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add isCollidable methods to various places
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index eb9e0eb1aa6e203ff6f896b177ee60c8afacc62d..137b4553636f31574c51960cada6eb07d80a02d9 100644
+index 401645f5e0dfe6c9a0d082b5a76112a882b058ee..8283eccf2578bae50a4c6fd86318e0d5f7cf09df 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4774,6 +4774,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4776,6 +4776,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      public Multimap<Attribute, AttributeModifier> getItemAttributes(@NotNull EquipmentSlot equipmentSlot) {
          return this.getDefaultAttributeModifiers(equipmentSlot);
      }
@@ -26,10 +26,10 @@ index eb9e0eb1aa6e203ff6f896b177ee60c8afacc62d..137b4553636f31574c51960cada6eb07
  
      /**
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 900b502a400bb99a2131305812e48acfeb8b94a1..75c9569214321b3f23f3614722d7453020d095c3 100644
+index a846f3c6e8dceb90e42db903b8be2c248f2f9d5c..e1f9d80f0a6481824443339015049f96f3bf86f2 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -220,5 +220,14 @@ public interface UnsafeValues {
+@@ -203,5 +203,14 @@ public interface UnsafeValues {
       * @throws IllegalArgumentException if the entity does not exist of have default attributes (use {@link #hasDefaultEntityAttributes(NamespacedKey)} first)
       */
      @org.jetbrains.annotations.NotNull org.bukkit.attribute.Attributable getDefaultEntityAttributes(@org.jetbrains.annotations.NotNull NamespacedKey entityKey);
diff --git a/patches/api/0320-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0320-Add-Raw-Byte-Entity-Serialization.patch
index 5895168aae..b0a70d977f 100644
--- a/patches/api/0320-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/api/0320-Add-Raw-Byte-Entity-Serialization.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 75c9569214321b3f23f3614722d7453020d095c3..bdfa60a764c13d82cd013335fb7b0c896abe74bd 100644
+index e1f9d80f0a6481824443339015049f96f3bf86f2..9245f50b2bac30e956ef6ddc11c551b9b68463ee 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -158,6 +158,14 @@ public interface UnsafeValues {
diff --git a/patches/api/0349-Add-enchantWithLevels-API.patch b/patches/api/0349-Add-enchantWithLevels-API.patch
index cf08b881ef..021eefa1f3 100644
--- a/patches/api/0349-Add-enchantWithLevels-API.patch
+++ b/patches/api/0349-Add-enchantWithLevels-API.patch
@@ -70,7 +70,7 @@ index dbebaf8172ec6872f56958b9583affde4f8400a4..98a970a6582dca22e719a31559c7bece
 +    // Paper end - enchantWithLevels API
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 0f3ef975293d0e970a35fd6845f8bf911e933169..984b6e96a5ebebc38ab62790c4d6a9946c9c6944 100644
+index 455e633edc19d29559e66b1d52c532ef1a0fa8df..637b9067973aadece2806cc2b6200a4d3b8d97a1 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -667,6 +667,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0367-Add-NamespacedKey-biome-methods.patch b/patches/api/0367-Add-NamespacedKey-biome-methods.patch
index 88b7d9aefc..9b5cd7d737 100644
--- a/patches/api/0367-Add-NamespacedKey-biome-methods.patch
+++ b/patches/api/0367-Add-NamespacedKey-biome-methods.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add NamespacedKey biome methods
 Co-authored-by: Thonk <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index bdfa60a764c13d82cd013335fb7b0c896abe74bd..0eddda31e47e807551436ae834e89ea56141f163 100644
+index 9245f50b2bac30e956ef6ddc11c551b9b68463ee..5d862c9221d1ce6d577295a5181f951c2f71a631 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -237,5 +237,32 @@ public interface UnsafeValues {
+@@ -220,5 +220,32 @@ public interface UnsafeValues {
       * @throws IllegalArgumentException if {@link Material#isBlock()} is false
       */
      boolean isCollidable(@org.jetbrains.annotations.NotNull Material material);
diff --git a/patches/api/0385-ItemStack-damage-API.patch b/patches/api/0385-ItemStack-damage-API.patch
index 391205b8ae..bd1863d99b 100644
--- a/patches/api/0385-ItemStack-damage-API.patch
+++ b/patches/api/0385-ItemStack-damage-API.patch
@@ -66,10 +66,10 @@ index 6bfc8a2148f504370df938447f4f6b757f1a516b..208bab1f5a3200f54141c38ee4272629
 +    // Paper end - ItemStack damage API
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 984b6e96a5ebebc38ab62790c4d6a9946c9c6944..13648f2e810daa84af25c28a009b1f641791e2f7 100644
+index 637b9067973aadece2806cc2b6200a4d3b8d97a1..d2162e53cefb8f9dc5c52bc1904e860066f43a41 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -982,5 +982,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -984,5 +984,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
      public boolean canRepair(@NotNull ItemStack toBeRepaired) {
          return Bukkit.getUnsafe().isValidRepairItemStack(toBeRepaired, this);
      }
diff --git a/patches/api/0416-Fix-custom-statistic-criteria-creation.patch b/patches/api/0416-Fix-custom-statistic-criteria-creation.patch
index 3a25880b2e..f8da658f51 100644
--- a/patches/api/0416-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/api/0416-Fix-custom-statistic-criteria-creation.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix custom statistic criteria creation
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 0eddda31e47e807551436ae834e89ea56141f163..7b54ca313ce65f91932ee8ee968196f6091db86f 100644
+index 5d862c9221d1ce6d577295a5181f951c2f71a631..e19434a0f5065987be087b6bd531c88be33d2917 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -264,5 +264,7 @@ public interface UnsafeValues {
+@@ -247,5 +247,7 @@ public interface UnsafeValues {
       * @throws IllegalStateException if no biome by the given key is registered.
       */
      void setBiomeKey(RegionAccessor accessor, int x, int y, int z, NamespacedKey biomeKey);
diff --git a/patches/api/0432-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0432-Allow-proper-checking-of-empty-item-stacks.patch
index 984f6939f5..5d980f4398 100644
--- a/patches/api/0432-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/api/0432-Allow-proper-checking-of-empty-item-stacks.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow proper checking of empty item stacks
 This adds a method to check if an item stack is empty or not. This mirrors vanilla's implementation of the same method.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 13648f2e810daa84af25c28a009b1f641791e2f7..ff3929b4a497ff0ef0c7ea7f9ac3509764b80e0a 100644
+index d2162e53cefb8f9dc5c52bc1904e860066f43a41..db02c04a8e9a0b8e1e4518a629d5703398d4ef72 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -996,5 +996,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -998,5 +998,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
      public @NotNull ItemStack damage(int amount, @NotNull org.bukkit.entity.LivingEntity livingEntity) {
          return livingEntity.damageItemStack(this, amount);
      }
diff --git a/patches/api/0440-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0440-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
index 3bddd2ce94..1617e84222 100644
--- a/patches/api/0440-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
+++ b/patches/api/0440-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
@@ -9,7 +9,7 @@ By removing this check we avoid unnecessarily allocating useless `ItemMeta` obje
 This is a leftover from when checking for the item's durability was "free" because the durability was stored in the `ItemStack` itself, this [was changed in Minecraft 1.13](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/commits/f8b2086d60942eb2cd7ac25a2a1408cb790c222c#src/main/java/org/bukkit/inventory/ItemStack.java).
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index ff3929b4a497ff0ef0c7ea7f9ac3509764b80e0a..ee636c066d1f87873c1ddf52c60c77b1b86d6e90 100644
+index db02c04a8e9a0b8e1e4518a629d5703398d4ef72..0611f19bcdd8230b439b5055713221318dce98e2 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -295,7 +295,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0442-add-missing-Experimental-annotations.patch b/patches/api/0442-add-missing-Experimental-annotations.patch
index 6a10187982..9c46d14fa0 100644
--- a/patches/api/0442-add-missing-Experimental-annotations.patch
+++ b/patches/api/0442-add-missing-Experimental-annotations.patch
@@ -27,7 +27,7 @@ index 6b68c92ec894451d99ded3e3df5965cb31d68ed2..fd5e433f930963c102c9c977523a0036
      public static final FeatureFlag UPDATE_121 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_21"));
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 137b4553636f31574c51960cada6eb07d80a02d9..cdbb67b677d5226d15df40339b7df02482561e3e 100644
+index 8283eccf2578bae50a4c6fd86318e0d5f7cf09df..6ebc5da2b47b005b836927621f3b929d2442a832 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -146,54 +146,67 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
diff --git a/patches/api/0454-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0454-Add-api-for-spawn-egg-texture-colors.patch
index f05f31cb72..6e3d91aff4 100644
--- a/patches/api/0454-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/api/0454-Add-api-for-spawn-egg-texture-colors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add api for spawn egg texture colors
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 7b54ca313ce65f91932ee8ee968196f6091db86f..e1493ef58854e7bc929a2fa5aaba9da527dfd563 100644
+index e19434a0f5065987be087b6bd531c88be33d2917..80947c6862a906dec9c039b5dff993461d4d831b 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -267,4 +267,17 @@ public interface UnsafeValues {
+@@ -250,4 +250,17 @@ public interface UnsafeValues {
  
      String getStatisticCriteriaKey(@NotNull org.bukkit.Statistic statistic);
      // Paper end
diff --git a/patches/api/0455-Add-Lifecycle-Event-system.patch b/patches/api/0455-Add-Lifecycle-Event-system.patch
index 540279acf4..4b36ba4885 100644
--- a/patches/api/0455-Add-Lifecycle-Event-system.patch
+++ b/patches/api/0455-Add-Lifecycle-Event-system.patch
@@ -528,10 +528,10 @@ index 0000000000000000000000000000000000000000..304f978e40e1759bb19704cc5cec3995
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index e1493ef58854e7bc929a2fa5aaba9da527dfd563..887129a95ff2e299507bf870b1ef3212afe6563e 100644
+index 80947c6862a906dec9c039b5dff993461d4d831b..7e6bdf3333537491b3421d196779a4eb502f7314 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -280,4 +280,12 @@ public interface UnsafeValues {
+@@ -263,4 +263,12 @@ public interface UnsafeValues {
       */
      @Nullable org.bukkit.Color getSpawnEggLayerColor(org.bukkit.entity.EntityType entityType, int layer);
      // Paper end - spawn egg color visibility
diff --git a/patches/api/0456-ItemStack-Tooltip-API.patch b/patches/api/0456-ItemStack-Tooltip-API.patch
index 995d8493f5..7eb3a41ef5 100644
--- a/patches/api/0456-ItemStack-Tooltip-API.patch
+++ b/patches/api/0456-ItemStack-Tooltip-API.patch
@@ -108,10 +108,10 @@ index 0000000000000000000000000000000000000000..1d9bed6691f581529c53b577b26f1d0f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 887129a95ff2e299507bf870b1ef3212afe6563e..c7d0cdd4778c329f09db6cea97ddb019690d6246 100644
+index 7e6bdf3333537491b3421d196779a4eb502f7314..a3ba9249e636d1fb8dad98fab413436009fe04df 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -288,4 +288,6 @@ public interface UnsafeValues {
+@@ -271,4 +271,6 @@ public interface UnsafeValues {
      @org.jetbrains.annotations.ApiStatus.Internal
      io.papermc.paper.plugin.lifecycle.event.LifecycleEventManager<org.bukkit.plugin.Plugin> createPluginLifecycleEventManager(final org.bukkit.plugin.java.JavaPlugin plugin, final java.util.function.BooleanSupplier registrationCheck);
      // Paper end - lifecycle event API
@@ -119,10 +119,10 @@ index 887129a95ff2e299507bf870b1ef3212afe6563e..c7d0cdd4778c329f09db6cea97ddb019
 +    @NotNull java.util.List<net.kyori.adventure.text.Component> computeTooltipLines(@NotNull ItemStack itemStack, @NotNull io.papermc.paper.inventory.tooltip.TooltipContext tooltipContext, @Nullable org.bukkit.entity.Player player); // Paper - expose itemstack tooltip lines
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index ee636c066d1f87873c1ddf52c60c77b1b86d6e90..b04e7b9c3f631c0bb7734b809a58dbb988414fbb 100644
+index 0611f19bcdd8230b439b5055713221318dce98e2..9440cffffa1d7e75d2d76d55d5608bafd69b645b 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -1016,4 +1016,21 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1018,4 +1018,21 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          return type.isAir() || amount <= 0;
      }
      // Paper end
diff --git a/patches/api/0466-Deprecate-ItemStack-setType.patch b/patches/api/0466-Deprecate-ItemStack-setType.patch
index 0ea99724f4..2c0996f9a1 100644
--- a/patches/api/0466-Deprecate-ItemStack-setType.patch
+++ b/patches/api/0466-Deprecate-ItemStack-setType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate ItemStack#setType
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index b04e7b9c3f631c0bb7734b809a58dbb988414fbb..df2d5ad5ff1bcb1488a94edde9cc4d53cacdd91d 100644
+index 9440cffffa1d7e75d2d76d55d5608bafd69b645b..91083a135a7e979e32cbb3531b5ef69b7a28f305 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -134,8 +134,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/server/0521-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0520-Drop-carried-item-when-player-has-disconnected.patch
index 4683817946..4683817946 100644
--- a/patches/server/0521-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0520-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0520-Item-Rarity-API.patch b/patches/server/0520-Item-Rarity-API.patch
deleted file mode 100644
index 0939bc6a87..0000000000
--- a/patches/server/0520-Item-Rarity-API.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Fri, 12 Mar 2021 17:09:42 -0800
-Subject: [PATCH] Item Rarity API
-
-== AT ==
-public net.minecraft.world.item.Item rarity
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index c0592a85a1a0781b83232533b9ca1b30b116eb98..125ed63d8ae812284cd452b4387fd0d674c9c25a 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -542,6 +542,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public String getMainLevelName() {
-         return ((net.minecraft.server.dedicated.DedicatedServer) net.minecraft.server.MinecraftServer.getServer()).getProperties().levelName;
-     }
-+
-+    @Override
-+    public io.papermc.paper.inventory.ItemRarity getItemRarity(org.bukkit.Material material) {
-+        Item item = getItem(material);
-+        if (item == null) {
-+            throw new IllegalArgumentException(material + " is not an item, and rarity does not apply to blocks");
-+        }
-+        return io.papermc.paper.inventory.ItemRarity.values()[item.components().getOrDefault(net.minecraft.core.component.DataComponents.RARITY, net.minecraft.world.item.Rarity.COMMON).ordinal()];
-+    }
-+
-+    @Override
-+    public io.papermc.paper.inventory.ItemRarity getItemStackRarity(org.bukkit.inventory.ItemStack itemStack) {
-+        return io.papermc.paper.inventory.ItemRarity.values()[itemStack.getRarity().ordinal()];
-+    }
-     // Paper end
- 
-     /**
-diff --git a/src/test/java/io/papermc/paper/inventory/ItemRarityTest.java b/src/test/java/io/papermc/paper/inventory/ItemRarityTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..8086e6a754cb94ce15428ac0cdbaa43590beb9fe
---- /dev/null
-+++ b/src/test/java/io/papermc/paper/inventory/ItemRarityTest.java
-@@ -0,0 +1,24 @@
-+package io.papermc.paper.inventory;
-+
-+import io.papermc.paper.adventure.PaperAdventure;
-+import net.minecraft.world.item.Rarity;
-+import org.junit.jupiter.api.Test;
-+
-+import static org.junit.jupiter.api.Assertions.assertEquals;
-+
-+public class ItemRarityTest {
-+
-+    @Test
-+    public void testConvertFromNmsToBukkit() {
-+        for (Rarity nmsRarity : Rarity.values()) {
-+            assertEquals(ItemRarity.values()[nmsRarity.ordinal()].name(), nmsRarity.name(), "rarity names are mis-matched");
-+        }
-+    }
-+
-+    @Test
-+    public void testRarityFormatting() {
-+        for (Rarity nmsRarity : Rarity.values()) {
-+            assertEquals(nmsRarity.color(), PaperAdventure.asVanilla(ItemRarity.values()[nmsRarity.ordinal()].color), "rarity formatting is mis-matched");
-+        }
-+    }
-+}
diff --git a/patches/server/0522-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0521-forced-whitelist-use-configurable-kick-message.patch
index 484e77b357..484e77b357 100644
--- a/patches/server/0522-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0521-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0523-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0522-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index df4031ea97..df4031ea97 100644
--- a/patches/server/0523-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0522-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0524-Expose-protocol-version.patch b/patches/server/0523-Expose-protocol-version.patch
index fc6a93944d..86eecc86b6 100644
--- a/patches/server/0524-Expose-protocol-version.patch
+++ b/patches/server/0523-Expose-protocol-version.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 125ed63d8ae812284cd452b4387fd0d674c9c25a..c4457bb46c3e66f5954383fb18b6109a5fe2772d 100644
+index c0592a85a1a0781b83232533b9ca1b30b116eb98..d11d0a9a2c6b13033437a22b7270e7d37bfe8046 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -556,6 +556,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public io.papermc.paper.inventory.ItemRarity getItemStackRarity(org.bukkit.inventory.ItemStack itemStack) {
-         return io.papermc.paper.inventory.ItemRarity.values()[itemStack.getRarity().ordinal()];
+@@ -542,6 +542,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
+     public String getMainLevelName() {
+         return ((net.minecraft.server.dedicated.DedicatedServer) net.minecraft.server.MinecraftServer.getServer()).getProperties().levelName;
      }
 +
 +    @Override
diff --git a/patches/server/0525-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0524-Enhance-console-tab-completions-for-brigadier-comman.patch
index 8e6ac6e4c9..8e6ac6e4c9 100644
--- a/patches/server/0525-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0524-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0526-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0525-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 36f12103c7..36f12103c7 100644
--- a/patches/server/0526-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0525-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0527-Add-bypass-host-check.patch b/patches/server/0526-Add-bypass-host-check.patch
index 8c40f13437..8c40f13437 100644
--- a/patches/server/0527-Add-bypass-host-check.patch
+++ b/patches/server/0526-Add-bypass-host-check.patch
diff --git a/patches/server/0528-Set-area-affect-cloud-rotation.patch b/patches/server/0527-Set-area-affect-cloud-rotation.patch
index e78e14e0a0..e78e14e0a0 100644
--- a/patches/server/0528-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0527-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0529-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0528-add-isDeeplySleeping-to-HumanEntity.patch
index 26e38b4777..26e38b4777 100644
--- a/patches/server/0529-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0528-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0530-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0529-add-consumeFuel-to-FurnaceBurnEvent.patch
index 2f79b2a47f..2f79b2a47f 100644
--- a/patches/server/0530-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0529-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0531-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0530-add-get-set-drop-chance-to-EntityEquipment.patch
index fd7cafa884..fd7cafa884 100644
--- a/patches/server/0531-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0530-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0532-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0531-fix-PigZombieAngerEvent-cancellation.patch
index ad3619023e..ad3619023e 100644
--- a/patches/server/0532-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0531-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0533-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0532-fix-PlayerItemHeldEvent-firing-twice.patch
index 3f974caf76..3f974caf76 100644
--- a/patches/server/0533-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0532-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0534-Add-PlayerDeepSleepEvent.patch b/patches/server/0533-Add-PlayerDeepSleepEvent.patch
index 638530f645..638530f645 100644
--- a/patches/server/0534-Add-PlayerDeepSleepEvent.patch
+++ b/patches/server/0533-Add-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0535-More-World-API.patch b/patches/server/0534-More-World-API.patch
index 0e444d651b..0e444d651b 100644
--- a/patches/server/0535-More-World-API.patch
+++ b/patches/server/0534-More-World-API.patch
diff --git a/patches/server/0536-Add-PlayerBedFailEnterEvent.patch b/patches/server/0535-Add-PlayerBedFailEnterEvent.patch
index aff72983ac..aff72983ac 100644
--- a/patches/server/0536-Add-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0535-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0537-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0536-Implement-methods-to-convert-between-Component-and-B.patch
index fc7d02c151..fc7d02c151 100644
--- a/patches/server/0537-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0536-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0538-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0537-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index 048061b651..048061b651 100644
--- a/patches/server/0538-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
+++ b/patches/server/0537-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
diff --git a/patches/server/0539-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0538-Introduce-beacon-activation-deactivation-events.patch
index de6741ca2b..de6741ca2b 100644
--- a/patches/server/0539-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0538-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0540-Add-Channel-initialization-listeners.patch b/patches/server/0539-Add-Channel-initialization-listeners.patch
index 8b6d7c3c06..8b6d7c3c06 100644
--- a/patches/server/0540-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0539-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0541-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0540-Send-empty-commands-if-tab-completion-is-disabled.patch
index d414ea5eae..d414ea5eae 100644
--- a/patches/server/0541-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0540-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0542-Add-more-WanderingTrader-API.patch b/patches/server/0541-Add-more-WanderingTrader-API.patch
index 07cdb98c54..07cdb98c54 100644
--- a/patches/server/0542-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0541-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0543-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0542-Add-EntityBlockStorage-clearEntities.patch
index e52d1c5e1c..e52d1c5e1c 100644
--- a/patches/server/0543-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0542-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0544-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0543-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 839c465c9c..839c465c9c 100644
--- a/patches/server/0544-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0543-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0545-Add-HiddenPotionEffect-API.patch b/patches/server/0544-Add-HiddenPotionEffect-API.patch
index 724bbc9ff5..724bbc9ff5 100644
--- a/patches/server/0545-Add-HiddenPotionEffect-API.patch
+++ b/patches/server/0544-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0546-Inventory-close.patch b/patches/server/0545-Inventory-close.patch
index 9ca8b717ab..9ca8b717ab 100644
--- a/patches/server/0546-Inventory-close.patch
+++ b/patches/server/0545-Inventory-close.patch
diff --git a/patches/server/0547-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0546-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 950600a9e0..950600a9e0 100644
--- a/patches/server/0547-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0546-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0548-Add-basic-Datapack-API.patch b/patches/server/0547-Add-basic-Datapack-API.patch
index e53f421ee9..e53f421ee9 100644
--- a/patches/server/0548-Add-basic-Datapack-API.patch
+++ b/patches/server/0547-Add-basic-Datapack-API.patch
diff --git a/patches/server/0549-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0548-Add-environment-variable-to-disable-server-gui.patch
index e4de8ec477..e4de8ec477 100644
--- a/patches/server/0549-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0548-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0550-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0549-Expand-PlayerGameModeChangeEvent.patch
index e8a43cf71d..e8a43cf71d 100644
--- a/patches/server/0550-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0549-Expand-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0551-ItemStack-repair-check-API.patch b/patches/server/0550-ItemStack-repair-check-API.patch
index 04cf961fe1..d72feae891 100644
--- a/patches/server/0551-ItemStack-repair-check-API.patch
+++ b/patches/server/0550-ItemStack-repair-check-API.patch
@@ -5,13 +5,14 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index c4457bb46c3e66f5954383fb18b6109a5fe2772d..a8ac14a908060aa656756ad728d0d1e826d3bbe7 100644
+index d11d0a9a2c6b13033437a22b7270e7d37bfe8046..c2a7801ee4f6642813778f5e8ae89db46a253a3d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -557,6 +557,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
-         return io.papermc.paper.inventory.ItemRarity.values()[itemStack.getRarity().ordinal()];
+@@ -547,6 +547,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
+     public int getProtocolVersion() {
+         return net.minecraft.SharedConstants.getCurrentVersion().getProtocolVersion();
      }
- 
++
 +    @Override
 +    public boolean isValidRepairItemStack(org.bukkit.inventory.ItemStack itemToBeRepaired, org.bukkit.inventory.ItemStack repairMaterial) {
 +        if (!itemToBeRepaired.getType().isItem() || !repairMaterial.getType().isItem()) {
@@ -19,10 +20,9 @@ index c4457bb46c3e66f5954383fb18b6109a5fe2772d..a8ac14a908060aa656756ad728d0d1e8
 +        }
 +        return CraftMagicNumbers.getItem(itemToBeRepaired.getType()).isValidRepairItem(CraftItemStack.asNMSCopy(itemToBeRepaired), CraftItemStack.asNMSCopy(repairMaterial));
 +    }
-+
-     @Override
-     public int getProtocolVersion() {
-         return net.minecraft.SharedConstants.getCurrentVersion().getProtocolVersion();
+     // Paper end
+ 
+     /**
 diff --git a/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java b/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..6b8d360ef86e181a680ad77f28b7dd7368dddfe7
diff --git a/patches/server/0552-More-Enchantment-API.patch b/patches/server/0551-More-Enchantment-API.patch
index 81b0f3ac5e..81b0f3ac5e 100644
--- a/patches/server/0552-More-Enchantment-API.patch
+++ b/patches/server/0551-More-Enchantment-API.patch
diff --git a/patches/server/0553-Move-range-check-for-block-placing-up.patch b/patches/server/0552-Move-range-check-for-block-placing-up.patch
index 3c66f1bf6a..3c66f1bf6a 100644
--- a/patches/server/0553-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0552-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0554-Add-Mob-lookAt-API.patch b/patches/server/0553-Add-Mob-lookAt-API.patch
index 3139490a61..3139490a61 100644
--- a/patches/server/0554-Add-Mob-lookAt-API.patch
+++ b/patches/server/0553-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0555-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0554-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
index faa6d5c514..faa6d5c514 100644
--- a/patches/server/0555-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/server/0554-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0556-Add-Unix-domain-socket-support.patch b/patches/server/0555-Add-Unix-domain-socket-support.patch
index c289ae85a2..c289ae85a2 100644
--- a/patches/server/0556-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0555-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0557-Add-EntityInsideBlockEvent.patch b/patches/server/0556-Add-EntityInsideBlockEvent.patch
index 03dd050787..03dd050787 100644
--- a/patches/server/0557-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0556-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0558-Fix-item-default-attributes-API.patch b/patches/server/0557-Fix-item-default-attributes-API.patch
index b1e4c1dbd5..f23189a1ba 100644
--- a/patches/server/0558-Fix-item-default-attributes-API.patch
+++ b/patches/server/0557-Fix-item-default-attributes-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix item default attributes API
 (previously added this API but upstream also added it)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index a8ac14a908060aa656756ad728d0d1e826d3bbe7..991a63f1a7cbd5d2cb88784a59ed0085b7bdfbe2 100644
+index c2a7801ee4f6642813778f5e8ae89db46a253a3d..61686e63b2d1a98b9747e11058f450a51e2d4d01 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -396,9 +396,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0559-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0558-Add-cause-to-Weather-ThunderChangeEvents.patch
index 92b87ba18e..92b87ba18e 100644
--- a/patches/server/0559-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0558-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0560-More-Lidded-Block-API.patch b/patches/server/0559-More-Lidded-Block-API.patch
index 7e52e36425..7e52e36425 100644
--- a/patches/server/0560-More-Lidded-Block-API.patch
+++ b/patches/server/0559-More-Lidded-Block-API.patch
diff --git a/patches/server/0561-Limit-item-frame-cursors-on-maps.patch b/patches/server/0560-Limit-item-frame-cursors-on-maps.patch
index 6072cb5269..6072cb5269 100644
--- a/patches/server/0561-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0560-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0562-Add-PlayerKickEvent-causes.patch b/patches/server/0561-Add-PlayerKickEvent-causes.patch
index cbba020ab8..cbba020ab8 100644
--- a/patches/server/0562-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0561-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0563-Add-PufferFishStateChangeEvent.patch b/patches/server/0562-Add-PufferFishStateChangeEvent.patch
index 87e61bb2a3..87e61bb2a3 100644
--- a/patches/server/0563-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0562-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0564-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0563-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 6e70197163..6e70197163 100644
--- a/patches/server/0564-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0563-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0565-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0564-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 04a6d787b6..04a6d787b6 100644
--- a/patches/server/0565-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0564-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0566-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0565-Add-option-to-fix-items-merging-through-walls.patch
index 05969fb324..05969fb324 100644
--- a/patches/server/0566-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0565-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0567-Add-BellRevealRaiderEvent.patch b/patches/server/0566-Add-BellRevealRaiderEvent.patch
index 871aa2a198..871aa2a198 100644
--- a/patches/server/0567-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0566-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0568-Fix-invulnerable-end-crystals.patch b/patches/server/0567-Fix-invulnerable-end-crystals.patch
index bddc6ec149..bddc6ec149 100644
--- a/patches/server/0568-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0567-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0569-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0568-Add-ElderGuardianAppearanceEvent.patch
index d9bc14356d..d9bc14356d 100644
--- a/patches/server/0569-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0568-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0570-Fix-dangerous-end-portal-logic.patch b/patches/server/0569-Fix-dangerous-end-portal-logic.patch
index 94e78d0600..94e78d0600 100644
--- a/patches/server/0570-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0569-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0571-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0570-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 3d03f4c4d2..3d03f4c4d2 100644
--- a/patches/server/0571-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0570-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0572-Line-Of-Sight-Changes.patch b/patches/server/0571-Line-Of-Sight-Changes.patch
index 6811307521..6811307521 100644
--- a/patches/server/0572-Line-Of-Sight-Changes.patch
+++ b/patches/server/0571-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0573-add-per-world-spawn-limits.patch b/patches/server/0572-add-per-world-spawn-limits.patch
index 8ff7b50013..8ff7b50013 100644
--- a/patches/server/0573-add-per-world-spawn-limits.patch
+++ b/patches/server/0572-add-per-world-spawn-limits.patch
diff --git a/patches/server/0574-Fix-potions-splash-events.patch b/patches/server/0573-Fix-potions-splash-events.patch
index 66e5ec5995..66e5ec5995 100644
--- a/patches/server/0574-Fix-potions-splash-events.patch
+++ b/patches/server/0573-Fix-potions-splash-events.patch
diff --git a/patches/server/0575-Add-more-LimitedRegion-API.patch b/patches/server/0574-Add-more-LimitedRegion-API.patch
index 6e183e954e..6e183e954e 100644
--- a/patches/server/0575-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0574-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0576-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0575-Fix-PlayerDropItemEvent-using-wrong-item.patch
index ab0fe17dd5..ab0fe17dd5 100644
--- a/patches/server/0576-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0575-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0577-Missing-Entity-API.patch b/patches/server/0576-Missing-Entity-API.patch
index 1e466fb30d..1e466fb30d 100644
--- a/patches/server/0577-Missing-Entity-API.patch
+++ b/patches/server/0576-Missing-Entity-API.patch
diff --git a/patches/server/0578-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0577-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 9af04f9803..9af04f9803 100644
--- a/patches/server/0578-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0577-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0579-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0578-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index a5c4eefb9a..a5c4eefb9a 100644
--- a/patches/server/0579-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0578-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0580-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0579-Use-getChunkIfLoadedImmediately-in-places.patch
index 452b5c4a64..452b5c4a64 100644
--- a/patches/server/0580-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0579-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0581-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0580-Fix-commands-from-signs-not-firing-command-events.patch
index b86e341359..b86e341359 100644
--- a/patches/server/0581-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0580-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0582-Add-PlayerArmSwingEvent.patch b/patches/server/0581-Add-PlayerArmSwingEvent.patch
index 14174822a6..14174822a6 100644
--- a/patches/server/0582-Add-PlayerArmSwingEvent.patch
+++ b/patches/server/0581-Add-PlayerArmSwingEvent.patch
diff --git a/patches/server/0583-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0582-Fix-kick-event-leave-message-not-being-sent.patch
index 8d66d84399..8d66d84399 100644
--- a/patches/server/0583-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0582-Fix-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0584-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0583-Don-t-apply-cramming-damage-to-players.patch
index 04ae75c0ea..04ae75c0ea 100644
--- a/patches/server/0584-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0583-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0585-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0584-Rate-options-and-timings-for-sensors-and-behaviors.patch
index d74af14524..d74af14524 100644
--- a/patches/server/0585-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0584-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0586-Add-missing-forceDrop-toggles.patch b/patches/server/0585-Add-missing-forceDrop-toggles.patch
index 951b6714fa..951b6714fa 100644
--- a/patches/server/0586-Add-missing-forceDrop-toggles.patch
+++ b/patches/server/0585-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0587-Stinger-API.patch b/patches/server/0586-Stinger-API.patch
index 3abe3d922a..3abe3d922a 100644
--- a/patches/server/0587-Stinger-API.patch
+++ b/patches/server/0586-Stinger-API.patch
diff --git a/patches/server/0588-Add-System.out-err-catcher.patch b/patches/server/0587-Add-System.out-err-catcher.patch
index 9cb38a5863..9cb38a5863 100644
--- a/patches/server/0588-Add-System.out-err-catcher.patch
+++ b/patches/server/0587-Add-System.out-err-catcher.patch
diff --git a/patches/server/0589-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0588-Prevent-AFK-kick-while-watching-end-credits.patch
index af6da87145..af6da87145 100644
--- a/patches/server/0589-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0588-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0590-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0589-Allow-skipping-writing-of-comments-to-server.propert.patch
index 1fce522892..1fce522892 100644
--- a/patches/server/0590-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0589-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0591-Add-PlayerSetSpawnEvent.patch b/patches/server/0590-Add-PlayerSetSpawnEvent.patch
index 5c81577101..5c81577101 100644
--- a/patches/server/0591-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0590-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0592-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0591-Make-hoppers-respect-inventory-max-stack-size.patch
index c5f669b979..c5f669b979 100644
--- a/patches/server/0592-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0591-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0593-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0592-Optimize-entity-tracker-passenger-checks.patch
index a764dcd8ab..a764dcd8ab 100644
--- a/patches/server/0593-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0592-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0594-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0593-Config-option-for-Piglins-guarding-chests.patch
index e1b0af28d0..e1b0af28d0 100644
--- a/patches/server/0594-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0593-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0595-Add-EntityDamageItemEvent.patch b/patches/server/0594-Add-EntityDamageItemEvent.patch
index ebd8955e26..ebd8955e26 100644
--- a/patches/server/0595-Add-EntityDamageItemEvent.patch
+++ b/patches/server/0594-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0596-Optimize-indirect-passenger-iteration.patch b/patches/server/0595-Optimize-indirect-passenger-iteration.patch
index f63dee44e9..f63dee44e9 100644
--- a/patches/server/0596-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0595-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0597-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0596-Configurable-item-frame-map-cursor-update-interval.patch
index f06f3a327b..f06f3a327b 100644
--- a/patches/server/0597-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0596-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0598-Clear-bucket-NBT-after-dispense.patch b/patches/server/0597-Clear-bucket-NBT-after-dispense.patch
index ece5517a45..ece5517a45 100644
--- a/patches/server/0598-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0597-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0599-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0598-Change-EnderEye-target-without-changing-other-things.patch
index 53d06a36ec..53d06a36ec 100644
--- a/patches/server/0599-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0598-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0600-Add-BlockBreakBlockEvent.patch b/patches/server/0599-Add-BlockBreakBlockEvent.patch
index fbf1b1ea38..fbf1b1ea38 100644
--- a/patches/server/0600-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0599-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0601-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0600-Option-to-prevent-data-components-copy-in-smithing-r.patch
index c4e4b8be1b..c4e4b8be1b 100644
--- a/patches/server/0601-Option-to-prevent-data-components-copy-in-smithing-r.patch
+++ b/patches/server/0600-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/server/0602-More-CommandBlock-API.patch b/patches/server/0601-More-CommandBlock-API.patch
index 16cf3ee3d7..16cf3ee3d7 100644
--- a/patches/server/0602-More-CommandBlock-API.patch
+++ b/patches/server/0601-More-CommandBlock-API.patch
diff --git a/patches/server/0603-Add-missing-team-sidebar-display-slots.patch b/patches/server/0602-Add-missing-team-sidebar-display-slots.patch
index 9d0068df5a..9d0068df5a 100644
--- a/patches/server/0603-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0602-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0604-Add-back-EntityPortalExitEvent.patch b/patches/server/0603-Add-back-EntityPortalExitEvent.patch
index 02c52718f6..02c52718f6 100644
--- a/patches/server/0604-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0603-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0605-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0604-Add-methods-to-find-targets-for-lightning-strikes.patch
index 7a7068cabb..7a7068cabb 100644
--- a/patches/server/0605-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0604-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0606-Get-entity-default-attributes.patch b/patches/server/0605-Get-entity-default-attributes.patch
index 616f74da09..b0c1f2f95c 100644
--- a/patches/server/0606-Get-entity-default-attributes.patch
+++ b/patches/server/0605-Get-entity-default-attributes.patch
@@ -81,12 +81,12 @@ index 0000000000000000000000000000000000000000..ec9ebd2d539333293c51b7edfa18f18b
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 991a63f1a7cbd5d2cb88784a59ed0085b7bdfbe2..4e02a5c432f0d9ff705c7f02dfccbc7d76d39805 100644
+index 61686e63b2d1a98b9747e11058f450a51e2d4d01..5f460ab55025ff5dd66d7e52f92b4e7f36f2bb3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -574,6 +574,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public int getProtocolVersion() {
-         return net.minecraft.SharedConstants.getCurrentVersion().getProtocolVersion();
+@@ -560,6 +560,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
+         }
+         return CraftMagicNumbers.getItem(itemToBeRepaired.getType()).isValidRepairItem(CraftItemStack.asNMSCopy(itemToBeRepaired), CraftItemStack.asNMSCopy(repairMaterial));
      }
 +
 +    @Override
diff --git a/patches/server/0607-Left-handed-API.patch b/patches/server/0606-Left-handed-API.patch
index 643df451a4..643df451a4 100644
--- a/patches/server/0607-Left-handed-API.patch
+++ b/patches/server/0606-Left-handed-API.patch
diff --git a/patches/server/0608-Add-more-advancement-API.patch b/patches/server/0607-Add-more-advancement-API.patch
index 0fa7fedd64..0fa7fedd64 100644
--- a/patches/server/0608-Add-more-advancement-API.patch
+++ b/patches/server/0607-Add-more-advancement-API.patch
diff --git a/patches/server/0609-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0608-Add-ItemFactory-getSpawnEgg-API.patch
index 207215c511..207215c511 100644
--- a/patches/server/0609-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0608-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0610-Add-critical-damage-API.patch b/patches/server/0609-Add-critical-damage-API.patch
index 862878dd06..862878dd06 100644
--- a/patches/server/0610-Add-critical-damage-API.patch
+++ b/patches/server/0609-Add-critical-damage-API.patch
diff --git a/patches/server/0611-Fix-issues-with-mob-conversion.patch b/patches/server/0610-Fix-issues-with-mob-conversion.patch
index c714b6dda9..c714b6dda9 100644
--- a/patches/server/0611-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0610-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0612-Add-isCollidable-methods-to-various-places.patch b/patches/server/0611-Add-isCollidable-methods-to-various-places.patch
index e7b98fac20..226170159d 100644
--- a/patches/server/0612-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0611-Add-isCollidable-methods-to-various-places.patch
@@ -39,10 +39,10 @@ index 1002123cd0c6f57cecc4e80f5f21cc6ff5886d37..e96023b71845526383288917e8d7c575
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 4e02a5c432f0d9ff705c7f02dfccbc7d76d39805..c1c90d38ceaf7020dc19f1774cc88dbff1f05caf 100644
+index 5f460ab55025ff5dd66d7e52f92b4e7f36f2bb3f..f0cbe0ae5123bebce82aa677f196f7e8e096dfc9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -586,6 +586,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -572,6 +572,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
          var supplier = net.minecraft.world.entity.ai.attributes.DefaultAttributes.getSupplier((net.minecraft.world.entity.EntityType<? extends net.minecraft.world.entity.LivingEntity>) net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(bukkitEntityKey)));
          return new io.papermc.paper.attribute.UnmodifiableAttributeMap(supplier);
      }
diff --git a/patches/server/0613-Goat-ram-API.patch b/patches/server/0612-Goat-ram-API.patch
index 2f5ccdfed4..2f5ccdfed4 100644
--- a/patches/server/0613-Goat-ram-API.patch
+++ b/patches/server/0612-Goat-ram-API.patch
diff --git a/patches/server/0614-Add-API-for-resetting-a-single-score.patch b/patches/server/0613-Add-API-for-resetting-a-single-score.patch
index b9dd1c2be3..b9dd1c2be3 100644
--- a/patches/server/0614-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0613-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0615-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0614-Add-Raw-Byte-Entity-Serialization.patch
index 4e849ec251..5eeed3ba32 100644
--- a/patches/server/0615-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0614-Add-Raw-Byte-Entity-Serialization.patch
@@ -50,7 +50,7 @@ index 9edcdc71b28cf08e42fbe44723ba540e8d4f7808..a61638bc8200f6aa25d9c3254aea6c0c
      @Override
      public boolean isInvisible() {  // Paper - moved up from LivingEntity
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index c1c90d38ceaf7020dc19f1774cc88dbff1f05caf..af29b750a066ba44d6869eb8d466c3028c5c874d 100644
+index f0cbe0ae5123bebce82aa677f196f7e8e096dfc9..365f7846d4c522811cf992ea1a2da67b025661b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -510,7 +510,33 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0616-Vanilla-command-permission-fixes.patch b/patches/server/0615-Vanilla-command-permission-fixes.patch
index 65bcdb8f85..65bcdb8f85 100644
--- a/patches/server/0616-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0615-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0617-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0616-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 9675d4a991..9675d4a991 100644
--- a/patches/server/0617-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0616-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0618-Fix-GameProfileCache-concurrency.patch b/patches/server/0617-Fix-GameProfileCache-concurrency.patch
index 6cb7e5235f..6cb7e5235f 100644
--- a/patches/server/0618-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0617-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0619-Improve-and-expand-AsyncCatcher.patch b/patches/server/0618-Improve-and-expand-AsyncCatcher.patch
index 1e59e9e075..1e59e9e075 100644
--- a/patches/server/0619-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0618-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0620-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0619-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 51302543ed..51302543ed 100644
--- a/patches/server/0620-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0619-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0621-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0620-Sanitize-ResourceLocation-error-logging.patch
index 28ba1000d7..28ba1000d7 100644
--- a/patches/server/0621-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0620-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0622-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0621-Manually-inline-methods-in-BlockPosition.patch
index 630cd08862..630cd08862 100644
--- a/patches/server/0622-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0621-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0623-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0622-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 30f250f235..30f250f235 100644
--- a/patches/server/0623-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0622-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0624-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0623-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index ffee136c87..ffee136c87 100644
--- a/patches/server/0624-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0623-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0625-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0624-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 0c62fa92a6..0c62fa92a6 100644
--- a/patches/server/0625-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0624-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0626-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0625-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index 0ab3e48f48..0ab3e48f48 100644
--- a/patches/server/0626-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
+++ b/patches/server/0625-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0627-Time-scoreboard-search.patch b/patches/server/0626-Time-scoreboard-search.patch
index 8d15084758..8d15084758 100644
--- a/patches/server/0627-Time-scoreboard-search.patch
+++ b/patches/server/0626-Time-scoreboard-search.patch
diff --git a/patches/server/0628-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0627-Oprimise-map-impl-for-tracked-players.patch
index 05a08024ed..05a08024ed 100644
--- a/patches/server/0628-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0627-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0629-Add-missing-InventoryType.patch b/patches/server/0628-Add-missing-InventoryType.patch
index a49bdf073d..a49bdf073d 100644
--- a/patches/server/0629-Add-missing-InventoryType.patch
+++ b/patches/server/0628-Add-missing-InventoryType.patch
diff --git a/patches/server/0630-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0629-Optimise-BlockSoil-nearby-water-lookup.patch
index 81b199a243..81b199a243 100644
--- a/patches/server/0630-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0629-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0631-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0630-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index f342ae9146..f342ae9146 100644
--- a/patches/server/0631-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0630-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0632-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0631-Check-requirement-before-suggesting-root-nodes.patch
index fce5e326f9..fce5e326f9 100644
--- a/patches/server/0632-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0631-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0633-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0632-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index f426fa8333..f426fa8333 100644
--- a/patches/server/0633-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0632-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0634-Add-packet-limiter-config.patch b/patches/server/0633-Add-packet-limiter-config.patch
index 8315eb0598..8315eb0598 100644
--- a/patches/server/0634-Add-packet-limiter-config.patch
+++ b/patches/server/0633-Add-packet-limiter-config.patch
diff --git a/patches/server/0635-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0634-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index b11f4117a8..b11f4117a8 100644
--- a/patches/server/0635-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0634-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0636-Ensure-valid-vehicle-status.patch b/patches/server/0635-Ensure-valid-vehicle-status.patch
index 657d2eb9a7..657d2eb9a7 100644
--- a/patches/server/0636-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0635-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0637-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0636-Prevent-softlocked-end-exit-portal-generation.patch
index e2698e961b..e2698e961b 100644
--- a/patches/server/0637-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0636-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0638-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0637-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 4fac0c1ab3..4fac0c1ab3 100644
--- a/patches/server/0638-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0637-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0639-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0638-Don-t-log-debug-logging-being-disabled.patch
index eda86b69fc..eda86b69fc 100644
--- a/patches/server/0639-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0638-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0640-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0639-fix-various-menus-with-empty-level-accesses.patch
index efe5d1ddce..efe5d1ddce 100644
--- a/patches/server/0640-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0639-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0641-Preserve-overstacked-loot.patch b/patches/server/0640-Preserve-overstacked-loot.patch
index bd846768be..bd846768be 100644
--- a/patches/server/0641-Preserve-overstacked-loot.patch
+++ b/patches/server/0640-Preserve-overstacked-loot.patch
diff --git a/patches/server/0642-Update-head-rotation-in-missing-places.patch b/patches/server/0641-Update-head-rotation-in-missing-places.patch
index 88e0dccdcb..88e0dccdcb 100644
--- a/patches/server/0642-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0641-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0643-prevent-unintended-light-block-manipulation.patch b/patches/server/0642-prevent-unintended-light-block-manipulation.patch
index bff44792dc..bff44792dc 100644
--- a/patches/server/0643-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0642-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0644-Fix-CraftCriteria-defaults-map.patch b/patches/server/0643-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0644-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0643-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0645-Fix-upstreams-block-state-factories.patch b/patches/server/0644-Fix-upstreams-block-state-factories.patch
index d5cf218ad2..d5cf218ad2 100644
--- a/patches/server/0645-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0644-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0646-Configurable-feature-seeds.patch b/patches/server/0645-Configurable-feature-seeds.patch
index 44d7b04076..44d7b04076 100644
--- a/patches/server/0646-Configurable-feature-seeds.patch
+++ b/patches/server/0645-Configurable-feature-seeds.patch
diff --git a/patches/server/0647-Add-root-admin-user-detection.patch b/patches/server/0646-Add-root-admin-user-detection.patch
index 5b81dcd09a..5b81dcd09a 100644
--- a/patches/server/0647-Add-root-admin-user-detection.patch
+++ b/patches/server/0646-Add-root-admin-user-detection.patch
diff --git a/patches/server/0648-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0647-don-t-attempt-to-teleport-dead-entities.patch
index 0a5f77989b..0a5f77989b 100644
--- a/patches/server/0648-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0647-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0649-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0648-Prevent-excessive-velocity-through-repeated-crits.patch
index 50956e86f7..50956e86f7 100644
--- a/patches/server/0649-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0648-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0650-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0649-Remove-client-side-code-using-deprecated-for-removal.patch
index 77ffcc7ddc..77ffcc7ddc 100644
--- a/patches/server/0650-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0649-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0651-Fix-Spigot-growth-modifiers.patch b/patches/server/0650-Fix-Spigot-growth-modifiers.patch
index 245729c1f4..245729c1f4 100644
--- a/patches/server/0651-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0650-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0652-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0651-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index b017de75d1..b017de75d1 100644
--- a/patches/server/0652-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0651-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0653-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0652-Add-PlayerItemFrameChangeEvent.patch
index 37c616b0a1..37c616b0a1 100644
--- a/patches/server/0653-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0652-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0654-Optimize-HashMapPalette.patch b/patches/server/0653-Optimize-HashMapPalette.patch
index d50159b901..d50159b901 100644
--- a/patches/server/0654-Optimize-HashMapPalette.patch
+++ b/patches/server/0653-Optimize-HashMapPalette.patch
diff --git a/patches/server/0655-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0654-Allow-delegation-to-vanilla-chunk-gen.patch
index bde496b837..bde496b837 100644
--- a/patches/server/0655-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0654-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0656-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0655-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 239a0c56cc..239a0c56cc 100644
--- a/patches/server/0656-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0655-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0657-Add-more-Campfire-API.patch b/patches/server/0656-Add-more-Campfire-API.patch
index c47758fa53..c47758fa53 100644
--- a/patches/server/0657-Add-more-Campfire-API.patch
+++ b/patches/server/0656-Add-more-Campfire-API.patch
diff --git a/patches/server/0658-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0657-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 82e383fc34..82e383fc34 100644
--- a/patches/server/0658-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0657-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0659-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0658-Forward-CraftEntity-in-teleport-command.patch
index fed3943910..fed3943910 100644
--- a/patches/server/0659-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0658-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0660-Improve-scoreboard-entries.patch b/patches/server/0659-Improve-scoreboard-entries.patch
index 8acac86ce3..8acac86ce3 100644
--- a/patches/server/0660-Improve-scoreboard-entries.patch
+++ b/patches/server/0659-Improve-scoreboard-entries.patch
diff --git a/patches/server/0661-Entity-powdered-snow-API.patch b/patches/server/0660-Entity-powdered-snow-API.patch
index 84af920e2a..84af920e2a 100644
--- a/patches/server/0661-Entity-powdered-snow-API.patch
+++ b/patches/server/0660-Entity-powdered-snow-API.patch
diff --git a/patches/server/0662-Add-API-for-item-entity-health.patch b/patches/server/0661-Add-API-for-item-entity-health.patch
index cd2757b544..cd2757b544 100644
--- a/patches/server/0662-Add-API-for-item-entity-health.patch
+++ b/patches/server/0661-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0663-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0662-Configurable-max-block-light-for-monster-spawning.patch
index 421d176050..421d176050 100644
--- a/patches/server/0663-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0662-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0664-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0663-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 2ee001a77a..2ee001a77a 100644
--- a/patches/server/0664-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0663-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0665-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0664-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..d7ccde8439 100644
--- a/patches/server/0665-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0664-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0666-Bucketable-API.patch b/patches/server/0665-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0666-Bucketable-API.patch
+++ b/patches/server/0665-Bucketable-API.patch
diff --git a/patches/server/0667-Validate-usernames.patch b/patches/server/0666-Validate-usernames.patch
index 51eedf4f14..51eedf4f14 100644
--- a/patches/server/0667-Validate-usernames.patch
+++ b/patches/server/0666-Validate-usernames.patch
diff --git a/patches/server/0668-Make-water-animal-spawn-height-configurable.patch b/patches/server/0667-Make-water-animal-spawn-height-configurable.patch
index 36a83d9116..36a83d9116 100644
--- a/patches/server/0668-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0667-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0669-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0668-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 2f2e8174a1..2f2e8174a1 100644
--- a/patches/server/0669-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0668-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0670-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0669-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0670-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0669-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0671-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0670-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
index be0eedab93..be0eedab93 100644
--- a/patches/server/0671-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/server/0670-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0672-Multiple-Entries-with-Scoreboards.patch b/patches/server/0671-Multiple-Entries-with-Scoreboards.patch
index c286ca9e4b..c286ca9e4b 100644
--- a/patches/server/0672-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0671-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0673-Reset-placed-block-on-exception.patch b/patches/server/0672-Reset-placed-block-on-exception.patch
index c5b6f9f135..c5b6f9f135 100644
--- a/patches/server/0673-Reset-placed-block-on-exception.patch
+++ b/patches/server/0672-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0674-Add-configurable-height-for-slime-spawn.patch b/patches/server/0673-Add-configurable-height-for-slime-spawn.patch
index 04458eb176..04458eb176 100644
--- a/patches/server/0674-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0673-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0675-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0674-Fix-xp-reward-for-baby-zombies.patch
index 67fe48ec26..67fe48ec26 100644
--- a/patches/server/0675-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0674-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0676-Multi-Block-Change-API-Implementation.patch b/patches/server/0675-Multi-Block-Change-API-Implementation.patch
index 3eee7a872a..3eee7a872a 100644
--- a/patches/server/0676-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0675-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0677-Fix-NotePlayEvent.patch b/patches/server/0676-Fix-NotePlayEvent.patch
index 4a601d8f1b..4a601d8f1b 100644
--- a/patches/server/0677-Fix-NotePlayEvent.patch
+++ b/patches/server/0676-Fix-NotePlayEvent.patch
diff --git a/patches/server/0678-Freeze-Tick-Lock-API.patch b/patches/server/0677-Freeze-Tick-Lock-API.patch
index 4c0f4ccb90..4c0f4ccb90 100644
--- a/patches/server/0678-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0677-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0679-More-PotionEffectType-API.patch b/patches/server/0678-More-PotionEffectType-API.patch
index de77572875..de77572875 100644
--- a/patches/server/0679-More-PotionEffectType-API.patch
+++ b/patches/server/0678-More-PotionEffectType-API.patch
diff --git a/patches/server/0680-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0679-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index b19bb65d35..b19bb65d35 100644
--- a/patches/server/0680-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0679-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0681-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0680-API-for-creating-command-sender-which-forwards-feedb.patch
index 0d180e00d7..0d180e00d7 100644
--- a/patches/server/0681-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0680-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0682-Add-missing-structure-set-seed-configs.patch b/patches/server/0681-Add-missing-structure-set-seed-configs.patch
index 0c160b7c1c..0c160b7c1c 100644
--- a/patches/server/0682-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0681-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0683-Implement-regenerateChunk.patch b/patches/server/0682-Implement-regenerateChunk.patch
index c6a6c8eb34..c6a6c8eb34 100644
--- a/patches/server/0683-Implement-regenerateChunk.patch
+++ b/patches/server/0682-Implement-regenerateChunk.patch
diff --git a/patches/server/0684-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0683-Fix-cancelled-powdered-snow-bucket-placement.patch
index ad31825c78..ad31825c78 100644
--- a/patches/server/0684-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0683-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0685-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0684-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index c72e485b62..c72e485b62 100644
--- a/patches/server/0685-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0684-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0686-Add-GameEvent-tags.patch b/patches/server/0685-Add-GameEvent-tags.patch
index 1d2259ee92..1d2259ee92 100644
--- a/patches/server/0686-Add-GameEvent-tags.patch
+++ b/patches/server/0685-Add-GameEvent-tags.patch
diff --git a/patches/server/0687-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0686-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 3d074b30b4..3d074b30b4 100644
--- a/patches/server/0687-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0686-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0688-Furnace-RecipesUsed-API.patch b/patches/server/0687-Furnace-RecipesUsed-API.patch
index d8224fe839..d8224fe839 100644
--- a/patches/server/0688-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0687-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0689-Configurable-sculk-sensor-listener-range.patch b/patches/server/0688-Configurable-sculk-sensor-listener-range.patch
index f2d79796cb..f2d79796cb 100644
--- a/patches/server/0689-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0688-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0690-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0689-Add-missing-block-data-mins-and-maxes.patch
index fe8170196d..fe8170196d 100644
--- a/patches/server/0690-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0689-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0691-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0690-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 22d038e185..22d038e185 100644
--- a/patches/server/0691-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0690-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0692-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0691-Put-world-into-worldlist-before-initing-the-world.patch
index 1383f9759f..1383f9759f 100644
--- a/patches/server/0692-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0691-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0693-Fix-Entity-Position-Desync.patch b/patches/server/0692-Fix-Entity-Position-Desync.patch
index fb9d587df1..fb9d587df1 100644
--- a/patches/server/0693-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0692-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0694-Custom-Potion-Mixes.patch b/patches/server/0693-Custom-Potion-Mixes.patch
index 97668bb16f..97668bb16f 100644
--- a/patches/server/0694-Custom-Potion-Mixes.patch
+++ b/patches/server/0693-Custom-Potion-Mixes.patch
diff --git a/patches/server/0695-Force-close-world-loading-screen.patch b/patches/server/0694-Force-close-world-loading-screen.patch
index a90bc669b4..a90bc669b4 100644
--- a/patches/server/0695-Force-close-world-loading-screen.patch
+++ b/patches/server/0694-Force-close-world-loading-screen.patch
diff --git a/patches/server/0696-Fix-falling-block-spawn-methods.patch b/patches/server/0695-Fix-falling-block-spawn-methods.patch
index 1f5d0c19cc..1f5d0c19cc 100644
--- a/patches/server/0696-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0695-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0697-Expose-furnace-minecart-push-values.patch b/patches/server/0696-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0697-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0696-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0698-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0697-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 2d524b390b..2d524b390b 100644
--- a/patches/server/0698-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0697-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0699-More-Projectile-API.patch b/patches/server/0698-More-Projectile-API.patch
index bccb9ad23b..bccb9ad23b 100644
--- a/patches/server/0699-More-Projectile-API.patch
+++ b/patches/server/0698-More-Projectile-API.patch
diff --git a/patches/server/0700-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0699-Fix-swamp-hut-cat-generation-deadlock.patch
index 1b0f7d0ed5..1b0f7d0ed5 100644
--- a/patches/server/0700-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0699-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0701-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0700-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 70d82d0dce..70d82d0dce 100644
--- a/patches/server/0701-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0700-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0702-Implement-getComputedBiome-API.patch b/patches/server/0701-Implement-getComputedBiome-API.patch
index 57a6b3a7c5..57a6b3a7c5 100644
--- a/patches/server/0702-Implement-getComputedBiome-API.patch
+++ b/patches/server/0701-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0703-Make-some-itemstacks-nonnull.patch b/patches/server/0702-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0703-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0702-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0704-Implement-enchantWithLevels-API.patch b/patches/server/0703-Implement-enchantWithLevels-API.patch
index 7031b197b7..7031b197b7 100644
--- a/patches/server/0704-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0703-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0705-Fix-saving-in-unloadWorld.patch b/patches/server/0704-Fix-saving-in-unloadWorld.patch
index 604e791aaa..604e791aaa 100644
--- a/patches/server/0705-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0704-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0706-Buffer-OOB-setBlock-calls.patch b/patches/server/0705-Buffer-OOB-setBlock-calls.patch
index d0e56ca766..d0e56ca766 100644
--- a/patches/server/0706-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0705-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0707-Add-TameableDeathMessageEvent.patch b/patches/server/0706-Add-TameableDeathMessageEvent.patch
index 355d8192ca..355d8192ca 100644
--- a/patches/server/0707-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0706-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0708-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0707-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index d811493fc4..d811493fc4 100644
--- a/patches/server/0708-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0707-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0709-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0708-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 0f56e9ee1f..0f56e9ee1f 100644
--- a/patches/server/0709-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0708-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0710-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0709-Ensure-entity-passenger-world-matches-ridden-entity.patch
index b656e4e0e3..b656e4e0e3 100644
--- a/patches/server/0710-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0709-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0711-cache-resource-keys.patch b/patches/server/0710-cache-resource-keys.patch
index d444813b7a..d444813b7a 100644
--- a/patches/server/0711-cache-resource-keys.patch
+++ b/patches/server/0710-cache-resource-keys.patch
diff --git a/patches/server/0712-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0711-Allow-changing-the-EnderDragon-podium.patch
index 623c4b9689..623c4b9689 100644
--- a/patches/server/0712-Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/server/0711-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0713-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0712-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 05d5b9189b..05d5b9189b 100644
--- a/patches/server/0713-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0712-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0714-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0713-Prevent-tile-entity-copies-loading-chunks.patch
index cc180d9fc6..cc180d9fc6 100644
--- a/patches/server/0714-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0713-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0715-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0714-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 9eed66c5cf..9eed66c5cf 100644
--- a/patches/server/0715-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0714-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0716-Expand-PlayerItemDamageEvent.patch b/patches/server/0715-Expand-PlayerItemDamageEvent.patch
index 31a7de127f..31a7de127f 100644
--- a/patches/server/0716-Expand-PlayerItemDamageEvent.patch
+++ b/patches/server/0715-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0717-WorldCreator-keepSpawnLoaded.patch b/patches/server/0716-WorldCreator-keepSpawnLoaded.patch
index 9e358f7c85..9e358f7c85 100644
--- a/patches/server/0717-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0716-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0718-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0717-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index ed8adb4503..ed8adb4503 100644
--- a/patches/server/0718-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0717-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0719-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0718-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index d6e979b4fa..d6e979b4fa 100644
--- a/patches/server/0719-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0718-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0720-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0719-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 7c31e2a5df..7c31e2a5df 100644
--- a/patches/server/0720-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0719-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0721-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0720-Fire-CauldronLevelChange-on-initial-fill.patch
index 4f5e70f836..4f5e70f836 100644
--- a/patches/server/0721-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0720-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0722-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0721-fix-powder-snow-cauldrons-not-turning-to-water.patch
index f277b93aa1..f277b93aa1 100644
--- a/patches/server/0722-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0721-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0723-Add-PlayerStopUsingItemEvent.patch b/patches/server/0722-Add-PlayerStopUsingItemEvent.patch
index f8544cd79c..f8544cd79c 100644
--- a/patches/server/0723-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0722-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0724-Don-t-tick-markers.patch b/patches/server/0723-Don-t-tick-markers.patch
index 33c11195ac..33c11195ac 100644
--- a/patches/server/0724-Don-t-tick-markers.patch
+++ b/patches/server/0723-Don-t-tick-markers.patch
diff --git a/patches/server/0725-Expand-FallingBlock-API.patch b/patches/server/0724-Expand-FallingBlock-API.patch
index 861e7e87f2..861e7e87f2 100644
--- a/patches/server/0725-Expand-FallingBlock-API.patch
+++ b/patches/server/0724-Expand-FallingBlock-API.patch
diff --git a/patches/server/0726-Add-support-for-Proxy-Protocol.patch b/patches/server/0725-Add-support-for-Proxy-Protocol.patch
index c94fcd99d4..c94fcd99d4 100644
--- a/patches/server/0726-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0725-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0727-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0726-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 61c9b7dd07..61c9b7dd07 100644
--- a/patches/server/0727-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0726-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0728-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0727-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 7158b83635..7158b83635 100644
--- a/patches/server/0728-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0727-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0729-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0728-Sanitize-sent-BlockEntity-NBT.patch
index 79bacba95c..79bacba95c 100644
--- a/patches/server/0729-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/server/0728-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0730-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0729-Disable-component-selector-resolving-in-books-by-def.patch
index 796fcc7f2a..796fcc7f2a 100644
--- a/patches/server/0730-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0729-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0731-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0730-Prevent-entity-loading-causing-async-lookups.patch
index d3f30f5169..d3f30f5169 100644
--- a/patches/server/0731-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0730-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0732-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0731-Throw-exception-on-world-create-while-being-ticked.patch
index 73a4b424a0..73a4b424a0 100644
--- a/patches/server/0732-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0731-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0733-Dont-resent-entity-on-art-update.patch b/patches/server/0732-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0733-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0732-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0734-Add-WardenAngerChangeEvent.patch b/patches/server/0733-Add-WardenAngerChangeEvent.patch
index 38df99e752..38df99e752 100644
--- a/patches/server/0734-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0733-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0735-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0734-Add-option-for-strict-advancement-dimension-checks.patch
index 6fa3d4f18f..6fa3d4f18f 100644
--- a/patches/server/0735-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0734-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0736-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0735-Add-missing-important-BlockStateListPopulator-method.patch
index ecf565ebf6..ecf565ebf6 100644
--- a/patches/server/0736-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0735-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0737-Nameable-Banner-API.patch b/patches/server/0736-Nameable-Banner-API.patch
index 823dd8a8c8..823dd8a8c8 100644
--- a/patches/server/0737-Nameable-Banner-API.patch
+++ b/patches/server/0736-Nameable-Banner-API.patch
diff --git a/patches/server/0738-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0737-Don-t-broadcast-messages-to-command-blocks.patch
index 1b002f4d1b..1b002f4d1b 100644
--- a/patches/server/0738-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0737-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0739-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0738-Prevent-empty-items-from-being-added-to-world.patch
index a619a30fd0..a619a30fd0 100644
--- a/patches/server/0739-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0738-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0740-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0739-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 2c104c79c4..2c104c79c4 100644
--- a/patches/server/0740-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0739-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0741-Add-Player-getFishHook.patch b/patches/server/0740-Add-Player-getFishHook.patch
index d87fa21619..d87fa21619 100644
--- a/patches/server/0741-Add-Player-getFishHook.patch
+++ b/patches/server/0740-Add-Player-getFishHook.patch
diff --git a/patches/server/0742-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0741-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 32aaf6dc6e..32aaf6dc6e 100644
--- a/patches/server/0742-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0741-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0743-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0742-Add-various-missing-EntityDropItemEvent-calls.patch
index bafd157cd1..bafd157cd1 100644
--- a/patches/server/0743-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0742-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0744-Fix-Bee-flower-NPE.patch b/patches/server/0743-Fix-Bee-flower-NPE.patch
index 13dcee533d..13dcee533d 100644
--- a/patches/server/0744-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0743-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0745-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0744-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 67d2417c55..67d2417c55 100644
--- a/patches/server/0745-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0744-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0746-More-Teleport-API.patch b/patches/server/0745-More-Teleport-API.patch
index 9a4763b6fe..9a4763b6fe 100644
--- a/patches/server/0746-More-Teleport-API.patch
+++ b/patches/server/0745-More-Teleport-API.patch
diff --git a/patches/server/0747-Add-EntityPortalReadyEvent.patch b/patches/server/0746-Add-EntityPortalReadyEvent.patch
index 50d3716266..50d3716266 100644
--- a/patches/server/0747-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0746-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0748-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0747-Don-t-use-level-random-in-entity-constructors.patch
index 4d7c249601..4d7c249601 100644
--- a/patches/server/0748-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0747-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0749-Send-block-entities-after-destroy-prediction.patch b/patches/server/0748-Send-block-entities-after-destroy-prediction.patch
index 0a6e27c3c6..0a6e27c3c6 100644
--- a/patches/server/0749-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0748-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0750-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0749-Warn-on-plugins-accessing-faraway-chunks.patch
index 2f60387b5d..2f60387b5d 100644
--- a/patches/server/0750-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0749-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0751-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0750-Custom-Chat-Completion-Suggestions-API.patch
index 52d9d632bf..52d9d632bf 100644
--- a/patches/server/0751-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0750-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0752-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0751-Add-and-fix-missing-BlockFadeEvents.patch
index 18f8fbe87f..18f8fbe87f 100644
--- a/patches/server/0752-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0751-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0753-Collision-API.patch b/patches/server/0752-Collision-API.patch
index b4840d04ac..b4840d04ac 100644
--- a/patches/server/0753-Collision-API.patch
+++ b/patches/server/0752-Collision-API.patch
diff --git a/patches/server/0754-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0753-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 42748ba6d8..42748ba6d8 100644
--- a/patches/server/0754-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0753-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0755-Block-Ticking-API.patch b/patches/server/0754-Block-Ticking-API.patch
index f1b51ee5b1..f1b51ee5b1 100644
--- a/patches/server/0755-Block-Ticking-API.patch
+++ b/patches/server/0754-Block-Ticking-API.patch
diff --git a/patches/server/0756-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0755-Add-Velocity-IP-Forwarding-Support.patch
index 873c5def20..873c5def20 100644
--- a/patches/server/0756-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0755-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0757-Add-NamespacedKey-biome-methods.patch b/patches/server/0756-Add-NamespacedKey-biome-methods.patch
index 910ff7350d..b870c787cc 100644
--- a/patches/server/0757-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0756-Add-NamespacedKey-biome-methods.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add NamespacedKey biome methods
 Co-authored-by: Thonk <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index af29b750a066ba44d6869eb8d466c3028c5c874d..7852b06b3cd3bb8ca761e9d05b172a27f9ef6330 100644
+index 365f7846d4c522811cf992ea1a2da67b025661b9..c4e517ef6cf5cd4975846459cf66ebd4db66a805 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -618,6 +618,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -604,6 +604,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
          Preconditions.checkArgument(material.isBlock(), material + " is not a block");
          return getBlock(material).hasCollision;
      }
diff --git a/patches/server/0758-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0757-Fix-plugin-loggers-on-server-shutdown.patch
index c0da2d76a6..c0da2d76a6 100644
--- a/patches/server/0758-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0757-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0759-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0758-Stop-large-look-changes-from-crashing-the-server.patch
index 4604a3c7d6..4604a3c7d6 100644
--- a/patches/server/0759-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0758-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0760-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0759-Fire-EntityChangeBlockEvent-in-more-places.patch
index d21cfe9e22..d21cfe9e22 100644
--- a/patches/server/0760-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0759-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0761-Missing-eating-regain-reason.patch b/patches/server/0760-Missing-eating-regain-reason.patch
index 6bce2423d9..6bce2423d9 100644
--- a/patches/server/0761-Missing-eating-regain-reason.patch
+++ b/patches/server/0760-Missing-eating-regain-reason.patch
diff --git a/patches/server/0762-Missing-effect-cause.patch b/patches/server/0761-Missing-effect-cause.patch
index 17172c3b36..17172c3b36 100644
--- a/patches/server/0762-Missing-effect-cause.patch
+++ b/patches/server/0761-Missing-effect-cause.patch
diff --git a/patches/server/0763-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0762-Added-byte-array-serialization-deserialization-for-P.patch
index f2a4d437f0..f2a4d437f0 100644
--- a/patches/server/0763-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0762-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0764-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0763-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index c6ff862ed6..c6ff862ed6 100644
--- a/patches/server/0764-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0763-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0765-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0764-Call-BlockPhysicsEvent-more-often.patch
index b2dc803286..b2dc803286 100644
--- a/patches/server/0765-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0764-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0766-Configurable-chat-thread-limit.patch b/patches/server/0765-Configurable-chat-thread-limit.patch
index 255381bd14..255381bd14 100644
--- a/patches/server/0766-Configurable-chat-thread-limit.patch
+++ b/patches/server/0765-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0767-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0766-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 6b16e23fbc..6b16e23fbc 100644
--- a/patches/server/0767-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0766-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0768-fix-Jigsaw-block-kicking-user.patch b/patches/server/0767-fix-Jigsaw-block-kicking-user.patch
index 0c52c47ce9..0c52c47ce9 100644
--- a/patches/server/0768-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0767-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0769-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0768-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 8653ffd786..8653ffd786 100644
--- a/patches/server/0769-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0768-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0770-Add-getDrops-to-BlockState.patch b/patches/server/0769-Add-getDrops-to-BlockState.patch
index ea12f69bde..ea12f69bde 100644
--- a/patches/server/0770-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0769-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0771-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0770-Fix-a-bunch-of-vanilla-bugs.patch
index f847c09279..f847c09279 100644
--- a/patches/server/0771-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0770-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0772-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0771-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 8e43d21dd8..8e43d21dd8 100644
--- a/patches/server/0772-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0771-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0773-Fix-custom-piglin-loved-items.patch b/patches/server/0772-Fix-custom-piglin-loved-items.patch
index 043217eed5..043217eed5 100644
--- a/patches/server/0773-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0772-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0774-EntityPickupItemEvent-fixes.patch b/patches/server/0773-EntityPickupItemEvent-fixes.patch
index 5780237591..5780237591 100644
--- a/patches/server/0774-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0773-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0775-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0774-Correctly-handle-interactions-with-items-on-cooldown.patch
index abeca5857c..abeca5857c 100644
--- a/patches/server/0775-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0774-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0776-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0775-Add-PlayerInventorySlotChangeEvent.patch
index c9503fa774..c9503fa774 100644
--- a/patches/server/0776-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0775-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0777-Elder-Guardian-appearance-API.patch b/patches/server/0776-Elder-Guardian-appearance-API.patch
index 403482552b..403482552b 100644
--- a/patches/server/0777-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0776-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0778-Allow-changing-bed-s-occupied-property.patch b/patches/server/0777-Allow-changing-bed-s-occupied-property.patch
index d8b51d7f0b..d8b51d7f0b 100644
--- a/patches/server/0778-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0777-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0779-Add-entity-knockback-API.patch b/patches/server/0778-Add-entity-knockback-API.patch
index c5c8da6eb6..c5c8da6eb6 100644
--- a/patches/server/0779-Add-entity-knockback-API.patch
+++ b/patches/server/0778-Add-entity-knockback-API.patch
diff --git a/patches/server/0780-Detect-headless-JREs.patch b/patches/server/0779-Detect-headless-JREs.patch
index 5ba28913a8..5ba28913a8 100644
--- a/patches/server/0780-Detect-headless-JREs.patch
+++ b/patches/server/0779-Detect-headless-JREs.patch
diff --git a/patches/server/0781-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0780-fix-entity-vehicle-collision-event-not-called.patch
index fdb817e0f7..fdb817e0f7 100644
--- a/patches/server/0781-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0780-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0782-Add-EntityToggleSitEvent.patch b/patches/server/0781-Add-EntityToggleSitEvent.patch
index 555f6fd377..555f6fd377 100644
--- a/patches/server/0782-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0781-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0783-Add-fire-tick-delay-option.patch b/patches/server/0782-Add-fire-tick-delay-option.patch
index 848f831f0e..848f831f0e 100644
--- a/patches/server/0783-Add-fire-tick-delay-option.patch
+++ b/patches/server/0782-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0784-Add-Moving-Piston-API.patch b/patches/server/0783-Add-Moving-Piston-API.patch
index e3d3955822..e3d3955822 100644
--- a/patches/server/0784-Add-Moving-Piston-API.patch
+++ b/patches/server/0783-Add-Moving-Piston-API.patch
diff --git a/patches/server/0785-Ignore-impossible-spawn-tick.patch b/patches/server/0784-Ignore-impossible-spawn-tick.patch
index f046102ceb..f046102ceb 100644
--- a/patches/server/0785-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0784-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0786-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0785-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index c42422ceca..c42422ceca 100644
--- a/patches/server/0786-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0785-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0787-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0786-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 4de5efdb09..4de5efdb09 100644
--- a/patches/server/0787-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0786-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0788-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0787-Add-PrePlayerAttackEntityEvent.patch
index 6ea383ac09..6ea383ac09 100644
--- a/patches/server/0788-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0787-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0789-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0788-ensure-reset-EnderDragon-boss-event-name.patch
index 854c391fc5..854c391fc5 100644
--- a/patches/server/0789-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0788-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0790-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0789-fix-MC-252817-green-map-markers-do-not-disappear.patch
index a5e8df272b..a5e8df272b 100644
--- a/patches/server/0790-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0789-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0791-Add-Player-Warden-Warning-API.patch b/patches/server/0790-Add-Player-Warden-Warning-API.patch
index cbda3eac9c..cbda3eac9c 100644
--- a/patches/server/0791-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0790-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0792-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0791-More-vanilla-friendly-methods-to-update-trades.patch
index 5280c03219..5280c03219 100644
--- a/patches/server/0792-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0791-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0793-Add-paper-dumplisteners-command.patch b/patches/server/0792-Add-paper-dumplisteners-command.patch
index ba293d1dad..ba293d1dad 100644
--- a/patches/server/0793-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0792-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0794-check-global-player-list-where-appropriate.patch b/patches/server/0793-check-global-player-list-where-appropriate.patch
index 38c66589bb..38c66589bb 100644
--- a/patches/server/0794-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0793-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0795-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0794-Fix-async-entity-add-due-to-fungus-trees.patch
index a5f4531c29..a5f4531c29 100644
--- a/patches/server/0795-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0794-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0796-ItemStack-damage-API.patch b/patches/server/0795-ItemStack-damage-API.patch
index 807a916f44..807a916f44 100644
--- a/patches/server/0796-ItemStack-damage-API.patch
+++ b/patches/server/0795-ItemStack-damage-API.patch
diff --git a/patches/server/0797-Friction-API.patch b/patches/server/0796-Friction-API.patch
index d4359b9c85..d4359b9c85 100644
--- a/patches/server/0797-Friction-API.patch
+++ b/patches/server/0796-Friction-API.patch
diff --git a/patches/server/0798-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0797-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 5bc45a7af4..5bc45a7af4 100644
--- a/patches/server/0798-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0797-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0799-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0798-Fix-premature-player-kicks-on-shutdown.patch
index d824af1bd8..d824af1bd8 100644
--- a/patches/server/0799-Fix-premature-player-kicks-on-shutdown.patch
+++ b/patches/server/0798-Fix-premature-player-kicks-on-shutdown.patch
diff --git a/patches/server/0800-Sync-offhand-slot-in-menus.patch b/patches/server/0799-Sync-offhand-slot-in-menus.patch
index ca3c70a65a..ca3c70a65a 100644
--- a/patches/server/0800-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0799-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0801-Player-Entity-Tracking-Events.patch b/patches/server/0800-Player-Entity-Tracking-Events.patch
index 4a5f62d874..4a5f62d874 100644
--- a/patches/server/0801-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0800-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0802-Limit-pet-look-distance.patch b/patches/server/0801-Limit-pet-look-distance.patch
index 7a9fe7cf5c..7a9fe7cf5c 100644
--- a/patches/server/0802-Limit-pet-look-distance.patch
+++ b/patches/server/0801-Limit-pet-look-distance.patch
diff --git a/patches/server/0803-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0802-Fixes-and-additions-to-the-SpawnReason-API.patch
index d758b37206..d758b37206 100644
--- a/patches/server/0803-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0802-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0804-fix-Instruments.patch b/patches/server/0803-fix-Instruments.patch
index 610a880852..610a880852 100644
--- a/patches/server/0804-fix-Instruments.patch
+++ b/patches/server/0803-fix-Instruments.patch
diff --git a/patches/server/0805-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0804-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 2f86713e06..2f86713e06 100644
--- a/patches/server/0805-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0804-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0806-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0805-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 5b38409d1f..5b38409d1f 100644
--- a/patches/server/0806-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0805-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0807-Add-BlockLockCheckEvent.patch b/patches/server/0806-Add-BlockLockCheckEvent.patch
index 91be1b9825..91be1b9825 100644
--- a/patches/server/0807-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0806-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0808-Add-Sneaking-API-for-Entities.patch b/patches/server/0807-Add-Sneaking-API-for-Entities.patch
index 47d08328f7..47d08328f7 100644
--- a/patches/server/0808-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0807-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0809-Improve-logging-and-errors.patch b/patches/server/0808-Improve-logging-and-errors.patch
index 5fd0fba842..5fd0fba842 100644
--- a/patches/server/0809-Improve-logging-and-errors.patch
+++ b/patches/server/0808-Improve-logging-and-errors.patch
diff --git a/patches/server/0810-Improve-PortalEvents.patch b/patches/server/0809-Improve-PortalEvents.patch
index 680471754c..680471754c 100644
--- a/patches/server/0810-Improve-PortalEvents.patch
+++ b/patches/server/0809-Improve-PortalEvents.patch
diff --git a/patches/server/0811-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0810-Add-config-option-for-spider-worldborder-climbing.patch
index b10bcacd3c..b10bcacd3c 100644
--- a/patches/server/0811-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0810-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0812-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0811-Add-missing-SpigotConfig-logCommands-check.patch
index fca5a305ca..fca5a305ca 100644
--- a/patches/server/0812-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0811-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0813-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0812-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0813-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0812-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0814-Flying-Fall-Damage.patch b/patches/server/0813-Flying-Fall-Damage.patch
index 46bd6e117e..46bd6e117e 100644
--- a/patches/server/0814-Flying-Fall-Damage.patch
+++ b/patches/server/0813-Flying-Fall-Damage.patch
diff --git a/patches/server/0815-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0814-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index c966db60a9..c966db60a9 100644
--- a/patches/server/0815-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/server/0814-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0816-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0815-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 214bb65165..214bb65165 100644
--- a/patches/server/0816-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0815-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0817-config-for-disabling-entity-tag-tags.patch b/patches/server/0816-config-for-disabling-entity-tag-tags.patch
index 79f922d624..79f922d624 100644
--- a/patches/server/0817-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0816-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0818-Use-single-player-info-update-packet-on-join.patch b/patches/server/0817-Use-single-player-info-update-packet-on-join.patch
index be7116d308..be7116d308 100644
--- a/patches/server/0818-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0817-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0819-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0818-Correctly-shrink-items-during-EntityResurrectEvent.patch
index d4dc43a7c7..d4dc43a7c7 100644
--- a/patches/server/0819-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0818-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0820-Win-Screen-API.patch b/patches/server/0819-Win-Screen-API.patch
index 55b4336093..55b4336093 100644
--- a/patches/server/0820-Win-Screen-API.patch
+++ b/patches/server/0819-Win-Screen-API.patch
diff --git a/patches/server/0821-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0820-Remove-CraftItemStack-setAmount-null-assignment.patch
index 83f46bb0c6..83f46bb0c6 100644
--- a/patches/server/0821-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0820-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0822-Fix-force-opening-enchantment-tables.patch b/patches/server/0821-Fix-force-opening-enchantment-tables.patch
index eac3ab63ee..eac3ab63ee 100644
--- a/patches/server/0822-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0821-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0823-Add-Entity-Body-Yaw-API.patch b/patches/server/0822-Add-Entity-Body-Yaw-API.patch
index 47d59d5783..47d59d5783 100644
--- a/patches/server/0823-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0822-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0824-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0823-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 962917dab8..962917dab8 100644
--- a/patches/server/0824-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0823-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0825-Add-EntityFertilizeEggEvent.patch b/patches/server/0824-Add-EntityFertilizeEggEvent.patch
index 4936a75506..4936a75506 100644
--- a/patches/server/0825-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0824-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0826-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0825-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index a3e0925b49..a3e0925b49 100644
--- a/patches/server/0826-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0825-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0827-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0826-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 85321a4a5b..85321a4a5b 100644
--- a/patches/server/0827-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0826-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0828-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0827-Correctly-handle-ArmorStand-invisibility.patch
index ea22d29006..ea22d29006 100644
--- a/patches/server/0828-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0827-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0829-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0828-Fix-advancement-triggers-for-entity-damage.patch
index 2d24162670..2d24162670 100644
--- a/patches/server/0829-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0828-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0830-Fix-text-display-error-on-spawn.patch b/patches/server/0829-Fix-text-display-error-on-spawn.patch
index 7f64cfe6d9..7f64cfe6d9 100644
--- a/patches/server/0830-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0829-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0831-Fix-inventories-returning-null-Locations.patch b/patches/server/0830-Fix-inventories-returning-null-Locations.patch
index 2a3e133d8d..2a3e133d8d 100644
--- a/patches/server/0831-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0830-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0832-Add-Shearable-API.patch b/patches/server/0831-Add-Shearable-API.patch
index 34eb025e6b..34eb025e6b 100644
--- a/patches/server/0832-Add-Shearable-API.patch
+++ b/patches/server/0831-Add-Shearable-API.patch
diff --git a/patches/server/0833-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0832-Fix-SpawnEggMeta-get-setSpawnedType.patch
index bf28528953..bf28528953 100644
--- a/patches/server/0833-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0832-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0834-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0833-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index c51be7e3ac..c51be7e3ac 100644
--- a/patches/server/0834-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0833-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0835-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0834-Treat-sequence-violations-like-they-should-be.patch
index 6a727c191f..6a727c191f 100644
--- a/patches/server/0835-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0834-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0836-remove-duplicate-animate-packet-for-records.patch b/patches/server/0835-remove-duplicate-animate-packet-for-records.patch
index 47fc3e8c30..47fc3e8c30 100644
--- a/patches/server/0836-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0835-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0837-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0836-Prevent-causing-expired-keys-from-impacting-new-join.patch
index bf4d66e914..bf4d66e914 100644
--- a/patches/server/0837-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0836-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0838-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0837-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 45b84428cb..45b84428cb 100644
--- a/patches/server/0838-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0837-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0839-Use-array-for-gamerule-storage.patch b/patches/server/0838-Use-array-for-gamerule-storage.patch
index 194ff8f15b..194ff8f15b 100644
--- a/patches/server/0839-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0838-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0840-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0839-Fix-a-couple-of-upstream-bed-issues.patch
index b2cad9c8d3..b2cad9c8d3 100644
--- a/patches/server/0840-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0839-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0841-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0840-Fix-demo-flag-not-enabling-demo-mode.patch
index d64dd23e37..d64dd23e37 100644
--- a/patches/server/0841-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0840-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0842-Add-Mob-Experience-reward-API.patch b/patches/server/0841-Add-Mob-Experience-reward-API.patch
index 487fe9e567..487fe9e567 100644
--- a/patches/server/0842-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0841-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0843-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0842-Break-redstone-on-top-of-trap-doors-early.patch
index 2f89b7d780..2f89b7d780 100644
--- a/patches/server/0843-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0842-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0844-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0843-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index becde16ce8..becde16ce8 100644
--- a/patches/server/0844-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0843-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0845-More-accurate-isInOpenWater-impl.patch b/patches/server/0844-More-accurate-isInOpenWater-impl.patch
index ca26fd9045..ca26fd9045 100644
--- a/patches/server/0845-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0844-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0846-Expand-PlayerItemMendEvent.patch b/patches/server/0845-Expand-PlayerItemMendEvent.patch
index 617b45a407..617b45a407 100644
--- a/patches/server/0846-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0845-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0847-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0846-Refresh-ProjectileSource-for-projectiles.patch
index f6d4037762..f6d4037762 100644
--- a/patches/server/0847-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0846-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0848-Add-transient-modifier-API.patch b/patches/server/0847-Add-transient-modifier-API.patch
index 5614f73626..5614f73626 100644
--- a/patches/server/0848-Add-transient-modifier-API.patch
+++ b/patches/server/0847-Add-transient-modifier-API.patch
diff --git a/patches/server/0849-Fix-block-place-logic.patch b/patches/server/0848-Fix-block-place-logic.patch
index 1b934b2488..1b934b2488 100644
--- a/patches/server/0849-Fix-block-place-logic.patch
+++ b/patches/server/0848-Fix-block-place-logic.patch
diff --git a/patches/server/0850-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0849-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index 5e1094abf9..5e1094abf9 100644
--- a/patches/server/0850-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0849-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0851-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0850-Call-BlockGrowEvent-for-missing-blocks.patch
index 895a528de8..895a528de8 100644
--- a/patches/server/0851-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0850-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0852-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0851-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index d6ca71427c..d6ca71427c 100644
--- a/patches/server/0852-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0851-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0853-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0852-fix-MapLike-spam-for-missing-key-selector.patch
index 2bd3b889f1..2bd3b889f1 100644
--- a/patches/server/0853-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0852-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0854-Fix-sniffer-removeExploredLocation.patch b/patches/server/0853-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0854-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0853-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0855-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0854-Add-method-to-remove-all-active-potion-effects.patch
index a3bf117ed3..a3bf117ed3 100644
--- a/patches/server/0855-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0854-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0856-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0855-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index 702619dd05..702619dd05 100644
--- a/patches/server/0856-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0855-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0857-Add-event-for-player-editing-sign.patch b/patches/server/0856-Add-event-for-player-editing-sign.patch
index e0b25d631e..e0b25d631e 100644
--- a/patches/server/0857-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0856-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0858-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0857-Only-tick-item-frames-if-players-can-see-it.patch
index dbf1486052..dbf1486052 100644
--- a/patches/server/0858-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0857-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0859-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0858-Fix-cmd-permission-levels-for-command-blocks.patch
index 31edf0f252..31edf0f252 100644
--- a/patches/server/0859-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0858-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0860-Add-option-to-disable-block-updates.patch b/patches/server/0859-Add-option-to-disable-block-updates.patch
index 8fe599472e..8fe599472e 100644
--- a/patches/server/0860-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0859-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0861-Call-missing-BlockDispenseEvent.patch b/patches/server/0860-Call-missing-BlockDispenseEvent.patch
index f018b2ae74..f018b2ae74 100644
--- a/patches/server/0861-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0860-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0862-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0861-Don-t-load-chunks-for-supporting-block-checks.patch
index 4dd0bce763..4dd0bce763 100644
--- a/patches/server/0862-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0861-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0863-Optimize-player-lookups-for-beacons.patch b/patches/server/0862-Optimize-player-lookups-for-beacons.patch
index e5daf82675..e5daf82675 100644
--- a/patches/server/0863-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0862-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0864-Add-Sign-getInteractableSideFor.patch b/patches/server/0863-Add-Sign-getInteractableSideFor.patch
index 2833829ce4..2833829ce4 100644
--- a/patches/server/0864-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0863-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0865-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0864-fix-item-meta-for-tadpole-buckets.patch
index 11453b4a7d..11453b4a7d 100644
--- a/patches/server/0865-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0864-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0866-Fix-BanList-API.patch b/patches/server/0865-Fix-BanList-API.patch
index ad75aaf764..ad75aaf764 100644
--- a/patches/server/0866-Fix-BanList-API.patch
+++ b/patches/server/0865-Fix-BanList-API.patch
diff --git a/patches/server/0867-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0866-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 5f51eb317c..5f51eb317c 100644
--- a/patches/server/0867-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0866-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0868-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0867-Fix-possible-NPE-on-painting-creation.patch
index cf51e817de..cf51e817de 100644
--- a/patches/server/0868-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0867-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0869-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0868-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 32b71969c8..32b71969c8 100644
--- a/patches/server/0869-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0868-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0870-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0869-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 96941a19e5..96941a19e5 100644
--- a/patches/server/0870-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0869-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0871-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0870-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 301b345fb9..301b345fb9 100644
--- a/patches/server/0871-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0870-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0872-Add-whitelist-events.patch b/patches/server/0871-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0872-Add-whitelist-events.patch
+++ b/patches/server/0871-Add-whitelist-events.patch
diff --git a/patches/server/0873-Implement-PlayerFailMoveEvent.patch b/patches/server/0872-Implement-PlayerFailMoveEvent.patch
index a0afcbdacd..a0afcbdacd 100644
--- a/patches/server/0873-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0872-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0874-Folia-scheduler-and-owned-region-API.patch b/patches/server/0873-Folia-scheduler-and-owned-region-API.patch
index 1730dfd0a8..1730dfd0a8 100644
--- a/patches/server/0874-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0873-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0875-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0874-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0875-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0874-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0876-API-for-updating-recipes-on-clients.patch b/patches/server/0875-API-for-updating-recipes-on-clients.patch
index 75dacf7f9b..75dacf7f9b 100644
--- a/patches/server/0876-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0875-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0877-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0876-Fix-rotation-when-spawning-display-entities.patch
index a027b8b8bb..a027b8b8bb 100644
--- a/patches/server/0877-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0876-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0878-Only-capture-actual-tree-growth.patch b/patches/server/0877-Only-capture-actual-tree-growth.patch
index b815f00241..b815f00241 100644
--- a/patches/server/0878-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0877-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0879-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0878-Use-correct-source-for-mushroom-block-spread-event.patch
index a295e29bcb..a295e29bcb 100644
--- a/patches/server/0879-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0878-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0880-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0879-Respect-randomizeData-on-more-entities-when-spawning.patch
index 777f9a2e5a..777f9a2e5a 100644
--- a/patches/server/0880-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0879-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0881-Use-correct-seed-on-api-world-load.patch b/patches/server/0880-Use-correct-seed-on-api-world-load.patch
index aef99ac6cc..aef99ac6cc 100644
--- a/patches/server/0881-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0880-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0882-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0881-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 2f19c9d94a..2f19c9d94a 100644
--- a/patches/server/0882-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0881-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0883-Cache-map-ids-on-item-frames.patch b/patches/server/0882-Cache-map-ids-on-item-frames.patch
index 4294f88d3c..4294f88d3c 100644
--- a/patches/server/0883-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0882-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0884-Fix-custom-statistic-criteria-creation.patch b/patches/server/0883-Fix-custom-statistic-criteria-creation.patch
index dbad1b4c5e..c15d703018 100644
--- a/patches/server/0884-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0883-Fix-custom-statistic-criteria-creation.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix custom statistic criteria creation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 7852b06b3cd3bb8ca761e9d05b172a27f9ef6330..1a92d22d2b536a84af1cc404ca9809cae066407a 100644
+index c4e517ef6cf5cd4975846459cf66ebd4db66a805..6e19867f0c242a735801974a8b0332485f450017 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -631,6 +631,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -617,6 +617,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
          net.minecraft.core.Holder<net.minecraft.world.level.biome.Biome> biomeBase = cra.getHandle().registryAccess().registryOrThrow(net.minecraft.core.registries.Registries.BIOME).getHolderOrThrow(net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.BIOME, org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(biomeKey)));
          cra.setBiome(x, y, z, biomeBase);
      }
diff --git a/patches/server/0885-Bandaid-fix-for-Effect.patch b/patches/server/0884-Bandaid-fix-for-Effect.patch
index 524e09bb4f..524e09bb4f 100644
--- a/patches/server/0885-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0884-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0886-SculkCatalyst-bloom-API.patch b/patches/server/0885-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0886-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0885-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0887-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0886-API-for-an-entity-s-scoreboard-name.patch
index c44b023d7d..c44b023d7d 100644
--- a/patches/server/0887-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0886-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0888-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0887-Deprecate-and-replace-methods-with-old-StructureType.patch
index 75eedc5080..75eedc5080 100644
--- a/patches/server/0888-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0887-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0889-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0888-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index f6d9c42ed2..f6d9c42ed2 100644
--- a/patches/server/0889-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0888-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0890-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0889-Properly-handle-BlockBreakEvent-isDropItems.patch
index aa3f1c73c8..aa3f1c73c8 100644
--- a/patches/server/0890-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0889-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0891-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0890-Fire-entity-death-event-for-ender-dragon.patch
index 08b7409275..08b7409275 100644
--- a/patches/server/0891-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0890-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0892-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0891-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 1cf3f3d9a6..1cf3f3d9a6 100644
--- a/patches/server/0892-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0891-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0893-Add-Listing-API-for-Player.patch b/patches/server/0892-Add-Listing-API-for-Player.patch
index 280e547dd5..280e547dd5 100644
--- a/patches/server/0893-Add-Listing-API-for-Player.patch
+++ b/patches/server/0892-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0894-Configurable-Region-Compression-Format.patch b/patches/server/0893-Configurable-Region-Compression-Format.patch
index 64a52a4ea2..64a52a4ea2 100644
--- a/patches/server/0894-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0893-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0895-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0894-Add-BlockFace-to-BlockDamageEvent.patch
index 3af304961a..3af304961a 100644
--- a/patches/server/0895-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0894-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0896-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0895-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0896-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0895-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0897-Expand-Pose-API.patch b/patches/server/0896-Expand-Pose-API.patch
index 1a247ee6fd..1a247ee6fd 100644
--- a/patches/server/0897-Expand-Pose-API.patch
+++ b/patches/server/0896-Expand-Pose-API.patch
diff --git a/patches/server/0898-More-DragonBattle-API.patch b/patches/server/0897-More-DragonBattle-API.patch
index a6e0c111c0..a6e0c111c0 100644
--- a/patches/server/0898-More-DragonBattle-API.patch
+++ b/patches/server/0897-More-DragonBattle-API.patch
diff --git a/patches/server/0899-Add-PlayerPickItemEvent.patch b/patches/server/0898-Add-PlayerPickItemEvent.patch
index a611fad439..a611fad439 100644
--- a/patches/server/0899-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0898-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0900-Allow-trident-custom-damage.patch b/patches/server/0899-Allow-trident-custom-damage.patch
index eaa126da9c..eaa126da9c 100644
--- a/patches/server/0900-Allow-trident-custom-damage.patch
+++ b/patches/server/0899-Allow-trident-custom-damage.patch
diff --git a/patches/server/0901-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0900-Expose-hand-in-BlockCanBuildEvent.patch
index 4abc7e9fc5..4abc7e9fc5 100644
--- a/patches/server/0901-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0900-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0902-Optimize-nearest-structure-border-iteration.patch b/patches/server/0901-Optimize-nearest-structure-border-iteration.patch
index 805af0f26c..805af0f26c 100644
--- a/patches/server/0902-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0901-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0903-Implement-OfflinePlayer-isConnected.patch b/patches/server/0902-Implement-OfflinePlayer-isConnected.patch
index 45edfbf777..45edfbf777 100644
--- a/patches/server/0903-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0902-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0904-Fix-inventory-desync.patch b/patches/server/0903-Fix-inventory-desync.patch
index 3381bed750..3381bed750 100644
--- a/patches/server/0904-Fix-inventory-desync.patch
+++ b/patches/server/0903-Fix-inventory-desync.patch
diff --git a/patches/server/0905-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0904-Add-titleOverride-to-InventoryOpenEvent.patch
index c4903a4da6..c4903a4da6 100644
--- a/patches/server/0905-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0904-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0906-Configure-sniffer-egg-hatch-time.patch b/patches/server/0905-Configure-sniffer-egg-hatch-time.patch
index 7def55b1f7..7def55b1f7 100644
--- a/patches/server/0906-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0905-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0907-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0906-Do-crystal-portal-proximity-check-before-entity-look.patch
index c83b2614f9..c83b2614f9 100644
--- a/patches/server/0907-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0906-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0908-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0907-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0908-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0907-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0909-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0908-Add-slot-sanity-checks-in-container-clicks.patch
index 3ee111d847..3ee111d847 100644
--- a/patches/server/0909-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0908-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0910-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0909-Call-BlockRedstoneEvents-for-lecterns.patch
index bafd87afad..bafd87afad 100644
--- a/patches/server/0910-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0909-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0911-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0910-Allow-proper-checking-of-empty-item-stacks.patch
index 906d0184e4..906d0184e4 100644
--- a/patches/server/0911-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0910-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0912-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0911-Fix-silent-equipment-change-for-mobs.patch
index c75be4adb1..c75be4adb1 100644
--- a/patches/server/0912-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0911-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0913-Fix-spigot-s-Forced-Stats.patch b/patches/server/0912-Fix-spigot-s-Forced-Stats.patch
index a138a58b79..a138a58b79 100644
--- a/patches/server/0913-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0912-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0914-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0913-Add-missing-InventoryHolders-to-inventories.patch
index a2c5867c17..a2c5867c17 100644
--- a/patches/server/0914-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0913-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0915-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0914-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index 21515b5dba..21515b5dba 100644
--- a/patches/server/0915-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0914-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0916-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0915-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0916-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0915-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0917-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0916-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e1f2934daa..e1f2934daa 100644
--- a/patches/server/0917-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0916-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0918-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0917-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0918-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0917-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0919-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0918-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0919-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0918-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0920-Fix-missing-map-initialize-event-call.patch b/patches/server/0919-Fix-missing-map-initialize-event-call.patch
index be9f07bfc2..be9f07bfc2 100644
--- a/patches/server/0920-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0919-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0921-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0920-Update-entity-data-when-attaching-firework-to-entity.patch
index 8cbc0f974a..8cbc0f974a 100644
--- a/patches/server/0921-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0920-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0922-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0921-Fix-UnsafeValues-loadAdvancement.patch
index 84ec6f0acd..07ee09f53a 100644
--- a/patches/server/0922-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0921-Fix-UnsafeValues-loadAdvancement.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix UnsafeValues#loadAdvancement
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 1a92d22d2b536a84af1cc404ca9809cae066407a..0a59d4354e332f4dba99404b770eb88f418546ca 100644
+index 6e19867f0c242a735801974a8b0332485f450017..bedd75d4bce73f317618da4cc22ef5bdce20a38f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -320,7 +320,27 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0923-Add-player-idle-duration-API.patch b/patches/server/0922-Add-player-idle-duration-API.patch
index 3aaeed1d13..3aaeed1d13 100644
--- a/patches/server/0923-Add-player-idle-duration-API.patch
+++ b/patches/server/0922-Add-player-idle-duration-API.patch
diff --git a/patches/server/0924-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0923-Don-t-check-if-we-can-see-non-visible-entities.patch
index a63a8d3cb7..a63a8d3cb7 100644
--- a/patches/server/0924-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0923-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0925-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0924-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 3f575aef28..3f575aef28 100644
--- a/patches/server/0925-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0924-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0926-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0925-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 2778d6eb28..2778d6eb28 100644
--- a/patches/server/0926-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0925-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0927-Optimize-VarInts.patch b/patches/server/0926-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0927-Optimize-VarInts.patch
+++ b/patches/server/0926-Optimize-VarInts.patch
diff --git a/patches/server/0928-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0927-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index ac06d6fe4b..ac06d6fe4b 100644
--- a/patches/server/0928-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0927-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0929-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0928-Add-predicate-for-blocks-when-raytracing.patch
index 712ca7a8c8..712ca7a8c8 100644
--- a/patches/server/0929-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0928-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0930-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0929-Broadcast-take-item-packets-with-collector-as-source.patch
index a1301dea28..a1301dea28 100644
--- a/patches/server/0930-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0929-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0931-Expand-LingeringPotion-API.patch b/patches/server/0930-Expand-LingeringPotion-API.patch
index b203b03355..b203b03355 100644
--- a/patches/server/0931-Expand-LingeringPotion-API.patch
+++ b/patches/server/0930-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0932-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0931-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index 3d51508d96..3d51508d96 100644
--- a/patches/server/0932-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0931-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0933-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0932-Add-hand-to-fish-event-for-all-player-interactions.patch
index 3bc8cd9b24..3bc8cd9b24 100644
--- a/patches/server/0933-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0932-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0934-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0933-Fix-several-issues-with-EntityBreedEvent.patch
index 96a98989cc..96a98989cc 100644
--- a/patches/server/0934-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0933-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0935-Add-UUID-attribute-modifier-API.patch b/patches/server/0934-Add-UUID-attribute-modifier-API.patch
index c9666b4f31..c9666b4f31 100644
--- a/patches/server/0935-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0934-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0936-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0935-Fix-missing-event-call-for-entity-teleport-API.patch
index ac77e45fa2..ac77e45fa2 100644
--- a/patches/server/0936-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0935-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0937-Lazily-create-LootContext-for-criterions.patch b/patches/server/0936-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0937-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0936-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0938-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0937-Don-t-fire-sync-events-during-worldgen.patch
index 492d95271a..492d95271a 100644
--- a/patches/server/0938-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0937-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0939-Add-Structure-check-API.patch b/patches/server/0938-Add-Structure-check-API.patch
index b1501eb55b..b1501eb55b 100644
--- a/patches/server/0939-Add-Structure-check-API.patch
+++ b/patches/server/0938-Add-Structure-check-API.patch
diff --git a/patches/server/0940-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0939-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index 8568cfc5bf..8568cfc5bf 100644
--- a/patches/server/0940-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0939-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0941-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0940-Restore-vanilla-entity-drops-behavior.patch
index edb6769a27..edb6769a27 100644
--- a/patches/server/0941-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0940-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0942-Dont-resend-blocks-on-interactions.patch b/patches/server/0941-Dont-resend-blocks-on-interactions.patch
index b55a7bbcc8..b55a7bbcc8 100644
--- a/patches/server/0942-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0941-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0943-add-more-scoreboard-API.patch b/patches/server/0942-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0943-add-more-scoreboard-API.patch
+++ b/patches/server/0942-add-more-scoreboard-API.patch
diff --git a/patches/server/0944-Improve-Registry.patch b/patches/server/0943-Improve-Registry.patch
index 0d7c6b94e6..0d7c6b94e6 100644
--- a/patches/server/0944-Improve-Registry.patch
+++ b/patches/server/0943-Improve-Registry.patch
diff --git a/patches/server/0945-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0944-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index b6f285b9cc..b6f285b9cc 100644
--- a/patches/server/0945-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0944-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0946-Add-experience-points-API.patch b/patches/server/0945-Add-experience-points-API.patch
index cdd4f08f67..cdd4f08f67 100644
--- a/patches/server/0946-Add-experience-points-API.patch
+++ b/patches/server/0945-Add-experience-points-API.patch
diff --git a/patches/server/0947-Add-drops-to-shear-events.patch b/patches/server/0946-Add-drops-to-shear-events.patch
index 2c756b4953..2c756b4953 100644
--- a/patches/server/0947-Add-drops-to-shear-events.patch
+++ b/patches/server/0946-Add-drops-to-shear-events.patch
diff --git a/patches/server/0948-Add-PlayerShieldDisableEvent.patch b/patches/server/0947-Add-PlayerShieldDisableEvent.patch
index a4316fd237..a4316fd237 100644
--- a/patches/server/0948-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0947-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0949-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0948-Validate-ResourceLocation-in-NBT-reading.patch
index 0e1c0b7e08..0e1c0b7e08 100644
--- a/patches/server/0949-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0948-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0950-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0949-Properly-handle-experience-dropping-on-block-break.patch
index 3ee724786e..3ee724786e 100644
--- a/patches/server/0950-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0949-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0951-Fixup-NamespacedKey-handling.patch b/patches/server/0950-Fixup-NamespacedKey-handling.patch
index 20c52c2fba..20c52c2fba 100644
--- a/patches/server/0951-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0950-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0952-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0951-Expose-LootTable-of-DecoratedPot.patch
index 6b5fd029f3..6b5fd029f3 100644
--- a/patches/server/0952-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0951-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0953-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0952-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index dc2cbd7a08..dc2cbd7a08 100644
--- a/patches/server/0953-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0952-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0954-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0953-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 7d75e1147a..7d75e1147a 100644
--- a/patches/server/0954-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0953-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0955-Add-ShulkerDuplicateEvent.patch b/patches/server/0954-Add-ShulkerDuplicateEvent.patch
index 22315c9908..22315c9908 100644
--- a/patches/server/0955-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/0954-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0956-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0955-Add-api-for-spawn-egg-texture-colors.patch
index 3f171b51f4..d937011392 100644
--- a/patches/server/0956-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0955-Add-api-for-spawn-egg-texture-colors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add api for spawn egg texture colors
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 0a59d4354e332f4dba99404b770eb88f418546ca..4213e5debc1737364de0dae42fbd1cb68dcb0c83 100644
+index bedd75d4bce73f317618da4cc22ef5bdce20a38f..20502685bad7dc04477308078597ef452f6458fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -659,6 +659,15 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -645,6 +645,15 @@ public final class CraftMagicNumbers implements UnsafeValues {
      }
      // Paper end
  
diff --git a/patches/server/0957-Add-Lifecycle-Event-system.patch b/patches/server/0956-Add-Lifecycle-Event-system.patch
index bc6a0a8656..57fce2eee7 100644
--- a/patches/server/0957-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0956-Add-Lifecycle-Event-system.patch
@@ -739,10 +739,10 @@ index d96399e9bf1a58db5a4a22e58abb99e7660e0694..66bdac50130f523f9dc4379b103b7a46
 +    // Paper end - lifecycle events
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 4213e5debc1737364de0dae42fbd1cb68dcb0c83..92d7e2435ea5c8b6fe9e5d2abb9d3c8cb350ef4d 100644
+index 20502685bad7dc04477308078597ef452f6458fa..ef580d02d3d1e46bb6a378ab29b351ad62e18743 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -668,6 +668,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -654,6 +654,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
      }
      // Paper end - spawn egg color visibility
  
diff --git a/patches/server/0958-ItemStack-Tooltip-API.patch b/patches/server/0957-ItemStack-Tooltip-API.patch
index 477d02c3fa..d55aff4e5d 100644
--- a/patches/server/0958-ItemStack-Tooltip-API.patch
+++ b/patches/server/0957-ItemStack-Tooltip-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack Tooltip API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 92d7e2435ea5c8b6fe9e5d2abb9d3c8cb350ef4d..2f44452631256e3d6abce02f861cc5bfa5208b53 100644
+index ef580d02d3d1e46bb6a378ab29b351ad62e18743..0b7187b59b6419d015e36a91c1f3b915d3d19d28 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -658,6 +658,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -644,6 +644,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
          return org.bukkit.craftbukkit.CraftStatistic.getNMSStatistic(statistic).getName();
      }
      // Paper end
diff --git a/patches/server/0959-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0958-Add-getChunkSnapshot-includeLightData-parameter.patch
index 70efa7282a..70efa7282a 100644
--- a/patches/server/0959-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/0958-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0960-Add-FluidState-API.patch b/patches/server/0959-Add-FluidState-API.patch
index de7b959ccc..de7b959ccc 100644
--- a/patches/server/0960-Add-FluidState-API.patch
+++ b/patches/server/0959-Add-FluidState-API.patch
diff --git a/patches/server/0961-add-number-format-api.patch b/patches/server/0960-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0961-add-number-format-api.patch
+++ b/patches/server/0960-add-number-format-api.patch
diff --git a/patches/server/0962-improve-BanList-types.patch b/patches/server/0961-improve-BanList-types.patch
index 9539b84792..9539b84792 100644
--- a/patches/server/0962-improve-BanList-types.patch
+++ b/patches/server/0961-improve-BanList-types.patch
diff --git a/patches/server/0963-Expanded-Hopper-API.patch b/patches/server/0962-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0963-Expanded-Hopper-API.patch
+++ b/patches/server/0962-Expanded-Hopper-API.patch
diff --git a/patches/server/0964-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0963-Add-BlockBreakProgressUpdateEvent.patch
index 67abc67fb7..67abc67fb7 100644
--- a/patches/server/0964-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0963-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0965-Deprecate-ItemStack-setType.patch b/patches/server/0964-Deprecate-ItemStack-setType.patch
index a252511a0b..a252511a0b 100644
--- a/patches/server/0965-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0964-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0966-Add-CartographyItemEvent.patch b/patches/server/0965-Add-CartographyItemEvent.patch
index 4502c9aa8a..4502c9aa8a 100644
--- a/patches/server/0966-Add-CartographyItemEvent.patch
+++ b/patches/server/0965-Add-CartographyItemEvent.patch
diff --git a/patches/server/0967-More-Raid-API.patch b/patches/server/0966-More-Raid-API.patch
index 14fcb7449a..14fcb7449a 100644
--- a/patches/server/0967-More-Raid-API.patch
+++ b/patches/server/0966-More-Raid-API.patch
diff --git a/patches/server/0968-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0967-Add-onboarding-message-for-initial-server-start.patch
index ee7cedb905..ee7cedb905 100644
--- a/patches/server/0968-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0967-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/0969-Configurable-max-block-fluid-ticks.patch b/patches/server/0968-Configurable-max-block-fluid-ticks.patch
index ed1c561d6e..ed1c561d6e 100644
--- a/patches/server/0969-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0968-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0970-Fix-bees-aging-inside-hives.patch b/patches/server/0969-Fix-bees-aging-inside-hives.patch
index ae6a0ff63d..ae6a0ff63d 100644
--- a/patches/server/0970-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0969-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0971-Disable-memory-reserve-allocating.patch b/patches/server/0970-Disable-memory-reserve-allocating.patch
index 30eabae9e8..30eabae9e8 100644
--- a/patches/server/0971-Disable-memory-reserve-allocating.patch
+++ b/patches/server/0970-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0972-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0971-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index 5c5bb40964..5c5bb40964 100644
--- a/patches/server/0972-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/0971-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0973-Fix-DamageSource-API.patch b/patches/server/0972-Fix-DamageSource-API.patch
index 0e5c644bc1..0e5c644bc1 100644
--- a/patches/server/0973-Fix-DamageSource-API.patch
+++ b/patches/server/0972-Fix-DamageSource-API.patch
diff --git a/patches/server/0974-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0973-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index a745081446..a745081446 100644
--- a/patches/server/0974-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/server/0973-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0975-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0974-Fix-possible-StackOverflowError-for-some-dispenses.patch
index 21910b922f..21910b922f 100644
--- a/patches/server/0975-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/0974-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0976-Improve-tag-parser-handling.patch b/patches/server/0975-Improve-tag-parser-handling.patch
index 6f346ac4f2..6f346ac4f2 100644
--- a/patches/server/0976-Improve-tag-parser-handling.patch
+++ b/patches/server/0975-Improve-tag-parser-handling.patch
diff --git a/patches/server/0977-Item-Mutation-Fixes.patch b/patches/server/0976-Item-Mutation-Fixes.patch
index 736d493c99..736d493c99 100644
--- a/patches/server/0977-Item-Mutation-Fixes.patch
+++ b/patches/server/0976-Item-Mutation-Fixes.patch
diff --git a/patches/server/0978-Per-world-ticks-per-spawn-settings.patch b/patches/server/0977-Per-world-ticks-per-spawn-settings.patch
index ebdf89762d..ebdf89762d 100644
--- a/patches/server/0978-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0977-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0979-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0978-Properly-track-the-changed-item-from-dispense-events.patch
index 9957c97ca3..9957c97ca3 100644
--- a/patches/server/0979-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/0978-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0980-Rewrite-dataconverter-system.patch b/patches/server/0979-Rewrite-dataconverter-system.patch
index bbb4bda157..7e296c938d 100644
--- a/patches/server/0980-Rewrite-dataconverter-system.patch
+++ b/patches/server/0979-Rewrite-dataconverter-system.patch
@@ -28899,7 +28899,7 @@ index 1d287dd7379e56f7fd4b425880b850cd843f5789..8ab7ca373a885fbe658013c9c6a2e38d
              return nbttagcompound;
          });
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 2f44452631256e3d6abce02f861cc5bfa5208b53..ca1240c2534f1e6c7182996fde23e58f9c252960 100644
+index 0b7187b59b6419d015e36a91c1f3b915d3d19d28..573b93fc4e392456af2f2cf3900a9d7014f67a22 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -526,7 +526,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0981-Suspicious-Effect-Entry-API.patch b/patches/server/0980-Suspicious-Effect-Entry-API.patch
index 2ff782764f..2ff782764f 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 6143642997..6143642997 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-disable-forced-empty-world-ticks.patch b/patches/server/0982-disable-forced-empty-world-ticks.patch
index 6ef5295591..6ef5295591 100644
--- a/patches/server/0983-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0982-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0984-Starlight.patch b/patches/server/0983-Starlight.patch
index 72b56b3d53..72b56b3d53 100644
--- a/patches/server/0984-Starlight.patch
+++ b/patches/server/0983-Starlight.patch
diff --git a/patches/server/0985-Rewrite-chunk-system.patch b/patches/server/0984-Rewrite-chunk-system.patch
index 97b19847e2..97b19847e2 100644
--- a/patches/server/0985-Rewrite-chunk-system.patch
+++ b/patches/server/0984-Rewrite-chunk-system.patch
diff --git a/patches/server/0986-incremental-chunk-and-player-saving.patch b/patches/server/0985-incremental-chunk-and-player-saving.patch
index 36bfcb0797..36bfcb0797 100644
--- a/patches/server/0986-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0985-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0987-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 474f3d6165..474f3d6165 100644
--- a/patches/server/0987-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0988-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index c004efe2f5..c004efe2f5 100644
--- a/patches/server/0988-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0989-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 1a86ce02de..1a86ce02de 100644
--- a/patches/server/0989-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0990-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 84396ba635..84396ba635 100644
--- a/patches/server/0990-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0991-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0990-Allow-Saving-of-Oversized-Chunks.patch
index c190834bbb..c190834bbb 100644
--- a/patches/server/0991-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0990-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0992-Fix-World-isChunkGenerated-calls.patch b/patches/server/0991-Fix-World-isChunkGenerated-calls.patch
index 85cc5c81aa..85cc5c81aa 100644
--- a/patches/server/0992-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0991-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0993-Flat-bedrock-generator-settings.patch b/patches/server/0992-Flat-bedrock-generator-settings.patch
index 7103386726..7103386726 100644
--- a/patches/server/0993-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0992-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0994-Entity-Activation-Range-2.0.patch b/patches/server/0993-Entity-Activation-Range-2.0.patch
index fee8d41d7e..fee8d41d7e 100644
--- a/patches/server/0994-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0993-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0995-Optional-per-player-mob-spawns.patch b/patches/server/0994-Optional-per-player-mob-spawns.patch
index b9fe80f3e4..b9fe80f3e4 100644
--- a/patches/server/0995-Optional-per-player-mob-spawns.patch
+++ b/patches/server/0994-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/0996-Anti-Xray.patch b/patches/server/0995-Anti-Xray.patch
index 124f02c236..124f02c236 100644
--- a/patches/server/0996-Anti-Xray.patch
+++ b/patches/server/0995-Anti-Xray.patch
diff --git a/patches/server/0997-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 12af227d2a..12af227d2a 100644
--- a/patches/server/0997-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0998-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0997-Optimize-Collision-to-not-load-chunks.patch
index 17286aaa99..17286aaa99 100644
--- a/patches/server/0998-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0997-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 1f46712639..1f46712639 100644
--- a/patches/server/0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/1000-Entity-load-save-limit-per-chunk.patch b/patches/server/0999-Entity-load-save-limit-per-chunk.patch
index 1dbf729bda..1dbf729bda 100644
--- a/patches/server/1000-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0999-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1001-Improved-Watchdog-Support.patch b/patches/server/1000-Improved-Watchdog-Support.patch
index 2f40b2b0ec..2f40b2b0ec 100644
--- a/patches/server/1001-Improved-Watchdog-Support.patch
+++ b/patches/server/1000-Improved-Watchdog-Support.patch
diff --git a/patches/server/1002-Optimize-Voxel-Shape-Merging.patch b/patches/server/1001-Optimize-Voxel-Shape-Merging.patch
index 4ec779560c..4ec779560c 100644
--- a/patches/server/1002-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/1001-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1003-Write-SavedData-IO-async.patch b/patches/server/1002-Write-SavedData-IO-async.patch
index 68fd4545a8..68fd4545a8 100644
--- a/patches/server/1003-Write-SavedData-IO-async.patch
+++ b/patches/server/1002-Write-SavedData-IO-async.patch
diff --git a/patches/server/1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 9d41c60b80..9d41c60b80 100644
--- a/patches/server/1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/1005-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch
index 22535d896b..22535d896b 100644
--- a/patches/server/1005-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/1006-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1005-Optimize-Bit-Operations-by-inlining.patch
index a1f24dd8dc..a1f24dd8dc 100644
--- a/patches/server/1006-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/1005-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1007-Remove-streams-from-hot-code.patch b/patches/server/1006-Remove-streams-from-hot-code.patch
index 4c6d94f7bf..4c6d94f7bf 100644
--- a/patches/server/1007-Remove-streams-from-hot-code.patch
+++ b/patches/server/1006-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1008-Eigencraft-redstone-implementation.patch b/patches/server/1007-Eigencraft-redstone-implementation.patch
index b3e3db6504..b3e3db6504 100644
--- a/patches/server/1008-Eigencraft-redstone-implementation.patch
+++ b/patches/server/1007-Eigencraft-redstone-implementation.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-Improve-boat-collision-performance.patch b/patches/server/1009-Improve-boat-collision-performance.patch
index 3cd32de1e5..3cd32de1e5 100644
--- a/patches/server/1010-Improve-boat-collision-performance.patch
+++ b/patches/server/1009-Improve-boat-collision-performance.patch
diff --git a/patches/server/1011-Optimise-general-POI-access.patch b/patches/server/1010-Optimise-general-POI-access.patch
index 118734c246..118734c246 100644
--- a/patches/server/1011-Optimise-general-POI-access.patch
+++ b/patches/server/1010-Optimise-general-POI-access.patch
diff --git a/patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1011-Custom-table-implementation-for-blockstate-state-loo.patch
index 96d90abea3..96d90abea3 100644
--- a/patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1011-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1013-Execute-chunk-tasks-mid-tick.patch b/patches/server/1012-Execute-chunk-tasks-mid-tick.patch
index 5fb8977769..5fb8977769 100644
--- a/patches/server/1013-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/1012-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/1014-Optimise-random-block-ticking.patch b/patches/server/1013-Optimise-random-block-ticking.patch
index 07b98dffde..07b98dffde 100644
--- a/patches/server/1014-Optimise-random-block-ticking.patch
+++ b/patches/server/1013-Optimise-random-block-ticking.patch
diff --git a/patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1014-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 0bbbb36e0b..0bbbb36e0b 100644
--- a/patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1014-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1015-Use-Velocity-compression-and-cipher-natives.patch
index c357a07cf3..c357a07cf3 100644
--- a/patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/1015-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1017-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1016-Detail-more-information-in-watchdog-dumps.patch
index 7859dad6a7..7859dad6a7 100644
--- a/patches/server/1017-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1016-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/1018-Collision-optimisations.patch b/patches/server/1017-Collision-optimisations.patch
index a6179487ff..a6179487ff 100644
--- a/patches/server/1018-Collision-optimisations.patch
+++ b/patches/server/1017-Collision-optimisations.patch
diff --git a/patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1018-Optimise-collision-checking-in-player-move-packet-ha.patch
index 378e882366..378e882366 100644
--- a/patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1018-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch
index fa7f6bde06..fa7f6bde06 100644
--- a/patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1020-Fix-entity-type-tags-suggestions-in-selectors.patch
index a31aeb7f18..a31aeb7f18 100644
--- a/patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1020-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1022-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1021-Add-Alternate-Current-redstone-implementation.patch
index afb3758607..afb3758607 100644
--- a/patches/server/1022-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1021-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1023-optimize-dirt-and-snow-spreading.patch b/patches/server/1022-optimize-dirt-and-snow-spreading.patch
index 49de7fcab9..49de7fcab9 100644
--- a/patches/server/1023-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/1022-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1024-Properly-resend-entities.patch b/patches/server/1023-Properly-resend-entities.patch
index 4ac71e7b7c..4ac71e7b7c 100644
--- a/patches/server/1024-Properly-resend-entities.patch
+++ b/patches/server/1023-Properly-resend-entities.patch
diff --git a/patches/server/1025-Optimize-Hoppers.patch b/patches/server/1024-Optimize-Hoppers.patch
index c0f53d43a2..c0f53d43a2 100644
--- a/patches/server/1025-Optimize-Hoppers.patch
+++ b/patches/server/1024-Optimize-Hoppers.patch
diff --git a/patches/server/1026-Improve-performance-of-mass-crafts.patch b/patches/server/1025-Improve-performance-of-mass-crafts.patch
index f9839d9135..f9839d9135 100644
--- a/patches/server/1026-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1025-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1027-Actually-optimise-explosions.patch b/patches/server/1026-Actually-optimise-explosions.patch
index a7db826672..a7db826672 100644
--- a/patches/server/1027-Actually-optimise-explosions.patch
+++ b/patches/server/1026-Actually-optimise-explosions.patch
diff --git a/patches/server/1028-Optimise-chunk-tick-iteration.patch b/patches/server/1027-Optimise-chunk-tick-iteration.patch
index 1452dcd9c5..1452dcd9c5 100644
--- a/patches/server/1028-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1027-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1029-Lag-compensation-ticks.patch b/patches/server/1028-Lag-compensation-ticks.patch
index 2d5fbb4444..2d5fbb4444 100644
--- a/patches/server/1029-Lag-compensation-ticks.patch
+++ b/patches/server/1028-Lag-compensation-ticks.patch
diff --git a/patches/server/1030-Optimise-nearby-player-retrieval.patch b/patches/server/1029-Optimise-nearby-player-retrieval.patch
index 080816f839..080816f839 100644
--- a/patches/server/1030-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1029-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1031-Distance-manager-tick-timings.patch b/patches/server/1030-Distance-manager-tick-timings.patch
index f946d92596..f946d92596 100644
--- a/patches/server/1031-Distance-manager-tick-timings.patch
+++ b/patches/server/1030-Distance-manager-tick-timings.patch
diff --git a/patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1031-Handle-Oversized-block-entities-in-chunks.patch
index b9ea4832bd..b9ea4832bd 100644
--- a/patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1031-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1032-Send-full-pos-packets-for-hard-colliding-entities.patch
index 6a98c63b52..6a98c63b52 100644
--- a/patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/1032-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/1034-Fix-and-optimise-world-force-upgrading.patch b/patches/server/1033-Fix-and-optimise-world-force-upgrading.patch
index d2ea2179d5..d2ea2179d5 100644
--- a/patches/server/1034-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/1033-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/1035-API-for-checking-sent-chunks.patch b/patches/server/1034-API-for-checking-sent-chunks.patch
index 6187f99887..6187f99887 100644
--- a/patches/server/1035-API-for-checking-sent-chunks.patch
+++ b/patches/server/1034-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1036-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch b/patches/server/1035-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
index b7399d5f48..b7399d5f48 100644
--- a/patches/server/1036-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
+++ b/patches/server/1035-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
diff --git a/patches/server/1037-handle-converting-old-serialized-names-to-new-names.patch b/patches/server/1036-handle-converting-old-serialized-names-to-new-names.patch
index 0f14e72527..0f14e72527 100644
--- a/patches/server/1037-handle-converting-old-serialized-names-to-new-names.patch
+++ b/patches/server/1036-handle-converting-old-serialized-names-to-new-names.patch
diff --git a/patches/server/1038-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/1037-Add-config-for-mobs-immune-to-default-effects.patch
index 7bf145751f..7bf145751f 100644
--- a/patches/server/1038-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/1037-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/1039-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/1038-Deep-clone-nbt-tags-in-PDC.patch
index 9e7d548220..9e7d548220 100644
--- a/patches/server/1039-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/server/1038-Deep-clone-nbt-tags-in-PDC.patch