1.20.6

824 files changed, 224 insertions, 547 deletions

diff --git a/README.md b/README.md
index f5b3dde06a..8277f968cb 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ How To (Plugin Developers)
 <dependency>
     <groupId>io.papermc.paper</groupId>
     <artifactId>paper-api</artifactId>
-    <version>1.20.5-R0.1-SNAPSHOT</version>
+    <version>1.20.6-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -53,7 +53,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.20.5-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT")
 }
 
 java {
diff --git a/build.gradle.kts b/build.gradle.kts
index b87e347cf5..df39c8a1fa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -68,7 +68,7 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.20.5+build.1:mergedv2")
+    paramMappings("net.fabricmc:yarn:1.20.6+build.1:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.10.2:fat")
     decompiler("org.vineflower:vineflower:1.10.1")
     spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.13")
diff --git a/gradle.properties b/gradle.properties
index 744935f5ac..cd64968334 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.20.5-R0.1-SNAPSHOT
-mcVersion=1.20.5
+version=1.20.6-R0.1-SNAPSHOT
+mcVersion=1.20.6
 
 # Set to true while updating Minecraft version
 updatingMinecraft=false
diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch
index 81ee13ba35..68949cde0c 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -124,7 +124,7 @@ index 0000000000000000000000000000000000000000..6271e2bad0ed937c2c46a8c8fdf186c4
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 278ecb12ecdb5e1fdf394a1c990a4d849e53e05e..0000000000000000000000000000000000000000
+index bea9ac450de7ec05f9752d253743e95d79c1cd14..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,267 +0,0 @@
@@ -135,7 +135,7 @@ index 278ecb12ecdb5e1fdf394a1c990a4d849e53e05e..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.20.5-R0.1-SNAPSHOT</version>
+-    <version>1.20.6-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
diff --git a/patches/api/0056-Fix-upstream-javadocs.patch b/patches/api/0056-Fix-upstream-javadocs.patch
index 1aa0e45854..e671e3d8da 100644
--- a/patches/api/0056-Fix-upstream-javadocs.patch
+++ b/patches/api/0056-Fix-upstream-javadocs.patch
@@ -600,16 +600,15 @@ index a0f6f1af304190b4c5db4b284d460f625eeb7801..7e21548cac8515c281ec86853e9272ab
   * The Block is already broken as this event is called, so #getBlock() will be
   * AIR in most cases. Use #getBlockState() for more Information about the broken
 diff --git a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
-index 44f7f6939a27b9a0a796d91eac4b7c97ec90a643..641c71ab66bd2499b35cf3c1d533fd105d096e10 100644
+index e534954457a9961a26dbec7ac035bec07e1d6694..8309b030c2120f1496d244f3ebc1094def41c869 100644
 --- a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
 +++ b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
-@@ -7,7 +7,9 @@ import org.bukkit.event.HandlerList;
- import org.jetbrains.annotations.NotNull;
- 
- /**
-- * Called when a block explodes
-+ * Called when a block explodes interacting with blocks. The
-+ * event isn't called if the {@link org.bukkit.GameRule#MOB_GRIEFING}
+@@ -13,6 +13,9 @@ import org.jetbrains.annotations.NotNull;
+  * Note that due to the nature of explosions, {@link #getBlock()} will always be
+  * an air block. {@link #getExplodedBlockState()} should be used to get
+  * information about the block state that exploded.
++ * <p>
++ * The event isn't called if the {@link org.bukkit.GameRule#MOB_GRIEFING}
 + * is disabled as no block interaction will occur.
   */
  public class BlockExplodeEvent extends BlockEvent implements Cancellable {
diff --git a/patches/api/0394-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/api/0394-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index de7e84ef8b..f81be68815 100644
--- a/patches/api/0394-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/api/0394-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
@@ -6,64 +6,35 @@ Subject: [PATCH] Add exploded block state to BlockExplodeEvent and
 
 
 diff --git a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
-index 641c71ab66bd2499b35cf3c1d533fd105d096e10..7dcbb75170296c1dd1d784a032bf369602328b29 100644
+index 8309b030c2120f1496d244f3ebc1094def41c869..b8bc5718dc1325f0b9d413851c486d91603c3ab4 100644
 --- a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
 +++ b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
-@@ -10,18 +10,31 @@ import org.jetbrains.annotations.NotNull;
-  * Called when a block explodes interacting with blocks. The
-  * event isn't called if the {@link org.bukkit.GameRule#MOB_GRIEFING}
-  * is disabled as no block interaction will occur.
-+ * <p>
-+ * The {@link Block} returned by this event is not necessarily
-+ * the block that caused the explosion, just the block at the location where
-+ * the explosion originated. See {@link #getExplodedBlockState()}
+@@ -13,9 +13,6 @@ import org.jetbrains.annotations.NotNull;
+  * Note that due to the nature of explosions, {@link #getBlock()} will always be
+  * an air block. {@link #getExplodedBlockState()} should be used to get
+  * information about the block state that exploded.
+- * <p>
+- * The event isn't called if the {@link org.bukkit.GameRule#MOB_GRIEFING}
+- * is disabled as no block interaction will occur.
   */
  public class BlockExplodeEvent extends BlockEvent implements Cancellable {
      private static final HandlerList handlers = new HandlerList();
-     private boolean cancel;
-     private final List<Block> blocks;
-     private float yield;
-+    private final org.bukkit.block.BlockState explodedBlockState; // Paper
- 
-+    @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper
-     public BlockExplodeEvent(@NotNull final Block what, @NotNull final List<Block> blocks, final float yield) {
-+        // Paper start
-+        this(what, blocks, yield, null);
-+    }
-+    @org.jetbrains.annotations.ApiStatus.Internal
-+    public BlockExplodeEvent(@NotNull final Block what, @NotNull final List<Block> blocks, final float yield, @org.jetbrains.annotations.Nullable org.bukkit.block.BlockState explodedBlockState) {
-+        // Paper end
-         super(what);
-         this.blocks = blocks;
-         this.yield = yield;
+@@ -32,6 +29,15 @@ public class BlockExplodeEvent extends BlockEvent implements Cancellable {
          this.cancel = false;
-+        this.explodedBlockState = explodedBlockState; // Paper
-     }
- 
-     @Override
-@@ -34,6 +47,22 @@ public class BlockExplodeEvent extends BlockEvent implements Cancellable {
-         this.cancel = cancel;
      }
  
 +    // Paper start
-+    /**
-+     * Get a capture of the block that directly caused
-+     * the explosion, like a bed or respawn anchor. This
-+     * block state is not placed so {@link org.bukkit.block.BlockState#isPlaced}
-+     * will be false.
-+     * <p>
-+     * Can be null if no block directly caused the explosion.
-+     *
-+     * @return the exploded block state or null if not applicable
-+     */
-+    public @org.jetbrains.annotations.Nullable org.bukkit.block.BlockState getExplodedBlockState() {
-+        return this.explodedBlockState;
++    @io.papermc.paper.annotation.DoNotUse
++    @Deprecated(forRemoval = true)
++    public BlockExplodeEvent(@NotNull final Block what, @NotNull final List<Block> blocks, final float yield, @org.jetbrains.annotations.Nullable org.bukkit.block.BlockState explodedBlockState) {
++        this(what, explodedBlockState != null ? explodedBlockState : what.getState(), blocks, yield);
 +    }
 +    // Paper end
 +
-     /**
-      * Returns the list of blocks that would have been removed or were removed
-      * from the explosion event.
++    @io.papermc.paper.annotation.DoNotUse // Paper
+     @Deprecated(forRemoval = true)
+     public BlockExplodeEvent(@NotNull final Block what, @NotNull final List<Block> blocks, final float yield) {
+         this(what, what.getState(), blocks, yield);
 diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
 index 467a0d6cabc5e860628be3b1e62de773efde5d2e..1fb15e2ade8ff3c4d662eca87b078b4577f786e1 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch
index 0305c825b8..6b5a62cd37 100644
--- a/patches/server/0001-Setup-Gradle-project.patch
+++ b/patches/server/0001-Setup-Gradle-project.patch
@@ -160,7 +160,7 @@ index 0000000000000000000000000000000000000000..a457cf30d37037ce09fbe5d26e051b95
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 37928a37028bb7ee4843d42f256675e000823774..0000000000000000000000000000000000000000
+index 4fabd6c37587aa6a9af11566d64c6b49f5bfadaa..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
 @@ -1,604 +0,0 @@
@@ -170,7 +170,7 @@ index 37928a37028bb7ee4843d42f256675e000823774..00000000000000000000000000000000
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.20.5-R0.1-SNAPSHOT</version>
+-    <version>1.20.6-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -
diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch
index eb822ff0c4..57c76efb81 100644
--- a/patches/server/0009-MC-Utils.patch
+++ b/patches/server/0009-MC-Utils.patch
@@ -7111,7 +7111,7 @@ index f73604d762efbac400d40f536ec1782fca584efa..4701bf9ee203f2f15b0b68e84bbfa2c4
          super(type, world);
          this.xpReward = 5;
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index a5d1cd1966ad85ad0a241bee9caa8fd7b7424017..2b8b220bf1e132b230abe14770da53de84db9818 100644
+index 7442e2b880f6410d3ca57a563f3ad77158a4c8ba..bf19e8e8aa96d646f057b8727f2f01ad2e2497cd 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -952,6 +952,25 @@ public final class ItemStack implements DataComponentHolder {
@@ -8131,7 +8131,7 @@ index 0000000000000000000000000000000000000000..909b2c98e7a9117d2f737245e4661792
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 2ee0f83f18477fe2c759dc1ccc5ee18dbe791527..38d72d95b1f3ab23710f3335177c59ea6a25270e 100644
+index cbbb404a6966fc72d17d0ec735d08c1be52b2d4f..3f91fce6df9b87a6e84df21ed04f25be3729814b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -105,8 +105,17 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index 3ba9b0bbf2..a93bef8177 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -3255,7 +3255,7 @@ index ed54c81a3269360acce674aa4e1d54ccb2461841..c9c849534c3998cfcab7ddcb12a71ccb
      }
  
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 2b8b220bf1e132b230abe14770da53de84db9818..96da768f55ad835a1a55bf359f0d7278bc232304 100644
+index bf19e8e8aa96d646f057b8727f2f01ad2e2497cd..d6b02a946bd18ea71278a5026468ec49fabd3a3b 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -186,7 +186,15 @@ public final class ItemStack implements DataComponentHolder {
@@ -5141,10 +5141,10 @@ index 9c57b883783145ad4483481a2c2e7f0f188cd174..b653c2c80e8e8524ea6d7625c6a86f82
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 7a5110efc5af1be6644b7afecd6ac025c20e6794..b79f29ccd512ec7d2a8f6a885c1a96dfd58e7dc5 100644
+index 64c039bd3b248bd508a2c298032fa9f984b37694..9a22459f15cff45a234c1d497aca27a5433570f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -843,6 +843,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -850,6 +850,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          return !(this.hasDisplayName() || this.hasItemName() || this.hasLocalizedName() || this.hasEnchants() || (this.lore != null) || this.hasCustomModelData() || this.hasBlockData() || this.hasRepairCost() || !this.unhandledTags.build().isEmpty() || !this.persistentDataContainer.isEmpty() || this.hideFlag != 0 || this.isHideTooltip() || this.isUnbreakable() || this.hasEnchantmentGlintOverride() || this.isFireResistant() || this.hasMaxStackSize() || this.hasRarity() || this.hasFood() || this.hasDamage() || this.hasMaxDamage() || this.hasAttributeModifiers() || this.customTag != null);
      }
  
@@ -5163,7 +5163,7 @@ index 7a5110efc5af1be6644b7afecd6ac025c20e6794..b79f29ccd512ec7d2a8f6a885c1a96df
      @Override
      public String getDisplayName() {
          return CraftChatMessage.fromComponent(this.displayName);
-@@ -873,6 +885,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -880,6 +892,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          return this.itemName != null;
      }
  
@@ -5182,7 +5182,7 @@ index 7a5110efc5af1be6644b7afecd6ac025c20e6794..b79f29ccd512ec7d2a8f6a885c1a96df
      @Override
      public String getLocalizedName() {
          return this.getDisplayName();
-@@ -892,6 +916,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -899,6 +923,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          return this.lore != null && !this.lore.isEmpty();
      }
  
@@ -5565,7 +5565,7 @@ index b963d471b33cacaeec385dba6b2bf369e3d4426f..51094fe6e37d3c0fad2682353f8de3d1
  
          boolean hadFormat = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 38d72d95b1f3ab23710f3335177c59ea6a25270e..da97b4e91b7952f1459e59c74447a659842990bc 100644
+index 3f91fce6df9b87a6e84df21ed04f25be3729814b..e57ba8af99f0ac0151ec1d4c4279393ace6826e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -76,6 +76,43 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch
index 1e2b0376b9..13b4a47b8f 100644
--- a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -216,7 +216,7 @@ index 0000000000000000000000000000000000000000..8f07539a82f449ad217e316a7513a170
 +
 +}
 diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-index cb9f8567ba6aae41a6cde519ac0cff0169a7cea7..333d6d82584fb3bf4e0fce7b03bc2d9c4094deb9 100644
+index fc6e13e4f2408ccbfa645eae2d7ebf4dcfc21908..badd85a92f38caae257181f67a322fc79599d1ce 100644
 --- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 +++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 @@ -31,6 +31,7 @@ import net.kyori.adventure.text.flattener.ComponentFlattener;
diff --git a/patches/server/0019-Paper-Plugins.patch b/patches/server/0019-Paper-Plugins.patch
index cd028c0ffb..7a19309b99 100644
--- a/patches/server/0019-Paper-Plugins.patch
+++ b/patches/server/0019-Paper-Plugins.patch
@@ -7326,7 +7326,7 @@ index 909b2c98e7a9117d2f737245e4661792ffafb744..d96399e9bf1a58db5a4a22e58abb99e7
      @Override
      public FileConfiguration getConfig() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index da97b4e91b7952f1459e59c74447a659842990bc..fb8d14a2bdaaa25a2237fa4161388439ea8cfc0f 100644
+index e57ba8af99f0ac0151ec1d4c4279393ace6826e4..c8c66f78335868100adbb4d044037168872d5f94 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -421,6 +421,16 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0020-Plugin-remapping.patch b/patches/server/0020-Plugin-remapping.patch
index 2f0aa23fa7..1306de91cd 100644
--- a/patches/server/0020-Plugin-remapping.patch
+++ b/patches/server/0020-Plugin-remapping.patch
@@ -1916,7 +1916,7 @@ index 45160b93a24dc74f6368441e2a4fe659ceaf5bf5..6573e72d041714ccc2bf0e3c8734bc21
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index fb8d14a2bdaaa25a2237fa4161388439ea8cfc0f..fdeec67b7f71700f88714b8ad734a5525fb119fd 100644
+index c8c66f78335868100adbb4d044037168872d5f94..96f0c447354d8081c614e466b0c17bfdb43c6fe7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -72,6 +72,7 @@ import org.bukkit.potion.PotionType;
diff --git a/patches/server/0023-Timings-v2.patch b/patches/server/0023-Timings-v2.patch
index 95b3510486..79cf655baa 100644
--- a/patches/server/0023-Timings-v2.patch
+++ b/patches/server/0023-Timings-v2.patch
@@ -1527,10 +1527,10 @@ index 991ebf07bc0608df0a12f1f26e581cc93255ae01..946001c57c326f2d2f0677bca954e855
      private String descriptionId;
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index 09ae9c3398e77ee575636a4ebe9e31b447c9fb8e..6eef8da8ead8a044aac757693d719ceea431515e 100644
+index 099f85ec8b427392947e815e0b85d7ec49369bc3..fb495fcbf42be3825bfb785a9887148c54f5b00b 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -33,10 +33,12 @@ import org.bukkit.inventory.InventoryHolder;
+@@ -34,10 +34,12 @@ import org.bukkit.inventory.InventoryHolder;
  // CraftBukkit end
  
  import org.spigotmc.CustomTimingsHandler; // Spigot
@@ -2005,7 +2005,7 @@ index f97eccb6a17c7876e1e002d798eb67bbe80571a0..76effc345d362047e64d064eb64a5222
 +    } // Paper
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index fdeec67b7f71700f88714b8ad734a5525fb119fd..9ae089c6dbb1cc919b005fd9672a690f89ca2b42 100644
+index 96f0c447354d8081c614e466b0c17bfdb43c6fe7..71a3a506f92b6881602b2e77a9b5ecfb6930cb2a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -213,6 +213,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0027-Support-components-in-ItemMeta.patch b/patches/server/0027-Support-components-in-ItemMeta.patch
index 8164a26fa7..c99655cebc 100644
--- a/patches/server/0027-Support-components-in-ItemMeta.patch
+++ b/patches/server/0027-Support-components-in-ItemMeta.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Support components in ItemMeta
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 780b7e971a9d4fda1a9c78790c7969a0799f51ab..e663c996146986bc02efb05b4fb452913e4015d7 100644
+index 9a22459f15cff45a234c1d497aca27a5433570f7..9c139f25eaef3c1b93fbf254cb08c6a449288ec8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -860,11 +860,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -867,11 +867,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          return CraftChatMessage.fromComponent(this.displayName);
      }
  
@@ -32,7 +32,7 @@ index 780b7e971a9d4fda1a9c78790c7969a0799f51ab..e663c996146986bc02efb05b4fb45291
      @Override
      public boolean hasDisplayName() {
          return this.displayName != null;
-@@ -1038,6 +1050,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1045,6 +1057,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          return this.lore == null ? null : new ArrayList<String>(Lists.transform(this.lore, CraftChatMessage::fromComponent));
      }
  
@@ -47,7 +47,7 @@ index 780b7e971a9d4fda1a9c78790c7969a0799f51ab..e663c996146986bc02efb05b4fb45291
      @Override
      public void setLore(List<String> lore) {
          if (lore == null || lore.isEmpty()) {
-@@ -1052,6 +1072,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1059,6 +1079,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
      }
  
@@ -69,7 +69,7 @@ index 780b7e971a9d4fda1a9c78790c7969a0799f51ab..e663c996146986bc02efb05b4fb45291
      @Override
      public boolean hasCustomModelData() {
          return this.customModelData != null;
-@@ -1675,6 +1710,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1682,6 +1717,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
  
          for (Object object : addFrom) {
diff --git a/patches/server/0035-Implement-Paper-VersionChecker.patch b/patches/server/0035-Implement-Paper-VersionChecker.patch
index 484e0425d5..60bbc34484 100644
--- a/patches/server/0035-Implement-Paper-VersionChecker.patch
+++ b/patches/server/0035-Implement-Paper-VersionChecker.patch
@@ -140,7 +140,7 @@ index 0000000000000000000000000000000000000000..22a55be34fde453fedd987173d95b8b3
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 9ae089c6dbb1cc919b005fd9672a690f89ca2b42..2f21520106aa848a9108937474570a8c4e723cfb 100644
+index 71a3a506f92b6881602b2e77a9b5ecfb6930cb2a..2c1df47a3ef416b63ac26d7eb33fc85f5b760d23 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -474,6 +474,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0037-Player-affects-spawning-API.patch b/patches/server/0037-Player-affects-spawning-API.patch
index 63452c1938..5c8acbaed6 100644
--- a/patches/server/0037-Player-affects-spawning-API.patch
+++ b/patches/server/0037-Player-affects-spawning-API.patch
@@ -73,7 +73,7 @@ index 8256af275e468a5aa506f0af22428f4082204956..c71d4f91df7ec1cf26888b00fac444bc
                              entityzombie.finalizeSpawn(worldserver, this.level().getCurrentDifficultyAt(entityzombie.blockPosition()), MobSpawnType.REINFORCEMENT, (SpawnGroupData) null);
                              worldserver.addFreshEntityWithPassengers(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index da52fdde1a17c230b4da2c58708fa69ebcf13431..81db0e4e4bced556d35978a10c9d9789ec527830 100644
+index 7a95aff16a973b7b7d00e8409a252d4a2f6c41bf..a1c5e5913430404838205bc4a04b2afcff9d9046 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -193,6 +193,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0040-Prevent-block-entity-and-entity-crashes.patch b/patches/server/0040-Prevent-block-entity-and-entity-crashes.patch
index ada6a4d53e..1b4eff07fa 100644
--- a/patches/server/0040-Prevent-block-entity-and-entity-crashes.patch
+++ b/patches/server/0040-Prevent-block-entity-and-entity-crashes.patch
@@ -26,10 +26,10 @@ index 5f881af95bd5ee94daadfd9e5d64ee6d411255c4..472df81e4aef21e0cf2684a9e04d6ce1
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index 6eef8da8ead8a044aac757693d719ceea431515e..0883e1755eae316faaeae8bf95763a0f80313c5a 100644
+index fb495fcbf42be3825bfb785a9887148c54f5b00b..8d281ce2a0e44b97957cea2992e273abc86bd157 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -262,7 +262,12 @@ public abstract class BlockEntity {
+@@ -263,7 +263,12 @@ public abstract class BlockEntity {
              return s + " // " + this.getClass().getCanonicalName();
          });
          if (this.level != null) {
diff --git a/patches/server/0045-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/server/0045-Fix-lag-from-explosions-processing-dead-entities.patch
index 7dd0adcea0..390dc10580 100644
--- a/patches/server/0045-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/patches/server/0045-Fix-lag-from-explosions-processing-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix lag from explosions processing dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 73cc11cf4732ede545e924d07480cae14c3ef226..8307c3e77ddc80a02f420503d67ae06fb973dc09 100644
+index 296de8e9ae1284d4805932e746291d1148f7f8eb..b8b142f573b297ba72d45be3ae4c2729f3cffe1e 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -226,7 +226,7 @@ public class Explosion {
diff --git a/patches/server/0046-Optimize-explosions.patch b/patches/server/0046-Optimize-explosions.patch
index 09b16b2e38..50bb8f8a47 100644
--- a/patches/server/0046-Optimize-explosions.patch
+++ b/patches/server/0046-Optimize-explosions.patch
@@ -22,7 +22,7 @@ index fcb2d06f088a938b5bb76e6b42581d8f292d2eaf..231fba80a25601cdfba4f6f44ac7c288
  
          this.profiler.popPush("connection");
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 8307c3e77ddc80a02f420503d67ae06fb973dc09..c769da15f1d0bdbd2bce412aa9fae6d10d1177f7 100644
+index b8b142f573b297ba72d45be3ae4c2729f3cffe1e..157eac2a0a92f13ec191ee07774bdb3680e7e5b5 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -278,7 +278,7 @@ public class Explosion {
@@ -34,7 +34,7 @@ index 8307c3e77ddc80a02f420503d67ae06fb973dc09..c769da15f1d0bdbd2bce412aa9fae6d1
                          double d13;
  
                          if (entity instanceof LivingEntity) {
-@@ -532,4 +532,84 @@ public class Explosion {
+@@ -534,4 +534,84 @@ public class Explosion {
  
          private BlockInteraction() {}
      }
diff --git a/patches/server/0047-Disable-explosion-knockback.patch b/patches/server/0047-Disable-explosion-knockback.patch
index 5f8f4d41c0..aef7f59ef6 100644
--- a/patches/server/0047-Disable-explosion-knockback.patch
+++ b/patches/server/0047-Disable-explosion-knockback.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable explosion knockback
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index c769da15f1d0bdbd2bce412aa9fae6d10d1177f7..94f72ff58ac5206878a81e89d32e81c17b1bd1fb 100644
+index 157eac2a0a92f13ec191ee07774bdb3680e7e5b5..754ca46d11dfe0495aa3109b68b1032e6d7d76e9 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -284,7 +284,7 @@ public class Explosion {
diff --git a/patches/server/0052-Add-BeaconEffectEvent.patch b/patches/server/0052-Add-BeaconEffectEvent.patch
index 4273bf29eb..52b61d4284 100644
--- a/patches/server/0052-Add-BeaconEffectEvent.patch
+++ b/patches/server/0052-Add-BeaconEffectEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add BeaconEffectEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index c731730abe50c521e5ce22b5fd8844ea1caed7ac..d3ef3d9a67bc54a4c82a39718f01201201dfc44c 100644
+index 2508e06ef33a4c219b330aec7d5311c5702b8e1b..cf48d4531821c2b1b031a63c8f007aa7d3fbef1d 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0074-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0074-Handle-Item-Meta-Inconsistencies.patch
index 17f9ccc1d9..69c778fc16 100644
--- a/patches/server/0074-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/server/0074-Handle-Item-Meta-Inconsistencies.patch
@@ -150,7 +150,7 @@ index b6521462d193bff83ace1dc694c6d957a7173969..d302767e8f01fdfcba9c22e2e35677af
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.world.item.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index e663c996146986bc02efb05b4fb452913e4015d7..954aa31f5890deacbf2004aed8722360a87da7f1 100644
+index 9c139f25eaef3c1b93fbf254cb08c6a449288ec8..0c385b713234a74ceba802f67f74e4ecab93e269 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableList;
@@ -195,7 +195,7 @@ index e663c996146986bc02efb05b4fb452913e4015d7..954aa31f5890deacbf2004aed8722360
          }
  
          if (meta.hasAttributeModifiers()) {
-@@ -385,8 +388,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -391,8 +394,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
      }
  
@@ -206,7 +206,7 @@ index e663c996146986bc02efb05b4fb452913e4015d7..954aa31f5890deacbf2004aed8722360
  
          tag.entrySet().forEach((entry) -> {
              Holder<net.minecraft.world.item.enchantment.Enchantment> id = entry.getKey();
-@@ -640,13 +643,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -646,13 +649,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          return modifiers;
      }
  
@@ -222,7 +222,7 @@ index e663c996146986bc02efb05b4fb452913e4015d7..954aa31f5890deacbf2004aed8722360
          for (Map.Entry<?, ?> entry : ench.entrySet()) {
              // Doctor older enchants
              String enchantKey = entry.getKey().toString();
-@@ -963,14 +966,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -970,14 +973,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
      @Override
      public Map<Enchantment, Integer> getEnchants() {
@@ -239,7 +239,7 @@ index e663c996146986bc02efb05b4fb452913e4015d7..954aa31f5890deacbf2004aed8722360
          }
  
          if (ignoreRestrictions || level >= ench.getStartLevel() && level <= ench.getMaxLevel()) {
-@@ -1506,7 +1509,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1513,7 +1516,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              clone.customModelData = this.customModelData;
              clone.blockData = this.blockData;
              if (this.enchantments != null) {
@@ -248,7 +248,7 @@ index e663c996146986bc02efb05b4fb452913e4015d7..954aa31f5890deacbf2004aed8722360
              }
              if (this.hasAttributeModifiers()) {
                  clone.attributeModifiers = LinkedHashMultimap.create(this.attributeModifiers);
-@@ -1826,4 +1829,22 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1833,4 +1836,22 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
          return (result != null) ? result : Optional.empty();
      }
diff --git a/patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 26653206d0..869abf5e86 100644
--- a/patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -32,7 +32,7 @@ index 31ccca2a4e94cb1b3f43de38907634f7e6e18aa5..385dd65af8b526d128ac4c99cecdb69a
              case RELEASE_SHIFT_KEY:
                  this.player.setShiftKeyDown(false);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 81db0e4e4bced556d35978a10c9d9789ec527830..4ac2d47df8e805b4f895951e839a0af8df7127cc 100644
+index a1c5e5913430404838205bc4a04b2afcff9d9046..0654cca68acefccec82cc138acba30515a336cfb 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -588,6 +588,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0142-Shoulder-Entities-Release-API.patch b/patches/server/0142-Shoulder-Entities-Release-API.patch
index 5cffe32839..9db14c66fd 100644
--- a/patches/server/0142-Shoulder-Entities-Release-API.patch
+++ b/patches/server/0142-Shoulder-Entities-Release-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 4ac2d47df8e805b4f895951e839a0af8df7127cc..e292c1ab45d2618c4e852875107ec1819dba85c4 100644
+index 0654cca68acefccec82cc138acba30515a336cfb..e81acc5c982cd14bc8a3aa5bf06e9636179b8555 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1982,20 +1982,45 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 7d1fe2ef5f..cb530598f0 100644
--- a/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index e292c1ab45d2618c4e852875107ec1819dba85c4..259ec0dea938758f43560b1ed7f46c1042984774 100644
+index e81acc5c982cd14bc8a3aa5bf06e9636179b8555..c1c0df2f4cf032a004568ab0e8f21db91e9dc705 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1243,7 +1243,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch
index 2ca3917af8..7a3041007e 100644
--- a/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -13,10 +13,10 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
 If Tile Entity was null, correct Sign to return empty lines instead of null
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index 0883e1755eae316faaeae8bf95763a0f80313c5a..90b218ebc947a1d8a8c7dfc677fe145b6386654a 100644
+index 8d281ce2a0e44b97957cea2992e273abc86bd157..d22cc83725cee3df20bb6f99de23aceb62923eef 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -57,6 +57,7 @@ public abstract class BlockEntity {
+@@ -58,6 +58,7 @@ public abstract class BlockEntity {
          this.type = type;
          this.worldPosition = pos.immutable();
          this.blockState = state;
@@ -24,7 +24,7 @@ index 0883e1755eae316faaeae8bf95763a0f80313c5a..90b218ebc947a1d8a8c7dfc677fe145b
      }
  
      public static BlockPos getPosFromTag(CompoundTag nbt) {
-@@ -78,7 +79,7 @@ public abstract class BlockEntity {
+@@ -79,7 +80,7 @@ public abstract class BlockEntity {
  
      // CraftBukkit start - read container
      protected void loadAdditional(CompoundTag nbt, HolderLookup.Provider registryLookup) {
@@ -33,7 +33,7 @@ index 0883e1755eae316faaeae8bf95763a0f80313c5a..90b218ebc947a1d8a8c7dfc677fe145b
  
          net.minecraft.nbt.Tag persistentDataTag = nbt.get("PublicBukkitValues");
          if (persistentDataTag instanceof CompoundTag) {
-@@ -342,8 +343,15 @@ public abstract class BlockEntity {
+@@ -353,8 +354,15 @@ public abstract class BlockEntity {
  
      // CraftBukkit start - add method
      public InventoryHolder getOwner() {
diff --git a/patches/server/0176-Toggleable-player-crits.patch b/patches/server/0176-Toggleable-player-crits.patch
index 5f23bbc174..df29b0135d 100644
--- a/patches/server/0176-Toggleable-player-crits.patch
+++ b/patches/server/0176-Toggleable-player-crits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggleable player crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 259ec0dea938758f43560b1ed7f46c1042984774..fecb622cb33fd75b87b055fb40f127cda6a22a7d 100644
+index c1c0df2f4cf032a004568ab0e8f21db91e9dc705..715a66018afa8d67f6e078e1157886390a2ad5dd 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1251,6 +1251,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0187-Configurable-sprint-interruption-on-attack.patch b/patches/server/0187-Configurable-sprint-interruption-on-attack.patch
index 19fef02dc1..1b98985534 100644
--- a/patches/server/0187-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/server/0187-Configurable-sprint-interruption-on-attack.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index fecb622cb33fd75b87b055fb40f127cda6a22a7d..0fa9cb53706482f5ea385ce4355273b67911b23a 100644
+index 715a66018afa8d67f6e078e1157886390a2ad5dd..c7865bb6fa7fbeee365a70a4858b0addb36d4165 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1299,8 +1299,12 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0205-PlayerReadyArrowEvent.patch b/patches/server/0205-PlayerReadyArrowEvent.patch
index 5675770a19..875fc3aa58 100644
--- a/patches/server/0205-PlayerReadyArrowEvent.patch
+++ b/patches/server/0205-PlayerReadyArrowEvent.patch
@@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0fa9cb53706482f5ea385ce4355273b67911b23a..705a756522473681516d60946ddd917647650bd4 100644
+index c7865bb6fa7fbeee365a70a4858b0addb36d4165..338903091e43b71baa46157a95629c2e6b27b992 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -2219,18 +2219,29 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch b/patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
index 424865e8cf..16837a9f75 100644
--- a/patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
+++ b/patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
@@ -179,7 +179,7 @@ index 38c27b4aa37e8b046e3eccdde3f527eb555da6f8..05dee42941a842bf4bba9480a2c04a14
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 705a756522473681516d60946ddd917647650bd4..4e1c032c7cdca81021c280a15db89e63a90ffe42 100644
+index 338903091e43b71baa46157a95629c2e6b27b992..0efd7b3d748d90b3359560aa717a017092ae0e47 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1295,7 +1295,7 @@ public abstract class Player extends LivingEntity {
@@ -218,7 +218,7 @@ index 9f9b7373c9a714597858ddcd8932e31b902cf5a1..f7f26d595072372004143c4e26506ed5
      public abstract void explode();
  
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 94f72ff58ac5206878a81e89d32e81c17b1bd1fb..b5b29210d9a6125d98e7dd737ca25f40545e512b 100644
+index 754ca46d11dfe0495aa3109b68b1032e6d7d76e9..4c7795e1ba7bb3135fcf5bab1c8aa857b8e7417b 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -303,6 +303,16 @@ public class Explosion {
diff --git a/patches/server/0212-InventoryCloseEvent-Reason-API.patch b/patches/server/0212-InventoryCloseEvent-Reason-API.patch
index a1467b88e7..78d2e875de 100644
--- a/patches/server/0212-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0212-InventoryCloseEvent-Reason-API.patch
@@ -109,7 +109,7 @@ index d25c762e449e2bce20487454ad52363b35b9af96..3273c3f06c142d4e3c947ca846459f4a
  
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : io.papermc.paper.adventure.PaperAdventure.asAdventure(entityplayer.getDisplayName()))); // Paper - Adventure
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 4e1c032c7cdca81021c280a15db89e63a90ffe42..9cc9c6f7e211d9cf42a050f3a265d0bceaf7fd40 100644
+index 0efd7b3d748d90b3359560aa717a017092ae0e47..b27a6719edd47f7ecb3f8c5560a36fc201efea36 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -277,7 +277,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0229-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0229-Remove-unnecessary-itemmeta-handling.patch
index ad3868499a..bf8b2dfd3b 100644
--- a/patches/server/0229-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/server/0229-Remove-unnecessary-itemmeta-handling.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove unnecessary itemmeta handling
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 96da768f55ad835a1a55bf359f0d7278bc232304..fb345894fec5e81d3c35af9812927220a7d56cd1 100644
+index d6b02a946bd18ea71278a5026468ec49fabd3a3b..6dd441484dbae1818a927773a6e6c663c70ccd0e 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -168,7 +168,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0248-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0248-Allow-chests-to-be-placed-with-NBT-data.patch
index 68138d557c..1a3e71696c 100644
--- a/patches/server/0248-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/server/0248-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index fb345894fec5e81d3c35af9812927220a7d56cd1..bf3785e3b347ebc1ce1e044c9db1a9d23c80f880 100644
+index 6dd441484dbae1818a927773a6e6c663c70ccd0e..91f342912372326a6ced16c23550da7727d6d3ad 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -469,6 +469,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0259-Catch-JsonParseException-in-entity-and-block-entity-.patch b/patches/server/0259-Catch-JsonParseException-in-entity-and-block-entity-.patch
deleted file mode 100644
index f96f0429bc..0000000000
--- a/patches/server/0259-Catch-JsonParseException-in-entity-and-block-entity-.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <[email protected]>
-Date: Sat, 22 Sep 2018 15:56:59 -0400
-Subject: [PATCH] Catch JsonParseException in entity and block entity names
-
-As a result, data that no longer parses correctly will not crash the server
-instead just logging the exception and continuing (and in most cases should
-fix the data)
-
-Player data is fixed pretty much immediately but some block data (like
-Shulkers) may need to be changed in order for it to re-save properly
-
-No more crashing though.
-
-diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index c95a0af32178fe24448a5ae7a229c86ec883e8de..5c401c7e30ed5f6f32b1ad6523537aa46173cff5 100644
---- a/src/main/java/io/papermc/paper/util/MCUtil.java
-+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -558,4 +558,19 @@ public final class MCUtil {
- 
-         return builder.build();
-     }
-+
-+    @Nullable
-+    public static net.minecraft.network.chat.Component getBaseComponentFromNbt(final String key, final net.minecraft.nbt.CompoundTag compound, final net.minecraft.core.HolderLookup.Provider lookupProvider) {
-+        if (!compound.contains(key)) {
-+            return null;
-+        }
-+        final String string = compound.getString(key);
-+        try {
-+            return net.minecraft.network.chat.Component.Serializer.fromJson(string, lookupProvider);
-+        } catch (com.google.gson.JsonParseException e) {
-+            org.bukkit.Bukkit.getLogger().warning("Unable to parse " + key + " from " + compound +": " + e.getMessage());
-+        }
-+
-+        return null;
-+    }
- }
-diff --git a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
-index 626e4fe03dea008907823b49f0dd936bbf7e4e04..2d0eac7a8aa94ed6c4ec024bc6024440cbeac702 100644
---- a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
-+++ b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
-@@ -75,7 +75,7 @@ public abstract class BaseCommandBlock implements CommandSource {
-         this.command = nbt.getString("Command");
-         this.successCount = nbt.getInt("SuccessCount");
-         if (nbt.contains("CustomName", 8)) {
--            this.setCustomName(Component.Serializer.fromJson(nbt.getString("CustomName"), registries));
-+            this.setCustomName(io.papermc.paper.util.MCUtil.getBaseComponentFromNbt("CustomName", nbt, registries)); // Paper - Catch ParseException
-         } else {
-             this.setCustomName((Component) null);
-         }
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java
-index df4cd333ecd5c90e910df0c7c5ab5aa44c182903..2656e06ab2269141a13011eaa906f601887ca3e2 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java
-@@ -77,7 +77,7 @@ public class BannerBlockEntity extends BlockEntity implements Nameable {
-     protected void loadAdditional(CompoundTag nbt, HolderLookup.Provider registryLookup) {
-         super.loadAdditional(nbt, registryLookup);
-         if (nbt.contains("CustomName", 8)) {
--            this.name = Component.Serializer.fromJson(nbt.getString("CustomName"), registryLookup);
-+            this.name = io.papermc.paper.util.MCUtil.getBaseComponentFromNbt("CustomName", nbt, registryLookup); // Paper - Catch ParseException
-         }
- 
-         if (nbt.contains("patterns")) {
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
-index ee3b370b6b36914146db33a3211b6bbd2f8f16b7..ff3f26c31bd11b48f48e354ea6b33aa55dcbff5d 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
-@@ -39,7 +39,7 @@ public abstract class BaseContainerBlockEntity extends BlockEntity implements Co
-         super.loadAdditional(nbt, registryLookup);
-         this.lockKey = LockCode.fromTag(nbt);
-         if (nbt.contains("CustomName", 8)) {
--            this.name = Component.Serializer.fromJson(nbt.getString("CustomName"), registryLookup);
-+            this.name = io.papermc.paper.util.MCUtil.getBaseComponentFromNbt("CustomName", nbt, registryLookup); // Paper - Catch ParseException
-         }
- 
-     }
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index d3ef3d9a67bc54a4c82a39718f01201201dfc44c..18450017bc3df2f0b1a5715e6021e8e5defa24a1 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-@@ -391,7 +391,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
-         this.secondaryPower = BeaconBlockEntity.loadEffect(nbt, "secondary_effect");
-         this.levels = nbt.getInt("Levels"); // CraftBukkit - SPIGOT-5053, use where available
-         if (nbt.contains("CustomName", 8)) {
--            this.name = Component.Serializer.fromJson(nbt.getString("CustomName"), registryLookup);
-+            this.name = io.papermc.paper.util.MCUtil.getBaseComponentFromNbt("CustomName", nbt, registryLookup); // Paper - Catch ParseException
-         }
- 
-         this.lockKey = LockCode.fromTag(nbt);
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
-index 767994f493fb0a0e4bf097cd7cc178c10e79e937..c3503eaec5c5ece6e27a52fb703d06ec7c767383 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
-@@ -45,7 +45,7 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable
-     protected void loadAdditional(CompoundTag nbt, HolderLookup.Provider registryLookup) {
-         super.loadAdditional(nbt, registryLookup);
-         if (nbt.contains("CustomName", 8)) {
--            this.name = Component.Serializer.fromJson(nbt.getString("CustomName"), registryLookup);
-+            this.name = io.papermc.paper.util.MCUtil.getBaseComponentFromNbt("CustomName", nbt, registryLookup); // Paper - Catch ParseException
-         }
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
-index 81d9a4e6bc1bc4f992ecb77b176daf89d645bbf2..40714cb145822b52cbc991a844486f87e46106d8 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
-@@ -151,7 +151,7 @@ public class SkullBlockEntity extends BlockEntity {
-         }
- 
-         if (nbt.contains("custom_name", 8)) {
--            this.customName = Component.Serializer.fromJson(nbt.getString("custom_name"), registryLookup);
-+            this.customName = io.papermc.paper.util.MCUtil.getBaseComponentFromNbt("custom_name", nbt, registryLookup); // Paper - Catch ParseException
-         } else {
-             this.customName = null;
-         }
diff --git a/patches/server/0260-Turtle-API.patch b/patches/server/0259-Turtle-API.patch
index 4069d4db59..4069d4db59 100644
--- a/patches/server/0260-Turtle-API.patch
+++ b/patches/server/0259-Turtle-API.patch
diff --git a/patches/server/0261-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0260-Call-player-spectator-target-events-and-improve-impl.patch
index d584dd8b7d..d584dd8b7d 100644
--- a/patches/server/0261-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0260-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0262-Add-more-Witch-API.patch b/patches/server/0261-Add-more-Witch-API.patch
index a4d09e1bb4..a4d09e1bb4 100644
--- a/patches/server/0262-Add-more-Witch-API.patch
+++ b/patches/server/0261-Add-more-Witch-API.patch
diff --git a/patches/server/0263-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0262-Check-Drowned-for-Villager-Aggression-Config.patch
index efafeb919c..efafeb919c 100644
--- a/patches/server/0263-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/server/0262-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0263-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 278991d650..278991d650 100644
--- a/patches/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0263-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0265-Reset-players-airTicks-on-respawn.patch b/patches/server/0264-Reset-players-airTicks-on-respawn.patch
index 0754da0a5c..0754da0a5c 100644
--- a/patches/server/0265-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0264-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0266-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0265-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index d871ee76b6..d871ee76b6 100644
--- a/patches/server/0266-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/server/0265-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0266-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 5930ac11e6..5930ac11e6 100644
--- a/patches/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0266-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0268-Optimize-World-Time-Updates.patch b/patches/server/0267-Optimize-World-Time-Updates.patch
index 4b1b035dfe..4b1b035dfe 100644
--- a/patches/server/0268-Optimize-World-Time-Updates.patch
+++ b/patches/server/0267-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0269-Restore-custom-InventoryHolder-support.patch b/patches/server/0268-Restore-custom-InventoryHolder-support.patch
index 99ca50730b..99ca50730b 100644
--- a/patches/server/0269-Restore-custom-InventoryHolder-support.patch
+++ b/patches/server/0268-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0270-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0269-Fix-SpongeAbsortEvent-handling.patch
index be21ac2045..be21ac2045 100644
--- a/patches/server/0270-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/server/0269-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0271-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0270-Don-t-allow-digging-into-unloaded-chunks.patch
index fb98100e18..fb98100e18 100644
--- a/patches/server/0271-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0270-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0272-Make-the-default-permission-message-configurable.patch b/patches/server/0271-Make-the-default-permission-message-configurable.patch
index 98a4c6ccc2..98a4c6ccc2 100644
--- a/patches/server/0272-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0271-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0273-force-entity-dismount-during-teleportation.patch b/patches/server/0272-force-entity-dismount-during-teleportation.patch
index b68fcb14b3..e1f996b5ac 100644
--- a/patches/server/0273-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0272-force-entity-dismount-during-teleportation.patch
@@ -93,7 +93,7 @@ index bac78415e34d41e3a5de482b86185f2202ecf068..a4eee658ecfc0f25e854c17a7715cb16
              this.dismountVehicle(entity);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 9cc9c6f7e211d9cf42a050f3a265d0bceaf7fd40..42911a87a9028a7ba8c3f63f498e4f15bcd07f24 100644
+index b27a6719edd47f7ecb3f8c5560a36fc201efea36..bbafbeff99a7c1bd2d9e27982671a017071f829c 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1150,7 +1150,13 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0274-Add-more-Zombie-API.patch b/patches/server/0273-Add-more-Zombie-API.patch
index 68302fc88c..68302fc88c 100644
--- a/patches/server/0274-Add-more-Zombie-API.patch
+++ b/patches/server/0273-Add-more-Zombie-API.patch
diff --git a/patches/server/0275-Book-Size-Limits.patch b/patches/server/0274-Book-Size-Limits.patch
index 1a377ffc13..1a377ffc13 100644
--- a/patches/server/0275-Book-Size-Limits.patch
+++ b/patches/server/0274-Book-Size-Limits.patch
diff --git a/patches/server/0276-Add-PlayerConnectionCloseEvent.patch b/patches/server/0275-Add-PlayerConnectionCloseEvent.patch
index f9b0532074..f9b0532074 100644
--- a/patches/server/0276-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0275-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0277-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0276-Replace-OfflinePlayer-getLastPlayed.patch
index 0ccff4ef31..0ccff4ef31 100644
--- a/patches/server/0277-Replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0276-Replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0278-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0277-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 8362051b8a..8362051b8a 100644
--- a/patches/server/0278-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0277-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0279-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0278-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
index 7ff0d9c37b..7ff0d9c37b 100644
--- a/patches/server/0279-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
+++ b/patches/server/0278-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
diff --git a/patches/server/0280-BlockDestroyEvent.patch b/patches/server/0279-BlockDestroyEvent.patch
index 726ae64149..726ae64149 100644
--- a/patches/server/0280-BlockDestroyEvent.patch
+++ b/patches/server/0279-BlockDestroyEvent.patch
diff --git a/patches/server/0281-Async-command-map-building.patch b/patches/server/0280-Async-command-map-building.patch
index 7f58d78b88..7f58d78b88 100644
--- a/patches/server/0281-Async-command-map-building.patch
+++ b/patches/server/0280-Async-command-map-building.patch
diff --git a/patches/server/0282-Brigadier-Mojang-API.patch b/patches/server/0281-Brigadier-Mojang-API.patch
index a406a36b20..a406a36b20 100644
--- a/patches/server/0282-Brigadier-Mojang-API.patch
+++ b/patches/server/0281-Brigadier-Mojang-API.patch
diff --git a/patches/server/0283-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0282-Improve-exact-choice-recipe-ingredients.patch
index 99b2e8b822..99b2e8b822 100644
--- a/patches/server/0283-Improve-exact-choice-recipe-ingredients.patch
+++ b/patches/server/0282-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/0284-Limit-Client-Sign-length-more.patch b/patches/server/0283-Limit-Client-Sign-length-more.patch
index 4ebb76bc89..4ebb76bc89 100644
--- a/patches/server/0284-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0283-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0285-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0284-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 17ab7a0e08..17ab7a0e08 100644
--- a/patches/server/0285-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0284-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0286-Entity-getEntitySpawnReason.patch b/patches/server/0285-Entity-getEntitySpawnReason.patch
index 1a57fcb5d4..1a57fcb5d4 100644
--- a/patches/server/0286-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0285-Entity-getEntitySpawnReason.patch
diff --git a/patches/server/0287-Fire-event-on-GS4-query.patch b/patches/server/0286-Fire-event-on-GS4-query.patch
index 6468ff12c1..6468ff12c1 100644
--- a/patches/server/0287-Fire-event-on-GS4-query.patch
+++ b/patches/server/0286-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0288-Add-PlayerPostRespawnEvent.patch b/patches/server/0287-Add-PlayerPostRespawnEvent.patch
index 0b64cfe5fe..0b64cfe5fe 100644
--- a/patches/server/0288-Add-PlayerPostRespawnEvent.patch
+++ b/patches/server/0287-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0289-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0288-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index f94771a112..f94771a112 100644
--- a/patches/server/0289-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0288-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0290-Server-Tick-Events.patch b/patches/server/0289-Server-Tick-Events.patch
index 384e60e5de..384e60e5de 100644
--- a/patches/server/0290-Server-Tick-Events.patch
+++ b/patches/server/0289-Server-Tick-Events.patch
diff --git a/patches/server/0291-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0290-PlayerDeathEvent-getItemsToKeep.patch
index ae34cde5f2..ae34cde5f2 100644
--- a/patches/server/0291-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0290-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0292-Optimize-Captured-BlockEntity-Lookup.patch b/patches/server/0291-Optimize-Captured-BlockEntity-Lookup.patch
index ca3803242c..ca3803242c 100644
--- a/patches/server/0292-Optimize-Captured-BlockEntity-Lookup.patch
+++ b/patches/server/0291-Optimize-Captured-BlockEntity-Lookup.patch
diff --git a/patches/server/0293-Add-Heightmap-API.patch b/patches/server/0292-Add-Heightmap-API.patch
index 6a2bacf567..6a2bacf567 100644
--- a/patches/server/0293-Add-Heightmap-API.patch
+++ b/patches/server/0292-Add-Heightmap-API.patch
diff --git a/patches/server/0294-Mob-Spawner-API-Enhancements.patch b/patches/server/0293-Mob-Spawner-API-Enhancements.patch
index cd16a9d0ca..cd16a9d0ca 100644
--- a/patches/server/0294-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0293-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0295-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0294-Fix-CB-call-to-changed-postToMainThread-method.patch
index b3bb4ebaec..b3bb4ebaec 100644
--- a/patches/server/0295-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0294-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0296-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0295-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 8e45f027aa..8e45f027aa 100644
--- a/patches/server/0296-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/server/0295-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0297-Implement-CraftBlockSoundGroup.patch b/patches/server/0296-Implement-CraftBlockSoundGroup.patch
index 9bf16806b3..9bf16806b3 100644
--- a/patches/server/0297-Implement-CraftBlockSoundGroup.patch
+++ b/patches/server/0296-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0298-Expose-the-internal-current-tick.patch b/patches/server/0297-Expose-the-internal-current-tick.patch
index b1d3de338b..b1d3de338b 100644
--- a/patches/server/0298-Expose-the-internal-current-tick.patch
+++ b/patches/server/0297-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0299-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0298-Show-blockstate-location-if-we-failed-to-read-it.patch
index 05aee9d84e..05aee9d84e 100644
--- a/patches/server/0299-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/server/0298-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0300-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0299-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index cb2e502f71..cb2e502f71 100644
--- a/patches/server/0300-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0299-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0301-Configurable-projectile-relative-velocity.patch b/patches/server/0300-Configurable-projectile-relative-velocity.patch
index c96f031ef6..c96f031ef6 100644
--- a/patches/server/0301-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0300-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0302-offset-item-frame-ticking.patch b/patches/server/0301-offset-item-frame-ticking.patch
index e5be0eb235..e5be0eb235 100644
--- a/patches/server/0302-offset-item-frame-ticking.patch
+++ b/patches/server/0301-offset-item-frame-ticking.patch
diff --git a/patches/server/0303-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0302-Prevent-consuming-the-wrong-itemstack.patch
index 2ff170a3bf..2ff170a3bf 100644
--- a/patches/server/0303-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0302-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0304-Dont-send-unnecessary-sign-update.patch b/patches/server/0303-Dont-send-unnecessary-sign-update.patch
index afca8562db..afca8562db 100644
--- a/patches/server/0304-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0303-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0305-Add-option-to-disable-pillager-patrols.patch b/patches/server/0304-Add-option-to-disable-pillager-patrols.patch
index 3021a1f6c8..3021a1f6c8 100644
--- a/patches/server/0305-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/server/0304-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0306-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0305-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index 82277a287f..82277a287f 100644
--- a/patches/server/0306-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/server/0305-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0307-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0306-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 528cf153ea..528cf153ea 100644
--- a/patches/server/0307-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/server/0306-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0308-Duplicate-UUID-Resolve-Option.patch b/patches/server/0307-Duplicate-UUID-Resolve-Option.patch
index a8fd0cc85e..a8fd0cc85e 100644
--- a/patches/server/0308-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0307-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0309-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0308-PlayerDeathEvent-shouldDropExperience.patch
index 371eaa1631..371eaa1631 100644
--- a/patches/server/0309-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0308-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0310-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0309-Prevent-bees-loading-chunks-checking-hive-position.patch
index 9e8924d226..9e8924d226 100644
--- a/patches/server/0310-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0309-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0311-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0310-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 3b189be4e4..3b189be4e4 100644
--- a/patches/server/0311-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/server/0310-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0312-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0311-Optimise-EntityGetter-getPlayerByUUID.patch
index 0428d89897..0428d89897 100644
--- a/patches/server/0312-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0311-Optimise-EntityGetter-getPlayerByUUID.patch
diff --git a/patches/server/0313-Fix-items-not-falling-correctly.patch b/patches/server/0312-Fix-items-not-falling-correctly.patch
index a9746d7d4e..a9746d7d4e 100644
--- a/patches/server/0313-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0312-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0314-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0313-Optimize-call-to-getFluid-for-explosions.patch
index fae5cedf53..d9b979b49f 100644
--- a/patches/server/0314-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0313-Optimize-call-to-getFluid-for-explosions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize call to getFluid for explosions
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index b5b29210d9a6125d98e7dd737ca25f40545e512b..30109db978563fab1a33b450f0ca82e176539703 100644
+index 4c7795e1ba7bb3135fcf5bab1c8aa857b8e7417b..0f02361110143c839fde6ada38e9e0b512aef978 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -192,7 +192,7 @@ public class Explosion {
diff --git a/patches/server/0315-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0314-Guard-against-serializing-mismatching-chunk-coordina.patch
index 98e6fa59a3..98e6fa59a3 100644
--- a/patches/server/0315-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/0314-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0316-Alternative-item-despawn-rate.patch b/patches/server/0315-Alternative-item-despawn-rate.patch
index a3a719c954..a3a719c954 100644
--- a/patches/server/0316-Alternative-item-despawn-rate.patch
+++ b/patches/server/0315-Alternative-item-despawn-rate.patch
diff --git a/patches/server/0317-Tracking-Range-Improvements.patch b/patches/server/0316-Tracking-Range-Improvements.patch
index 0c63932883..0c63932883 100644
--- a/patches/server/0317-Tracking-Range-Improvements.patch
+++ b/patches/server/0316-Tracking-Range-Improvements.patch
diff --git a/patches/server/0318-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0317-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 19d4ba5fa9..19d4ba5fa9 100644
--- a/patches/server/0318-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0317-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0319-Improve-Block-breakNaturally-API.patch b/patches/server/0318-Improve-Block-breakNaturally-API.patch
index 59270e660a..59270e660a 100644
--- a/patches/server/0319-Improve-Block-breakNaturally-API.patch
+++ b/patches/server/0318-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0320-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0319-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index a96e5d4769..a96e5d4769 100644
--- a/patches/server/0320-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0319-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0321-Add-debug-for-sync-chunk-loads.patch b/patches/server/0320-Add-debug-for-sync-chunk-loads.patch
index f96cf2c189..f96cf2c189 100644
--- a/patches/server/0321-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0320-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0322-Improve-java-version-check.patch b/patches/server/0321-Improve-java-version-check.patch
index b923a87862..b923a87862 100644
--- a/patches/server/0322-Improve-java-version-check.patch
+++ b/patches/server/0321-Improve-java-version-check.patch
diff --git a/patches/server/0323-Add-ThrownEggHatchEvent.patch b/patches/server/0322-Add-ThrownEggHatchEvent.patch
index acec0a7669..acec0a7669 100644
--- a/patches/server/0323-Add-ThrownEggHatchEvent.patch
+++ b/patches/server/0322-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0324-Entity-Jump-API.patch b/patches/server/0323-Entity-Jump-API.patch
index 33973d1d65..33973d1d65 100644
--- a/patches/server/0324-Entity-Jump-API.patch
+++ b/patches/server/0323-Entity-Jump-API.patch
diff --git a/patches/server/0325-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0324-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 21df90e99e..21df90e99e 100644
--- a/patches/server/0325-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0324-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0326-Make-the-GUI-graph-fancier.patch b/patches/server/0325-Make-the-GUI-graph-fancier.patch
index 9e79ca7b91..9e79ca7b91 100644
--- a/patches/server/0326-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0325-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0327-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0326-add-hand-to-BlockMultiPlaceEvent.patch
index 17fa73f9af..17fa73f9af 100644
--- a/patches/server/0327-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0326-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0328-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0327-Validate-tripwire-hook-placement-before-update.patch
index bc1125b169..bc1125b169 100644
--- a/patches/server/0328-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/server/0327-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0329-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0328-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index e09ab64290..e09ab64290 100644
--- a/patches/server/0329-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/server/0328-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0330-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0329-Configurable-chance-of-villager-zombie-infection.patch
index ecb3c72bd4..ecb3c72bd4 100644
--- a/patches/server/0330-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0329-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0331-Optimise-Chunk-getFluid.patch b/patches/server/0330-Optimise-Chunk-getFluid.patch
index 211f2b345f..211f2b345f 100644
--- a/patches/server/0331-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0330-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0332-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0331-Set-spigots-verbose-world-setting-to-false-by-def.patch
index f00c33db91..f00c33db91 100644
--- a/patches/server/0332-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0331-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0333-Add-tick-times-API-and-mspt-command.patch b/patches/server/0332-Add-tick-times-API-and-mspt-command.patch
index b596499602..b596499602 100644
--- a/patches/server/0333-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0332-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0334-Expose-MinecraftServer-isRunning.patch b/patches/server/0333-Expose-MinecraftServer-isRunning.patch
index 5f6a2398f3..5f6a2398f3 100644
--- a/patches/server/0334-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0333-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0335-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0334-Add-Raw-Byte-ItemStack-Serialization.patch
index 711b66b07b..2690624b47 100644
--- a/patches/server/0335-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0334-Add-Raw-Byte-ItemStack-Serialization.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization
 Serializes using NBT which is safer for server data migrations than bukkits format.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 2f21520106aa848a9108937474570a8c4e723cfb..13568d93bf9c0243a9505d1c0aa36fb912bf2bb7 100644
+index 2c1df47a3ef416b63ac26d7eb33fc85f5b760d23..488946dfe508d2d2a22b9dc4f687b2292d830260 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -479,6 +479,53 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0336-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0335-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 95935c86fc..95935c86fc 100644
--- a/patches/server/0336-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0335-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0337-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0336-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index d5833fa44c..d5833fa44c 100644
--- a/patches/server/0337-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0336-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0338-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0337-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index 80606e638c..80606e638c 100644
--- a/patches/server/0338-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0337-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0339-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0338-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 8403fc132e..8403fc132e 100644
--- a/patches/server/0339-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0338-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0340-Don-t-tick-dead-players.patch b/patches/server/0339-Don-t-tick-dead-players.patch
index 52e63e2774..52e63e2774 100644
--- a/patches/server/0340-Don-t-tick-dead-players.patch
+++ b/patches/server/0339-Don-t-tick-dead-players.patch
diff --git a/patches/server/0341-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0340-Dead-Player-s-shouldn-t-be-able-to-move.patch
index 91235fa7aa..6c42f020df 100644
--- a/patches/server/0341-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0340-Dead-Player-s-shouldn-t-be-able-to-move.patch
@@ -7,7 +7,7 @@ This fixes a lot of game state issues where packets were delayed for processing
 due to 1.15's new queue but processed while dead.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 42911a87a9028a7ba8c3f63f498e4f15bcd07f24..8fe41d4291736fd8c45d73429062a597d54ac30b 100644
+index bbafbeff99a7c1bd2d9e27982671a017071f829c..f07c2bd727a8e3e65bb2e6b1367a4bb392febe23 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1162,7 +1162,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0342-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0341-Don-t-move-existing-players-to-world-spawn.patch
index 781abaf10c..781abaf10c 100644
--- a/patches/server/0342-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0341-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0343-Optimize-Pathfinding.patch b/patches/server/0342-Optimize-Pathfinding.patch
index 281988ce37..281988ce37 100644
--- a/patches/server/0343-Optimize-Pathfinding.patch
+++ b/patches/server/0342-Optimize-Pathfinding.patch
diff --git a/patches/server/0344-Reduce-Either-Optional-allocation.patch b/patches/server/0343-Reduce-Either-Optional-allocation.patch
index d42e0ac184..d42e0ac184 100644
--- a/patches/server/0344-Reduce-Either-Optional-allocation.patch
+++ b/patches/server/0343-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0345-Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0344-Reduce-memory-footprint-of-CompoundTag.patch
index 55111ab6e8..55111ab6e8 100644
--- a/patches/server/0345-Reduce-memory-footprint-of-CompoundTag.patch
+++ b/patches/server/0344-Reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/server/0346-Prevent-opening-inventories-when-frozen.patch b/patches/server/0345-Prevent-opening-inventories-when-frozen.patch
index 574aa307db..574aa307db 100644
--- a/patches/server/0346-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0345-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0347-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0346-Don-t-run-entity-collision-code-if-not-needed.patch
index 2da84f514d..2da84f514d 100644
--- a/patches/server/0347-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0346-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0348-Implement-Player-Client-Options-API.patch b/patches/server/0347-Implement-Player-Client-Options-API.patch
index 48f83018f9..48f83018f9 100644
--- a/patches/server/0348-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0347-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0349-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0348-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 0859eed952..0859eed952 100644
--- a/patches/server/0349-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/server/0348-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0350-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0349-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
index f8725ebf87..f8725ebf87 100644
--- a/patches/server/0350-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
+++ b/patches/server/0349-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
diff --git a/patches/server/0351-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0350-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 3cf5caf32a..3cf5caf32a 100644
--- a/patches/server/0351-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0350-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0352-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0351-Add-PlayerAttackEntityCooldownResetEvent.patch
index e96017d4ce..e96017d4ce 100644
--- a/patches/server/0352-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0351-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0353-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0352-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 8a262c1f35..8a262c1f35 100644
--- a/patches/server/0353-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0352-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0354-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0353-Add-phantom-creative-and-insomniac-controls.patch
index 8101fc3b6a..8101fc3b6a 100644
--- a/patches/server/0354-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0353-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0355-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0354-Fix-item-duplication-and-teleport-issues.patch
index e1d2d1f039..e1d2d1f039 100644
--- a/patches/server/0355-Fix-item-duplication-and-teleport-issues.patch
+++ b/patches/server/0354-Fix-item-duplication-and-teleport-issues.patch
diff --git a/patches/server/0356-Villager-Restocks-API.patch b/patches/server/0355-Villager-Restocks-API.patch
index 75b7928672..75b7928672 100644
--- a/patches/server/0356-Villager-Restocks-API.patch
+++ b/patches/server/0355-Villager-Restocks-API.patch
diff --git a/patches/server/0357-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0356-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 03ebc55195..03ebc55195 100644
--- a/patches/server/0357-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0356-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0358-Expose-game-version.patch b/patches/server/0357-Expose-game-version.patch
index bd1a504019..bd1a504019 100644
--- a/patches/server/0358-Expose-game-version.patch
+++ b/patches/server/0357-Expose-game-version.patch
diff --git a/patches/server/0359-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0358-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index a5ad213696..a5ad213696 100644
--- a/patches/server/0359-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0358-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0360-misc-debugging-dumps.patch b/patches/server/0359-misc-debugging-dumps.patch
index 9e356eecb4..9e356eecb4 100644
--- a/patches/server/0360-misc-debugging-dumps.patch
+++ b/patches/server/0359-misc-debugging-dumps.patch
diff --git a/patches/server/0361-Prevent-teleporting-dead-entities.patch b/patches/server/0360-Prevent-teleporting-dead-entities.patch
index 2820b8f349..2820b8f349 100644
--- a/patches/server/0361-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0360-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0362-Implement-Mob-Goal-API.patch b/patches/server/0361-Implement-Mob-Goal-API.patch
index 56f3af0c73..56f3af0c73 100644
--- a/patches/server/0362-Implement-Mob-Goal-API.patch
+++ b/patches/server/0361-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0363-Add-villager-reputation-API.patch b/patches/server/0362-Add-villager-reputation-API.patch
index 5043e90bdc..5043e90bdc 100644
--- a/patches/server/0363-Add-villager-reputation-API.patch
+++ b/patches/server/0362-Add-villager-reputation-API.patch
diff --git a/patches/server/0364-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0363-Option-for-maximum-exp-value-when-merging-orbs.patch
index 6b0e5e5279..6b0e5e5279 100644
--- a/patches/server/0364-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0363-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0365-ExperienceOrbMergeEvent.patch b/patches/server/0364-ExperienceOrbMergeEvent.patch
index 2d56cb06bf..2d56cb06bf 100644
--- a/patches/server/0365-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0364-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0366-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0365-Fix-PotionEffect-ignores-icon-flag.patch
index a401f6eca3..a401f6eca3 100644
--- a/patches/server/0366-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0365-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0367-Potential-bed-API.patch b/patches/server/0366-Potential-bed-API.patch
index 34470bcfc1..34470bcfc1 100644
--- a/patches/server/0367-Potential-bed-API.patch
+++ b/patches/server/0366-Potential-bed-API.patch
diff --git a/patches/server/0368-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0367-Wait-for-Async-Tasks-during-shutdown.patch
index 6115960afb..6115960afb 100644
--- a/patches/server/0368-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0367-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0369-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0368-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index a65b9bbbbc..a65b9bbbbc 100644
--- a/patches/server/0369-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0368-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0370-Ensure-safe-gateway-teleport.patch b/patches/server/0369-Ensure-safe-gateway-teleport.patch
index c1867dbc2c..c1867dbc2c 100644
--- a/patches/server/0370-Ensure-safe-gateway-teleport.patch
+++ b/patches/server/0369-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0371-Add-option-for-console-having-all-permissions.patch b/patches/server/0370-Add-option-for-console-having-all-permissions.patch
index ace91d22dd..ace91d22dd 100644
--- a/patches/server/0371-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0370-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0372-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0371-Fix-villager-trading-demand-MC-163962.patch
index bd7b6c4273..bd7b6c4273 100644
--- a/patches/server/0372-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/server/0371-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0373-Maps-shouldn-t-load-chunks.patch b/patches/server/0372-Maps-shouldn-t-load-chunks.patch
index 3bc3299f81..3bc3299f81 100644
--- a/patches/server/0373-Maps-shouldn-t-load-chunks.patch
+++ b/patches/server/0372-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0374-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0373-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 27672e59d7..27672e59d7 100644
--- a/patches/server/0374-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/server/0373-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0375-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0374-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 4175cae3b0..4175cae3b0 100644
--- a/patches/server/0375-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/server/0374-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0376-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0375-Fix-piston-physics-inconsistency-MC-188840.patch
index 44f85960c4..44f85960c4 100644
--- a/patches/server/0376-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0375-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0377-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0376-Fix-missing-chunks-due-to-integer-overflow.patch
index e7af97469b..e7af97469b 100644
--- a/patches/server/0377-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0376-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0378-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0377-Prevent-position-desync-causing-tp-exploit.patch
index f789abcfe7..f789abcfe7 100644
--- a/patches/server/0378-Prevent-position-desync-causing-tp-exploit.patch
+++ b/patches/server/0377-Prevent-position-desync-causing-tp-exploit.patch
diff --git a/patches/server/0379-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0378-Inventory-getHolder-method-without-block-snapshot.patch
index b30d42bf56..b30d42bf56 100644
--- a/patches/server/0379-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0378-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0380-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0379-Add-PlayerRecipeBookClickEvent.patch
index 21e43aed85..21e43aed85 100644
--- a/patches/server/0380-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0379-Add-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0381-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0380-Hide-sync-chunk-writes-behind-flag.patch
index 030a5a1365..030a5a1365 100644
--- a/patches/server/0381-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0380-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0382-Add-permission-for-command-blocks.patch b/patches/server/0381-Add-permission-for-command-blocks.patch
index ee751febd7..f95c6d1035 100644
--- a/patches/server/0382-Add-permission-for-command-blocks.patch
+++ b/patches/server/0381-Add-permission-for-command-blocks.patch
@@ -40,10 +40,10 @@ index a6cd53e08a0770b93876f98efa7ebfe5b77a2f15..8011266f5fe082c0a81a7a828fe2cf74
          } else {
              BaseCommandBlock commandblocklistenerabstract = packet.getCommandBlock(this.player.level());
 diff --git a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
-index 2d0eac7a8aa94ed6c4ec024bc6024440cbeac702..e40069d937de5fd00741ae6873abeecc46b93732 100644
+index efd6fcb0528d3c903e720edeb2f704347b34c18d..8c2dcc4134d96351cee75773214f3f47e71533e9 100644
 --- a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
 +++ b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
-@@ -203,7 +203,7 @@ public abstract class BaseCommandBlock implements CommandSource {
+@@ -204,7 +204,7 @@ public abstract class BaseCommandBlock implements CommandSource {
      }
  
      public InteractionResult usedBy(Player player) {
diff --git a/patches/server/0383-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0382-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index db4f96e468..db4f96e468 100644
--- a/patches/server/0383-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/server/0382-Ensure-Entity-position-and-AABB-are-never-invalid.patch
diff --git a/patches/server/0384-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0383-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 5e0986e0dd..5e0986e0dd 100644
--- a/patches/server/0384-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0383-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0385-Paper-dumpitem-command.patch b/patches/server/0384-Paper-dumpitem-command.patch
index fc0d3fd7a8..fc0d3fd7a8 100644
--- a/patches/server/0385-Paper-dumpitem-command.patch
+++ b/patches/server/0384-Paper-dumpitem-command.patch
diff --git a/patches/server/0386-Improve-Legacy-Component-serialization-size.patch b/patches/server/0385-Improve-Legacy-Component-serialization-size.patch
index 2fc5b1860f..2fc5b1860f 100644
--- a/patches/server/0386-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0385-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0387-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0386-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index deaa1e2a0d..deaa1e2a0d 100644
--- a/patches/server/0387-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0386-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0388-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0387-Add-BlockStateMeta-clearBlockState.patch
index 01340d9d9b..01340d9d9b 100644
--- a/patches/server/0388-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/server/0387-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/server/0389-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0388-Convert-legacy-attributes-in-Item-Meta.patch
index 56978470d7..0572745730 100644
--- a/patches/server/0389-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0388-Convert-legacy-attributes-in-Item-Meta.patch
@@ -30,10 +30,10 @@ index de40e522960469b98f987bd688489740446d9f85..a0a34f680e21007ebf2c2497d2e6505e
      public CraftAttributeMap(AttributeMap handle) {
          this.handle = handle;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index e88364dfe067c605856390d2cce07ba320632df9..069666c797c39b5119e41a3c18727f89fcc3b8c5 100644
+index 0c385b713234a74ceba802f67f74e4ecab93e269..0464c7b6cc6cb523fa833c870e4028c3f599ea65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -607,7 +607,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -613,7 +613,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
              AttributeModifier attribMod = CraftAttributeInstance.convert(nmsModifier);
  
diff --git a/patches/server/0390-Do-not-accept-invalid-client-settings.patch b/patches/server/0389-Do-not-accept-invalid-client-settings.patch
index 4cc4ebcdec..4cc4ebcdec 100644
--- a/patches/server/0390-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0389-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0391-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0390-Improve-fix-EntityTargetLivingEntityEvent.patch
index 513faeb27d..513faeb27d 100644
--- a/patches/server/0391-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/server/0390-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0392-Add-entity-liquid-API.patch b/patches/server/0391-Add-entity-liquid-API.patch
index ab34d7ab7a..ab34d7ab7a 100644
--- a/patches/server/0392-Add-entity-liquid-API.patch
+++ b/patches/server/0391-Add-entity-liquid-API.patch
diff --git a/patches/server/0393-Add-PrepareResultEvent.patch b/patches/server/0392-Add-PrepareResultEvent.patch
index 647dfc2399..647dfc2399 100644
--- a/patches/server/0393-Add-PrepareResultEvent.patch
+++ b/patches/server/0392-Add-PrepareResultEvent.patch
diff --git a/patches/server/0394-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0393-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index b7931f343c..b7931f343c 100644
--- a/patches/server/0394-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0393-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0395-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0394-Fix-arrows-never-despawning-MC-125757.patch
index a08ff237f0..a08ff237f0 100644
--- a/patches/server/0395-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0394-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0396-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0395-Thread-Safe-Vanilla-Command-permission-checking.patch
index a210e43dce..a210e43dce 100644
--- a/patches/server/0396-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0395-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0397-Fix-SPIGOT-5989.patch b/patches/server/0396-Fix-SPIGOT-5989.patch
index 5b41e0742c..5b41e0742c 100644
--- a/patches/server/0397-Fix-SPIGOT-5989.patch
+++ b/patches/server/0396-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0398-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0397-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index fe347fabc4..fe347fabc4 100644
--- a/patches/server/0398-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0397-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0399-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0398-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index df26348fac..df26348fac 100644
--- a/patches/server/0399-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0398-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0400-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0399-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 817e925f2f..817e925f2f 100644
--- a/patches/server/0400-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0399-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0401-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0400-Optimize-NetworkManager-Exception-Handling.patch
index 8626e3b900..8626e3b900 100644
--- a/patches/server/0401-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0400-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0402-Fix-some-rails-connecting-improperly.patch b/patches/server/0401-Fix-some-rails-connecting-improperly.patch
index 4f5cd86538..4f5cd86538 100644
--- a/patches/server/0402-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0401-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0403-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0402-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 75cd32bb83..75cd32bb83 100644
--- a/patches/server/0403-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0402-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0404-Brand-support.patch b/patches/server/0403-Brand-support.patch
index 8d331cba7f..8d331cba7f 100644
--- a/patches/server/0404-Brand-support.patch
+++ b/patches/server/0403-Brand-support.patch
diff --git a/patches/server/0405-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0404-Add-playPickupItemAnimation-to-LivingEntity.patch
index 00d87adf6c..00d87adf6c 100644
--- a/patches/server/0405-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0404-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0406-Don-t-require-FACING-data.patch b/patches/server/0405-Don-t-require-FACING-data.patch
index 98d0ef923f..98d0ef923f 100644
--- a/patches/server/0406-Don-t-require-FACING-data.patch
+++ b/patches/server/0405-Don-t-require-FACING-data.patch
diff --git a/patches/server/0407-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0406-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 47d790e9ed..47d790e9ed 100644
--- a/patches/server/0407-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0406-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0408-Add-moon-phase-API.patch b/patches/server/0407-Add-moon-phase-API.patch
index bcc15c76d0..bcc15c76d0 100644
--- a/patches/server/0408-Add-moon-phase-API.patch
+++ b/patches/server/0407-Add-moon-phase-API.patch
diff --git a/patches/server/0409-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0408-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 4c1742107a..4c1742107a 100644
--- a/patches/server/0409-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0408-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0410-Prevent-headless-pistons-from-being-created.patch b/patches/server/0409-Prevent-headless-pistons-from-being-created.patch
index bc829f1c99..d5d5a474f6 100644
--- a/patches/server/0410-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0409-Prevent-headless-pistons-from-being-created.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 30109db978563fab1a33b450f0ca82e176539703..d29b4268431472c6132efdfcd305e9616c57da21 100644
+index 0f02361110143c839fde6ada38e9e0b512aef978..414297ab9e953049b5f0b091e54d37c6e9edf861 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -206,6 +206,15 @@ public class Explosion {
diff --git a/patches/server/0411-Add-BellRingEvent.patch b/patches/server/0410-Add-BellRingEvent.patch
index 114bbe332a..114bbe332a 100644
--- a/patches/server/0411-Add-BellRingEvent.patch
+++ b/patches/server/0410-Add-BellRingEvent.patch
diff --git a/patches/server/0412-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0411-Add-zombie-targets-turtle-egg-config.patch
index 553e712827..553e712827 100644
--- a/patches/server/0412-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0411-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0413-Buffer-joins-to-world.patch b/patches/server/0412-Buffer-joins-to-world.patch
index 26675cacaf..26675cacaf 100644
--- a/patches/server/0413-Buffer-joins-to-world.patch
+++ b/patches/server/0412-Buffer-joins-to-world.patch
diff --git a/patches/server/0414-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0413-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 0f9bba490b..0f9bba490b 100644
--- a/patches/server/0414-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0413-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0415-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0414-PortalCreateEvent-needs-to-know-its-entity.patch
index 4f717a77b9..f4c4bfc8bb 100644
--- a/patches/server/0415-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0414-PortalCreateEvent-needs-to-know-its-entity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PortalCreateEvent needs to know its entity
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index bf3785e3b347ebc1ce1e044c9db1a9d23c80f880..1fe34b2b160569b41ce87910eff56d590731e708 100644
+index 91f342912372326a6ced16c23550da7727d6d3ad..b4cb9ff5553995dddfb99b6b3ac1250b92a65d9d 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -501,7 +501,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0416-Add-more-Evoker-API.patch b/patches/server/0415-Add-more-Evoker-API.patch
index f44eceff55..f44eceff55 100644
--- a/patches/server/0416-Add-more-Evoker-API.patch
+++ b/patches/server/0415-Add-more-Evoker-API.patch
diff --git a/patches/server/0417-Add-methods-to-get-translation-keys.patch b/patches/server/0416-Add-methods-to-get-translation-keys.patch
index e61dce6cd3..e61dce6cd3 100644
--- a/patches/server/0417-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0416-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0418-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0417-Create-HoverEvent-from-ItemStack-Entity.patch
index 4117c384be..4117c384be 100644
--- a/patches/server/0418-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0417-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0419-Cache-block-data-strings.patch b/patches/server/0418-Cache-block-data-strings.patch
index ead288ff03..ead288ff03 100644
--- a/patches/server/0419-Cache-block-data-strings.patch
+++ b/patches/server/0418-Cache-block-data-strings.patch
diff --git a/patches/server/0420-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0419-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 3df9c42e9a..3df9c42e9a 100644
--- a/patches/server/0420-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0419-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0421-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0420-Add-additional-open-container-api-to-HumanEntity.patch
index 47aa453acf..47aa453acf 100644
--- a/patches/server/0421-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0420-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0422-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0421-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 572dc995c0..572dc995c0 100644
--- a/patches/server/0422-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0421-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0423-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0422-Extend-block-drop-capture-to-capture-all-items-added.patch
index bf2c2519f2..bf2c2519f2 100644
--- a/patches/server/0423-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0422-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0424-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0423-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index a704a14645..1061e214b9 100644
--- a/patches/server/0424-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0423-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -21,7 +21,7 @@ index c8e4e37b706bd8cb9698ac2d13d0d8668e2d1d14..909575a02bf5f7040eb9c8edb034e7b6
 +    // Paper end - Expose entity id counter
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 13568d93bf9c0243a9505d1c0aa36fb912bf2bb7..b338b83d333b420c54c0362e2fc9839332fcc32e 100644
+index 488946dfe508d2d2a22b9dc4f687b2292d830260..05f073907538991cc74996cf5235351848bc03e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -526,6 +526,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0425-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0424-Lazily-track-plugin-scoreboards-by-default.patch
index 28ae9df043..28ae9df043 100644
--- a/patches/server/0425-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0424-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0426-Entity-isTicking.patch b/patches/server/0425-Entity-isTicking.patch
index 5add9ab4cb..5add9ab4cb 100644
--- a/patches/server/0426-Entity-isTicking.patch
+++ b/patches/server/0425-Entity-isTicking.patch
diff --git a/patches/server/0427-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0426-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index eab9b96e28..eab9b96e28 100644
--- a/patches/server/0427-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0426-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0428-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0427-Fix-Concurrency-issue-in-ShufflingList.patch
index f04a40e1ac..f04a40e1ac 100644
--- a/patches/server/0428-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0427-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0429-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0428-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index f727c2200f..f727c2200f 100644
--- a/patches/server/0429-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0428-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0430-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0429-Fix-for-large-move-vectors-crashing-server.patch
index d7ab320b2d..d7ab320b2d 100644
--- a/patches/server/0430-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0429-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0431-Optimise-getType-calls.patch b/patches/server/0430-Optimise-getType-calls.patch
index 988e1865ce..988e1865ce 100644
--- a/patches/server/0431-Optimise-getType-calls.patch
+++ b/patches/server/0430-Optimise-getType-calls.patch
diff --git a/patches/server/0432-Villager-resetOffers.patch b/patches/server/0431-Villager-resetOffers.patch
index e8e71e6b5c..e8e71e6b5c 100644
--- a/patches/server/0432-Villager-resetOffers.patch
+++ b/patches/server/0431-Villager-resetOffers.patch
diff --git a/patches/server/0433-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0432-Retain-block-place-order-when-capturing-blockstates.patch
index 9de684873f..9de684873f 100644
--- a/patches/server/0433-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0432-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0434-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0433-Fix-item-locations-dropped-from-campfires.patch
index 65034de65e..65034de65e 100644
--- a/patches/server/0434-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0433-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0435-Fix-bell-block-entity-memory-leak.patch b/patches/server/0434-Fix-bell-block-entity-memory-leak.patch
index 5343b073cd..5343b073cd 100644
--- a/patches/server/0435-Fix-bell-block-entity-memory-leak.patch
+++ b/patches/server/0434-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0436-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0435-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 87d59f556c..87d59f556c 100644
--- a/patches/server/0436-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0435-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0437-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0436-Add-getOfflinePlayerIfCached-String.patch
index 8965f3368d..8965f3368d 100644
--- a/patches/server/0437-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0436-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0438-Add-ignore-discounts-API.patch b/patches/server/0437-Add-ignore-discounts-API.patch
index 2f9c40bb4c..2f9c40bb4c 100644
--- a/patches/server/0438-Add-ignore-discounts-API.patch
+++ b/patches/server/0437-Add-ignore-discounts-API.patch
diff --git a/patches/server/0439-Toggle-for-removing-existing-dragon.patch b/patches/server/0438-Toggle-for-removing-existing-dragon.patch
index 1bfa511969..1bfa511969 100644
--- a/patches/server/0439-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0438-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0440-Fix-client-lag-on-advancement-loading.patch b/patches/server/0439-Fix-client-lag-on-advancement-loading.patch
index aca8035481..9fbe6595f6 100644
--- a/patches/server/0440-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0439-Fix-client-lag-on-advancement-loading.patch
@@ -15,7 +15,7 @@ manually reload the advancement data for all players, which
 normally takes place as a part of the datapack reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index b338b83d333b420c54c0362e2fc9839332fcc32e..07befa14f64c5ae097378023a5b352278df2731a 100644
+index 05f073907538991cc74996cf5235351848bc03e1..30bca0a9ead81055b1e7b8d9411c515e817e3a7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -333,7 +333,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0441-Item-no-age-no-player-pickup.patch b/patches/server/0440-Item-no-age-no-player-pickup.patch
index 1fffbaf558..1fffbaf558 100644
--- a/patches/server/0441-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0440-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0442-Beacon-API-custom-effect-ranges.patch b/patches/server/0441-Beacon-API-custom-effect-ranges.patch
index 5ab714aeef..b8790eb9fa 100644
--- a/patches/server/0442-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0441-Beacon-API-custom-effect-ranges.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Beacon API - custom effect ranges
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 18450017bc3df2f0b1a5715e6021e8e5defa24a1..cdb6b89ad4c34be419f66f4f6e6a11068273765d 100644
+index cf48d4531821c2b1b031a63c8f007aa7d3fbef1d..dc39e7e3d166b0f7fb09e04b222b8db00d42b11b 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -86,6 +86,26 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
diff --git a/patches/server/0443-Add-API-for-quit-reason.patch b/patches/server/0442-Add-API-for-quit-reason.patch
index 2bcaaecee6..2bcaaecee6 100644
--- a/patches/server/0443-Add-API-for-quit-reason.patch
+++ b/patches/server/0442-Add-API-for-quit-reason.patch
diff --git a/patches/server/0444-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0443-Add-Wandering-Trader-spawn-rate-config-options.patch
index 98525387d7..98525387d7 100644
--- a/patches/server/0444-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0443-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0445-Expose-world-spawn-angle.patch b/patches/server/0444-Expose-world-spawn-angle.patch
index 8a6e41905d..8a6e41905d 100644
--- a/patches/server/0445-Expose-world-spawn-angle.patch
+++ b/patches/server/0444-Expose-world-spawn-angle.patch
diff --git a/patches/server/0446-Add-Destroy-Speed-API.patch b/patches/server/0445-Add-Destroy-Speed-API.patch
index 3d0806c67f..3d0806c67f 100644
--- a/patches/server/0446-Add-Destroy-Speed-API.patch
+++ b/patches/server/0445-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0447-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0446-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index b837b1cf1f..b837b1cf1f 100644
--- a/patches/server/0447-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0446-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0448-Add-LivingEntity-clearActiveItem.patch b/patches/server/0447-Add-LivingEntity-clearActiveItem.patch
index 50382e523c..50382e523c 100644
--- a/patches/server/0448-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0447-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0449-Add-PlayerItemCooldownEvent.patch b/patches/server/0448-Add-PlayerItemCooldownEvent.patch
index 4b90903dd2..4b90903dd2 100644
--- a/patches/server/0449-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0448-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0450-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0449-Significantly-improve-performance-of-the-end-generat.patch
index ed3ee50bc9..ed3ee50bc9 100644
--- a/patches/server/0450-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0449-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0451-More-lightning-API.patch b/patches/server/0450-More-lightning-API.patch
index 967871902a..967871902a 100644
--- a/patches/server/0451-More-lightning-API.patch
+++ b/patches/server/0450-More-lightning-API.patch
diff --git a/patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0451-Climbing-should-not-bypass-cramming-gamerule.patch
index c2f72432f5..c2f72432f5 100644
--- a/patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0451-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0453-Add-missing-default-perms-for-commands.patch b/patches/server/0452-Add-missing-default-perms-for-commands.patch
index d49628ee32..d49628ee32 100644
--- a/patches/server/0453-Add-missing-default-perms-for-commands.patch
+++ b/patches/server/0452-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0454-Add-PlayerShearBlockEvent.patch b/patches/server/0453-Add-PlayerShearBlockEvent.patch
index e212c2217b..e212c2217b 100644
--- a/patches/server/0454-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0453-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0455-Limit-recipe-packets.patch b/patches/server/0454-Limit-recipe-packets.patch
index 6ec29c0b17..6ec29c0b17 100644
--- a/patches/server/0455-Limit-recipe-packets.patch
+++ b/patches/server/0454-Limit-recipe-packets.patch
diff --git a/patches/server/0456-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0455-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0456-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0455-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0457-Player-Chunk-Load-Unload-Events.patch b/patches/server/0456-Player-Chunk-Load-Unload-Events.patch
index bd58a9a7ec..bd58a9a7ec 100644
--- a/patches/server/0457-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0456-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0458-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0457-Optimize-Dynamic-get-Missing-Keys.patch
index e8bbac8b76..e8bbac8b76 100644
--- a/patches/server/0458-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0457-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0459-Expose-LivingEntity-hurt-direction.patch b/patches/server/0458-Expose-LivingEntity-hurt-direction.patch
index a2ec7481d3..35d1e83e02 100644
--- a/patches/server/0459-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0458-Expose-LivingEntity-hurt-direction.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose LivingEntity hurt direction
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 8fe41d4291736fd8c45d73429062a597d54ac30b..ecae1708feee507df1440ad2822e7af8c3c278de 100644
+index f07c2bd727a8e3e65bb2e6b1367a4bb392febe23..47ace2c3f395a86db3aa67d597686c8275a91323 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -187,7 +187,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0460-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0459-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index ca3ce280b4..ca3ce280b4 100644
--- a/patches/server/0460-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0459-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0461-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0460-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
index 762023bb09..762023bb09 100644
--- a/patches/server/0461-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
+++ b/patches/server/0460-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0462-Add-TargetHitEvent.patch b/patches/server/0461-Add-TargetHitEvent.patch
index 816c525fd2..816c525fd2 100644
--- a/patches/server/0462-Add-TargetHitEvent.patch
+++ b/patches/server/0461-Add-TargetHitEvent.patch
diff --git a/patches/server/0463-MC-4-Fix-item-position-desync.patch b/patches/server/0462-MC-4-Fix-item-position-desync.patch
index 56d177e95e..56d177e95e 100644
--- a/patches/server/0463-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0462-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0464-Additional-Block-Material-API.patch b/patches/server/0463-Additional-Block-Material-API.patch
index 81728edf48..81728edf48 100644
--- a/patches/server/0464-Additional-Block-Material-API.patch
+++ b/patches/server/0463-Additional-Block-Material-API.patch
diff --git a/patches/server/0465-Fix-harming-potion-dupe.patch b/patches/server/0464-Fix-harming-potion-dupe.patch
index 8fdd027d4f..8fdd027d4f 100644
--- a/patches/server/0465-Fix-harming-potion-dupe.patch
+++ b/patches/server/0464-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0466-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0465-API-to-get-Material-from-Boats-and-Minecarts.patch
index 9bcb17ad14..9bcb17ad14 100644
--- a/patches/server/0466-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/server/0465-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0467-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0466-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index da8441444c..da8441444c 100644
--- a/patches/server/0467-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0466-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0468-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0467-Fix-Not-a-string-Map-Conversion-spam.patch
index 00f5d0e877..00f5d0e877 100644
--- a/patches/server/0468-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0467-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0469-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0468-Add-PlayerFlowerPotManipulateEvent.patch
index 8b61833059..8b61833059 100644
--- a/patches/server/0469-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0468-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0470-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0469-Fix-interact-event-not-being-called-sometimes.patch
index 7781f60252..7781f60252 100644
--- a/patches/server/0470-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0469-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0471-Zombie-API-breaking-doors.patch b/patches/server/0470-Zombie-API-breaking-doors.patch
index 50bb6965cf..50bb6965cf 100644
--- a/patches/server/0471-Zombie-API-breaking-doors.patch
+++ b/patches/server/0470-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0472-Fix-nerfed-slime-when-splitting.patch b/patches/server/0471-Fix-nerfed-slime-when-splitting.patch
index 2ebdf09288..2ebdf09288 100644
--- a/patches/server/0472-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0471-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0473-Add-EntityLoadCrossbowEvent.patch b/patches/server/0472-Add-EntityLoadCrossbowEvent.patch
index 074e763090..074e763090 100644
--- a/patches/server/0473-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0472-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0474-Add-WorldGameRuleChangeEvent.patch b/patches/server/0473-Add-WorldGameRuleChangeEvent.patch
index 547e9cb24d..547e9cb24d 100644
--- a/patches/server/0474-Add-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0473-Add-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0475-Add-ServerResourcesReloadedEvent.patch b/patches/server/0474-Add-ServerResourcesReloadedEvent.patch
index 05289f3429..05289f3429 100644
--- a/patches/server/0475-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0474-Add-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0476-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0475-Add-world-settings-for-mobs-picking-up-loot.patch
index d75813f3ee..d75813f3ee 100644
--- a/patches/server/0476-Add-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0475-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0477-Add-BlockFailedDispenseEvent.patch b/patches/server/0476-Add-BlockFailedDispenseEvent.patch
index df51c962ab..df51c962ab 100644
--- a/patches/server/0477-Add-BlockFailedDispenseEvent.patch
+++ b/patches/server/0476-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0478-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0477-Add-PlayerLecternPageChangeEvent.patch
index 2e62d2becf..2e62d2becf 100644
--- a/patches/server/0478-Add-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0477-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0479-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0478-Add-PlayerLoomPatternSelectEvent.patch
index 4d74c20681..4d74c20681 100644
--- a/patches/server/0479-Add-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0478-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0480-Configurable-door-breaking-difficulty.patch b/patches/server/0479-Configurable-door-breaking-difficulty.patch
index 9fdaf01170..9fdaf01170 100644
--- a/patches/server/0480-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0479-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0481-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0480-Empty-commands-shall-not-be-dispatched.patch
index 947eb79c2e..947eb79c2e 100644
--- a/patches/server/0481-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0480-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0482-Remove-stale-POIs.patch b/patches/server/0481-Remove-stale-POIs.patch
index fece7e3371..fece7e3371 100644
--- a/patches/server/0482-Remove-stale-POIs.patch
+++ b/patches/server/0481-Remove-stale-POIs.patch
diff --git a/patches/server/0483-Fix-villager-boat-exploit.patch b/patches/server/0482-Fix-villager-boat-exploit.patch
index 91f979915f..91f979915f 100644
--- a/patches/server/0483-Fix-villager-boat-exploit.patch
+++ b/patches/server/0482-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0484-Add-sendOpLevel-API.patch b/patches/server/0483-Add-sendOpLevel-API.patch
index fd90e10a99..fd90e10a99 100644
--- a/patches/server/0484-Add-sendOpLevel-API.patch
+++ b/patches/server/0483-Add-sendOpLevel-API.patch
diff --git a/patches/server/0485-TODO-Registry-Modification-API.patch b/patches/server/0484-TODO-Registry-Modification-API.patch
index d624aad69b..d624aad69b 100644
--- a/patches/server/0485-TODO-Registry-Modification-API.patch
+++ b/patches/server/0484-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0486-Add-StructuresLocateEvent.patch b/patches/server/0485-Add-StructuresLocateEvent.patch
index 4e44861dd1..4e44861dd1 100644
--- a/patches/server/0486-Add-StructuresLocateEvent.patch
+++ b/patches/server/0485-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0487-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0486-Collision-option-for-requiring-a-player-participant.patch
index 8d8ebfc1f4..8d8ebfc1f4 100644
--- a/patches/server/0487-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0486-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0488-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0487-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index bb6de57d99..bb6de57d99 100644
--- a/patches/server/0488-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0487-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0489-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0488-Return-chat-component-with-empty-text-instead-of-thr.patch
index 4dea2ddeed..4dea2ddeed 100644
--- a/patches/server/0489-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0488-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0490-Make-schedule-command-per-world.patch b/patches/server/0489-Make-schedule-command-per-world.patch
index 2d8f63ad1e..2d8f63ad1e 100644
--- a/patches/server/0490-Make-schedule-command-per-world.patch
+++ b/patches/server/0489-Make-schedule-command-per-world.patch
diff --git a/patches/server/0491-Configurable-max-leash-distance.patch b/patches/server/0490-Configurable-max-leash-distance.patch
index e228b633f0..e228b633f0 100644
--- a/patches/server/0491-Configurable-max-leash-distance.patch
+++ b/patches/server/0490-Configurable-max-leash-distance.patch
diff --git a/patches/server/0492-Add-BlockPreDispenseEvent.patch b/patches/server/0491-Add-BlockPreDispenseEvent.patch
index 2f1b97fbfa..2f1b97fbfa 100644
--- a/patches/server/0492-Add-BlockPreDispenseEvent.patch
+++ b/patches/server/0491-Add-BlockPreDispenseEvent.patch
diff --git a/patches/server/0493-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0492-Add-PlayerChangeBeaconEffectEvent.patch
index b3444419ee..b3444419ee 100644
--- a/patches/server/0493-Add-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0492-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0494-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0493-Add-toggle-for-always-placing-the-dragon-egg.patch
index 2576990e24..2576990e24 100644
--- a/patches/server/0494-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0493-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0495-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0494-Add-PlayerStonecutterRecipeSelectEvent.patch
index 6aad83c0bc..6aad83c0bc 100644
--- a/patches/server/0495-Add-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0494-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0496-Expand-EntityUnleashEvent.patch b/patches/server/0495-Expand-EntityUnleashEvent.patch
index 06754053fc..06754053fc 100644
--- a/patches/server/0496-Expand-EntityUnleashEvent.patch
+++ b/patches/server/0495-Expand-EntityUnleashEvent.patch
diff --git a/patches/server/0497-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0496-Reset-shield-blocking-on-dimension-change.patch
index c33708022d..c33708022d 100644
--- a/patches/server/0497-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0496-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0498-Add-DragonEggFormEvent.patch b/patches/server/0497-Add-DragonEggFormEvent.patch
index c9ec752038..c9ec752038 100644
--- a/patches/server/0498-Add-DragonEggFormEvent.patch
+++ b/patches/server/0497-Add-DragonEggFormEvent.patch
diff --git a/patches/server/0499-Add-EntityMoveEvent.patch b/patches/server/0498-Add-EntityMoveEvent.patch
index 5f87e7e8ec..5f87e7e8ec 100644
--- a/patches/server/0499-Add-EntityMoveEvent.patch
+++ b/patches/server/0498-Add-EntityMoveEvent.patch
diff --git a/patches/server/0500-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0499-added-option-to-disable-pathfinding-updates-on-block.patch
index f740499e21..f740499e21 100644
--- a/patches/server/0500-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0499-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0501-Inline-shift-direction-fields.patch b/patches/server/0500-Inline-shift-direction-fields.patch
index 910b881e3a..910b881e3a 100644
--- a/patches/server/0501-Inline-shift-direction-fields.patch
+++ b/patches/server/0500-Inline-shift-direction-fields.patch
diff --git a/patches/server/0502-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0501-Allow-adding-items-to-BlockDropItemEvent.patch
index ea45c33555..ea45c33555 100644
--- a/patches/server/0502-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0501-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0503-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0502-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 57d54a0434..57d54a0434 100644
--- a/patches/server/0503-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0502-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0504-living-entity-allow-attribute-registration.patch b/patches/server/0503-living-entity-allow-attribute-registration.patch
index fc60a15040..fc60a15040 100644
--- a/patches/server/0504-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0503-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0505-fix-dead-slime-setSize-invincibility.patch b/patches/server/0504-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0505-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0504-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0506-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0505-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0506-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0505-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0507-Expose-Tracked-Players.patch b/patches/server/0506-Expose-Tracked-Players.patch
index b15fc67f75..b15fc67f75 100644
--- a/patches/server/0507-Expose-Tracked-Players.patch
+++ b/patches/server/0506-Expose-Tracked-Players.patch
diff --git a/patches/server/0508-Improve-ServerGUI.patch b/patches/server/0507-Improve-ServerGUI.patch
index 872206f5fe..872206f5fe 100644
--- a/patches/server/0508-Improve-ServerGUI.patch
+++ b/patches/server/0507-Improve-ServerGUI.patch
diff --git a/patches/server/0509-fix-converting-txt-to-json-file.patch b/patches/server/0508-fix-converting-txt-to-json-file.patch
index ad83e310fc..ad83e310fc 100644
--- a/patches/server/0509-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0508-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0510-Add-worldborder-events.patch b/patches/server/0509-Add-worldborder-events.patch
index 2ab55e30ef..2ab55e30ef 100644
--- a/patches/server/0510-Add-worldborder-events.patch
+++ b/patches/server/0509-Add-worldborder-events.patch
diff --git a/patches/server/0511-Add-PlayerNameEntityEvent.patch b/patches/server/0510-Add-PlayerNameEntityEvent.patch
index 9287edc1b7..9287edc1b7 100644
--- a/patches/server/0511-Add-PlayerNameEntityEvent.patch
+++ b/patches/server/0510-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0512-Add-recipe-to-cook-events.patch b/patches/server/0511-Add-recipe-to-cook-events.patch
index 05bf67ef6c..05bf67ef6c 100644
--- a/patches/server/0512-Add-recipe-to-cook-events.patch
+++ b/patches/server/0511-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0513-Add-Block-isValidTool.patch b/patches/server/0512-Add-Block-isValidTool.patch
index 5f36fb047c..5f36fb047c 100644
--- a/patches/server/0513-Add-Block-isValidTool.patch
+++ b/patches/server/0512-Add-Block-isValidTool.patch
diff --git a/patches/server/0514-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0513-Allow-using-signs-inside-spawn-protection.patch
index fba8a91080..fba8a91080 100644
--- a/patches/server/0514-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0513-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0515-Expand-world-key-API.patch b/patches/server/0514-Expand-world-key-API.patch
index 74d0fe3827..b904c428b7 100644
--- a/patches/server/0515-Expand-world-key-API.patch
+++ b/patches/server/0514-Expand-world-key-API.patch
@@ -67,7 +67,7 @@ index 1460060f2ff42ebaa7b2418b375ce661c73bd17f..b9180b7552796331d09c3aef1e863a25
          // Check if a World already exists with the UID.
          if (this.getWorld(world.getUID()) != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 07befa14f64c5ae097378023a5b352278df2731a..c0592a85a1a0781b83232533b9ca1b30b116eb98 100644
+index 30bca0a9ead81055b1e7b8d9411c515e817e3a7b..a914618ddcca61f30316a97c73f88698d44bc301 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -537,6 +537,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0516-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0515-Add-fast-alternative-constructor-for-Rotations.patch
index e28775fc9a..e28775fc9a 100644
--- a/patches/server/0516-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0515-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0517-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0516-Drop-carried-item-when-player-has-disconnected.patch
index 4683817946..4683817946 100644
--- a/patches/server/0517-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0516-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0518-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0517-forced-whitelist-use-configurable-kick-message.patch
index 484e77b357..484e77b357 100644
--- a/patches/server/0518-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0517-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0519-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0518-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 71bc52ad49..71bc52ad49 100644
--- a/patches/server/0519-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0518-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0520-Expose-protocol-version.patch b/patches/server/0519-Expose-protocol-version.patch
index 86eecc86b6..d03986573e 100644
--- a/patches/server/0520-Expose-protocol-version.patch
+++ b/patches/server/0519-Expose-protocol-version.patch
@@ -5,7 +5,7 @@ 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 c0592a85a1a0781b83232533b9ca1b30b116eb98..d11d0a9a2c6b13033437a22b7270e7d37bfe8046 100644
+index a914618ddcca61f30316a97c73f88698d44bc301..d27175bf9899b7ee79ab697eb2c20cd2e7ca6499 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -542,6 +542,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0521-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0520-Enhance-console-tab-completions-for-brigadier-comman.patch
index 8e6ac6e4c9..8e6ac6e4c9 100644
--- a/patches/server/0521-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0520-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0522-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0521-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 8ee954570b..8ee954570b 100644
--- a/patches/server/0522-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0521-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0523-Add-bypass-host-check.patch b/patches/server/0522-Add-bypass-host-check.patch
index 8c40f13437..8c40f13437 100644
--- a/patches/server/0523-Add-bypass-host-check.patch
+++ b/patches/server/0522-Add-bypass-host-check.patch
diff --git a/patches/server/0524-Set-area-affect-cloud-rotation.patch b/patches/server/0523-Set-area-affect-cloud-rotation.patch
index e78e14e0a0..e78e14e0a0 100644
--- a/patches/server/0524-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0523-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0525-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0524-add-isDeeplySleeping-to-HumanEntity.patch
index 26e38b4777..26e38b4777 100644
--- a/patches/server/0525-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0524-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0526-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0525-add-consumeFuel-to-FurnaceBurnEvent.patch
index 2f79b2a47f..2f79b2a47f 100644
--- a/patches/server/0526-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0525-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0527-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0526-add-get-set-drop-chance-to-EntityEquipment.patch
index fd7cafa884..fd7cafa884 100644
--- a/patches/server/0527-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0526-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0528-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0527-fix-PigZombieAngerEvent-cancellation.patch
index ad3619023e..ad3619023e 100644
--- a/patches/server/0528-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0527-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0529-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0528-fix-PlayerItemHeldEvent-firing-twice.patch
index 6506af4c0c..6506af4c0c 100644
--- a/patches/server/0529-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0528-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0530-Add-PlayerDeepSleepEvent.patch b/patches/server/0529-Add-PlayerDeepSleepEvent.patch
index 638530f645..b9ed97ec97 100644
--- a/patches/server/0530-Add-PlayerDeepSleepEvent.patch
+++ b/patches/server/0529-Add-PlayerDeepSleepEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerDeepSleepEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index ecae1708feee507df1440ad2822e7af8c3c278de..1f4351c1701465a3b5dfcb8d61aa5035956bbd42 100644
+index 47ace2c3f395a86db3aa67d597686c8275a91323..bed2f9903378c16d630a08156f5c39047b613ad4 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -260,6 +260,13 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0531-More-World-API.patch b/patches/server/0530-More-World-API.patch
index 0e444d651b..0e444d651b 100644
--- a/patches/server/0531-More-World-API.patch
+++ b/patches/server/0530-More-World-API.patch
diff --git a/patches/server/0532-Add-PlayerBedFailEnterEvent.patch b/patches/server/0531-Add-PlayerBedFailEnterEvent.patch
index aff72983ac..df053f1523 100644
--- a/patches/server/0532-Add-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0531-Add-PlayerBedFailEnterEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerBedFailEnterEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index 68326d7c3bd14e5a66971f34e6ec8ec8e93b728a..03035ed3df2f32e14a8eb9bc3d536ef64b5d87ba 100644
+index 28689e333bb2ddb3c22e793b5c3d379233034840..c353643a9c9b400d351ef49e1b7d4f516ed0b0eb 100644
 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
 @@ -118,14 +118,23 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
diff --git a/patches/server/0533-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0532-Implement-methods-to-convert-between-Component-and-B.patch
index fc7d02c151..fc7d02c151 100644
--- a/patches/server/0533-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0532-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0534-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0533-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index 8fa5c39562..8fa5c39562 100644
--- a/patches/server/0534-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
+++ b/patches/server/0533-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
diff --git a/patches/server/0535-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0534-Introduce-beacon-activation-deactivation-events.patch
index de6741ca2b..ba8abff209 100644
--- a/patches/server/0535-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0534-Introduce-beacon-activation-deactivation-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Introduce beacon activation/deactivation events
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index cdb6b89ad4c34be419f66f4f6e6a11068273765d..00ce8c45d906d8a468d93f464638f367d77e40fb 100644
+index dc39e7e3d166b0f7fb09e04b222b8db00d42b11b..a11f487197274da7cf3217f24e1cae2a343a7331 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -225,6 +225,15 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
diff --git a/patches/server/0536-Add-Channel-initialization-listeners.patch b/patches/server/0535-Add-Channel-initialization-listeners.patch
index 8b6d7c3c06..8b6d7c3c06 100644
--- a/patches/server/0536-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0535-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0537-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0536-Send-empty-commands-if-tab-completion-is-disabled.patch
index 3c45c05c10..3c45c05c10 100644
--- a/patches/server/0537-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0536-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0538-Add-more-WanderingTrader-API.patch b/patches/server/0537-Add-more-WanderingTrader-API.patch
index 07cdb98c54..07cdb98c54 100644
--- a/patches/server/0538-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0537-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0539-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0538-Add-EntityBlockStorage-clearEntities.patch
index e52d1c5e1c..e52d1c5e1c 100644
--- a/patches/server/0539-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0538-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0540-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0539-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 839c465c9c..839c465c9c 100644
--- a/patches/server/0540-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0539-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0541-Add-HiddenPotionEffect-API.patch b/patches/server/0540-Add-HiddenPotionEffect-API.patch
index 724bbc9ff5..724bbc9ff5 100644
--- a/patches/server/0541-Add-HiddenPotionEffect-API.patch
+++ b/patches/server/0540-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0542-Inventory-close.patch b/patches/server/0541-Inventory-close.patch
index 9ca8b717ab..9ca8b717ab 100644
--- a/patches/server/0542-Inventory-close.patch
+++ b/patches/server/0541-Inventory-close.patch
diff --git a/patches/server/0543-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0542-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 950600a9e0..950600a9e0 100644
--- a/patches/server/0543-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0542-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0544-Add-basic-Datapack-API.patch b/patches/server/0543-Add-basic-Datapack-API.patch
index 08c4d71896..08c4d71896 100644
--- a/patches/server/0544-Add-basic-Datapack-API.patch
+++ b/patches/server/0543-Add-basic-Datapack-API.patch
diff --git a/patches/server/0545-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0544-Add-environment-variable-to-disable-server-gui.patch
index e4de8ec477..e4de8ec477 100644
--- a/patches/server/0545-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0544-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0546-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0545-Expand-PlayerGameModeChangeEvent.patch
index f9a90cac58..f9a90cac58 100644
--- a/patches/server/0546-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0545-Expand-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0547-ItemStack-repair-check-API.patch b/patches/server/0546-ItemStack-repair-check-API.patch
index d72feae891..15db6d18c9 100644
--- a/patches/server/0547-ItemStack-repair-check-API.patch
+++ b/patches/server/0546-ItemStack-repair-check-API.patch
@@ -5,7 +5,7 @@ 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 d11d0a9a2c6b13033437a22b7270e7d37bfe8046..c2a7801ee4f6642813778f5e8ae89db46a253a3d 100644
+index d27175bf9899b7ee79ab697eb2c20cd2e7ca6499..bb72e1180a354a41c2f268fec49efd98354d1395 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -547,6 +547,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0548-More-Enchantment-API.patch b/patches/server/0547-More-Enchantment-API.patch
index d561409c37..d561409c37 100644
--- a/patches/server/0548-More-Enchantment-API.patch
+++ b/patches/server/0547-More-Enchantment-API.patch
diff --git a/patches/server/0549-Move-range-check-for-block-placing-up.patch b/patches/server/0548-Move-range-check-for-block-placing-up.patch
index ecccee748f..ecccee748f 100644
--- a/patches/server/0549-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0548-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0550-Add-Mob-lookAt-API.patch b/patches/server/0549-Add-Mob-lookAt-API.patch
index 3139490a61..3139490a61 100644
--- a/patches/server/0550-Add-Mob-lookAt-API.patch
+++ b/patches/server/0549-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0551-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0550-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
index faa6d5c514..faa6d5c514 100644
--- a/patches/server/0551-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/server/0550-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0552-Add-Unix-domain-socket-support.patch b/patches/server/0551-Add-Unix-domain-socket-support.patch
index 413dd25508..413dd25508 100644
--- a/patches/server/0552-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0551-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0553-Add-EntityInsideBlockEvent.patch b/patches/server/0552-Add-EntityInsideBlockEvent.patch
index 26d32bc8bf..26d32bc8bf 100644
--- a/patches/server/0553-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0552-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0554-Fix-item-default-attributes-API.patch b/patches/server/0553-Fix-item-default-attributes-API.patch
index f23189a1ba..fd1ebe689f 100644
--- a/patches/server/0554-Fix-item-default-attributes-API.patch
+++ b/patches/server/0553-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 c2a7801ee4f6642813778f5e8ae89db46a253a3d..61686e63b2d1a98b9747e11058f450a51e2d4d01 100644
+index bb72e1180a354a41c2f268fec49efd98354d1395..0254b4e5146ee7e082a467812dc04a2d07094af7 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/0555-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0554-Add-cause-to-Weather-ThunderChangeEvents.patch
index d1e76737e3..d1e76737e3 100644
--- a/patches/server/0555-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0554-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0556-More-Lidded-Block-API.patch b/patches/server/0555-More-Lidded-Block-API.patch
index 7e52e36425..7e52e36425 100644
--- a/patches/server/0556-More-Lidded-Block-API.patch
+++ b/patches/server/0555-More-Lidded-Block-API.patch
diff --git a/patches/server/0557-Limit-item-frame-cursors-on-maps.patch b/patches/server/0556-Limit-item-frame-cursors-on-maps.patch
index 6072cb5269..6072cb5269 100644
--- a/patches/server/0557-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0556-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0558-Add-PlayerKickEvent-causes.patch b/patches/server/0557-Add-PlayerKickEvent-causes.patch
index 8bf3ee985a..8bf3ee985a 100644
--- a/patches/server/0558-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0557-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0559-Add-PufferFishStateChangeEvent.patch b/patches/server/0558-Add-PufferFishStateChangeEvent.patch
index 87e61bb2a3..87e61bb2a3 100644
--- a/patches/server/0559-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0558-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0560-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0559-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 6e70197163..6e70197163 100644
--- a/patches/server/0560-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0559-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0561-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0560-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 04a6d787b6..04a6d787b6 100644
--- a/patches/server/0561-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0560-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0562-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0561-Add-option-to-fix-items-merging-through-walls.patch
index 05969fb324..05969fb324 100644
--- a/patches/server/0562-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0561-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0563-Add-BellRevealRaiderEvent.patch b/patches/server/0562-Add-BellRevealRaiderEvent.patch
index 871aa2a198..871aa2a198 100644
--- a/patches/server/0563-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0562-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0564-Fix-invulnerable-end-crystals.patch b/patches/server/0563-Fix-invulnerable-end-crystals.patch
index bddc6ec149..bddc6ec149 100644
--- a/patches/server/0564-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0563-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0565-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0564-Add-ElderGuardianAppearanceEvent.patch
index d9bc14356d..d9bc14356d 100644
--- a/patches/server/0565-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0564-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0566-Fix-dangerous-end-portal-logic.patch b/patches/server/0565-Fix-dangerous-end-portal-logic.patch
index 94e78d0600..94e78d0600 100644
--- a/patches/server/0566-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0565-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0567-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0566-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 3d03f4c4d2..3d03f4c4d2 100644
--- a/patches/server/0567-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0566-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0568-Line-Of-Sight-Changes.patch b/patches/server/0567-Line-Of-Sight-Changes.patch
index f0d5d6bd3e..f0d5d6bd3e 100644
--- a/patches/server/0568-Line-Of-Sight-Changes.patch
+++ b/patches/server/0567-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0569-add-per-world-spawn-limits.patch b/patches/server/0568-add-per-world-spawn-limits.patch
index 8ff7b50013..8ff7b50013 100644
--- a/patches/server/0569-add-per-world-spawn-limits.patch
+++ b/patches/server/0568-add-per-world-spawn-limits.patch
diff --git a/patches/server/0570-Fix-potions-splash-events.patch b/patches/server/0569-Fix-potions-splash-events.patch
index 66e5ec5995..66e5ec5995 100644
--- a/patches/server/0570-Fix-potions-splash-events.patch
+++ b/patches/server/0569-Fix-potions-splash-events.patch
diff --git a/patches/server/0571-Add-more-LimitedRegion-API.patch b/patches/server/0570-Add-more-LimitedRegion-API.patch
index 6e183e954e..6e183e954e 100644
--- a/patches/server/0571-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0570-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0572-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0571-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 7c8cf8059d..9880621068 100644
--- a/patches/server/0572-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0571-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -44,7 +44,7 @@ index ef24112c5360ec329dc8a89546f64bad68d7fd8e..1ac19a789bee22fe512a019e618e2b99
  
                  this.awardStat(Stats.DROP);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 1f4351c1701465a3b5dfcb8d61aa5035956bbd42..44e2a0f36359ab914c9328b633dd8a360591751d 100644
+index bed2f9903378c16d630a08156f5c39047b613ad4..40fb59c799850915c3ae71a4c4121e664c79d9b2 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -726,6 +726,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0573-Missing-Entity-API.patch b/patches/server/0572-Missing-Entity-API.patch
index 0f3d205a48..0f3d205a48 100644
--- a/patches/server/0573-Missing-Entity-API.patch
+++ b/patches/server/0572-Missing-Entity-API.patch
diff --git a/patches/server/0574-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0573-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index ef18db22e4..ef18db22e4 100644
--- a/patches/server/0574-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0573-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0575-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0574-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index a5c4eefb9a..a5c4eefb9a 100644
--- a/patches/server/0575-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0574-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0576-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0575-Use-getChunkIfLoadedImmediately-in-places.patch
index 0a393f84af..0a393f84af 100644
--- a/patches/server/0576-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0575-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0577-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0576-Fix-commands-from-signs-not-firing-command-events.patch
index b86e341359..b86e341359 100644
--- a/patches/server/0577-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0576-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0578-Add-PlayerArmSwingEvent.patch b/patches/server/0577-Add-PlayerArmSwingEvent.patch
index a6cc51d98f..a6cc51d98f 100644
--- a/patches/server/0578-Add-PlayerArmSwingEvent.patch
+++ b/patches/server/0577-Add-PlayerArmSwingEvent.patch
diff --git a/patches/server/0579-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0578-Fix-kick-event-leave-message-not-being-sent.patch
index 09377dd14d..2be09dd881 100644
--- a/patches/server/0579-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0578-Fix-kick-event-leave-message-not-being-sent.patch
@@ -17,7 +17,7 @@ index 1ac19a789bee22fe512a019e618e2b99bb07f183..d3f3eed67557b362c0f51a83967f6027
      public boolean isRealPlayer; // Paper
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 0273998b72c9d8a1e7de4b1195c547001922cb8e..802ea97fe03028cfe911aa4052d9c82ad23058f2 100644
+index dde1d3850af610241e1f76a194efe1a58dc96bd5..8ac5d8ccf731100a1be690cb2ed1be82cadba8ed 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -109,6 +109,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0580-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0579-Don-t-apply-cramming-damage-to-players.patch
index 8a1b8eb465..8a1b8eb465 100644
--- a/patches/server/0580-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0579-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0581-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0580-Rate-options-and-timings-for-sensors-and-behaviors.patch
index d74af14524..d74af14524 100644
--- a/patches/server/0581-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0580-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0582-Add-missing-forceDrop-toggles.patch b/patches/server/0581-Add-missing-forceDrop-toggles.patch
index 951b6714fa..951b6714fa 100644
--- a/patches/server/0582-Add-missing-forceDrop-toggles.patch
+++ b/patches/server/0581-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0583-Stinger-API.patch b/patches/server/0582-Stinger-API.patch
index 3abe3d922a..3abe3d922a 100644
--- a/patches/server/0583-Stinger-API.patch
+++ b/patches/server/0582-Stinger-API.patch
diff --git a/patches/server/0584-Add-System.out-err-catcher.patch b/patches/server/0583-Add-System.out-err-catcher.patch
index 5b85a7f2b8..5b85a7f2b8 100644
--- a/patches/server/0584-Add-System.out-err-catcher.patch
+++ b/patches/server/0583-Add-System.out-err-catcher.patch
diff --git a/patches/server/0585-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0584-Prevent-AFK-kick-while-watching-end-credits.patch
index c0ffba11ed..c0ffba11ed 100644
--- a/patches/server/0585-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0584-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0586-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0585-Allow-skipping-writing-of-comments-to-server.propert.patch
index 1fce522892..1fce522892 100644
--- a/patches/server/0586-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0585-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0587-Add-PlayerSetSpawnEvent.patch b/patches/server/0586-Add-PlayerSetSpawnEvent.patch
index 2c3b96803d..1bc05bf134 100644
--- a/patches/server/0587-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0586-Add-PlayerSetSpawnEvent.patch
@@ -167,7 +167,7 @@ index 2b7ad2b9cd525814c9f91d22606c42aa82ce9f94..d7bbdcc97745246718c92c9aba56d9f9
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-index e18726915d1491d74084827afd9978800aecb644..a4a90df0b500fb440226b07462faaa87594b12a5 100644
+index 3cfe325f14b6b184517de7c6982f54e0895b1eb8..be85535767bc79875c38da78a209d33d4be87c8a 100644
 --- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
 @@ -89,9 +89,14 @@ public class RespawnAnchorBlock extends Block {
diff --git a/patches/server/0588-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0587-Make-hoppers-respect-inventory-max-stack-size.patch
index c5f669b979..c5f669b979 100644
--- a/patches/server/0588-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0587-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0589-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0588-Optimize-entity-tracker-passenger-checks.patch
index a764dcd8ab..a764dcd8ab 100644
--- a/patches/server/0589-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0588-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0590-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0589-Config-option-for-Piglins-guarding-chests.patch
index e1b0af28d0..e1b0af28d0 100644
--- a/patches/server/0590-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0589-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0591-Add-EntityDamageItemEvent.patch b/patches/server/0590-Add-EntityDamageItemEvent.patch
index 34c8cf7e74..e78be10457 100644
--- a/patches/server/0591-Add-EntityDamageItemEvent.patch
+++ b/patches/server/0590-Add-EntityDamageItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityDamageItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 1fe34b2b160569b41ce87910eff56d590731e708..f5547caeaeeb8fa37f2aa9bfea6f176b1cc3430a 100644
+index b4cb9ff5553995dddfb99b6b3ac1250b92a65d9d..2947a43a1d9e49273ed0242691273e50c657cd05 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -647,7 +647,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0592-Optimize-indirect-passenger-iteration.patch b/patches/server/0591-Optimize-indirect-passenger-iteration.patch
index f63dee44e9..f63dee44e9 100644
--- a/patches/server/0592-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0591-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0593-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0592-Configurable-item-frame-map-cursor-update-interval.patch
index f06f3a327b..f06f3a327b 100644
--- a/patches/server/0593-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0592-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0594-Clear-bucket-NBT-after-dispense.patch b/patches/server/0593-Clear-bucket-NBT-after-dispense.patch
index ece5517a45..ece5517a45 100644
--- a/patches/server/0594-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0593-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0595-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0594-Change-EnderEye-target-without-changing-other-things.patch
index 53d06a36ec..53d06a36ec 100644
--- a/patches/server/0595-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0594-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0596-Add-BlockBreakBlockEvent.patch b/patches/server/0595-Add-BlockBreakBlockEvent.patch
index fbf1b1ea38..fbf1b1ea38 100644
--- a/patches/server/0596-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0595-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0597-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0596-Option-to-prevent-data-components-copy-in-smithing-r.patch
index c4e4b8be1b..c4e4b8be1b 100644
--- a/patches/server/0597-Option-to-prevent-data-components-copy-in-smithing-r.patch
+++ b/patches/server/0596-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/server/0598-More-CommandBlock-API.patch b/patches/server/0597-More-CommandBlock-API.patch
index 16cf3ee3d7..16cf3ee3d7 100644
--- a/patches/server/0598-More-CommandBlock-API.patch
+++ b/patches/server/0597-More-CommandBlock-API.patch
diff --git a/patches/server/0599-Add-missing-team-sidebar-display-slots.patch b/patches/server/0598-Add-missing-team-sidebar-display-slots.patch
index 8e253e2960..43027f57f3 100644
--- a/patches/server/0599-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0598-Add-missing-team-sidebar-display-slots.patch
@@ -9,7 +9,7 @@ public org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations toBukkitSlo
 public org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations fromBukkitSlot(Lorg/bukkit/scoreboard/DisplaySlot;)Lnet/minecraft/world/scores/DisplaySlot;
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java b/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java
-index 658f3962543a36bc8c16f306ccb3e254b5b3d0a8..a1510dfd4824c0e246543d770f0e74f0f97c4ace 100644
+index 9e1896199d10be606a6c6304d849c7c9eb3c9fa1..b8a5ff5702f5a504c5b3aa0d9c27eb15f99471b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java
 +++ b/src/main/java/org/bukkit/craftbukkit/legacy/FieldRename.java
 @@ -27,6 +27,7 @@ public class FieldRename {
diff --git a/patches/server/0600-Add-back-EntityPortalExitEvent.patch b/patches/server/0599-Add-back-EntityPortalExitEvent.patch
index 02c52718f6..02c52718f6 100644
--- a/patches/server/0600-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0599-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0601-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0600-Add-methods-to-find-targets-for-lightning-strikes.patch
index a6b0c9df56..a6b0c9df56 100644
--- a/patches/server/0601-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0600-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0602-Get-entity-default-attributes.patch b/patches/server/0601-Get-entity-default-attributes.patch
index b0c1f2f95c..243137354a 100644
--- a/patches/server/0602-Get-entity-default-attributes.patch
+++ b/patches/server/0601-Get-entity-default-attributes.patch
@@ -81,7 +81,7 @@ 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 61686e63b2d1a98b9747e11058f450a51e2d4d01..5f460ab55025ff5dd66d7e52f92b4e7f36f2bb3f 100644
+index 0254b4e5146ee7e082a467812dc04a2d07094af7..5cb1da944f0040e7c5a21db201d41fda3c5bda83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -560,6 +560,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0603-Left-handed-API.patch b/patches/server/0602-Left-handed-API.patch
index 643df451a4..643df451a4 100644
--- a/patches/server/0603-Left-handed-API.patch
+++ b/patches/server/0602-Left-handed-API.patch
diff --git a/patches/server/0604-Add-more-advancement-API.patch b/patches/server/0603-Add-more-advancement-API.patch
index 0fa7fedd64..0fa7fedd64 100644
--- a/patches/server/0604-Add-more-advancement-API.patch
+++ b/patches/server/0603-Add-more-advancement-API.patch
diff --git a/patches/server/0605-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0604-Add-ItemFactory-getSpawnEgg-API.patch
index 207215c511..207215c511 100644
--- a/patches/server/0605-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0604-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0606-Add-critical-damage-API.patch b/patches/server/0605-Add-critical-damage-API.patch
index 862878dd06..b279a27b3e 100644
--- a/patches/server/0606-Add-critical-damage-API.patch
+++ b/patches/server/0605-Add-critical-damage-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add critical damage API
 
 
 diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index 435490f2931dae9d4fc5adb713c47a962684eeb5..ec52c7a75d9988475fbb4fe12ef7f4489ef3d894 100644
+index 70e946483f09195c82d4b306c487ba22a8f8cf6f..ffb7c966617bdfa2c3f05ec4e753e32996493343 100644
 --- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
 +++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-@@ -238,4 +238,18 @@ public class DamageSource {
+@@ -240,4 +240,18 @@ public class DamageSource {
      public Holder<DamageType> typeHolder() {
          return this.type;
      }
@@ -28,7 +28,7 @@ index 435490f2931dae9d4fc5adb713c47a962684eeb5..ec52c7a75d9988475fbb4fe12ef7f448
 +    // Paper end - add critical damage API
  }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 44e2a0f36359ab914c9328b633dd8a360591751d..c3fc0adeafbebaaaab8c155df9829f488e41d8ab 100644
+index 40fb59c799850915c3ae71a4c4121e664c79d9b2..7cb10e9c8ba6d100f1ae4d949401cd83034f0f14 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1274,7 +1274,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0607-Fix-issues-with-mob-conversion.patch b/patches/server/0606-Fix-issues-with-mob-conversion.patch
index c714b6dda9..c714b6dda9 100644
--- a/patches/server/0607-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0606-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0608-Add-isCollidable-methods-to-various-places.patch b/patches/server/0607-Add-isCollidable-methods-to-various-places.patch
index 226170159d..fd446708ab 100644
--- a/patches/server/0608-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0607-Add-isCollidable-methods-to-various-places.patch
@@ -39,7 +39,7 @@ 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 5f460ab55025ff5dd66d7e52f92b4e7f36f2bb3f..f0cbe0ae5123bebce82aa677f196f7e8e096dfc9 100644
+index 5cb1da944f0040e7c5a21db201d41fda3c5bda83..d8d13aca9a002f92b3af2bc67b86f4f9dd092603 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -572,6 +572,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0609-Goat-ram-API.patch b/patches/server/0608-Goat-ram-API.patch
index 2f5ccdfed4..2f5ccdfed4 100644
--- a/patches/server/0609-Goat-ram-API.patch
+++ b/patches/server/0608-Goat-ram-API.patch
diff --git a/patches/server/0610-Add-API-for-resetting-a-single-score.patch b/patches/server/0609-Add-API-for-resetting-a-single-score.patch
index b9dd1c2be3..b9dd1c2be3 100644
--- a/patches/server/0610-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0609-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0611-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0610-Add-Raw-Byte-Entity-Serialization.patch
index 5eeed3ba32..402954c84f 100644
--- a/patches/server/0611-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0610-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 f0cbe0ae5123bebce82aa677f196f7e8e096dfc9..365f7846d4c522811cf992ea1a2da67b025661b9 100644
+index d8d13aca9a002f92b3af2bc67b86f4f9dd092603..a14a316d63e34ac4ac7ee81a27a8fbdfcdb2b451 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/0612-Vanilla-command-permission-fixes.patch b/patches/server/0611-Vanilla-command-permission-fixes.patch
index e7be2c02c2..e7be2c02c2 100644
--- a/patches/server/0612-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0611-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0613-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0612-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index cb9b1652bf..19d821b087 100644
--- a/patches/server/0613-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0612-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -51,7 +51,7 @@ index 22f9b40e2c9a71f8944b1738e91ee2e189a77cec..c3e8efd58c191ac8f479f8a979e73cc3
      @Override
      public void doCloseContainer() {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index c3fc0adeafbebaaaab8c155df9829f488e41d8ab..4003dfeae8b2486045a3dbe4c1adc65a882e70ba 100644
+index 7cb10e9c8ba6d100f1ae4d949401cd83034f0f14..f861a942807f8b8af36d6b70a124da7853eda053 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -509,6 +509,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0614-Fix-GameProfileCache-concurrency.patch b/patches/server/0613-Fix-GameProfileCache-concurrency.patch
index 6cb7e5235f..6cb7e5235f 100644
--- a/patches/server/0614-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0613-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0615-Improve-and-expand-AsyncCatcher.patch b/patches/server/0614-Improve-and-expand-AsyncCatcher.patch
index f248ef7a0f..f248ef7a0f 100644
--- a/patches/server/0615-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0614-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0616-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0615-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 5d60195ebe..5d60195ebe 100644
--- a/patches/server/0616-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0615-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0617-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0616-Sanitize-ResourceLocation-error-logging.patch
index 28ba1000d7..28ba1000d7 100644
--- a/patches/server/0617-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0616-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0618-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0617-Manually-inline-methods-in-BlockPosition.patch
index 630cd08862..630cd08862 100644
--- a/patches/server/0618-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0617-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0619-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0618-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 30f250f235..30f250f235 100644
--- a/patches/server/0619-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0618-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0620-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0619-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index ffee136c87..ffee136c87 100644
--- a/patches/server/0620-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0619-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0621-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0620-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 0c62fa92a6..0c62fa92a6 100644
--- a/patches/server/0621-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0620-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0622-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0621-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index 0ab3e48f48..0ab3e48f48 100644
--- a/patches/server/0622-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
+++ b/patches/server/0621-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0623-Time-scoreboard-search.patch b/patches/server/0622-Time-scoreboard-search.patch
index 8d15084758..8d15084758 100644
--- a/patches/server/0623-Time-scoreboard-search.patch
+++ b/patches/server/0622-Time-scoreboard-search.patch
diff --git a/patches/server/0624-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0623-Oprimise-map-impl-for-tracked-players.patch
index 05a08024ed..05a08024ed 100644
--- a/patches/server/0624-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0623-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0625-Add-missing-InventoryType.patch b/patches/server/0624-Add-missing-InventoryType.patch
index a49bdf073d..a49bdf073d 100644
--- a/patches/server/0625-Add-missing-InventoryType.patch
+++ b/patches/server/0624-Add-missing-InventoryType.patch
diff --git a/patches/server/0626-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0625-Optimise-BlockSoil-nearby-water-lookup.patch
index 81b199a243..81b199a243 100644
--- a/patches/server/0626-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0625-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0627-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0626-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index e17f65772c..e17f65772c 100644
--- a/patches/server/0627-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0626-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0628-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0627-Check-requirement-before-suggesting-root-nodes.patch
index fce5e326f9..fce5e326f9 100644
--- a/patches/server/0628-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0627-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0629-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0628-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 17cdc399d8..17cdc399d8 100644
--- a/patches/server/0629-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0628-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0630-Add-packet-limiter-config.patch b/patches/server/0629-Add-packet-limiter-config.patch
index 8315eb0598..8315eb0598 100644
--- a/patches/server/0630-Add-packet-limiter-config.patch
+++ b/patches/server/0629-Add-packet-limiter-config.patch
diff --git a/patches/server/0631-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0630-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index b11f4117a8..b11f4117a8 100644
--- a/patches/server/0631-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0630-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0632-Ensure-valid-vehicle-status.patch b/patches/server/0631-Ensure-valid-vehicle-status.patch
index 948908a5db..948908a5db 100644
--- a/patches/server/0632-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0631-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0633-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0632-Prevent-softlocked-end-exit-portal-generation.patch
index e2698e961b..e2698e961b 100644
--- a/patches/server/0633-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0632-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0634-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0633-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 4fac0c1ab3..4fac0c1ab3 100644
--- a/patches/server/0634-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0633-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0635-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0634-Don-t-log-debug-logging-being-disabled.patch
index eda86b69fc..eda86b69fc 100644
--- a/patches/server/0635-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0634-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0636-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0635-fix-various-menus-with-empty-level-accesses.patch
index efe5d1ddce..efe5d1ddce 100644
--- a/patches/server/0636-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0635-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0637-Preserve-overstacked-loot.patch b/patches/server/0636-Preserve-overstacked-loot.patch
index bd846768be..bd846768be 100644
--- a/patches/server/0637-Preserve-overstacked-loot.patch
+++ b/patches/server/0636-Preserve-overstacked-loot.patch
diff --git a/patches/server/0638-Update-head-rotation-in-missing-places.patch b/patches/server/0637-Update-head-rotation-in-missing-places.patch
index 88e0dccdcb..88e0dccdcb 100644
--- a/patches/server/0638-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0637-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0639-prevent-unintended-light-block-manipulation.patch b/patches/server/0638-prevent-unintended-light-block-manipulation.patch
index bff44792dc..bff44792dc 100644
--- a/patches/server/0639-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0638-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0640-Fix-CraftCriteria-defaults-map.patch b/patches/server/0639-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0640-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0639-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0641-Fix-upstreams-block-state-factories.patch b/patches/server/0640-Fix-upstreams-block-state-factories.patch
index d5cf218ad2..55093f7e56 100644
--- a/patches/server/0641-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0640-Fix-upstreams-block-state-factories.patch
@@ -13,10 +13,10 @@ the material type of the block at that location.
 public net.minecraft.world.level.block.entity.BlockEntityType validBlocks
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index 90b218ebc947a1d8a8c7dfc677fe145b6386654a..df945a152747bea0452ec18c09d59598903aa91f 100644
+index d22cc83725cee3df20bb6f99de23aceb62923eef..978125c69b2a9ea465595c7eef10a1aea7ccf26c 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -350,7 +350,7 @@ public abstract class BlockEntity {
+@@ -361,7 +361,7 @@ public abstract class BlockEntity {
          // Paper end
          if (this.level == null) return null;
          org.bukkit.block.Block block = this.level.getWorld().getBlockAt(this.worldPosition.getX(), this.worldPosition.getY(), this.worldPosition.getZ());
diff --git a/patches/server/0642-Configurable-feature-seeds.patch b/patches/server/0641-Configurable-feature-seeds.patch
index 44d7b04076..44d7b04076 100644
--- a/patches/server/0642-Configurable-feature-seeds.patch
+++ b/patches/server/0641-Configurable-feature-seeds.patch
diff --git a/patches/server/0643-Add-root-admin-user-detection.patch b/patches/server/0642-Add-root-admin-user-detection.patch
index 5b81dcd09a..5b81dcd09a 100644
--- a/patches/server/0643-Add-root-admin-user-detection.patch
+++ b/patches/server/0642-Add-root-admin-user-detection.patch
diff --git a/patches/server/0644-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0643-don-t-attempt-to-teleport-dead-entities.patch
index 0a5f77989b..0a5f77989b 100644
--- a/patches/server/0644-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0643-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0645-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0644-Prevent-excessive-velocity-through-repeated-crits.patch
index c26ce6b90a..c26ce6b90a 100644
--- a/patches/server/0645-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0644-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0646-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0645-Remove-client-side-code-using-deprecated-for-removal.patch
index 77ffcc7ddc..77ffcc7ddc 100644
--- a/patches/server/0646-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0645-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0647-Fix-Spigot-growth-modifiers.patch b/patches/server/0646-Fix-Spigot-growth-modifiers.patch
index 245729c1f4..245729c1f4 100644
--- a/patches/server/0647-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0646-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0648-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0647-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index b017de75d1..b017de75d1 100644
--- a/patches/server/0648-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0647-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0649-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0648-Add-PlayerItemFrameChangeEvent.patch
index 37c616b0a1..37c616b0a1 100644
--- a/patches/server/0649-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0648-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0650-Optimize-HashMapPalette.patch b/patches/server/0649-Optimize-HashMapPalette.patch
index d50159b901..d50159b901 100644
--- a/patches/server/0650-Optimize-HashMapPalette.patch
+++ b/patches/server/0649-Optimize-HashMapPalette.patch
diff --git a/patches/server/0651-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0650-Allow-delegation-to-vanilla-chunk-gen.patch
index 8c6c32dac2..8c6c32dac2 100644
--- a/patches/server/0651-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0650-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0652-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0651-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 239a0c56cc..239a0c56cc 100644
--- a/patches/server/0652-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0651-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0653-Add-more-Campfire-API.patch b/patches/server/0652-Add-more-Campfire-API.patch
index c47758fa53..c47758fa53 100644
--- a/patches/server/0653-Add-more-Campfire-API.patch
+++ b/patches/server/0652-Add-more-Campfire-API.patch
diff --git a/patches/server/0654-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0653-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 82e383fc34..82e383fc34 100644
--- a/patches/server/0654-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0653-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0655-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0654-Forward-CraftEntity-in-teleport-command.patch
index fed3943910..fed3943910 100644
--- a/patches/server/0655-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0654-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0656-Improve-scoreboard-entries.patch b/patches/server/0655-Improve-scoreboard-entries.patch
index 8acac86ce3..8acac86ce3 100644
--- a/patches/server/0656-Improve-scoreboard-entries.patch
+++ b/patches/server/0655-Improve-scoreboard-entries.patch
diff --git a/patches/server/0657-Entity-powdered-snow-API.patch b/patches/server/0656-Entity-powdered-snow-API.patch
index 84af920e2a..84af920e2a 100644
--- a/patches/server/0657-Entity-powdered-snow-API.patch
+++ b/patches/server/0656-Entity-powdered-snow-API.patch
diff --git a/patches/server/0658-Add-API-for-item-entity-health.patch b/patches/server/0657-Add-API-for-item-entity-health.patch
index cd2757b544..cd2757b544 100644
--- a/patches/server/0658-Add-API-for-item-entity-health.patch
+++ b/patches/server/0657-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0659-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0658-Configurable-max-block-light-for-monster-spawning.patch
index 421d176050..421d176050 100644
--- a/patches/server/0659-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0658-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0660-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0659-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 2ee001a77a..2ee001a77a 100644
--- a/patches/server/0660-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0659-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0661-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0660-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..d7ccde8439 100644
--- a/patches/server/0661-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0660-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0662-Bucketable-API.patch b/patches/server/0661-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0662-Bucketable-API.patch
+++ b/patches/server/0661-Bucketable-API.patch
diff --git a/patches/server/0663-Validate-usernames.patch b/patches/server/0662-Validate-usernames.patch
index d3b04f3950..d3b04f3950 100644
--- a/patches/server/0663-Validate-usernames.patch
+++ b/patches/server/0662-Validate-usernames.patch
diff --git a/patches/server/0664-Make-water-animal-spawn-height-configurable.patch b/patches/server/0663-Make-water-animal-spawn-height-configurable.patch
index 36a83d9116..36a83d9116 100644
--- a/patches/server/0664-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0663-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0665-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0664-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 96fc6e3b61..96fc6e3b61 100644
--- a/patches/server/0665-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0664-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0666-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0665-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0666-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0665-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0667-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0666-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
index be0eedab93..be0eedab93 100644
--- a/patches/server/0667-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/server/0666-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0668-Multiple-Entries-with-Scoreboards.patch b/patches/server/0667-Multiple-Entries-with-Scoreboards.patch
index c286ca9e4b..c286ca9e4b 100644
--- a/patches/server/0668-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0667-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0669-Reset-placed-block-on-exception.patch b/patches/server/0668-Reset-placed-block-on-exception.patch
index c5b6f9f135..c5b6f9f135 100644
--- a/patches/server/0669-Reset-placed-block-on-exception.patch
+++ b/patches/server/0668-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0670-Add-configurable-height-for-slime-spawn.patch b/patches/server/0669-Add-configurable-height-for-slime-spawn.patch
index 04458eb176..04458eb176 100644
--- a/patches/server/0670-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0669-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0671-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0670-Fix-xp-reward-for-baby-zombies.patch
index 67fe48ec26..67fe48ec26 100644
--- a/patches/server/0671-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0670-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0672-Multi-Block-Change-API-Implementation.patch b/patches/server/0671-Multi-Block-Change-API-Implementation.patch
index 3eee7a872a..3eee7a872a 100644
--- a/patches/server/0672-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0671-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0673-Fix-NotePlayEvent.patch b/patches/server/0672-Fix-NotePlayEvent.patch
index 4a601d8f1b..4a601d8f1b 100644
--- a/patches/server/0673-Fix-NotePlayEvent.patch
+++ b/patches/server/0672-Fix-NotePlayEvent.patch
diff --git a/patches/server/0674-Freeze-Tick-Lock-API.patch b/patches/server/0673-Freeze-Tick-Lock-API.patch
index 80171b8e78..80171b8e78 100644
--- a/patches/server/0674-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0673-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0675-More-PotionEffectType-API.patch b/patches/server/0674-More-PotionEffectType-API.patch
index 07a0ef6777..07a0ef6777 100644
--- a/patches/server/0675-More-PotionEffectType-API.patch
+++ b/patches/server/0674-More-PotionEffectType-API.patch
diff --git a/patches/server/0676-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0675-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index b19bb65d35..b19bb65d35 100644
--- a/patches/server/0676-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0675-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0677-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0676-API-for-creating-command-sender-which-forwards-feedb.patch
index 4e11ae0467..4e11ae0467 100644
--- a/patches/server/0677-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0676-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0678-Add-missing-structure-set-seed-configs.patch b/patches/server/0677-Add-missing-structure-set-seed-configs.patch
index 0c160b7c1c..0c160b7c1c 100644
--- a/patches/server/0678-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0677-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0679-Implement-regenerateChunk.patch b/patches/server/0678-Implement-regenerateChunk.patch
index c6a6c8eb34..c6a6c8eb34 100644
--- a/patches/server/0679-Implement-regenerateChunk.patch
+++ b/patches/server/0678-Implement-regenerateChunk.patch
diff --git a/patches/server/0680-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0679-Fix-cancelled-powdered-snow-bucket-placement.patch
index 57020bc01b..e46654952c 100644
--- a/patches/server/0680-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0679-Fix-cancelled-powdered-snow-bucket-placement.patch
@@ -8,7 +8,7 @@ snow bucket didn't revert grass that became snowy because of the
 placement.
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index f5547caeaeeb8fa37f2aa9bfea6f176b1cc3430a..2f60e67de38bb4b39deb505f23e35aeff9eded73 100644
+index 2947a43a1d9e49273ed0242691273e50c657cd05..51a7919b019f2fd5d2e2ab850ed512769b0b1685 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -401,7 +401,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0681-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0680-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 43e7e71051..43e7e71051 100644
--- a/patches/server/0681-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0680-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0682-Add-GameEvent-tags.patch b/patches/server/0681-Add-GameEvent-tags.patch
index 1de3d4a3c4..1de3d4a3c4 100644
--- a/patches/server/0682-Add-GameEvent-tags.patch
+++ b/patches/server/0681-Add-GameEvent-tags.patch
diff --git a/patches/server/0683-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0682-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 3d074b30b4..3d074b30b4 100644
--- a/patches/server/0683-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0682-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0684-Furnace-RecipesUsed-API.patch b/patches/server/0683-Furnace-RecipesUsed-API.patch
index d8224fe839..d8224fe839 100644
--- a/patches/server/0684-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0683-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0685-Configurable-sculk-sensor-listener-range.patch b/patches/server/0684-Configurable-sculk-sensor-listener-range.patch
index f2d79796cb..f2d79796cb 100644
--- a/patches/server/0685-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0684-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0686-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0685-Add-missing-block-data-mins-and-maxes.patch
index fe8170196d..fe8170196d 100644
--- a/patches/server/0686-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0685-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0687-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0686-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 22d038e185..22d038e185 100644
--- a/patches/server/0687-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0686-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0688-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0687-Put-world-into-worldlist-before-initing-the-world.patch
index de105288ed..de105288ed 100644
--- a/patches/server/0688-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0687-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0689-Fix-Entity-Position-Desync.patch b/patches/server/0688-Fix-Entity-Position-Desync.patch
index fb9d587df1..fb9d587df1 100644
--- a/patches/server/0689-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0688-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0690-Custom-Potion-Mixes.patch b/patches/server/0689-Custom-Potion-Mixes.patch
index 04763694af..04763694af 100644
--- a/patches/server/0690-Custom-Potion-Mixes.patch
+++ b/patches/server/0689-Custom-Potion-Mixes.patch
diff --git a/patches/server/0691-Force-close-world-loading-screen.patch b/patches/server/0690-Force-close-world-loading-screen.patch
index a90bc669b4..a90bc669b4 100644
--- a/patches/server/0691-Force-close-world-loading-screen.patch
+++ b/patches/server/0690-Force-close-world-loading-screen.patch
diff --git a/patches/server/0692-Fix-falling-block-spawn-methods.patch b/patches/server/0691-Fix-falling-block-spawn-methods.patch
index 1f5d0c19cc..1f5d0c19cc 100644
--- a/patches/server/0692-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0691-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0693-Expose-furnace-minecart-push-values.patch b/patches/server/0692-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0693-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0692-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0694-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0693-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 2d524b390b..2d524b390b 100644
--- a/patches/server/0694-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0693-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0695-More-Projectile-API.patch b/patches/server/0694-More-Projectile-API.patch
index bccb9ad23b..bccb9ad23b 100644
--- a/patches/server/0695-More-Projectile-API.patch
+++ b/patches/server/0694-More-Projectile-API.patch
diff --git a/patches/server/0696-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0695-Fix-swamp-hut-cat-generation-deadlock.patch
index 1b0f7d0ed5..1b0f7d0ed5 100644
--- a/patches/server/0696-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0695-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0697-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0696-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index f3a8cad2df..f3a8cad2df 100644
--- a/patches/server/0697-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0696-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0698-Implement-getComputedBiome-API.patch b/patches/server/0697-Implement-getComputedBiome-API.patch
index 57a6b3a7c5..57a6b3a7c5 100644
--- a/patches/server/0698-Implement-getComputedBiome-API.patch
+++ b/patches/server/0697-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0699-Make-some-itemstacks-nonnull.patch b/patches/server/0698-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0699-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0698-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0700-Implement-enchantWithLevels-API.patch b/patches/server/0699-Implement-enchantWithLevels-API.patch
index 7031b197b7..7031b197b7 100644
--- a/patches/server/0700-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0699-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0701-Fix-saving-in-unloadWorld.patch b/patches/server/0700-Fix-saving-in-unloadWorld.patch
index aa9f726bd7..aa9f726bd7 100644
--- a/patches/server/0701-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0700-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0702-Buffer-OOB-setBlock-calls.patch b/patches/server/0701-Buffer-OOB-setBlock-calls.patch
index d0e56ca766..d0e56ca766 100644
--- a/patches/server/0702-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0701-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0703-Add-TameableDeathMessageEvent.patch b/patches/server/0702-Add-TameableDeathMessageEvent.patch
index 355d8192ca..355d8192ca 100644
--- a/patches/server/0703-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0702-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0704-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0703-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index d811493fc4..d811493fc4 100644
--- a/patches/server/0704-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0703-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0705-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0704-fix-player-loottables-running-when-mob-loot-gamerule.patch
index c0f0ba62ab..c0f0ba62ab 100644
--- a/patches/server/0705-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0704-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0706-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0705-Ensure-entity-passenger-world-matches-ridden-entity.patch
index b656e4e0e3..b656e4e0e3 100644
--- a/patches/server/0706-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0705-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0707-cache-resource-keys.patch b/patches/server/0706-cache-resource-keys.patch
index d444813b7a..d444813b7a 100644
--- a/patches/server/0707-cache-resource-keys.patch
+++ b/patches/server/0706-cache-resource-keys.patch
diff --git a/patches/server/0708-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0707-Allow-changing-the-EnderDragon-podium.patch
index 623c4b9689..623c4b9689 100644
--- a/patches/server/0708-Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/server/0707-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0709-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0708-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 05d5b9189b..05d5b9189b 100644
--- a/patches/server/0709-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0708-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0710-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0709-Prevent-tile-entity-copies-loading-chunks.patch
index a8ec237bcc..a8ec237bcc 100644
--- a/patches/server/0710-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0709-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0711-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0710-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 9eed66c5cf..9eed66c5cf 100644
--- a/patches/server/0711-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0710-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0712-Expand-PlayerItemDamageEvent.patch b/patches/server/0711-Expand-PlayerItemDamageEvent.patch
index 9163d3de01..bb07753eca 100644
--- a/patches/server/0712-Expand-PlayerItemDamageEvent.patch
+++ b/patches/server/0711-Expand-PlayerItemDamageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand PlayerItemDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 2f60e67de38bb4b39deb505f23e35aeff9eded73..0a883564b9dda4fa0e6a7174a6e46b98af8be3e6 100644
+index 51a7919b019f2fd5d2e2ab850ed512769b0b1685..acce1b72185d4687ef5a72dd4014d87149f4b092 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -661,10 +661,11 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0713-WorldCreator-keepSpawnLoaded.patch b/patches/server/0712-WorldCreator-keepSpawnLoaded.patch
index 92ffaf7290..92ffaf7290 100644
--- a/patches/server/0713-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0712-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0714-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0713-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index ed8adb4503..ed8adb4503 100644
--- a/patches/server/0714-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0713-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0715-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0714-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index d6e979b4fa..d6e979b4fa 100644
--- a/patches/server/0715-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0714-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0716-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0715-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 7c31e2a5df..7c31e2a5df 100644
--- a/patches/server/0716-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0715-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0717-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0716-Fire-CauldronLevelChange-on-initial-fill.patch
index 4f5e70f836..4f5e70f836 100644
--- a/patches/server/0717-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0716-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0718-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0717-fix-powder-snow-cauldrons-not-turning-to-water.patch
index f277b93aa1..f277b93aa1 100644
--- a/patches/server/0718-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0717-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0719-Add-PlayerStopUsingItemEvent.patch b/patches/server/0718-Add-PlayerStopUsingItemEvent.patch
index fa87839c01..fa87839c01 100644
--- a/patches/server/0719-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0718-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0720-Don-t-tick-markers.patch b/patches/server/0719-Don-t-tick-markers.patch
index 429927b2bf..429927b2bf 100644
--- a/patches/server/0720-Don-t-tick-markers.patch
+++ b/patches/server/0719-Don-t-tick-markers.patch
diff --git a/patches/server/0721-Expand-FallingBlock-API.patch b/patches/server/0720-Expand-FallingBlock-API.patch
index 861e7e87f2..861e7e87f2 100644
--- a/patches/server/0721-Expand-FallingBlock-API.patch
+++ b/patches/server/0720-Expand-FallingBlock-API.patch
diff --git a/patches/server/0722-Add-support-for-Proxy-Protocol.patch b/patches/server/0721-Add-support-for-Proxy-Protocol.patch
index 1ffaba0911..1ffaba0911 100644
--- a/patches/server/0722-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0721-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0723-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0722-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 61c9b7dd07..61c9b7dd07 100644
--- a/patches/server/0723-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0722-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0724-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0723-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 7158b83635..7158b83635 100644
--- a/patches/server/0724-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0723-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0725-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0724-Sanitize-sent-BlockEntity-NBT.patch
index 79bacba95c..4e53e16b15 100644
--- a/patches/server/0725-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/server/0724-Sanitize-sent-BlockEntity-NBT.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] Sanitize sent BlockEntity NBT
 
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
-index 1970c0fa24764f6bbd0cc360b7d32d7906eaf808..db03254682b827d650160d6f2c1a18cf12c861d7 100644
+index 4f3ba61f13dbe5773034a19e749b7c4f5dc3d291..5d3e739d28d394ed59fe0003245cc55ac62e6087 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
-@@ -23,7 +23,7 @@ public class ClientboundBlockEntityDataPacket implements Packet<ClientGamePacket
-     public static ClientboundBlockEntityDataPacket create(BlockEntity blockEntity, BiFunction<BlockEntity, RegistryAccess, CompoundTag> nbtGetter) {
-         RegistryAccess iregistrycustom = blockEntity.getLevel().registryAccess();
+@@ -29,7 +29,7 @@ public class ClientboundBlockEntityDataPacket implements Packet<ClientGamePacket
  
--        return new ClientboundBlockEntityDataPacket(blockEntity.getBlockPos(), blockEntity.getType(), (CompoundTag) nbtGetter.apply(blockEntity, iregistrycustom));
-+        return new ClientboundBlockEntityDataPacket(blockEntity.getBlockPos(), blockEntity.getType(), (CompoundTag) blockEntity.sanitizeSentNbt(nbtGetter.apply(blockEntity, iregistrycustom)));  // Paper - Sanitize sent data
+     public static ClientboundBlockEntityDataPacket create(BlockEntity blockEntity, BiFunction<BlockEntity, RegistryAccess, CompoundTag> nbtGetter) {
+         RegistryAccess registryAccess = blockEntity.getLevel().registryAccess();
+-        return new ClientboundBlockEntityDataPacket(blockEntity.getBlockPos(), blockEntity.getType(), nbtGetter.apply(blockEntity, registryAccess));
++        return new ClientboundBlockEntityDataPacket(blockEntity.getBlockPos(), blockEntity.getType(), blockEntity.sanitizeSentNbt(nbtGetter.apply(blockEntity, registryAccess)));  // Paper - Sanitize sent data
      }
  
      public static ClientboundBlockEntityDataPacket create(BlockEntity blockEntity) {
@@ -30,10 +30,10 @@ index ac900dfdc5c90e9e60d47efa734be8f0a5b20dca..ec1cb034d840633240f2b379b09f7d2f
          }
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index df945a152747bea0452ec18c09d59598903aa91f..a7dfad2696e7145af1355a5db132af14d09a6f30 100644
+index 978125c69b2a9ea465595c7eef10a1aea7ccf26c..30a75492a4b25450c194b4cc44deb665711db5af 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -357,6 +357,14 @@ public abstract class BlockEntity {
+@@ -368,6 +368,14 @@ public abstract class BlockEntity {
      }
      // CraftBukkit end
  
diff --git a/patches/server/0726-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0725-Disable-component-selector-resolving-in-books-by-def.patch
index 796fcc7f2a..796fcc7f2a 100644
--- a/patches/server/0726-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0725-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0727-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0726-Prevent-entity-loading-causing-async-lookups.patch
index d3f30f5169..d3f30f5169 100644
--- a/patches/server/0727-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0726-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0728-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0727-Throw-exception-on-world-create-while-being-ticked.patch
index e3913abcf5..e3913abcf5 100644
--- a/patches/server/0728-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0727-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0729-Dont-resent-entity-on-art-update.patch b/patches/server/0728-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0729-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0728-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0730-Add-WardenAngerChangeEvent.patch b/patches/server/0729-Add-WardenAngerChangeEvent.patch
index 38df99e752..38df99e752 100644
--- a/patches/server/0730-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0729-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0731-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0730-Add-option-for-strict-advancement-dimension-checks.patch
index a6ef3a78f3..a6ef3a78f3 100644
--- a/patches/server/0731-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0730-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0732-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0731-Add-missing-important-BlockStateListPopulator-method.patch
index ecf565ebf6..ecf565ebf6 100644
--- a/patches/server/0732-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0731-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0733-Nameable-Banner-API.patch b/patches/server/0732-Nameable-Banner-API.patch
index 823dd8a8c8..21ca7151b4 100644
--- a/patches/server/0733-Nameable-Banner-API.patch
+++ b/patches/server/0732-Nameable-Banner-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Nameable Banner API
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java
-index 2656e06ab2269141a13011eaa906f601887ca3e2..26d2f63d2add276a2f51c399f494a7219413d3e3 100644
+index 925608bfa9c848ed6285de5e35d60aa66e12004a..60c26076e7acf869fa0e20fdc14eeec341387d99 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java
 @@ -29,7 +29,7 @@ public class BannerBlockEntity extends BlockEntity implements Nameable {
diff --git a/patches/server/0734-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0733-Don-t-broadcast-messages-to-command-blocks.patch
index 44292abef1..58912bb8af 100644
--- a/patches/server/0734-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0733-Don-t-broadcast-messages-to-command-blocks.patch
@@ -8,10 +8,10 @@ in command blocks, and if called asynchronously, would throw
 an error
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
-index e40069d937de5fd00741ae6873abeecc46b93732..552f7ab11dc09fa69034f009235cb22429a9ed11 100644
+index 8c2dcc4134d96351cee75773214f3f47e71533e9..e6bfcc50cdf728216084bc00a5bb8b6b3b8f72e4 100644
 --- a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
 +++ b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java
-@@ -177,6 +177,7 @@ public abstract class BaseCommandBlock implements CommandSource {
+@@ -178,6 +178,7 @@ public abstract class BaseCommandBlock implements CommandSource {
      @Override
      public void sendSystemMessage(Component message) {
          if (this.trackOutput) {
diff --git a/patches/server/0735-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0734-Prevent-empty-items-from-being-added-to-world.patch
index f3d82c1fbd..f3d82c1fbd 100644
--- a/patches/server/0735-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0734-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0736-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0735-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 2c104c79c4..2c104c79c4 100644
--- a/patches/server/0736-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0735-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0737-Add-Player-getFishHook.patch b/patches/server/0736-Add-Player-getFishHook.patch
index d87fa21619..d87fa21619 100644
--- a/patches/server/0737-Add-Player-getFishHook.patch
+++ b/patches/server/0736-Add-Player-getFishHook.patch
diff --git a/patches/server/0738-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0737-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 32aaf6dc6e..32aaf6dc6e 100644
--- a/patches/server/0738-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0737-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0739-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0738-Add-various-missing-EntityDropItemEvent-calls.patch
index bafd157cd1..bafd157cd1 100644
--- a/patches/server/0739-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0738-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0740-Fix-Bee-flower-NPE.patch b/patches/server/0739-Fix-Bee-flower-NPE.patch
index 13dcee533d..13dcee533d 100644
--- a/patches/server/0740-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0739-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0741-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0740-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 8d111565f9..8d111565f9 100644
--- a/patches/server/0741-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0740-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0742-More-Teleport-API.patch b/patches/server/0741-More-Teleport-API.patch
index 2f7a16ac49..2f7a16ac49 100644
--- a/patches/server/0742-More-Teleport-API.patch
+++ b/patches/server/0741-More-Teleport-API.patch
diff --git a/patches/server/0743-Add-EntityPortalReadyEvent.patch b/patches/server/0742-Add-EntityPortalReadyEvent.patch
index 50d3716266..50d3716266 100644
--- a/patches/server/0743-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0742-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0744-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0743-Don-t-use-level-random-in-entity-constructors.patch
index 4d7c249601..4d7c249601 100644
--- a/patches/server/0744-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0743-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0745-Send-block-entities-after-destroy-prediction.patch b/patches/server/0744-Send-block-entities-after-destroy-prediction.patch
index 4516d3139c..4516d3139c 100644
--- a/patches/server/0745-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0744-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0746-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0745-Warn-on-plugins-accessing-faraway-chunks.patch
index 2f60387b5d..2f60387b5d 100644
--- a/patches/server/0746-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0745-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0747-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0746-Custom-Chat-Completion-Suggestions-API.patch
index 52d9d632bf..52d9d632bf 100644
--- a/patches/server/0747-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0746-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0748-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0747-Add-and-fix-missing-BlockFadeEvents.patch
index 18f8fbe87f..18f8fbe87f 100644
--- a/patches/server/0748-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0747-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0749-Collision-API.patch b/patches/server/0748-Collision-API.patch
index b4840d04ac..b4840d04ac 100644
--- a/patches/server/0749-Collision-API.patch
+++ b/patches/server/0748-Collision-API.patch
diff --git a/patches/server/0750-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0749-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index c145128551..c145128551 100644
--- a/patches/server/0750-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0749-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0751-Block-Ticking-API.patch b/patches/server/0750-Block-Ticking-API.patch
index f1b51ee5b1..f1b51ee5b1 100644
--- a/patches/server/0751-Block-Ticking-API.patch
+++ b/patches/server/0750-Block-Ticking-API.patch
diff --git a/patches/server/0752-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0751-Add-Velocity-IP-Forwarding-Support.patch
index 717824d206..717824d206 100644
--- a/patches/server/0752-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0751-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0753-Add-NamespacedKey-biome-methods.patch b/patches/server/0752-Add-NamespacedKey-biome-methods.patch
index b870c787cc..5367ba1df6 100644
--- a/patches/server/0753-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0752-Add-NamespacedKey-biome-methods.patch
@@ -6,7 +6,7 @@ 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 365f7846d4c522811cf992ea1a2da67b025661b9..c4e517ef6cf5cd4975846459cf66ebd4db66a805 100644
+index a14a316d63e34ac4ac7ee81a27a8fbdfcdb2b451..6ab39cc723f0874c28def182eaada05c11d36678 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -604,6 +604,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0754-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0753-Fix-plugin-loggers-on-server-shutdown.patch
index c0da2d76a6..c0da2d76a6 100644
--- a/patches/server/0754-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0753-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0755-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0754-Stop-large-look-changes-from-crashing-the-server.patch
index fdc94d50a1..fdc94d50a1 100644
--- a/patches/server/0755-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0754-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0756-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0755-Fire-EntityChangeBlockEvent-in-more-places.patch
index d21cfe9e22..d21cfe9e22 100644
--- a/patches/server/0756-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0755-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0757-Missing-eating-regain-reason.patch b/patches/server/0756-Missing-eating-regain-reason.patch
index 7c26c6d752..7c26c6d752 100644
--- a/patches/server/0757-Missing-eating-regain-reason.patch
+++ b/patches/server/0756-Missing-eating-regain-reason.patch
diff --git a/patches/server/0758-Missing-effect-cause.patch b/patches/server/0757-Missing-effect-cause.patch
index 17172c3b36..17172c3b36 100644
--- a/patches/server/0758-Missing-effect-cause.patch
+++ b/patches/server/0757-Missing-effect-cause.patch
diff --git a/patches/server/0759-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0758-Added-byte-array-serialization-deserialization-for-P.patch
index f2a4d437f0..f2a4d437f0 100644
--- a/patches/server/0759-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0758-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0760-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0759-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index c6ff862ed6..c6ff862ed6 100644
--- a/patches/server/0760-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0759-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0761-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0760-Call-BlockPhysicsEvent-more-often.patch
index 1839fbe711..1839fbe711 100644
--- a/patches/server/0761-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0760-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0762-Configurable-chat-thread-limit.patch b/patches/server/0761-Configurable-chat-thread-limit.patch
index 255381bd14..255381bd14 100644
--- a/patches/server/0762-Configurable-chat-thread-limit.patch
+++ b/patches/server/0761-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0763-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0762-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 6b16e23fbc..6b16e23fbc 100644
--- a/patches/server/0763-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0762-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0764-fix-Jigsaw-block-kicking-user.patch b/patches/server/0763-fix-Jigsaw-block-kicking-user.patch
index 0c52c47ce9..0c52c47ce9 100644
--- a/patches/server/0764-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0763-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0765-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0764-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 8653ffd786..8653ffd786 100644
--- a/patches/server/0765-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0764-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0766-Add-getDrops-to-BlockState.patch b/patches/server/0765-Add-getDrops-to-BlockState.patch
index ea12f69bde..ea12f69bde 100644
--- a/patches/server/0766-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0765-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0766-Fix-a-bunch-of-vanilla-bugs.patch
index 45f93faf5c..1848692372 100644
--- a/patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0766-Fix-a-bunch-of-vanilla-bugs.patch
@@ -408,7 +408,7 @@ index 614ddebb92aba91694951fc22900fed362b3426d..d19e799491f790ca967a0731ef95a069
      }
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 00ce8c45d906d8a468d93f464638f367d77e40fb..ac1547d4f45aa676ae174c6c80716db3437f2914 100644
+index a11f487197274da7cf3217f24e1cae2a343a7331..edb7d981bb443b5b395a1985fb7cfd96009d0b0a 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -295,7 +295,11 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
diff --git a/patches/server/0768-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0767-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 73e5958d98..73e5958d98 100644
--- a/patches/server/0768-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0767-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0769-Fix-custom-piglin-loved-items.patch b/patches/server/0768-Fix-custom-piglin-loved-items.patch
index 043217eed5..043217eed5 100644
--- a/patches/server/0769-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0768-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0770-EntityPickupItemEvent-fixes.patch b/patches/server/0769-EntityPickupItemEvent-fixes.patch
index 5780237591..5780237591 100644
--- a/patches/server/0770-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0769-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0771-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0770-Correctly-handle-interactions-with-items-on-cooldown.patch
index abeca5857c..abeca5857c 100644
--- a/patches/server/0771-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0770-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0772-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0771-Add-PlayerInventorySlotChangeEvent.patch
index 40015b3b36..40015b3b36 100644
--- a/patches/server/0772-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0771-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0773-Elder-Guardian-appearance-API.patch b/patches/server/0772-Elder-Guardian-appearance-API.patch
index 403482552b..403482552b 100644
--- a/patches/server/0773-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0772-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0774-Allow-changing-bed-s-occupied-property.patch b/patches/server/0773-Allow-changing-bed-s-occupied-property.patch
index d8b51d7f0b..d8b51d7f0b 100644
--- a/patches/server/0774-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0773-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0775-Add-entity-knockback-API.patch b/patches/server/0774-Add-entity-knockback-API.patch
index c5c8da6eb6..c5c8da6eb6 100644
--- a/patches/server/0775-Add-entity-knockback-API.patch
+++ b/patches/server/0774-Add-entity-knockback-API.patch
diff --git a/patches/server/0776-Detect-headless-JREs.patch b/patches/server/0775-Detect-headless-JREs.patch
index 5ba28913a8..5ba28913a8 100644
--- a/patches/server/0776-Detect-headless-JREs.patch
+++ b/patches/server/0775-Detect-headless-JREs.patch
diff --git a/patches/server/0777-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0776-fix-entity-vehicle-collision-event-not-called.patch
index fdb817e0f7..fdb817e0f7 100644
--- a/patches/server/0777-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0776-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0778-Add-EntityToggleSitEvent.patch b/patches/server/0777-Add-EntityToggleSitEvent.patch
index 6430c3e7f9..6430c3e7f9 100644
--- a/patches/server/0778-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0777-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0779-Add-fire-tick-delay-option.patch b/patches/server/0778-Add-fire-tick-delay-option.patch
index 848f831f0e..848f831f0e 100644
--- a/patches/server/0779-Add-fire-tick-delay-option.patch
+++ b/patches/server/0778-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0780-Add-Moving-Piston-API.patch b/patches/server/0779-Add-Moving-Piston-API.patch
index e3d3955822..e3d3955822 100644
--- a/patches/server/0780-Add-Moving-Piston-API.patch
+++ b/patches/server/0779-Add-Moving-Piston-API.patch
diff --git a/patches/server/0781-Ignore-impossible-spawn-tick.patch b/patches/server/0780-Ignore-impossible-spawn-tick.patch
index f046102ceb..f046102ceb 100644
--- a/patches/server/0781-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0780-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0782-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0781-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index c42422ceca..c42422ceca 100644
--- a/patches/server/0782-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0781-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0783-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0782-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 5def430ee3..5def430ee3 100644
--- a/patches/server/0783-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0782-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0784-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0783-Add-PrePlayerAttackEntityEvent.patch
index 6ea383ac09..2c7c8105ab 100644
--- a/patches/server/0784-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0783-Add-PrePlayerAttackEntityEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 4003dfeae8b2486045a3dbe4c1adc65a882e70ba..761e8a0c4e1db465c18892999e86885f27ca8075 100644
+index f861a942807f8b8af36d6b70a124da7853eda053..90c9856dc16f83c762415aaeeb030bcd07b72d51 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1246,8 +1246,17 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0785-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0784-ensure-reset-EnderDragon-boss-event-name.patch
index 854c391fc5..854c391fc5 100644
--- a/patches/server/0785-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0784-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0786-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0785-fix-MC-252817-green-map-markers-do-not-disappear.patch
index a5e8df272b..a5e8df272b 100644
--- a/patches/server/0786-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0785-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0787-Add-Player-Warden-Warning-API.patch b/patches/server/0786-Add-Player-Warden-Warning-API.patch
index cbda3eac9c..cbda3eac9c 100644
--- a/patches/server/0787-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0786-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0788-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0787-More-vanilla-friendly-methods-to-update-trades.patch
index 5280c03219..5280c03219 100644
--- a/patches/server/0788-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0787-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0789-Add-paper-dumplisteners-command.patch b/patches/server/0788-Add-paper-dumplisteners-command.patch
index 4170206f59..4170206f59 100644
--- a/patches/server/0789-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0788-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0790-check-global-player-list-where-appropriate.patch b/patches/server/0789-check-global-player-list-where-appropriate.patch
index 56ca131550..56ca131550 100644
--- a/patches/server/0790-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0789-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0791-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0790-Fix-async-entity-add-due-to-fungus-trees.patch
index a5f4531c29..a5f4531c29 100644
--- a/patches/server/0791-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0790-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0792-ItemStack-damage-API.patch b/patches/server/0791-ItemStack-damage-API.patch
index 807a916f44..807a916f44 100644
--- a/patches/server/0792-ItemStack-damage-API.patch
+++ b/patches/server/0791-ItemStack-damage-API.patch
diff --git a/patches/server/0793-Friction-API.patch b/patches/server/0792-Friction-API.patch
index 8818e0e61b..8818e0e61b 100644
--- a/patches/server/0793-Friction-API.patch
+++ b/patches/server/0792-Friction-API.patch
diff --git a/patches/server/0794-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0793-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 5bc45a7af4..5bc45a7af4 100644
--- a/patches/server/0794-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0793-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0795-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0794-Fix-premature-player-kicks-on-shutdown.patch
index d824af1bd8..d824af1bd8 100644
--- a/patches/server/0795-Fix-premature-player-kicks-on-shutdown.patch
+++ b/patches/server/0794-Fix-premature-player-kicks-on-shutdown.patch
diff --git a/patches/server/0796-Sync-offhand-slot-in-menus.patch b/patches/server/0795-Sync-offhand-slot-in-menus.patch
index 2c88b798a8..2c88b798a8 100644
--- a/patches/server/0796-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0795-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0797-Player-Entity-Tracking-Events.patch b/patches/server/0796-Player-Entity-Tracking-Events.patch
index 4a5f62d874..4a5f62d874 100644
--- a/patches/server/0797-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0796-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0798-Limit-pet-look-distance.patch b/patches/server/0797-Limit-pet-look-distance.patch
index 7a9fe7cf5c..7a9fe7cf5c 100644
--- a/patches/server/0798-Limit-pet-look-distance.patch
+++ b/patches/server/0797-Limit-pet-look-distance.patch
diff --git a/patches/server/0799-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0798-Fixes-and-additions-to-the-SpawnReason-API.patch
index d758b37206..d758b37206 100644
--- a/patches/server/0799-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0798-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0800-fix-Instruments.patch b/patches/server/0799-fix-Instruments.patch
index 610a880852..610a880852 100644
--- a/patches/server/0800-fix-Instruments.patch
+++ b/patches/server/0799-fix-Instruments.patch
diff --git a/patches/server/0801-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0800-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 2f86713e06..2f86713e06 100644
--- a/patches/server/0801-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0800-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0802-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0801-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 5b38409d1f..5b38409d1f 100644
--- a/patches/server/0802-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0801-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0803-Add-BlockLockCheckEvent.patch b/patches/server/0802-Add-BlockLockCheckEvent.patch
index 91be1b9825..7e9746e1ed 100644
--- a/patches/server/0803-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0802-Add-BlockLockCheckEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add BlockLockCheckEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
-index ff3f26c31bd11b48f48e354ea6b33aa55dcbff5d..02675f15e157ce68506c813b19cf5472bf67bc00 100644
+index bf9ae460bdfb247456b895f026f6a7a2e162c5f5..15fd1fe1b55b6421d2c09e8385c9f69fa0152e56 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
 @@ -73,17 +73,44 @@ public abstract class BaseContainerBlockEntity extends BlockEntity implements Co
@@ -56,7 +56,7 @@ index ff3f26c31bd11b48f48e354ea6b33aa55dcbff5d..02675f15e157ce68506c813b19cf5472
  
      protected abstract NonNullList<ItemStack> getItems();
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index ac1547d4f45aa676ae174c6c80716db3437f2914..d575294924df6b970c5773a5cdd8b2a1a9cbce19 100644
+index edb7d981bb443b5b395a1985fb7cfd96009d0b0a..62b9b5f508462dd2257094cb48ce6123e29cb64d 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -472,7 +472,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
diff --git a/patches/server/0804-Add-Sneaking-API-for-Entities.patch b/patches/server/0803-Add-Sneaking-API-for-Entities.patch
index 47d08328f7..47d08328f7 100644
--- a/patches/server/0804-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0803-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0805-Improve-logging-and-errors.patch b/patches/server/0804-Improve-logging-and-errors.patch
index cb4ce73b0f..cb4ce73b0f 100644
--- a/patches/server/0805-Improve-logging-and-errors.patch
+++ b/patches/server/0804-Improve-logging-and-errors.patch
diff --git a/patches/server/0806-Improve-PortalEvents.patch b/patches/server/0805-Improve-PortalEvents.patch
index 680471754c..680471754c 100644
--- a/patches/server/0806-Improve-PortalEvents.patch
+++ b/patches/server/0805-Improve-PortalEvents.patch
diff --git a/patches/server/0807-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0806-Add-config-option-for-spider-worldborder-climbing.patch
index b10bcacd3c..b10bcacd3c 100644
--- a/patches/server/0807-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0806-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0808-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0807-Add-missing-SpigotConfig-logCommands-check.patch
index cffc70d916..cffc70d916 100644
--- a/patches/server/0808-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0807-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0809-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0808-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0809-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0808-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0810-Flying-Fall-Damage.patch b/patches/server/0809-Flying-Fall-Damage.patch
index 46bd6e117e..17c6c542fd 100644
--- a/patches/server/0810-Flying-Fall-Damage.patch
+++ b/patches/server/0809-Flying-Fall-Damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 761e8a0c4e1db465c18892999e86885f27ca8075..230ffd3c4541ef8979605d733b6463e39cd00206 100644
+index 90c9856dc16f83c762415aaeeb030bcd07b72d51..96fc37c871566ec41c42bd0e0f4a147044c239b4 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -194,6 +194,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0812-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0810-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 214bb65165..214bb65165 100644
--- a/patches/server/0812-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0810-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0811-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0811-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
deleted file mode 100644
index 62b06bc717..0000000000
--- a/patches/server/0811-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Fri, 22 Oct 2021 16:25:07 -0700
-Subject: [PATCH] Add exploded block state to BlockExplodeEvent and
- EntityDamageByBlockEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index ec52c7a75d9988475fbb4fe12ef7f4489ef3d894..a78fd4f9ce97ebece45979908382de8f5fc14c1b 100644
---- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-@@ -21,6 +21,7 @@ public class DamageSource {
-     private final Entity directEntity;
-     @Nullable
-     private final Vec3 damageSourcePosition;
-+    public org.bukkit.block.BlockState explodedBlockState; // Paper - add exploded state
-     // CraftBukkit start
-     @Nullable
-     private org.bukkit.block.Block directBlock; // The block that caused the damage. damageSourcePosition is not used for all block damages
-@@ -94,6 +95,7 @@ public class DamageSource {
- 
-     private DamageSource cloneInstance() {
-         DamageSource damageSource = new DamageSource(this.type, this.directEntity, this.causingEntity, this.damageSourcePosition);
-+        damageSource.explodedBlockState = this.explodedBlockState; // Paper - Include explodedBlockState when clone this instance of DamageSource
-         damageSource.directBlock = this.getDirectBlock();
-         damageSource.withSweep = this.isSweep();
-         damageSource.poison = this.isPoison();
-diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSources.java b/src/main/java/net/minecraft/world/damagesource/DamageSources.java
-index 2f5591aa232b834bb9b69a2a349ce93d1a9c63fa..8ba60de95845f4d56f299c5f1b2b5163461ba38d 100644
---- a/src/main/java/net/minecraft/world/damagesource/DamageSources.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSources.java
-@@ -265,8 +265,17 @@ public class DamageSources {
-         return this.source(DamageTypes.SONIC_BOOM, attacker);
-     }
- 
-+    @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper - add exploded state
-     public DamageSource badRespawnPointExplosion(Vec3 position) {
--        return new DamageSource(this.damageTypes.getHolderOrThrow(DamageTypes.BAD_RESPAWN_POINT), position);
-+        // Paper start - add exploded state
-+        return this.badRespawnPointExplosion(position, null);
-+    }
-+
-+    public DamageSource badRespawnPointExplosion(Vec3 position, @Nullable org.bukkit.block.BlockState explodedBlockState) {
-+        DamageSource source = new DamageSource(this.damageTypes.getHolderOrThrow(DamageTypes.BAD_RESPAWN_POINT), position);
-+        source.explodedBlockState = explodedBlockState;
-+        return source;
-+        // Paper end - add exploded state
-     }
- 
-     public DamageSource outOfBorder() {
-diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index d29b4268431472c6132efdfcd305e9616c57da21..0a8e46eef6df0bfda663758fc22b1eb4640aaf4e 100644
---- a/src/main/java/net/minecraft/world/level/Explosion.java
-+++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -389,7 +389,7 @@ public class Explosion {
-                 bukkitBlocks = event.blockList();
-                 this.yield = event.getYield();
-             } else {
--                BlockExplodeEvent event = new BlockExplodeEvent(location.getBlock(), blockList, this.yield);
-+                BlockExplodeEvent event = new BlockExplodeEvent(location.getBlock(), blockList, this.yield, this.damageSource.explodedBlockState); // Paper - add exploded state
-                 this.level.getCraftServer().getPluginManager().callEvent(event);
-                 this.wasCanceled = event.isCancelled();
-                 bukkitBlocks = event.blockList();
-diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index 03035ed3df2f32e14a8eb9bc3d536ef64b5d87ba..872bec4c366c86177334452315cc4a8097dae3c0 100644
---- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-@@ -95,6 +95,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
- 
-             // CraftBukkit - moved world and biome check into EntityHuman
-             if (false && !BedBlock.canSetSpawn(world)) {
-+                final org.bukkit.block.BlockState explodedBlockState = org.bukkit.craftbukkit.block.CraftBlockStates.getUnplacedBlockState(world, pos, state); // Paper - add exploded state (this won't be called due to the false, but it's good for reference)
-                 world.removeBlock(pos, false);
-                 BlockPos blockposition1 = pos.relative(((Direction) state.getValue(BedBlock.FACING)).getOpposite());
- 
-@@ -104,7 +105,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
- 
-                 Vec3 vec3d = pos.getCenter();
- 
--                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK);
-+                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // Paper - add exploded state
-                 return InteractionResult.SUCCESS;
-             } else if ((Boolean) state.getValue(BedBlock.OCCUPIED)) {
-                 if (!this.kickVillagerOutOfBed(world, pos)) {
-@@ -146,6 +147,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
-     private InteractionResult explodeBed(BlockState iblockdata, Level world, BlockPos blockposition) {
-         {
-             {
-+                final org.bukkit.block.BlockState explodedBlockState = org.bukkit.craftbukkit.block.CraftBlockStates.getUnplacedBlockState(world, blockposition, iblockdata); // Paper - add exploded state
-                 world.removeBlock(blockposition, false);
-                 BlockPos blockposition1 = blockposition.relative(((Direction) iblockdata.getValue(BedBlock.FACING)).getOpposite());
- 
-@@ -155,7 +157,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
- 
-                 Vec3 vec3d = blockposition.getCenter();
- 
--                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK);
-+                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // Paper - add exploded state
-                 return InteractionResult.SUCCESS;
-             }
-         }
-diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-index a4a90df0b500fb440226b07462faaa87594b12a5..4e2fad1f234356ada6f29445038e43b9a8406cf9 100644
---- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-@@ -133,6 +133,7 @@ public class RespawnAnchorBlock extends Block {
-     }
- 
-     private void explode(BlockState state, Level world, final BlockPos explodedPos) {
-+        final org.bukkit.block.BlockState explodedBlockState = org.bukkit.craftbukkit.block.CraftBlockStates.getBlockState(world, explodedPos, state, null); // Paper - add exploded state
-         world.removeBlock(explodedPos, false);
-         Stream<Direction> stream = Direction.Plane.HORIZONTAL.stream(); // CraftBukkit - decompile error
- 
-@@ -149,7 +150,7 @@ public class RespawnAnchorBlock extends Block {
-         };
-         Vec3 vec3d = explodedPos.getCenter();
- 
--        world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d), explosiondamagecalculator, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK);
-+        world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), explosiondamagecalculator, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // Paper - add exploded state
-     }
- 
-     public static boolean canSetSpawn(Level world) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
-index 411c2de93c71e480f95229c882cdf43b8801edc8..489c17d002a5c3580637fda1c51f1bd63814bfa0 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
-@@ -291,6 +291,12 @@ public final class CraftBlockStates {
-         BlockEntity tileEntity = (blockEntityTag == null) ? null : BlockEntity.loadStatic(blockPosition, blockData, blockEntityTag, registry);
-         return CraftBlockStates.getBlockState(null, blockPosition, blockData, tileEntity);
-     }
-+    // Paper start - add exploded state
-+    public static BlockState getUnplacedBlockState(net.minecraft.world.level.BlockGetter levelAccessor, BlockPos blockPos, net.minecraft.world.level.block.state.BlockState blockData) {
-+        BlockEntity tileEntity = levelAccessor.getBlockEntity(blockPos);
-+        return CraftBlockStates.getBlockState(null, blockPos, blockData, tileEntity);
-+    }
-+    // Paper end - add exploded state
- 
-     // See BlockStateFactory#createBlockState(World, BlockPosition, IBlockData, TileEntity)
-     private static CraftBlockState getBlockState(World world, BlockPos blockPosition, net.minecraft.world.level.block.state.BlockState blockData, BlockEntity tileEntity) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c52cb55cd1da988ec646e4e1484ec1a72513291d..a226b7cdc9c63ef09d7d48269c287af1ab6dbdc4 100644
---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1070,7 +1070,7 @@ public class CraftEventFactory {
-         Entity damager = (bukkitDamageSource.isIndirect() && source.getDirectEntity() != null) ? source.getDirectEntity() : source.getCausingEntity();
-         if (source.is(DamageTypeTags.IS_EXPLOSION)) {
-             if (damager == null) {
--                return CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), entity, DamageCause.BLOCK_EXPLOSION, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
-+                return CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), entity, DamageCause.BLOCK_EXPLOSION, bukkitDamageSource, modifiers, modifierFunctions, cancelled, source.explodedBlockState); // Paper - Include BlockState for damage
-             }
-             DamageCause damageCause = (damager.getBukkitEntity() instanceof org.bukkit.entity.TNTPrimed) ? DamageCause.BLOCK_EXPLOSION : DamageCause.ENTITY_EXPLOSION;
-             return CraftEventFactory.callEntityDamageEvent(damager, entity, damageCause, bukkitDamageSource, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
-@@ -1117,7 +1117,7 @@ public class CraftEventFactory {
-             } else {
-                 throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, source.getDirectBlock(), source.getMsgId()));
-             }
--            return CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), entity, cause, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
-+            return CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), entity, cause, bukkitDamageSource, modifiers, modifierFunctions, cancelled, source.explodedBlockState); // Paper - Include BlockState for damage
-         }
- 
-         DamageCause cause;
-@@ -1170,8 +1170,13 @@ public class CraftEventFactory {
-         return CraftEventFactory.callEntityDamageEvent(event, damagee, cancelled);
-     }
- 
--    private static EntityDamageEvent callEntityDamageEvent(Block damager, Entity damagee, DamageCause cause, org.bukkit.damage.DamageSource bukkitDamageSource, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled) {
--        EntityDamageByBlockEvent event = new EntityDamageByBlockEvent(damager, damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions);
-+    // Paper start
-+    private static EntityDamageEvent callEntityDamageEvent(Block damager, Entity damagee, DamageCause cause, org.bukkit.damage.DamageSource bukkitDamageSource, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled) { // Paper
-+        return callEntityDamageEvent(damager, damagee, cause, bukkitDamageSource, modifiers, modifierFunctions, cancelled, null);
-+    }
-+    private static EntityDamageEvent callEntityDamageEvent(Block damager, Entity damagee, DamageCause cause, org.bukkit.damage.DamageSource bukkitDamageSource, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled, @Nullable org.bukkit.block.BlockState explodedBlockState) {
-+        EntityDamageByBlockEvent event = new EntityDamageByBlockEvent(damager, damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions, explodedBlockState);
-+        // Paper end
-         return CraftEventFactory.callEntityDamageEvent(event, damagee, cancelled);
-     }
- 
diff --git a/patches/server/0813-config-for-disabling-entity-tag-tags.patch b/patches/server/0811-config-for-disabling-entity-tag-tags.patch
index 79f922d624..79f922d624 100644
--- a/patches/server/0813-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0811-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0814-Use-single-player-info-update-packet-on-join.patch b/patches/server/0812-Use-single-player-info-update-packet-on-join.patch
index c2d4b634f7..c2d4b634f7 100644
--- a/patches/server/0814-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0812-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0815-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0813-Correctly-shrink-items-during-EntityResurrectEvent.patch
index aa171312b3..aa171312b3 100644
--- a/patches/server/0815-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0813-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0816-Win-Screen-API.patch b/patches/server/0814-Win-Screen-API.patch
index 55b4336093..55b4336093 100644
--- a/patches/server/0816-Win-Screen-API.patch
+++ b/patches/server/0814-Win-Screen-API.patch
diff --git a/patches/server/0817-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0815-Remove-CraftItemStack-setAmount-null-assignment.patch
index 83f46bb0c6..83f46bb0c6 100644
--- a/patches/server/0817-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0815-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0818-Fix-force-opening-enchantment-tables.patch b/patches/server/0816-Fix-force-opening-enchantment-tables.patch
index eac3ab63ee..eac3ab63ee 100644
--- a/patches/server/0818-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0816-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0819-Add-Entity-Body-Yaw-API.patch b/patches/server/0817-Add-Entity-Body-Yaw-API.patch
index 47d59d5783..47d59d5783 100644
--- a/patches/server/0819-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0817-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0820-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0818-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 962917dab8..962917dab8 100644
--- a/patches/server/0820-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0818-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0821-Add-EntityFertilizeEggEvent.patch b/patches/server/0819-Add-EntityFertilizeEggEvent.patch
index 4936a75506..a3946553c9 100644
--- a/patches/server/0821-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0819-Add-EntityFertilizeEggEvent.patch
@@ -69,10 +69,10 @@ index a0c52ce65d4035d135b1536c7408a6867a553447..dc035bf94c5f6574ed8ad369b327b7f7
          this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F);
          } // Paper - Call EntityDropItemEvent
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a226b7cdc9c63ef09d7d48269c287af1ab6dbdc4..e9a70547324dabd97dc90820515a11d2b630a704 100644
+index c52cb55cd1da988ec646e4e1484ec1a72513291d..79f2ad0c0013ad1bfc0f0abe90ac93d799bafffa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -2109,4 +2109,28 @@ public class CraftEventFactory {
+@@ -2104,4 +2104,28 @@ public class CraftEventFactory {
          return event.callEvent();
      }
      // Paper end
diff --git a/patches/server/0822-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0820-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index a3e0925b49..a3e0925b49 100644
--- a/patches/server/0822-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0820-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0823-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0821-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 85321a4a5b..85321a4a5b 100644
--- a/patches/server/0823-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0821-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0824-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0822-Correctly-handle-ArmorStand-invisibility.patch
index ea22d29006..ea22d29006 100644
--- a/patches/server/0824-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0822-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0825-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0823-Fix-advancement-triggers-for-entity-damage.patch
index f5cd8361e8..f5cd8361e8 100644
--- a/patches/server/0825-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0823-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0826-Fix-text-display-error-on-spawn.patch b/patches/server/0824-Fix-text-display-error-on-spawn.patch
index 7f64cfe6d9..7f64cfe6d9 100644
--- a/patches/server/0826-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0824-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0827-Fix-inventories-returning-null-Locations.patch b/patches/server/0825-Fix-inventories-returning-null-Locations.patch
index 2a3e133d8d..2a3e133d8d 100644
--- a/patches/server/0827-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0825-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0828-Add-Shearable-API.patch b/patches/server/0826-Add-Shearable-API.patch
index 34eb025e6b..34eb025e6b 100644
--- a/patches/server/0828-Add-Shearable-API.patch
+++ b/patches/server/0826-Add-Shearable-API.patch
diff --git a/patches/server/0829-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0827-Fix-SpawnEggMeta-get-setSpawnedType.patch
index bf28528953..bf28528953 100644
--- a/patches/server/0829-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0827-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0830-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0828-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index c51be7e3ac..c51be7e3ac 100644
--- a/patches/server/0830-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0828-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0831-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0829-Treat-sequence-violations-like-they-should-be.patch
index b2b2aef8d8..b2b2aef8d8 100644
--- a/patches/server/0831-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0829-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0832-remove-duplicate-animate-packet-for-records.patch b/patches/server/0830-remove-duplicate-animate-packet-for-records.patch
index 47fc3e8c30..47fc3e8c30 100644
--- a/patches/server/0832-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0830-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0833-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0831-Prevent-causing-expired-keys-from-impacting-new-join.patch
index fdb8ee4768..fdb8ee4768 100644
--- a/patches/server/0833-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0831-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0834-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0832-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 98ae07fa8b..98ae07fa8b 100644
--- a/patches/server/0834-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0832-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0835-Use-array-for-gamerule-storage.patch b/patches/server/0833-Use-array-for-gamerule-storage.patch
index 194ff8f15b..194ff8f15b 100644
--- a/patches/server/0835-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0833-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0836-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0834-Fix-a-couple-of-upstream-bed-issues.patch
index b2cad9c8d3..c39d5850ee 100644
--- a/patches/server/0836-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0834-Fix-a-couple-of-upstream-bed-issues.patch
@@ -10,18 +10,18 @@ but then replaced it with a bed, you could respawn
 at the bed in that world.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index 872bec4c366c86177334452315cc4a8097dae3c0..e9f8949267208b93f0c56c36ada38274ed4280f5 100644
+index c353643a9c9b400d351ef49e1b7d4f516ed0b0eb..f726c3839ab93cc81fee26bfeb821bead3533b5e 100644
 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-@@ -108,6 +108,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
-                 world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // Paper - add exploded state
+@@ -107,6 +107,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
+                 world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK);
                  return InteractionResult.SUCCESS;
              } else if ((Boolean) state.getValue(BedBlock.OCCUPIED)) {
 +                if (!BedBlock.canSetSpawn(world)) return this.explodeBed(state, world, pos); // Paper - check explode first
                  if (!this.kickVillagerOutOfBed(world, pos)) {
                      player.displayClientMessage(Component.translatable("block.minecraft.bed.occupied"), true);
                  }
-@@ -165,8 +166,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
+@@ -163,8 +164,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
      // CraftBukkit end
  
      public static boolean canSetSpawn(Level world) {
diff --git a/patches/server/0837-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0835-Fix-demo-flag-not-enabling-demo-mode.patch
index d64dd23e37..d64dd23e37 100644
--- a/patches/server/0837-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0835-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0838-Add-Mob-Experience-reward-API.patch b/patches/server/0836-Add-Mob-Experience-reward-API.patch
index 487fe9e567..487fe9e567 100644
--- a/patches/server/0838-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0836-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0839-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0837-Break-redstone-on-top-of-trap-doors-early.patch
index 2f89b7d780..2f89b7d780 100644
--- a/patches/server/0839-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0837-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0840-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0838-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index becde16ce8..becde16ce8 100644
--- a/patches/server/0840-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0838-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0841-More-accurate-isInOpenWater-impl.patch b/patches/server/0839-More-accurate-isInOpenWater-impl.patch
index ca26fd9045..ca26fd9045 100644
--- a/patches/server/0841-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0839-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0842-Expand-PlayerItemMendEvent.patch b/patches/server/0840-Expand-PlayerItemMendEvent.patch
index 617b45a407..3d8abe4aa8 100644
--- a/patches/server/0842-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0840-Expand-PlayerItemMendEvent.patch
@@ -51,10 +51,10 @@ index 37c23923ebd4dfd6405d3c19fa42609fc683a42e..7c039d79b6fba3358daaaf8894e05d94
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e9a70547324dabd97dc90820515a11d2b630a704..c1b5d9713cb301dc06b74d97dca4fd5562c539e2 100644
+index 79f2ad0c0013ad1bfc0f0abe90ac93d799bafffa..007c939f9d02bab9b5fea9850a27d259e14033fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1267,10 +1267,10 @@ public class CraftEventFactory {
+@@ -1262,10 +1262,10 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0843-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0841-Refresh-ProjectileSource-for-projectiles.patch
index f6d4037762..f6d4037762 100644
--- a/patches/server/0843-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0841-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0844-Add-transient-modifier-API.patch b/patches/server/0842-Add-transient-modifier-API.patch
index 5614f73626..5614f73626 100644
--- a/patches/server/0844-Add-transient-modifier-API.patch
+++ b/patches/server/0842-Add-transient-modifier-API.patch
diff --git a/patches/server/0845-Fix-block-place-logic.patch b/patches/server/0843-Fix-block-place-logic.patch
index 2e91a7ea75..6438856b91 100644
--- a/patches/server/0845-Fix-block-place-logic.patch
+++ b/patches/server/0843-Fix-block-place-logic.patch
@@ -22,7 +22,7 @@ index 7d76cdc59984b156628273c8357485eb10046007..7180996027f70aef7afe32fb2adfce64
                      itemstack.consume(1, entityhuman);
                      return InteractionResult.sidedSuccess(world.isClientSide);
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 0a883564b9dda4fa0e6a7174a6e46b98af8be3e6..5ebd43bd4fa08df4531051fde606a9b2921692bf 100644
+index acce1b72185d4687ef5a72dd4014d87149f4b092..0f0d35955827ffa8cdc7d947b316704a42242ad3 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -515,13 +515,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0846-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0844-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index a337cf6e29..c2c946f528 100644
--- a/patches/server/0846-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0844-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix spigot sound playing for BlockItem ItemStacks
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 5ebd43bd4fa08df4531051fde606a9b2921692bf..0d44469149ea1bd80bec6a45a104b63e41ac2d6b 100644
+index 0f0d35955827ffa8cdc7d947b316704a42242ad3..f099e677041daf795ffee35d3a4659274fc3f3d9 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -566,7 +566,11 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0847-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0845-Call-BlockGrowEvent-for-missing-blocks.patch
index 895a528de8..895a528de8 100644
--- a/patches/server/0847-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0845-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0848-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0846-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index d3064fd3ee..d3064fd3ee 100644
--- a/patches/server/0848-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0846-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0849-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0847-fix-MapLike-spam-for-missing-key-selector.patch
index 2bd3b889f1..2bd3b889f1 100644
--- a/patches/server/0849-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0847-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0850-Fix-sniffer-removeExploredLocation.patch b/patches/server/0848-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0850-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0848-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0851-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0849-Add-method-to-remove-all-active-potion-effects.patch
index a3bf117ed3..a3bf117ed3 100644
--- a/patches/server/0851-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0849-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0852-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0850-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index 702619dd05..702619dd05 100644
--- a/patches/server/0852-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0850-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0853-Add-event-for-player-editing-sign.patch b/patches/server/0851-Add-event-for-player-editing-sign.patch
index 30316e5cd7..ec1df39aea 100644
--- a/patches/server/0853-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0851-Add-event-for-player-editing-sign.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add event for player editing sign
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 0d44469149ea1bd80bec6a45a104b63e41ac2d6b..b065b2997a0be453a9cba932bcba8320ce80c283 100644
+index f099e677041daf795ffee35d3a4659274fc3f3d9..d7693f2551ee4c5c3be6d3e77b18b7ddfbd6e36c 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -545,7 +545,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0854-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0852-Only-tick-item-frames-if-players-can-see-it.patch
index dbf1486052..dbf1486052 100644
--- a/patches/server/0854-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0852-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0855-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0853-Fix-cmd-permission-levels-for-command-blocks.patch
index 1f86b6a789..1f86b6a789 100644
--- a/patches/server/0855-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0853-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0856-Add-option-to-disable-block-updates.patch b/patches/server/0854-Add-option-to-disable-block-updates.patch
index 8fe599472e..8fe599472e 100644
--- a/patches/server/0856-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0854-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0857-Call-missing-BlockDispenseEvent.patch b/patches/server/0855-Call-missing-BlockDispenseEvent.patch
index f018b2ae74..e4652e6550 100644
--- a/patches/server/0857-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0855-Call-missing-BlockDispenseEvent.patch
@@ -50,10 +50,10 @@ index 9507dbbb4b490149b9248c384be5adaccae40c41..5bbadc890a72f1cb22c6881ebcc163b0
                              for (int k = 0; k < 5; ++k) {
                                  worldserver.sendParticles(ParticleTypes.SPLASH, (double) blockposition.getX() + worldserver.random.nextDouble(), (double) (blockposition.getY() + 1), (double) blockposition.getZ() + worldserver.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c1b5d9713cb301dc06b74d97dca4fd5562c539e2..27bafd5349805171399dbd141f5c568ec35286f4 100644
+index 007c939f9d02bab9b5fea9850a27d259e14033fe..6bfd932d89c6ba68f049c600cb2d70ea411708c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -2110,6 +2110,32 @@ public class CraftEventFactory {
+@@ -2105,6 +2105,32 @@ public class CraftEventFactory {
      }
      // Paper end
  
diff --git a/patches/server/0858-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0856-Don-t-load-chunks-for-supporting-block-checks.patch
index 4dd0bce763..4dd0bce763 100644
--- a/patches/server/0858-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0856-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0859-Optimize-player-lookups-for-beacons.patch b/patches/server/0857-Optimize-player-lookups-for-beacons.patch
index e5daf82675..c6e0cae5ab 100644
--- a/patches/server/0859-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0857-Optimize-player-lookups-for-beacons.patch
@@ -7,7 +7,7 @@ For larger ranges, it's better to iterate over the player list
 than the entity slices.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index d575294924df6b970c5773a5cdd8b2a1a9cbce19..dd1fe8357ccf084880a7f3d4d9e499bde672c787 100644
+index 62b9b5f508462dd2257094cb48ce6123e29cb64d..a6ffbbc1b5021564864e42c0756342352c2b8290 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -333,7 +333,22 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
diff --git a/patches/server/0860-Add-Sign-getInteractableSideFor.patch b/patches/server/0858-Add-Sign-getInteractableSideFor.patch
index 2833829ce4..2833829ce4 100644
--- a/patches/server/0860-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0858-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0861-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0859-fix-item-meta-for-tadpole-buckets.patch
index 11453b4a7d..11453b4a7d 100644
--- a/patches/server/0861-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0859-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0862-Fix-BanList-API.patch b/patches/server/0860-Fix-BanList-API.patch
index ad75aaf764..ad75aaf764 100644
--- a/patches/server/0862-Fix-BanList-API.patch
+++ b/patches/server/0860-Fix-BanList-API.patch
diff --git a/patches/server/0863-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0861-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 5f51eb317c..5f51eb317c 100644
--- a/patches/server/0863-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0861-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0864-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0862-Fix-possible-NPE-on-painting-creation.patch
index cf51e817de..cf51e817de 100644
--- a/patches/server/0864-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0862-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0865-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0863-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 32b71969c8..32b71969c8 100644
--- a/patches/server/0865-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0863-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0866-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0864-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 96941a19e5..5a46769a06 100644
--- a/patches/server/0866-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0864-ExperienceOrb-should-call-EntitySpawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ExperienceOrb should call EntitySpawnEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 27bafd5349805171399dbd141f5c568ec35286f4..5af62603415865068ca4b79a7e68d8eb813596b1 100644
+index 6bfd932d89c6ba68f049c600cb2d70ea411708c1..cadb1958d2441aa4fe6a6183c9092a3dad41ab38 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -735,7 +735,8 @@ public class CraftEventFactory {
diff --git a/patches/server/0867-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0865-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 301b345fb9..301b345fb9 100644
--- a/patches/server/0867-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0865-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0868-Add-whitelist-events.patch b/patches/server/0866-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0868-Add-whitelist-events.patch
+++ b/patches/server/0866-Add-whitelist-events.patch
diff --git a/patches/server/0869-Implement-PlayerFailMoveEvent.patch b/patches/server/0867-Implement-PlayerFailMoveEvent.patch
index 5be3895e6c..5be3895e6c 100644
--- a/patches/server/0869-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0867-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0870-Folia-scheduler-and-owned-region-API.patch b/patches/server/0868-Folia-scheduler-and-owned-region-API.patch
index 43a9734890..43a9734890 100644
--- a/patches/server/0870-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0868-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0871-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0869-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0871-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0869-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0872-API-for-updating-recipes-on-clients.patch b/patches/server/0870-API-for-updating-recipes-on-clients.patch
index 6460683bdd..6460683bdd 100644
--- a/patches/server/0872-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0870-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0873-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0871-Fix-rotation-when-spawning-display-entities.patch
index a027b8b8bb..a027b8b8bb 100644
--- a/patches/server/0873-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0871-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0874-Only-capture-actual-tree-growth.patch b/patches/server/0872-Only-capture-actual-tree-growth.patch
index de9ee567ad..9f209c027a 100644
--- a/patches/server/0874-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0872-Only-capture-actual-tree-growth.patch
@@ -17,7 +17,7 @@ index 5bbadc890a72f1cb22c6881ebcc163b0c06a367a..4fa838bf97ede6e1c893ba64f53aa7af
                      }
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index b065b2997a0be453a9cba932bcba8320ce80c283..f52e4ebd94a5b91689847be05b8e4bb02db97563 100644
+index d7693f2551ee4c5c3be6d3e77b18b7ddfbd6e36c..f309bd640dfac68b9a1cf59bb52d315285b91c2c 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -445,6 +445,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0875-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0873-Use-correct-source-for-mushroom-block-spread-event.patch
index a295e29bcb..a295e29bcb 100644
--- a/patches/server/0875-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0873-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0876-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0874-Respect-randomizeData-on-more-entities-when-spawning.patch
index 777f9a2e5a..777f9a2e5a 100644
--- a/patches/server/0876-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0874-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0877-Use-correct-seed-on-api-world-load.patch b/patches/server/0875-Use-correct-seed-on-api-world-load.patch
index b5e00916b9..b5e00916b9 100644
--- a/patches/server/0877-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0875-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0878-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0876-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 2f19c9d94a..2f19c9d94a 100644
--- a/patches/server/0878-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0876-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0879-Cache-map-ids-on-item-frames.patch b/patches/server/0877-Cache-map-ids-on-item-frames.patch
index 4294f88d3c..4294f88d3c 100644
--- a/patches/server/0879-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0877-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0880-Fix-custom-statistic-criteria-creation.patch b/patches/server/0878-Fix-custom-statistic-criteria-creation.patch
index c15d703018..9588fffe75 100644
--- a/patches/server/0880-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0878-Fix-custom-statistic-criteria-creation.patch
@@ -5,7 +5,7 @@ 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 c4e517ef6cf5cd4975846459cf66ebd4db66a805..6e19867f0c242a735801974a8b0332485f450017 100644
+index 6ab39cc723f0874c28def182eaada05c11d36678..e47db705f078245a2be8afc15dd081919188626e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -617,6 +617,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0881-Bandaid-fix-for-Effect.patch b/patches/server/0879-Bandaid-fix-for-Effect.patch
index 524e09bb4f..524e09bb4f 100644
--- a/patches/server/0881-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0879-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0882-SculkCatalyst-bloom-API.patch b/patches/server/0880-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0882-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0880-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0883-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0881-API-for-an-entity-s-scoreboard-name.patch
index c44b023d7d..c44b023d7d 100644
--- a/patches/server/0883-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0881-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0884-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0882-Deprecate-and-replace-methods-with-old-StructureType.patch
index 31119a3193..31119a3193 100644
--- a/patches/server/0884-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0882-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0885-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0883-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index ca6f261bbc..ca6f261bbc 100644
--- a/patches/server/0885-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0883-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0886-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0884-Properly-handle-BlockBreakEvent-isDropItems.patch
index aa3f1c73c8..aa3f1c73c8 100644
--- a/patches/server/0886-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0884-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0887-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0885-Fire-entity-death-event-for-ender-dragon.patch
index 08b7409275..08b7409275 100644
--- a/patches/server/0887-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0885-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0888-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0886-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 1cf3f3d9a6..1cf3f3d9a6 100644
--- a/patches/server/0888-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0886-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0889-Add-Listing-API-for-Player.patch b/patches/server/0887-Add-Listing-API-for-Player.patch
index 280e547dd5..280e547dd5 100644
--- a/patches/server/0889-Add-Listing-API-for-Player.patch
+++ b/patches/server/0887-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0890-Configurable-Region-Compression-Format.patch b/patches/server/0888-Configurable-Region-Compression-Format.patch
index 64a52a4ea2..64a52a4ea2 100644
--- a/patches/server/0890-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0888-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0891-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0889-Add-BlockFace-to-BlockDamageEvent.patch
index 3af304961a..599ff00534 100644
--- a/patches/server/0891-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0889-Add-BlockFace-to-BlockDamageEvent.patch
@@ -18,7 +18,7 @@ index 7b4426ac0435d3f419d9ece29dc9eccdb8f99950..cef3a64b5e6c4d34ed079078420078a7
                  if (blockEvent.isCancelled()) {
                      // Let the client know the block still exists
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5af62603415865068ca4b79a7e68d8eb813596b1..47a02b7786d284370d8019b07b8d85f895dc280a 100644
+index cadb1958d2441aa4fe6a6183c9092a3dad41ab38..f2bb77e54e1c283bc1aaabe2ffe4fabb05fd412b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -650,13 +650,13 @@ public class CraftEventFactory {
diff --git a/patches/server/0892-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0890-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0892-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0890-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0893-Expand-Pose-API.patch b/patches/server/0891-Expand-Pose-API.patch
index 1a247ee6fd..1a247ee6fd 100644
--- a/patches/server/0893-Expand-Pose-API.patch
+++ b/patches/server/0891-Expand-Pose-API.patch
diff --git a/patches/server/0894-More-DragonBattle-API.patch b/patches/server/0892-More-DragonBattle-API.patch
index a6e0c111c0..a6e0c111c0 100644
--- a/patches/server/0894-More-DragonBattle-API.patch
+++ b/patches/server/0892-More-DragonBattle-API.patch
diff --git a/patches/server/0895-Add-PlayerPickItemEvent.patch b/patches/server/0893-Add-PlayerPickItemEvent.patch
index 005f1da60d..005f1da60d 100644
--- a/patches/server/0895-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0893-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0896-Allow-trident-custom-damage.patch b/patches/server/0894-Allow-trident-custom-damage.patch
index eaa126da9c..eaa126da9c 100644
--- a/patches/server/0896-Allow-trident-custom-damage.patch
+++ b/patches/server/0894-Allow-trident-custom-damage.patch
diff --git a/patches/server/0897-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0895-Expose-hand-in-BlockCanBuildEvent.patch
index 4abc7e9fc5..4abc7e9fc5 100644
--- a/patches/server/0897-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0895-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0898-Optimize-nearest-structure-border-iteration.patch b/patches/server/0896-Optimize-nearest-structure-border-iteration.patch
index 805af0f26c..805af0f26c 100644
--- a/patches/server/0898-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0896-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0899-Implement-OfflinePlayer-isConnected.patch b/patches/server/0897-Implement-OfflinePlayer-isConnected.patch
index 45edfbf777..45edfbf777 100644
--- a/patches/server/0899-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0897-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0900-Fix-inventory-desync.patch b/patches/server/0898-Fix-inventory-desync.patch
index fce9f49abd..fce9f49abd 100644
--- a/patches/server/0900-Fix-inventory-desync.patch
+++ b/patches/server/0898-Fix-inventory-desync.patch
diff --git a/patches/server/0901-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0899-Add-titleOverride-to-InventoryOpenEvent.patch
index 157d433e22..aaf43b3d85 100644
--- a/patches/server/0901-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0899-Add-titleOverride-to-InventoryOpenEvent.patch
@@ -79,10 +79,10 @@ index 3d36d79a4e7f16f6face3465cdf54656984f3ebc..41f3cdec7deabf34358b8087df77169f
          if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper - Prevent opening inventories when frozen
          player.containerMenu = container;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 47a02b7786d284370d8019b07b8d85f895dc280a..eefdb3da069d9615db7c663bcf8a72b78a0e6817 100644
+index f2bb77e54e1c283bc1aaabe2ffe4fabb05fd412b..1366e0e03277ebf12057d12b251abc1a6c5ef10e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1384,10 +1384,21 @@ public class CraftEventFactory {
+@@ -1379,10 +1379,21 @@ public class CraftEventFactory {
      }
  
      public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container) {
@@ -105,7 +105,7 @@ index 47a02b7786d284370d8019b07b8d85f895dc280a..eefdb3da069d9615db7c663bcf8a72b7
          if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open
              player.connection.handleContainerClose(new ServerboundContainerClosePacket(player.containerMenu.containerId), InventoryCloseEvent.Reason.OPEN_NEW); // Paper - Inventory close reason
          }
-@@ -1402,10 +1413,10 @@ public class CraftEventFactory {
+@@ -1397,10 +1408,10 @@ public class CraftEventFactory {
  
          if (event.isCancelled()) {
              container.transferTo(player.containerMenu, craftPlayer);
diff --git a/patches/server/0902-Configure-sniffer-egg-hatch-time.patch b/patches/server/0900-Configure-sniffer-egg-hatch-time.patch
index 7def55b1f7..7def55b1f7 100644
--- a/patches/server/0902-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0900-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0903-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0901-Do-crystal-portal-proximity-check-before-entity-look.patch
index c83b2614f9..c83b2614f9 100644
--- a/patches/server/0903-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0901-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0904-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0902-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0904-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0902-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0905-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0903-Add-slot-sanity-checks-in-container-clicks.patch
index ddbb17de53..ddbb17de53 100644
--- a/patches/server/0905-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0903-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0906-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0904-Call-BlockRedstoneEvents-for-lecterns.patch
index bafd87afad..bafd87afad 100644
--- a/patches/server/0906-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0904-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0907-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0905-Allow-proper-checking-of-empty-item-stacks.patch
index 906d0184e4..906d0184e4 100644
--- a/patches/server/0907-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0905-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0908-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0906-Fix-silent-equipment-change-for-mobs.patch
index 3ec68fbdbd..3ec68fbdbd 100644
--- a/patches/server/0908-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0906-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0909-Fix-spigot-s-Forced-Stats.patch b/patches/server/0907-Fix-spigot-s-Forced-Stats.patch
index a138a58b79..a138a58b79 100644
--- a/patches/server/0909-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0907-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0910-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0908-Add-missing-InventoryHolders-to-inventories.patch
index a2c5867c17..a2c5867c17 100644
--- a/patches/server/0910-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0908-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0911-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0909-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index 21515b5dba..21515b5dba 100644
--- a/patches/server/0911-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0909-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0912-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0910-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0912-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0910-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0913-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0911-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e1f2934daa..e1f2934daa 100644
--- a/patches/server/0913-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0911-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0914-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0912-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0914-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0912-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0915-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0913-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0915-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0913-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0916-Fix-missing-map-initialize-event-call.patch b/patches/server/0914-Fix-missing-map-initialize-event-call.patch
index df02af5590..df02af5590 100644
--- a/patches/server/0916-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0914-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0917-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0915-Update-entity-data-when-attaching-firework-to-entity.patch
index 8cbc0f974a..8cbc0f974a 100644
--- a/patches/server/0917-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0915-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0918-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0916-Fix-UnsafeValues-loadAdvancement.patch
index 07ee09f53a..f6e0f5f883 100644
--- a/patches/server/0918-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0916-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 6e19867f0c242a735801974a8b0332485f450017..bedd75d4bce73f317618da4cc22ef5bdce20a38f 100644
+index e47db705f078245a2be8afc15dd081919188626e..c45e2e29cade6bb8fabc19c5818d5da64a9093c3 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/0919-Add-player-idle-duration-API.patch b/patches/server/0917-Add-player-idle-duration-API.patch
index 3aaeed1d13..3aaeed1d13 100644
--- a/patches/server/0919-Add-player-idle-duration-API.patch
+++ b/patches/server/0917-Add-player-idle-duration-API.patch
diff --git a/patches/server/0920-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0918-Don-t-check-if-we-can-see-non-visible-entities.patch
index a63a8d3cb7..a63a8d3cb7 100644
--- a/patches/server/0920-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0918-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0921-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0919-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 3f575aef28..3f575aef28 100644
--- a/patches/server/0921-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0919-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0922-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0920-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 2778d6eb28..2778d6eb28 100644
--- a/patches/server/0922-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0920-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0923-Optimize-VarInts.patch b/patches/server/0921-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0923-Optimize-VarInts.patch
+++ b/patches/server/0921-Optimize-VarInts.patch
diff --git a/patches/server/0924-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0922-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index ac06d6fe4b..ac06d6fe4b 100644
--- a/patches/server/0924-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0922-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0925-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0923-Add-predicate-for-blocks-when-raytracing.patch
index 712ca7a8c8..712ca7a8c8 100644
--- a/patches/server/0925-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0923-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0926-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0924-Broadcast-take-item-packets-with-collector-as-source.patch
index ba525debbf..ba525debbf 100644
--- a/patches/server/0926-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0924-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0927-Expand-LingeringPotion-API.patch b/patches/server/0925-Expand-LingeringPotion-API.patch
index b203b03355..b203b03355 100644
--- a/patches/server/0927-Expand-LingeringPotion-API.patch
+++ b/patches/server/0925-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0928-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0926-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index 3d51508d96..3d51508d96 100644
--- a/patches/server/0928-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0926-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0929-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0927-Add-hand-to-fish-event-for-all-player-interactions.patch
index 3bc8cd9b24..3bc8cd9b24 100644
--- a/patches/server/0929-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0927-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0930-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0928-Fix-several-issues-with-EntityBreedEvent.patch
index 872b3ba687..872b3ba687 100644
--- a/patches/server/0930-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0928-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0931-Add-UUID-attribute-modifier-API.patch b/patches/server/0929-Add-UUID-attribute-modifier-API.patch
index c9666b4f31..c9666b4f31 100644
--- a/patches/server/0931-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0929-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0932-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0930-Fix-missing-event-call-for-entity-teleport-API.patch
index ac77e45fa2..ac77e45fa2 100644
--- a/patches/server/0932-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0930-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0933-Lazily-create-LootContext-for-criterions.patch b/patches/server/0931-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0933-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0931-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0934-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0932-Don-t-fire-sync-events-during-worldgen.patch
index 144b9ec8bc..144b9ec8bc 100644
--- a/patches/server/0934-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0932-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0935-Add-Structure-check-API.patch b/patches/server/0933-Add-Structure-check-API.patch
index b1501eb55b..b1501eb55b 100644
--- a/patches/server/0935-Add-Structure-check-API.patch
+++ b/patches/server/0933-Add-Structure-check-API.patch
diff --git a/patches/server/0936-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0934-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index 3541a8efc4..dd807faaf3 100644
--- a/patches/server/0936-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0934-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix CraftMetaItem#getAttributeModifier duplication check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 796f7e5ce2661339081214369497318fb32d2743..f24f911bed23016e9e8d17c777481b7af45a5400 100644
+index 0464c7b6cc6cb523fa833c870e4028c3f599ea65..72f60a1308d93eefe73ab8a5a509c08d3ddd1521 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -1267,7 +1267,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1274,7 +1274,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          Preconditions.checkNotNull(modifier, "AttributeModifier cannot be null");
          this.checkAttributeList();
          for (Map.Entry<Attribute, AttributeModifier> entry : this.attributeModifiers.entries()) {
diff --git a/patches/server/0937-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0935-Restore-vanilla-entity-drops-behavior.patch
index 1b3e74a14f..2a317f2be1 100644
--- a/patches/server/0937-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0935-Restore-vanilla-entity-drops-behavior.patch
@@ -165,7 +165,7 @@ index b1b0b0554e0ad035463fd53aa440d9c079b7cfb4..2ed6845f16fab175e2e9e96e76391e63
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index eefdb3da069d9615db7c663bcf8a72b78a0e6817..822bfebc779646dde655239ac217bad011a9eee4 100644
+index 1366e0e03277ebf12057d12b251abc1a6c5ef10e..2c127f1aa22815168b07cf226c0fb56e8358bc8b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -964,17 +964,23 @@ public class CraftEventFactory {
diff --git a/patches/server/0938-Dont-resend-blocks-on-interactions.patch b/patches/server/0936-Dont-resend-blocks-on-interactions.patch
index a08da77332..9afb1ffa5b 100644
--- a/patches/server/0938-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0936-Dont-resend-blocks-on-interactions.patch
@@ -149,7 +149,7 @@ index 6d494b80ae002aea00afa44adf83dad1ae5bbbc1..49557d6f22c5725c663a231deab019d4
                      return false;
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index f52e4ebd94a5b91689847be05b8e4bb02db97563..f444e5b96c1a768690afadec56e17ba67b2f36f2 100644
+index f309bd640dfac68b9a1cf59bb52d315285b91c2c..3e9caee7322d7ffdb93fd7d063675dddc4c71226 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -479,10 +479,12 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0939-add-more-scoreboard-API.patch b/patches/server/0937-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0939-add-more-scoreboard-API.patch
+++ b/patches/server/0937-add-more-scoreboard-API.patch
diff --git a/patches/server/0940-Improve-Registry.patch b/patches/server/0938-Improve-Registry.patch
index 0d7c6b94e6..0d7c6b94e6 100644
--- a/patches/server/0940-Improve-Registry.patch
+++ b/patches/server/0938-Improve-Registry.patch
diff --git a/patches/server/0941-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0939-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 9bde782301..9bde782301 100644
--- a/patches/server/0941-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0939-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0942-Add-experience-points-API.patch b/patches/server/0940-Add-experience-points-API.patch
index cdd4f08f67..84a3db0a12 100644
--- a/patches/server/0942-Add-experience-points-API.patch
+++ b/patches/server/0940-Add-experience-points-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add experience points API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 230ffd3c4541ef8979605d733b6463e39cd00206..446556028028b25c35dbf3d099bf14a59e32a266 100644
+index 96fc37c871566ec41c42bd0e0f4a147044c239b4..10b62625323e24aa4e9e01e7c0c02d8c49f96a60 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1855,7 +1855,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0943-Add-drops-to-shear-events.patch b/patches/server/0941-Add-drops-to-shear-events.patch
index 2c756b4953..15fb9bcf40 100644
--- a/patches/server/0943-Add-drops-to-shear-events.patch
+++ b/patches/server/0941-Add-drops-to-shear-events.patch
@@ -271,10 +271,10 @@ index 9c0bfddd479eef688d2509ad700371c3c860ff1a..754eb747179d9318bc5a3883e5622cc4
      public boolean readyForShearing() {
          return !this.isSheared() && this.isAlive();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 822bfebc779646dde655239ac217bad011a9eee4..444287fea080182df533198f5c659533de86c5dc 100644
+index 2c127f1aa22815168b07cf226c0fb56e8358bc8b..21a6f42035738c86dff35f60926e70f939eed7bf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1669,20 +1669,20 @@ public class CraftEventFactory {
+@@ -1664,20 +1664,20 @@ public class CraftEventFactory {
          player.level().getCraftServer().getPluginManager().callEvent(event);
      }
  
diff --git a/patches/server/0944-Add-PlayerShieldDisableEvent.patch b/patches/server/0942-Add-PlayerShieldDisableEvent.patch
index a4316fd237..e4fddcc8e5 100644
--- a/patches/server/0944-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0942-Add-PlayerShieldDisableEvent.patch
@@ -16,7 +16,7 @@ sideeffects, meaning the disable event cannot share a handlerlist with
 the cooldown event
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 446556028028b25c35dbf3d099bf14a59e32a266..70d225dbf5649e6a3fa658291de734f54a6f73dc 100644
+index 10b62625323e24aa4e9e01e7c0c02d8c49f96a60..18a83c189e50f68d3aa2982d828c9d6d94c13c1c 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -989,7 +989,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0945-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0943-Validate-ResourceLocation-in-NBT-reading.patch
index 6de34aa3c7..6de34aa3c7 100644
--- a/patches/server/0945-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0943-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0946-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0944-Properly-handle-experience-dropping-on-block-break.patch
index 3ee724786e..3ee724786e 100644
--- a/patches/server/0946-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0944-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0947-Fixup-NamespacedKey-handling.patch b/patches/server/0945-Fixup-NamespacedKey-handling.patch
index 20c52c2fba..20c52c2fba 100644
--- a/patches/server/0947-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0945-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0948-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0946-Expose-LootTable-of-DecoratedPot.patch
index 6b5fd029f3..6b5fd029f3 100644
--- a/patches/server/0948-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0946-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0949-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0947-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index dc2cbd7a08..dc2cbd7a08 100644
--- a/patches/server/0949-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0947-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0950-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0948-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 7d75e1147a..7d75e1147a 100644
--- a/patches/server/0950-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0948-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0951-Add-ShulkerDuplicateEvent.patch b/patches/server/0949-Add-ShulkerDuplicateEvent.patch
index 22315c9908..22315c9908 100644
--- a/patches/server/0951-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/0949-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0952-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0950-Add-api-for-spawn-egg-texture-colors.patch
index d937011392..3e80b5f5cc 100644
--- a/patches/server/0952-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0950-Add-api-for-spawn-egg-texture-colors.patch
@@ -5,7 +5,7 @@ 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 bedd75d4bce73f317618da4cc22ef5bdce20a38f..20502685bad7dc04477308078597ef452f6458fa 100644
+index c45e2e29cade6bb8fabc19c5818d5da64a9093c3..283e306d43152eeb6897ad30a30550af8a6f9ac0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -645,6 +645,15 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0953-Add-Lifecycle-Event-system.patch b/patches/server/0951-Add-Lifecycle-Event-system.patch
index 4d36afb58d..f4da4cb532 100644
--- a/patches/server/0953-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0951-Add-Lifecycle-Event-system.patch
@@ -739,7 +739,7 @@ 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 20502685bad7dc04477308078597ef452f6458fa..ef580d02d3d1e46bb6a378ab29b351ad62e18743 100644
+index 283e306d43152eeb6897ad30a30550af8a6f9ac0..d7beec81ab50d1d060d7063b9ab942577b3ba311 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -654,6 +654,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0954-ItemStack-Tooltip-API.patch b/patches/server/0952-ItemStack-Tooltip-API.patch
index d55aff4e5d..95322e2766 100644
--- a/patches/server/0954-ItemStack-Tooltip-API.patch
+++ b/patches/server/0952-ItemStack-Tooltip-API.patch
@@ -5,7 +5,7 @@ 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 ef580d02d3d1e46bb6a378ab29b351ad62e18743..0b7187b59b6419d015e36a91c1f3b915d3d19d28 100644
+index d7beec81ab50d1d060d7063b9ab942577b3ba311..350abcd717e9bb2973f7470f3c529a6dee715898 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -644,6 +644,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0955-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0953-Add-getChunkSnapshot-includeLightData-parameter.patch
index 70efa7282a..70efa7282a 100644
--- a/patches/server/0955-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/0953-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0956-Add-FluidState-API.patch b/patches/server/0954-Add-FluidState-API.patch
index de7b959ccc..de7b959ccc 100644
--- a/patches/server/0956-Add-FluidState-API.patch
+++ b/patches/server/0954-Add-FluidState-API.patch
diff --git a/patches/server/0957-add-number-format-api.patch b/patches/server/0955-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0957-add-number-format-api.patch
+++ b/patches/server/0955-add-number-format-api.patch
diff --git a/patches/server/0958-improve-BanList-types.patch b/patches/server/0956-improve-BanList-types.patch
index b5d73be289..b5d73be289 100644
--- a/patches/server/0958-improve-BanList-types.patch
+++ b/patches/server/0956-improve-BanList-types.patch
diff --git a/patches/server/0959-Expanded-Hopper-API.patch b/patches/server/0957-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0959-Expanded-Hopper-API.patch
+++ b/patches/server/0957-Expanded-Hopper-API.patch
diff --git a/patches/server/0960-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0958-Add-BlockBreakProgressUpdateEvent.patch
index 8ecbca8a5a..8ecbca8a5a 100644
--- a/patches/server/0960-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0958-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0961-Deprecate-ItemStack-setType.patch b/patches/server/0959-Deprecate-ItemStack-setType.patch
index 03fe55cb8b..03fe55cb8b 100644
--- a/patches/server/0961-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0959-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0962-Add-CartographyItemEvent.patch b/patches/server/0960-Add-CartographyItemEvent.patch
index 7570602097..7570602097 100644
--- a/patches/server/0962-Add-CartographyItemEvent.patch
+++ b/patches/server/0960-Add-CartographyItemEvent.patch
diff --git a/patches/server/0963-More-Raid-API.patch b/patches/server/0961-More-Raid-API.patch
index 14fcb7449a..14fcb7449a 100644
--- a/patches/server/0963-More-Raid-API.patch
+++ b/patches/server/0961-More-Raid-API.patch
diff --git a/patches/server/0964-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0962-Add-onboarding-message-for-initial-server-start.patch
index 29e25a735d..29e25a735d 100644
--- a/patches/server/0964-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0962-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/0965-Configurable-max-block-fluid-ticks.patch b/patches/server/0963-Configurable-max-block-fluid-ticks.patch
index daf283c431..daf283c431 100644
--- a/patches/server/0965-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0963-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0966-Fix-bees-aging-inside-hives.patch b/patches/server/0964-Fix-bees-aging-inside-hives.patch
index ae6a0ff63d..ae6a0ff63d 100644
--- a/patches/server/0966-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0964-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0967-Disable-memory-reserve-allocating.patch b/patches/server/0965-Disable-memory-reserve-allocating.patch
index 30eabae9e8..30eabae9e8 100644
--- a/patches/server/0967-Disable-memory-reserve-allocating.patch
+++ b/patches/server/0965-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0968-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0966-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index 5c5bb40964..5c5bb40964 100644
--- a/patches/server/0968-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/0966-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0969-Fix-DamageSource-API.patch b/patches/server/0967-Fix-DamageSource-API.patch
index 2f3c828816..ed565a85f1 100644
--- a/patches/server/0969-Fix-DamageSource-API.patch
+++ b/patches/server/0967-Fix-DamageSource-API.patch
@@ -7,10 +7,10 @@ Uses the correct entity in the EntityDamageByEntity event
 Returns the correct entity for API's DamageSource#getCausingEntity
 
 diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index a78fd4f9ce97ebece45979908382de8f5fc14c1b..160dc3216e8f5db5f9b3cce5e2d655f2b35b208a 100644
+index ffb7c966617bdfa2c3f05ec4e753e32996493343..359a2f0492a9b938a4f015c546e100e0092ae1d4 100644
 --- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
 +++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-@@ -28,7 +28,8 @@ public class DamageSource {
+@@ -29,7 +29,8 @@ public class DamageSource {
      private boolean withSweep = false;
      private boolean melting = false;
      private boolean poison = false;
@@ -20,7 +20,7 @@ index a78fd4f9ce97ebece45979908382de8f5fc14c1b..160dc3216e8f5db5f9b3cce5e2d655f2
  
      public DamageSource sweep() {
          this.withSweep = true;
-@@ -57,18 +58,18 @@ public class DamageSource {
+@@ -58,18 +59,18 @@ public class DamageSource {
          return this.poison;
      }
  
@@ -139,7 +139,7 @@ index 02931861de955352e71d6f5ffc720a17304815fe..55b4b5ad5f084c9a271a716d07667247
  
              if (flag && entity instanceof LivingEntity) {
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 0a8e46eef6df0bfda663758fc22b1eb4640aaf4e..67c7458619227961e065615853f4ed02559a0723 100644
+index 414297ab9e953049b5f0b091e54d37c6e9edf861..2f9be855815d8db0098f969c2d1bd0c3c25f0892 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -104,7 +104,7 @@ public class Explosion {
@@ -190,7 +190,7 @@ index 4c6e15535fa40aad8cf1920f392589404f9ba79c..35eb95ef6fb6a0f7ea63351e90741c48
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 444287fea080182df533198f5c659533de86c5dc..544567e576023709f86abf57963c37a5490ab9f0 100644
+index 21a6f42035738c86dff35f60926e70f939eed7bf..92af5fd7c70b8034895e99629e110626cb208876 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1082,7 +1082,7 @@ public class CraftEventFactory {
@@ -201,4 +201,4 @@ index 444287fea080182df533198f5c659533de86c5dc..544567e576023709f86abf57963c37a5
 +        final Entity damager = source.getCustomEventDamager(); // Paper - fix DamageSource API
          if (source.is(DamageTypeTags.IS_EXPLOSION)) {
              if (damager == null) {
-                 return CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), entity, DamageCause.BLOCK_EXPLOSION, bukkitDamageSource, modifiers, modifierFunctions, cancelled, source.explodedBlockState); // Paper - Include BlockState for damage
+                 return CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), entity, DamageCause.BLOCK_EXPLOSION, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
diff --git a/patches/server/0970-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0968-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index a745081446..a745081446 100644
--- a/patches/server/0970-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/server/0968-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0971-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0969-Fix-possible-StackOverflowError-for-some-dispenses.patch
index 21910b922f..21910b922f 100644
--- a/patches/server/0971-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/0969-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0972-Improve-tag-parser-handling.patch b/patches/server/0970-Improve-tag-parser-handling.patch
index 1bb246240c..1bb246240c 100644
--- a/patches/server/0972-Improve-tag-parser-handling.patch
+++ b/patches/server/0970-Improve-tag-parser-handling.patch
diff --git a/patches/server/0973-Item-Mutation-Fixes.patch b/patches/server/0971-Item-Mutation-Fixes.patch
index 736d493c99..736d493c99 100644
--- a/patches/server/0973-Item-Mutation-Fixes.patch
+++ b/patches/server/0971-Item-Mutation-Fixes.patch
diff --git a/patches/server/0974-Per-world-ticks-per-spawn-settings.patch b/patches/server/0972-Per-world-ticks-per-spawn-settings.patch
index ebdf89762d..ebdf89762d 100644
--- a/patches/server/0974-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0972-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0975-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0973-Properly-track-the-changed-item-from-dispense-events.patch
index 9957c97ca3..9957c97ca3 100644
--- a/patches/server/0975-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/0973-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0976-Rewrite-dataconverter-system.patch b/patches/server/0974-Rewrite-dataconverter-system.patch
index 290aeebd76..e39ee702d3 100644
--- a/patches/server/0976-Rewrite-dataconverter-system.patch
+++ b/patches/server/0974-Rewrite-dataconverter-system.patch
@@ -28906,7 +28906,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 0b7187b59b6419d015e36a91c1f3b915d3d19d28..573b93fc4e392456af2f2cf3900a9d7014f67a22 100644
+index 350abcd717e9bb2973f7470f3c529a6dee715898..2afd0335334fc2392503e598919b3eec95c73961 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/0977-Suspicious-Effect-Entry-API.patch b/patches/server/0975-Suspicious-Effect-Entry-API.patch
index 2ff782764f..2ff782764f 100644
--- a/patches/server/0977-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/0975-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0978-check-if-itemstack-is-stackable-first.patch b/patches/server/0976-check-if-itemstack-is-stackable-first.patch
index 6143642997..6143642997 100644
--- a/patches/server/0978-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/0976-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0979-disable-forced-empty-world-ticks.patch b/patches/server/0977-disable-forced-empty-world-ticks.patch
index 35b666570c..35b666570c 100644
--- a/patches/server/0979-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0977-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0980-Starlight.patch b/patches/server/0978-Starlight.patch
index 72b56b3d53..72b56b3d53 100644
--- a/patches/server/0980-Starlight.patch
+++ b/patches/server/0978-Starlight.patch
diff --git a/patches/server/0981-Rewrite-chunk-system.patch b/patches/server/0979-Rewrite-chunk-system.patch
index f1d58b1206..b655a09a35 100644
--- a/patches/server/0981-Rewrite-chunk-system.patch
+++ b/patches/server/0979-Rewrite-chunk-system.patch
@@ -14776,7 +14776,7 @@ index cea9c098ade00ee87b8efc8164ab72f5279758f0..197224e31175252d8438a8df585bbb65
 +    }
  }
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index 5c401c7e30ed5f6f32b1ad6523537aa46173cff5..e5c2e53388ff61e4aeae22a74b525d9a26ea0200 100644
+index c95a0af32178fe24448a5ae7a229c86ec883e8de..1d6b3fe2ce240af4ede61588795456b046eee6c9 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
 @@ -7,17 +7,30 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
diff --git a/patches/server/0982-incremental-chunk-and-player-saving.patch b/patches/server/0980-incremental-chunk-and-player-saving.patch
index adc9d293bb..adc9d293bb 100644
--- a/patches/server/0982-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0980-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0983-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0981-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 474f3d6165..474f3d6165 100644
--- a/patches/server/0983-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0981-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0984-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0982-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 73b3fa9e9c..639ebbd6a2 100644
--- a/patches/server/0984-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0982-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -25,7 +25,7 @@ index afc1639c96c01197c6c11873fcd5d779e4ed93a9..7106f388aed2ef2ce14a2228eb85b510
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 70d225dbf5649e6a3fa658291de734f54a6f73dc..72b3e64cf6d184e90a6e2c0d822b83312312d67d 100644
+index 18a83c189e50f68d3aa2982d828c9d6d94c13c1c..093d1388ff90ad59110a37536b6639f939549068 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -789,6 +789,14 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0985-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0983-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index a2017dadf4..a2017dadf4 100644
--- a/patches/server/0985-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0983-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0986-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0984-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 84396ba635..84396ba635 100644
--- a/patches/server/0986-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0984-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0987-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0985-Allow-Saving-of-Oversized-Chunks.patch
index c190834bbb..c190834bbb 100644
--- a/patches/server/0987-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0985-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0988-Fix-World-isChunkGenerated-calls.patch b/patches/server/0986-Fix-World-isChunkGenerated-calls.patch
index 85cc5c81aa..85cc5c81aa 100644
--- a/patches/server/0988-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0986-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0989-Flat-bedrock-generator-settings.patch b/patches/server/0987-Flat-bedrock-generator-settings.patch
index 7103386726..7103386726 100644
--- a/patches/server/0989-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0987-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0990-Entity-Activation-Range-2.0.patch b/patches/server/0988-Entity-Activation-Range-2.0.patch
index 0327db7ee1..0327db7ee1 100644
--- a/patches/server/0990-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0988-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0991-Optional-per-player-mob-spawns.patch b/patches/server/0989-Optional-per-player-mob-spawns.patch
index 54636b93ff..54636b93ff 100644
--- a/patches/server/0991-Optional-per-player-mob-spawns.patch
+++ b/patches/server/0989-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/0992-Anti-Xray.patch b/patches/server/0990-Anti-Xray.patch
index 11b005d518..11b005d518 100644
--- a/patches/server/0992-Anti-Xray.patch
+++ b/patches/server/0990-Anti-Xray.patch
diff --git a/patches/server/0993-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 14ca843b31..14ca843b31 100644
--- a/patches/server/0993-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0994-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0992-Optimize-Collision-to-not-load-chunks.patch
index 17286aaa99..17286aaa99 100644
--- a/patches/server/0994-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0992-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0995-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0993-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 1f46712639..1f46712639 100644
--- a/patches/server/0995-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0993-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0996-Entity-load-save-limit-per-chunk.patch b/patches/server/0994-Entity-load-save-limit-per-chunk.patch
index 1dbf729bda..1dbf729bda 100644
--- a/patches/server/0996-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0994-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0997-Improved-Watchdog-Support.patch b/patches/server/0995-Improved-Watchdog-Support.patch
index 2f40b2b0ec..2f40b2b0ec 100644
--- a/patches/server/0997-Improved-Watchdog-Support.patch
+++ b/patches/server/0995-Improved-Watchdog-Support.patch
diff --git a/patches/server/0998-Optimize-Voxel-Shape-Merging.patch b/patches/server/0996-Optimize-Voxel-Shape-Merging.patch
index 4ec779560c..4ec779560c 100644
--- a/patches/server/0998-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/0996-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0999-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0997-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 87c5ae2763..3604b1e125 100644
--- a/patches/server/0999-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0997-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -13,7 +13,7 @@ A config is provided if you rather let players use these exploits, and let
 them destroy the worlds End Portals and get on top of the nether easy.
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 67c7458619227961e065615853f4ed02559a0723..2826160f3dd951884f17d48c1b3d8f95c90e5856 100644
+index 2f9be855815d8db0098f969c2d1bd0c3c25f0892..a896b9242b0cbe74f4b39fb43beb6d7dbb667d78 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -192,6 +192,7 @@ public class Explosion {
diff --git a/patches/server/1000-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0998-Use-distance-map-to-optimise-entity-tracker.patch
index 22535d896b..22535d896b 100644
--- a/patches/server/1000-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0998-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/1001-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0999-Optimize-Bit-Operations-by-inlining.patch
index a1f24dd8dc..a1f24dd8dc 100644
--- a/patches/server/1001-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0999-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1002-Remove-streams-from-hot-code.patch b/patches/server/1000-Remove-streams-from-hot-code.patch
index 4c6d94f7bf..4c6d94f7bf 100644
--- a/patches/server/1002-Remove-streams-from-hot-code.patch
+++ b/patches/server/1000-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1003-Eigencraft-redstone-implementation.patch b/patches/server/1001-Eigencraft-redstone-implementation.patch
index b3e3db6504..b3e3db6504 100644
--- a/patches/server/1003-Eigencraft-redstone-implementation.patch
+++ b/patches/server/1001-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1004-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1002-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 6fc4445bbf..6fc4445bbf 100644
--- a/patches/server/1004-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/1002-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1005-Improve-boat-collision-performance.patch b/patches/server/1003-Improve-boat-collision-performance.patch
index 8266a668a8..8266a668a8 100644
--- a/patches/server/1005-Improve-boat-collision-performance.patch
+++ b/patches/server/1003-Improve-boat-collision-performance.patch
diff --git a/patches/server/1006-Optimise-general-POI-access.patch b/patches/server/1004-Optimise-general-POI-access.patch
index 118734c246..118734c246 100644
--- a/patches/server/1006-Optimise-general-POI-access.patch
+++ b/patches/server/1004-Optimise-general-POI-access.patch
diff --git a/patches/server/1007-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1005-Custom-table-implementation-for-blockstate-state-loo.patch
index 96d90abea3..96d90abea3 100644
--- a/patches/server/1007-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1005-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1008-Execute-chunk-tasks-mid-tick.patch b/patches/server/1006-Execute-chunk-tasks-mid-tick.patch
index f31ae8f976..f31ae8f976 100644
--- a/patches/server/1008-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/1006-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/1009-Optimise-random-block-ticking.patch b/patches/server/1007-Optimise-random-block-ticking.patch
index a414d7b769..a414d7b769 100644
--- a/patches/server/1009-Optimise-random-block-ticking.patch
+++ b/patches/server/1007-Optimise-random-block-ticking.patch
diff --git a/patches/server/1010-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1008-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 0bbbb36e0b..0bbbb36e0b 100644
--- a/patches/server/1010-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1008-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1011-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1009-Use-Velocity-compression-and-cipher-natives.patch
index 95f9b5544d..95f9b5544d 100644
--- a/patches/server/1011-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/1009-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1012-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1010-Detail-more-information-in-watchdog-dumps.patch
index e7c3992145..e7c3992145 100644
--- a/patches/server/1012-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1010-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/1013-Collision-optimisations.patch b/patches/server/1011-Collision-optimisations.patch
index 1d14ead3c6..1d14ead3c6 100644
--- a/patches/server/1013-Collision-optimisations.patch
+++ b/patches/server/1011-Collision-optimisations.patch
diff --git a/patches/server/1014-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1012-Optimise-collision-checking-in-player-move-packet-ha.patch
index d7da9feb2a..d7da9feb2a 100644
--- a/patches/server/1014-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1012-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1015-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1013-Fix-tripwire-disarming-not-working-as-intended.patch
index fa7f6bde06..fa7f6bde06 100644
--- a/patches/server/1015-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/server/1013-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/1016-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1014-Fix-entity-type-tags-suggestions-in-selectors.patch
index d24e7d583c..d24e7d583c 100644
--- a/patches/server/1016-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1014-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1017-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1015-Add-Alternate-Current-redstone-implementation.patch
index 6fcb4ef6f5..6fcb4ef6f5 100644
--- a/patches/server/1017-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1015-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1018-optimize-dirt-and-snow-spreading.patch b/patches/server/1016-optimize-dirt-and-snow-spreading.patch
index 49de7fcab9..49de7fcab9 100644
--- a/patches/server/1018-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/1016-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1019-Properly-resend-entities.patch b/patches/server/1017-Properly-resend-entities.patch
index f69eb0f883..f69eb0f883 100644
--- a/patches/server/1019-Properly-resend-entities.patch
+++ b/patches/server/1017-Properly-resend-entities.patch
diff --git a/patches/server/1020-Optimize-Hoppers.patch b/patches/server/1018-Optimize-Hoppers.patch
index a73804d96d..bc710d764f 100644
--- a/patches/server/1020-Optimize-Hoppers.patch
+++ b/patches/server/1018-Optimize-Hoppers.patch
@@ -62,7 +62,7 @@ index 2cd2e260e9a958c8aee7b2fb4e010ef8fc600f53..b21daeeb043df885fba5e6a7572d311f
              this.profiler.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index f444e5b96c1a768690afadec56e17ba67b2f36f2..36e3415b9312d3a80c9f5e1c36b42b7ea30c31c5 100644
+index 3e9caee7322d7ffdb93fd7d063675dddc4c71226..8e2b3dd109dca3089cbce82cd3788874613a3230 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -794,10 +794,16 @@ public final class ItemStack implements DataComponentHolder {
@@ -85,10 +85,10 @@ index f444e5b96c1a768690afadec56e17ba67b2f36f2..36e3415b9312d3a80c9f5e1c36b42b7e
              itemstack.setPopTime(this.getPopTime());
              return itemstack;
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index a7dfad2696e7145af1355a5db132af14d09a6f30..b0421823684ff6b9474b81675742d2ee3b17edf7 100644
+index 30a75492a4b25450c194b4cc44deb665711db5af..f37858eb18defbf11b2f4fe825ab9416ebbc7210 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -37,6 +37,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
+@@ -38,6 +38,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
  import co.aikar.timings.Timing; // Paper
  
  public abstract class BlockEntity {
@@ -96,7 +96,7 @@ index a7dfad2696e7145af1355a5db132af14d09a6f30..b0421823684ff6b9474b81675742d2ee
  
      public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper
      // CraftBukkit start - data containers
-@@ -210,6 +211,7 @@ public abstract class BlockEntity {
+@@ -211,6 +212,7 @@ public abstract class BlockEntity {
  
      public void setChanged() {
          if (this.level != null) {
diff --git a/patches/server/1021-Improve-performance-of-mass-crafts.patch b/patches/server/1019-Improve-performance-of-mass-crafts.patch
index f9839d9135..f9839d9135 100644
--- a/patches/server/1021-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1019-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1022-Actually-optimise-explosions.patch b/patches/server/1020-Actually-optimise-explosions.patch
index 6f9813b4fc..1814b2a132 100644
--- a/patches/server/1022-Actually-optimise-explosions.patch
+++ b/patches/server/1020-Actually-optimise-explosions.patch
@@ -34,7 +34,7 @@ The results indicate that this logic is 5 times faster than Vanilla
 and 2.3 times faster than Lithium.
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 2826160f3dd951884f17d48c1b3d8f95c90e5856..feb470e8036ecfcd838cff05a0dc1d43cc96ae3c 100644
+index a896b9242b0cbe74f4b39fb43beb6d7dbb667d78..dc88014c4d9f172cc54e5d77b488128f9ffbc73d 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -112,6 +112,271 @@ public class Explosion {
@@ -478,7 +478,7 @@ index 2826160f3dd951884f17d48c1b3d8f95c90e5856..feb470e8036ecfcd838cff05a0dc1d43
      }
  
      public void finalizeExplosion(boolean particles) {
-@@ -553,14 +872,14 @@ public class Explosion {
+@@ -555,14 +874,14 @@ public class Explosion {
          private BlockInteraction() {}
      }
      // Paper start - Optimize explosions
diff --git a/patches/server/1023-Optimise-chunk-tick-iteration.patch b/patches/server/1021-Optimise-chunk-tick-iteration.patch
index a1c98f7aad..a1c98f7aad 100644
--- a/patches/server/1023-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1021-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1024-Lag-compensation-ticks.patch b/patches/server/1022-Lag-compensation-ticks.patch
index 4eab1e51ab..4eab1e51ab 100644
--- a/patches/server/1024-Lag-compensation-ticks.patch
+++ b/patches/server/1022-Lag-compensation-ticks.patch
diff --git a/patches/server/1025-Optimise-nearby-player-retrieval.patch b/patches/server/1023-Optimise-nearby-player-retrieval.patch
index 22e16a6576..22e16a6576 100644
--- a/patches/server/1025-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1023-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1026-Distance-manager-tick-timings.patch b/patches/server/1024-Distance-manager-tick-timings.patch
index f946d92596..f946d92596 100644
--- a/patches/server/1026-Distance-manager-tick-timings.patch
+++ b/patches/server/1024-Distance-manager-tick-timings.patch
diff --git a/patches/server/1027-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1025-Handle-Oversized-block-entities-in-chunks.patch
index b9ea4832bd..b9ea4832bd 100644
--- a/patches/server/1027-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1025-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1028-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1026-Send-full-pos-packets-for-hard-colliding-entities.patch
index 6a98c63b52..6a98c63b52 100644
--- a/patches/server/1028-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/1026-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/1029-Fix-and-optimise-world-force-upgrading.patch b/patches/server/1027-Fix-and-optimise-world-force-upgrading.patch
index 3e94098edd..3e94098edd 100644
--- a/patches/server/1029-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/1027-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/1030-API-for-checking-sent-chunks.patch b/patches/server/1028-API-for-checking-sent-chunks.patch
index 6187f99887..6187f99887 100644
--- a/patches/server/1030-API-for-checking-sent-chunks.patch
+++ b/patches/server/1028-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1031-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch b/patches/server/1029-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
index f7ac79e2e0..ac29883b8f 100644
--- a/patches/server/1031-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
+++ b/patches/server/1029-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Properly handle pdc and custom tags in ItemMeta
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index fac6f3aa00b209e6090f4cb0207e53a994e51cac..c6886ddaebe6a393e079fed18bb0784cff8eb9dc 100644
+index 72f60a1308d93eefe73ab8a5a509c08d3ddd1521..218a35d9bd6a587334fac7e650efdef28c8c2c70 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -369,6 +369,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@@ -17,7 +17,7 @@ index fac6f3aa00b209e6090f4cb0207e53a994e51cac..c6886ddaebe6a393e079fed18bb0784c
                  Set<String> keys = compound.getAllKeys();
                  for (String key : keys) {
                      this.persistentDataContainer.put(key, compound.get(key).copy());
-@@ -573,6 +575,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -579,6 +581,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              ByteArrayInputStream buf = new ByteArrayInputStream(Base64.getDecoder().decode(custom));
              try {
                  this.customTag = NbtIo.readCompressed(buf, NbtAccounter.unlimitedHeap());
@@ -26,10 +26,10 @@ index fac6f3aa00b209e6090f4cb0207e53a994e51cac..c6886ddaebe6a393e079fed18bb0784c
              } catch (IOException ex) {
                  Logger.getLogger(CraftMetaItem.class.getName()).log(Level.SEVERE, null, ex);
              }
-@@ -795,6 +799,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -802,6 +806,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
-         if (this.customTag != null) {
-             itemTag.put(CraftMetaItem.CUSTOM_DATA, CustomData.of(this.customTag));
+         if (customTag != null) {
+             itemTag.put(CraftMetaItem.CUSTOM_DATA, CustomData.of(customTag));
 +            this.customTag.remove(CraftMetaItem.BUKKIT_CUSTOM_TAG.BUKKIT); // Paper - remove PDC from custom tag
 +            if (this.customTag.isEmpty()) this.customTag = null; // Paper - reset custom tag if empty
          }
diff --git a/patches/server/1032-handle-converting-old-serialized-names-to-new-names.patch b/patches/server/1030-handle-converting-old-serialized-names-to-new-names.patch
index ea703343ed..007e60a716 100644
--- a/patches/server/1032-handle-converting-old-serialized-names-to-new-names.patch
+++ b/patches/server/1030-handle-converting-old-serialized-names-to-new-names.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] handle converting old serialized names to new names
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index c6886ddaebe6a393e079fed18bb0784cff8eb9dc..7626ccaec65acbda22738296b4dd4423ee535aa8 100644
+index 218a35d9bd6a587334fac7e650efdef28c8c2c70..6c5c65f93133ee15fcef8385c9761cd31384375b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -490,7 +490,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -496,7 +496,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              for (Object hideFlagObject : hideFlags) {
                  String hideFlagString = (String) hideFlagObject;
                  try {
@@ -17,7 +17,7 @@ index c6886ddaebe6a393e079fed18bb0784cff8eb9dc..7626ccaec65acbda22738296b4dd4423
                      this.addItemFlags(hideFlatEnum);
                  } catch (IllegalArgumentException ex) {
                      // Ignore when we got a old String which does not map to a Enum value anymore
-@@ -661,7 +661,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -667,7 +667,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                  enchantKey = "SWEEPING_EDGE";
              }
  
@@ -26,7 +26,7 @@ index c6886ddaebe6a393e079fed18bb0784cff8eb9dc..7626ccaec65acbda22738296b4dd4423
              if ((enchantment != null) && (entry.getValue() instanceof Integer)) {
                  enchantments.put(enchantment, (Integer) entry.getValue());
              }
-@@ -695,7 +695,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -701,7 +701,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                      continue;
                  }
                  AttributeModifier modifier = (AttributeModifier) o;
diff --git a/patches/server/1033-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/1031-Add-config-for-mobs-immune-to-default-effects.patch
index 7bf145751f..7bf145751f 100644
--- a/patches/server/1033-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/1031-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/1034-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/1032-Deep-clone-nbt-tags-in-PDC.patch
index ee5dc2335c..464b30f715 100644
--- a/patches/server/1034-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/server/1032-Deep-clone-nbt-tags-in-PDC.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deep clone nbt tags in PDC
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index feea880d29ca7019bcdfa5232bea2b8ca8c3f644..2c4e7cfe71a9a960e7ac84b19ce32b478b9da3c3 100644
+index 6c5c65f93133ee15fcef8385c9761cd31384375b..49df54931470f7d38e787cc4d4af2434de143480 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -284,7 +284,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@@ -17,7 +17,7 @@ index feea880d29ca7019bcdfa5232bea2b8ca8c3f644..2c4e7cfe71a9a960e7ac84b19ce32b47
  
          this.customTag = meta.customTag;
  
-@@ -1523,7 +1523,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1530,7 +1530,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              if (this.customTag != null) {
                  clone.customTag = this.customTag.copy();
              }
diff --git a/patches/server/1035-Support-old-UUID-format-for-NBT.patch b/patches/server/1033-Support-old-UUID-format-for-NBT.patch
index a38c2a7f7b..a38c2a7f7b 100644
--- a/patches/server/1035-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/1033-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/1036-Fix-shield-disable-inconsistency.patch b/patches/server/1034-Fix-shield-disable-inconsistency.patch
index 61f593ff71..61f593ff71 100644
--- a/patches/server/1036-Fix-shield-disable-inconsistency.patch
+++ b/patches/server/1034-Fix-shield-disable-inconsistency.patch
diff --git a/patches/server/1037-Write-SavedData-IO-async.patch b/patches/server/1035-Write-SavedData-IO-async.patch
index 932cd936fb..932cd936fb 100644
--- a/patches/server/1037-Write-SavedData-IO-async.patch
+++ b/patches/server/1035-Write-SavedData-IO-async.patch
diff --git a/patches/server/1038-Don-t-lose-removed-data-components-in-ItemMeta.patch b/patches/server/1036-Don-t-lose-removed-data-components-in-ItemMeta.patch
index a74a67e381..6f56828fe2 100644
--- a/patches/server/1038-Don-t-lose-removed-data-components-in-ItemMeta.patch
+++ b/patches/server/1036-Don-t-lose-removed-data-components-in-ItemMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't lose removed data components in ItemMeta
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index ca41754a8224ad0fe959c982a4b6adfd8b346b05..ba58f0f2f4f9cb99fb6cecfe772ae5781f976b63 100644
+index 49df54931470f7d38e787cc4d4af2434de143480..405a1874995c4941d5a7608ba7eb8aa510fed567 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -174,6 +174,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@@ -22,7 +22,7 @@ index ca41754a8224ad0fe959c982a4b6adfd8b346b05..ba58f0f2f4f9cb99fb6cecfe772ae578
          DataComponentPatch build() {
              return this.builder.build();
          }
-@@ -380,7 +387,9 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -386,7 +393,9 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
          Set<Map.Entry<DataComponentType<?>, Optional<?>>> keys = tag.entrySet();
          for (Map.Entry<DataComponentType<?>, Optional<?>> key : keys) {
@@ -33,7 +33,7 @@ index ca41754a8224ad0fe959c982a4b6adfd8b346b05..ba58f0f2f4f9cb99fb6cecfe772ae578
                  key.getValue().ifPresentOrElse((value) -> {
                      this.unhandledTags.set((DataComponentType) key.getKey(), value);
                  }, () -> {
-@@ -778,9 +787,9 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -784,9 +793,9 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
  
          for (Map.Entry<DataComponentType<?>, Optional<?>> e : this.unhandledTags.build().entrySet()) {
@@ -44,4 +44,4 @@ index ca41754a8224ad0fe959c982a4b6adfd8b346b05..ba58f0f2f4f9cb99fb6cecfe772ae578
 +            }, () -> itemTag.remove(e.getKey()));
          }
  
-         if (!this.persistentDataContainer.isEmpty()) {
+         CompoundTag customTag = (this.customTag != null) ? this.customTag.copy() : null;
diff --git a/patches/server/1039-Add-experimental-improved-give-command.patch b/patches/server/1037-Add-experimental-improved-give-command.patch
index 4ff1984b05..4ff1984b05 100644
--- a/patches/server/1039-Add-experimental-improved-give-command.patch
+++ b/patches/server/1037-Add-experimental-improved-give-command.patch
diff --git a/patches/server/1040-Handle-Large-Packets-disconnecting-client.patch b/patches/server/1038-Handle-Large-Packets-disconnecting-client.patch
index 49f2553189..49f2553189 100644
--- a/patches/server/1040-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/1038-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/1041-Fix-ItemFlags.patch b/patches/server/1039-Fix-ItemFlags.patch
index c72ef1a1d0..ebe758a061 100644
--- a/patches/server/1041-Fix-ItemFlags.patch
+++ b/patches/server/1039-Fix-ItemFlags.patch
@@ -33,7 +33,7 @@ index fca0cfba14dd2cc6f24b56eaf269594b2d87fd04..8734f0b777432cd8639094b75a3da1b9
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index ba58f0f2f4f9cb99fb6cecfe772ae5781f976b63..04a0f63411ed95bcf5bac1689d29bbe52f345bac 100644
+index 405a1874995c4941d5a7608ba7eb8aa510fed567..9f2f891db68e8fbeb65e08b0022775ab85d919e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -224,6 +224,12 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@@ -60,8 +60,8 @@ index ba58f0f2f4f9cb99fb6cecfe772ae5781f976b63..04a0f63411ed95bcf5bac1689d29bbe5
      }
  
      CraftMetaItem(DataComponentPatch tag) {
-@@ -384,6 +394,20 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-                 }
+@@ -390,6 +400,20 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+                 this.customTag = null;
              }
          });
 +        // Paper start - fix ItemFlags
@@ -81,7 +81,7 @@ index ba58f0f2f4f9cb99fb6cecfe772ae5781f976b63..04a0f63411ed95bcf5bac1689d29bbe5
  
          Set<Map.Entry<DataComponentType<?>, Optional<?>>> keys = tag.entrySet();
          for (Map.Entry<DataComponentType<?>, Optional<?>> key : keys) {
-@@ -565,10 +589,19 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -571,10 +595,19 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
          String unhandled = SerializableMeta.getString(map, "unhandled", true);
          if (unhandled != null) {
@@ -103,7 +103,7 @@ index ba58f0f2f4f9cb99fb6cecfe772ae5781f976b63..04a0f63411ed95bcf5bac1689d29bbe5
              } catch (IOException ex) {
                  Logger.getLogger(CraftMetaItem.class.getName()).log(Level.SEVERE, null, ex);
              }
-@@ -786,6 +819,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -792,6 +825,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              itemTag.put(CraftMetaItem.MAX_DAMAGE, this.maxDamage);
          }
  
@@ -119,7 +119,7 @@ index ba58f0f2f4f9cb99fb6cecfe772ae5781f976b63..04a0f63411ed95bcf5bac1689d29bbe5
          for (Map.Entry<DataComponentType<?>, Optional<?>> e : this.unhandledTags.build().entrySet()) {
              e.getValue().ifPresentOrElse((value) -> {
                  itemTag.builder.set((DataComponentType) e.getKey(), value);
-@@ -858,7 +900,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -865,7 +907,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
      @Overridden
      boolean isEmpty() {
@@ -128,7 +128,7 @@ index ba58f0f2f4f9cb99fb6cecfe772ae5781f976b63..04a0f63411ed95bcf5bac1689d29bbe5
      }
  
      // Paper start
-@@ -1467,6 +1509,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1474,6 +1516,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                  && (this.hasFood() ? that.hasFood() && this.food.equals(that.food) : !that.hasFood())
                  && (this.hasDamage() ? that.hasDamage() && this.damage == that.damage : !that.hasDamage())
                  && (this.hasMaxDamage() ? that.hasMaxDamage() && this.maxDamage.equals(that.maxDamage) : !that.hasMaxDamage())
@@ -137,7 +137,7 @@ index ba58f0f2f4f9cb99fb6cecfe772ae5781f976b63..04a0f63411ed95bcf5bac1689d29bbe5
                  && (this.version == that.version);
      }
  
-@@ -1509,6 +1553,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1516,6 +1560,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          hash = 61 * hash + (this.hasDamage() ? this.damage : 0);
          hash = 61 * hash + (this.hasMaxDamage() ? 1231 : 1237);
          hash = 61 * hash + (this.hasAttributeModifiers() ? this.attributeModifiers.hashCode() : 0);
@@ -146,7 +146,7 @@ index ba58f0f2f4f9cb99fb6cecfe772ae5781f976b63..04a0f63411ed95bcf5bac1689d29bbe5
          hash = 61 * hash + this.version;
          return hash;
      }
-@@ -1546,6 +1592,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1553,6 +1599,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              clone.damage = this.damage;
              clone.maxDamage = this.maxDamage;
              clone.version = this.version;
@@ -161,7 +161,7 @@ index ba58f0f2f4f9cb99fb6cecfe772ae5781f976b63..04a0f63411ed95bcf5bac1689d29bbe5
              return clone;
          } catch (CloneNotSupportedException e) {
              throw new Error(e);
-@@ -1655,6 +1709,16 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1662,6 +1716,16 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              }
          }
  
@@ -178,7 +178,7 @@ index ba58f0f2f4f9cb99fb6cecfe772ae5781f976b63..04a0f63411ed95bcf5bac1689d29bbe5
          if (!this.unhandledTags.isEmpty()) {
              Tag unhandled = DataComponentPatch.CODEC.encodeStart(MinecraftServer.getDefaultRegistryAccess().createSerializationContext(NbtOps.INSTANCE), this.unhandledTags.build()).getOrThrow(IllegalStateException::new);
              try {
-@@ -1665,6 +1729,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1672,6 +1736,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                  Logger.getLogger(CraftMetaItem.class.getName()).log(Level.SEVERE, null, ex);
              }
          }
@@ -193,7 +193,7 @@ index ba58f0f2f4f9cb99fb6cecfe772ae5781f976b63..04a0f63411ed95bcf5bac1689d29bbe5
  
          if (!this.persistentDataContainer.isEmpty()) { // Store custom tags, wrapped in their compound
              builder.put(CraftMetaItem.BUKKIT_CUSTOM_TAG.BUKKIT, this.persistentDataContainer.serialize());
-@@ -1806,6 +1878,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1813,6 +1885,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                          CraftMetaItem.MAX_DAMAGE.TYPE,
                          CraftMetaItem.CUSTOM_DATA.TYPE,
                          CraftMetaItem.ATTRIBUTES.TYPE,
diff --git a/patches/server/1042-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/1040-Fix-helmet-damage-reduction-inconsistencies.patch
index 38d5a20724..4fbae39d15 100644
--- a/patches/server/1042-Fix-helmet-damage-reduction-inconsistencies.patch
+++ b/patches/server/1040-Fix-helmet-damage-reduction-inconsistencies.patch
@@ -7,10 +7,10 @@ Affect the falling stalactite damage type where the
 reduction is not applied like in Vanilla
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 544567e576023709f86abf57963c37a5490ab9f0..5a9c68b60cf3bf694fe1fcd3b095516b6481f8a2 100644
+index 92af5fd7c70b8034895e99629e110626cb208876..952e3f730f042da199994d9ea76c8ad1b5d7a23f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1215,7 +1215,7 @@ public class CraftEventFactory {
+@@ -1210,7 +1210,7 @@ public class CraftEventFactory {
          Map<DamageModifier, Function<? super Double, Double>> modifierFunctions = new EnumMap<>(DamageModifier.class);
          modifiers.put(DamageModifier.BASE, rawDamage);
          modifierFunctions.put(DamageModifier.BASE, CraftEventFactory.ZERO);
diff --git a/patches/server/1043-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/1041-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index 736542f8cc..736542f8cc 100644
--- a/patches/server/1043-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/1041-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/patches/server/1044-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/1042-improve-checking-handled-tags-in-itemmeta.patch
index bef86d842e..1465d9317a 100644
--- a/patches/server/1044-improve-checking-handled-tags-in-itemmeta.patch
+++ b/patches/server/1042-improve-checking-handled-tags-in-itemmeta.patch
@@ -404,7 +404,7 @@ index b444bd26d6c3def3494d3cc0520e462408272be3..8e0dd4b7a7a25a8beb27b507047bc48d
          getOrEmpty(tag, CraftMetaFirework.FIREWORKS).ifPresent((fireworks) -> {
              this.power = fireworks.flightDuration();
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index f41ce4d2184aeb3c6b852d28073bb7ae265d03c3..7c5f9c711c2364ec3a47aed1203df370ed85a3c8 100644
+index 9f2f891db68e8fbeb65e08b0022775ab85d919e2..74d4f74236c015a117c3ac2e3e76bfd850318925 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -308,7 +308,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@@ -416,7 +416,7 @@ index f41ce4d2184aeb3c6b852d28073bb7ae265d03c3..7c5f9c711c2364ec3a47aed1203df370
          CraftMetaItem.getOrEmpty(tag, CraftMetaItem.NAME).ifPresent((component) -> {
              this.displayName = component;
          });
-@@ -409,11 +409,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -415,11 +415,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          });
          // Paper end - fix ItemFlags
  
@@ -436,7 +436,7 @@ index f41ce4d2184aeb3c6b852d28073bb7ae265d03c3..7c5f9c711c2364ec3a47aed1203df370
                  key.getValue().ifPresentOrElse((value) -> {
                      this.unhandledTags.set((DataComponentType) key.getKey(), value);
                  }, () -> {
-@@ -1855,63 +1862,73 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1862,63 +1869,73 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          this.version = version;
      }
  
diff --git a/patches/server/1045-General-ItemMeta-fixes.patch b/patches/server/1043-General-ItemMeta-fixes.patch
index 9338f6fe7d..293895c590 100644
--- a/patches/server/1045-General-ItemMeta-fixes.patch
+++ b/patches/server/1043-General-ItemMeta-fixes.patch
@@ -23,10 +23,10 @@ index 8e2b3dd109dca3089cbce82cd3788874613a3230..a45389d64c04cd4c2a35fbc511595be0
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index b0421823684ff6b9474b81675742d2ee3b17edf7..285257421a6958b854ecaa468ed275d33990db3d 100644
+index f37858eb18defbf11b2f4fe825ab9416ebbc7210..7963afff4b32a0e46be9bdeb413657718cfc14f5 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -139,6 +139,11 @@ public abstract class BlockEntity {
+@@ -140,6 +140,11 @@ public abstract class BlockEntity {
          CompoundTag nbttagcompound = new CompoundTag();
  
          this.saveAdditional(nbttagcompound, registryLookup);
@@ -234,7 +234,7 @@ index 8e0dd4b7a7a25a8beb27b507047bc48d8227627c..cf5d27ccc2225bac3aa57912f444f95d
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 7765f774bfdbead492ad6427873b8bc94ef64a4b..c2517ad00b6efba47e792a46e591038d79cb3a82 100644
+index 74d4f74236c015a117c3ac2e3e76bfd850318925..684c88a8e608ef6bd767083c04c99328d1af3983 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -165,9 +165,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@@ -249,7 +249,7 @@ index 7765f774bfdbead492ad6427873b8bc94ef64a4b..c2517ad00b6efba47e792a46e591038d
  
          <T> Applicator put(ItemMetaKeyType<T> key, T value) {
              this.builder.set(key.TYPE, value);
-@@ -1003,6 +1004,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1010,6 +1011,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
      @Override
      public void lore(final List<? extends net.kyori.adventure.text.Component> lore) {
@@ -257,7 +257,7 @@ index 7765f774bfdbead492ad6427873b8bc94ef64a4b..c2517ad00b6efba47e792a46e591038d
          this.lore = lore != null ? io.papermc.paper.adventure.PaperAdventure.asVanilla(lore) : null;
      }
      // Paper end
-@@ -1127,6 +1129,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1134,6 +1136,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      // Paper end
      @Override
      public void setLore(List<String> lore) {
@@ -265,7 +265,7 @@ index 7765f774bfdbead492ad6427873b8bc94ef64a4b..c2517ad00b6efba47e792a46e591038d
          if (lore == null || lore.isEmpty()) {
              this.lore = null;
          } else {
-@@ -1142,6 +1145,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1149,6 +1152,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      // Paper start
      @Override
      public void setLoreComponents(List<net.md_5.bungee.api.chat.BaseComponent[]> lore) {
@@ -273,7 +273,7 @@ index 7765f774bfdbead492ad6427873b8bc94ef64a4b..c2517ad00b6efba47e792a46e591038d
          if (lore == null) {
              this.lore = null;
          } else {
-@@ -1409,7 +1413,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1416,7 +1420,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
      @Override
      public String getAsString() {
diff --git a/work/BuildData b/work/BuildData
-Subproject a7f7c2118b877fde4cf0f32f1f730ffcdee8e9e
+Subproject 32d1baf2f4e0e7cd1ac22c7b2f6eb4c387e8a34
diff --git a/work/Bukkit b/work/Bukkit
-Subproject 304e83eb384c338546aa96eea51388e0e8407e2
+Subproject ac72b19b01bcb3aef5710677b0b942e09847966
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject 91b1fc3f1cf89e2591367dca1fa7362fe376f28
+Subproject 079901346673010c8eafe4b1e651b0c05d2e2f4
diff --git a/work/Spigot b/work/Spigot
-Subproject b698b49caf14f97a717afd67e13fd7ac59f5108
+Subproject e2c1eee02c2e00f71d78c56d6439dafc3af7dfa