Readd last API patch (with TODO)

301 files changed, 42 insertions, 44 deletions

diff --git a/patches/unapplied/api/0400-API-for-updating-recipes-on-clients.patch b/patches/api/0400-API-for-updating-recipes-on-clients.patch
index 4a98cf2e1e..4a98cf2e1e 100644
--- a/patches/unapplied/api/0400-API-for-updating-recipes-on-clients.patch
+++ b/patches/api/0400-API-for-updating-recipes-on-clients.patch
diff --git a/patches/api/0400-Add-PlayerFailMoveEvent.patch b/patches/api/0401-Add-PlayerFailMoveEvent.patch
index e6903a2b56..e6903a2b56 100644
--- a/patches/api/0400-Add-PlayerFailMoveEvent.patch
+++ b/patches/api/0401-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0401-Fix-custom-statistic-criteria-creation.patch b/patches/api/0402-Fix-custom-statistic-criteria-creation.patch
index 5e3f26f4f3..5e3f26f4f3 100644
--- a/patches/api/0401-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/api/0402-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0402-SculkCatalyst-bloom-API.patch b/patches/api/0403-SculkCatalyst-bloom-API.patch
index 49d8c8c2bd..49d8c8c2bd 100644
--- a/patches/api/0402-SculkCatalyst-bloom-API.patch
+++ b/patches/api/0403-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0403-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0404-API-for-an-entity-s-scoreboard-name.patch
index 1fb9128be8..1fb9128be8 100644
--- a/patches/api/0403-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/api/0404-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/api/0404-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0405-Deprecate-and-replace-methods-with-old-StructureType.patch
index f09ff7714f..a832ca9f1d 100644
--- a/patches/api/0404-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/api/0405-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 50efe16bb80c618c3dfae03b70c8c165183af8ec..85ad1f7f0de9a6f9048981c3ee509b42ddbeef1a 100644
+index 52c601328bbf5c1642aa620c8bb466a9d2d231be..c8fa12acaf52cd3923a7a8702ccc50cfdc9170a2 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -949,9 +949,6 @@ public final class Bukkit {
@@ -84,7 +84,7 @@ index 50efe16bb80c618c3dfae03b70c8c165183af8ec..85ad1f7f0de9a6f9048981c3ee509b42
      /**
       * Reloads the server, refreshing settings and plugin information.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1b8d6a3333a4fa9155b79644e683e2343c134e12..640ef81d204f480f4af83d420c7e968ce569a38d 100644
+index 8ba2fbaab7428a42b506fd000fbc162f68ddaed1..50ffca9bccfb582d58ccb13f0decf66e5d91aef3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -817,16 +817,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0405-Add-Listing-API-for-Player.patch b/patches/api/0406-Add-Listing-API-for-Player.patch
index 3135969fe0..3135969fe0 100644
--- a/patches/api/0405-Add-Listing-API-for-Player.patch
+++ b/patches/api/0406-Add-Listing-API-for-Player.patch
diff --git a/patches/api/0406-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0407-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index 34d1940866..34d1940866 100644
--- a/patches/api/0406-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/api/0407-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0407-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0408-Fix-NPE-on-Boat-getStatus.patch
index 985aab9f2b..985aab9f2b 100644
--- a/patches/api/0407-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/api/0408-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0408-Expand-Pose-API.patch b/patches/api/0409-Expand-Pose-API.patch
index a7ac9f7567..a7ac9f7567 100644
--- a/patches/api/0408-Expand-Pose-API.patch
+++ b/patches/api/0409-Expand-Pose-API.patch
diff --git a/patches/api/0409-MerchantRecipe-add-copy-constructor.patch b/patches/api/0410-MerchantRecipe-add-copy-constructor.patch
index 1c5ba2803c..1c5ba2803c 100644
--- a/patches/api/0409-MerchantRecipe-add-copy-constructor.patch
+++ b/patches/api/0410-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0410-More-DragonBattle-API.patch b/patches/api/0411-More-DragonBattle-API.patch
index e25208ec19..e25208ec19 100644
--- a/patches/api/0410-More-DragonBattle-API.patch
+++ b/patches/api/0411-More-DragonBattle-API.patch
diff --git a/patches/api/0411-Add-PlayerPickItemEvent.patch b/patches/api/0412-Add-PlayerPickItemEvent.patch
index 0532447562..0532447562 100644
--- a/patches/api/0411-Add-PlayerPickItemEvent.patch
+++ b/patches/api/0412-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0412-Allow-trident-custom-damage.patch b/patches/api/0413-Allow-trident-custom-damage.patch
index 870b735548..870b735548 100644
--- a/patches/api/0412-Allow-trident-custom-damage.patch
+++ b/patches/api/0413-Allow-trident-custom-damage.patch
diff --git a/patches/api/0413-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0414-Expose-hand-during-BlockCanBuildEvent.patch
index 97d99a40d2..97d99a40d2 100644
--- a/patches/api/0413-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/api/0414-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0414-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0415-Limit-setBurnTime-to-valid-short-values.patch
index 2faac56fd8..2faac56fd8 100644
--- a/patches/api/0414-Limit-setBurnTime-to-valid-short-values.patch
+++ b/patches/api/0415-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0415-Add-OfflinePlayer-isConnected.patch b/patches/api/0416-Add-OfflinePlayer-isConnected.patch
index 08e2f91095..08e2f91095 100644
--- a/patches/api/0415-Add-OfflinePlayer-isConnected.patch
+++ b/patches/api/0416-Add-OfflinePlayer-isConnected.patch
diff --git a/patches/api/0416-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0417-Add-titleOverride-to-InventoryOpenEvent.patch
index 68e755f010..68e755f010 100644
--- a/patches/api/0416-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/api/0417-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0417-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0418-Allow-proper-checking-of-empty-item-stacks.patch
index 0fe58e0369..0fe58e0369 100644
--- a/patches/api/0417-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/api/0418-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/api/0418-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0419-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
index e72f86be5d..e72f86be5d 100644
--- a/patches/api/0418-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
+++ b/patches/api/0419-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0419-Add-player-idle-duration-API.patch b/patches/api/0420-Add-player-idle-duration-API.patch
index ac250c0760..ac250c0760 100644
--- a/patches/api/0419-Add-player-idle-duration-API.patch
+++ b/patches/api/0420-Add-player-idle-duration-API.patch
diff --git a/patches/api/0420-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0421-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 3bb30787dc..3bb30787dc 100644
--- a/patches/api/0420-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/api/0421-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/api/0421-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0422-Add-predicate-for-blocks-when-raytracing.patch
index e24c9fcedf..e24c9fcedf 100644
--- a/patches/api/0421-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/api/0422-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/api/0422-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0423-Add-hand-to-fish-event-for-all-player-interactions.patch
index b431332b9a..b431332b9a 100644
--- a/patches/api/0422-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/api/0423-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0423-Attribute-Modifier-API-improvements.patch b/patches/api/0424-Attribute-Modifier-API-improvements.patch
index d4b0442c30..d4b0442c30 100644
--- a/patches/api/0423-Attribute-Modifier-API-improvements.patch
+++ b/patches/api/0424-Attribute-Modifier-API-improvements.patch
diff --git a/patches/api/0424-Expand-LingeringPotion-API.patch b/patches/api/0425-Expand-LingeringPotion-API.patch
index 40b5a5f547..40b5a5f547 100644
--- a/patches/api/0424-Expand-LingeringPotion-API.patch
+++ b/patches/api/0425-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0425-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0426-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
index 88ecd35099..88ecd35099 100644
--- a/patches/api/0425-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
+++ b/patches/api/0426-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
diff --git a/patches/api/0426-Add-Structure-check-API.patch b/patches/api/0427-Add-Structure-check-API.patch
index 43073fe8f4..43073fe8f4 100644
--- a/patches/api/0426-Add-Structure-check-API.patch
+++ b/patches/api/0427-Add-Structure-check-API.patch
diff --git a/patches/api/0427-Experimental-annotations-change.patch b/patches/api/0428-Experimental-annotations-change.patch
index 5660d684ce..5660d684ce 100644
--- a/patches/api/0427-Experimental-annotations-change.patch
+++ b/patches/api/0428-Experimental-annotations-change.patch
diff --git a/patches/api/0428-Add-more-scoreboard-API.patch b/patches/api/0429-Add-more-scoreboard-API.patch
index 201af36b0c..201af36b0c 100644
--- a/patches/api/0428-Add-more-scoreboard-API.patch
+++ b/patches/api/0429-Add-more-scoreboard-API.patch
diff --git a/patches/api/0429-Improve-Registry.patch b/patches/api/0430-Improve-Registry.patch
index 607568bd87..607568bd87 100644
--- a/patches/api/0429-Improve-Registry.patch
+++ b/patches/api/0430-Improve-Registry.patch
diff --git a/patches/api/0430-Add-experience-points-API.patch b/patches/api/0431-Add-experience-points-API.patch
index 5581883301..5581883301 100644
--- a/patches/api/0430-Add-experience-points-API.patch
+++ b/patches/api/0431-Add-experience-points-API.patch
diff --git a/patches/api/0431-Add-missing-InventoryType.patch b/patches/api/0432-Add-missing-InventoryType.patch
index 3735af5696..3735af5696 100644
--- a/patches/api/0431-Add-missing-InventoryType.patch
+++ b/patches/api/0432-Add-missing-InventoryType.patch
diff --git a/patches/api/0432-Add-drops-to-shear-events.patch b/patches/api/0433-Add-drops-to-shear-events.patch
index c87460e48d..c87460e48d 100644
--- a/patches/api/0432-Add-drops-to-shear-events.patch
+++ b/patches/api/0433-Add-drops-to-shear-events.patch
diff --git a/patches/api/0433-Add-HiddenPotionEffect-API.patch b/patches/api/0434-Add-HiddenPotionEffect-API.patch
index 03c31e4ff8..03c31e4ff8 100644
--- a/patches/api/0433-Add-HiddenPotionEffect-API.patch
+++ b/patches/api/0434-Add-HiddenPotionEffect-API.patch
diff --git a/patches/api/0434-Add-PlayerShieldDisableEvent.patch b/patches/api/0435-Add-PlayerShieldDisableEvent.patch
index ddc6deadf5..ddc6deadf5 100644
--- a/patches/api/0434-Add-PlayerShieldDisableEvent.patch
+++ b/patches/api/0435-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/api/0435-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0436-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
index 93ba48c77c..93ba48c77c 100644
--- a/patches/api/0435-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
+++ b/patches/api/0436-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
diff --git a/patches/api/0436-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0437-Add-BlockStateMeta-clearBlockState.patch
index 7e8c47a8e2..7e8c47a8e2 100644
--- a/patches/api/0436-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/api/0437-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/api/0437-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0438-Expose-LootTable-of-DecoratedPot.patch
index 42a8de4123..42a8de4123 100644
--- a/patches/api/0437-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/api/0438-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/api/0438-Add-ShulkerDuplicateEvent.patch b/patches/api/0439-Add-ShulkerDuplicateEvent.patch
index bed71db255..bed71db255 100644
--- a/patches/api/0438-Add-ShulkerDuplicateEvent.patch
+++ b/patches/api/0439-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/api/0439-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0440-Add-api-for-spawn-egg-texture-colors.patch
index 996340cf25..996340cf25 100644
--- a/patches/api/0439-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/api/0440-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/api/0440-Add-Lifecycle-Event-system.patch b/patches/api/0441-Add-Lifecycle-Event-system.patch
index 31bfe9a70f..31bfe9a70f 100644
--- a/patches/api/0440-Add-Lifecycle-Event-system.patch
+++ b/patches/api/0441-Add-Lifecycle-Event-system.patch
diff --git a/patches/api/0441-ItemStack-Tooltip-API.patch b/patches/api/0442-ItemStack-Tooltip-API.patch
index 4af91c3ade..4af91c3ade 100644
--- a/patches/api/0441-ItemStack-Tooltip-API.patch
+++ b/patches/api/0442-ItemStack-Tooltip-API.patch
diff --git a/patches/api/0442-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0443-Add-getChunkSnapshot-includeLightData-parameter.patch
index 9b950f9493..9b950f9493 100644
--- a/patches/api/0442-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/api/0443-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/api/0443-Add-FluidState-API.patch b/patches/api/0444-Add-FluidState-API.patch
index 8f786918cb..8f786918cb 100644
--- a/patches/api/0443-Add-FluidState-API.patch
+++ b/patches/api/0444-Add-FluidState-API.patch
diff --git a/patches/api/0444-add-number-format-api.patch b/patches/api/0445-add-number-format-api.patch
index 8d36669b0a..8d36669b0a 100644
--- a/patches/api/0444-add-number-format-api.patch
+++ b/patches/api/0445-add-number-format-api.patch
diff --git a/patches/api/0445-improve-BanList-types.patch b/patches/api/0446-improve-BanList-types.patch
index 0c89e083a6..bfb2a6a550 100644
--- a/patches/api/0445-improve-BanList-types.patch
+++ b/patches/api/0446-improve-BanList-types.patch
@@ -70,10 +70,10 @@ index a77c0411a68a9bad33ddfb335b7a996a843e478c..739d9d3ec789e58c10c8d818a9ca59ce
          /**
           * Banned player names
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 85ad1f7f0de9a6f9048981c3ee509b42ddbeef1a..2d466b308b2f8bd31c50f5d05416eadf20c9cb71 100644
+index c8fa12acaf52cd3923a7a8702ccc50cfdc9170a2..e20e4239a5a1f952e1c70e899549989d5e42f73c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1611,11 +1611,27 @@ public final class Bukkit {
+@@ -1663,11 +1663,27 @@ public final class Bukkit {
       * @param <T> The ban target
       *
       * @return a ban list of the specified type
@@ -102,10 +102,10 @@ index 85ad1f7f0de9a6f9048981c3ee509b42ddbeef1a..2d466b308b2f8bd31c50f5d05416eadf
      /**
       * Gets a set containing all player operators.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 640ef81d204f480f4af83d420c7e968ce569a38d..20750c09d819d62f32491db8672936b929e1098e 100644
+index 50ffca9bccfb582d58ccb13f0decf66e5d91aef3..6246251caf2c6f025c824b8e7a944b8d48751fa1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1374,10 +1374,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1425,10 +1425,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param <T> The ban target
       *
       * @return a ban list of the specified type
diff --git a/patches/api/0446-Suspicious-Effect-Entry-API.patch b/patches/api/0447-Suspicious-Effect-Entry-API.patch
index d591d57ce9..d591d57ce9 100644
--- a/patches/api/0446-Suspicious-Effect-Entry-API.patch
+++ b/patches/api/0447-Suspicious-Effect-Entry-API.patch
diff --git a/patches/api/0447-Fix-DamageSource-API.patch b/patches/api/0448-Fix-DamageSource-API.patch
index efe4403e2c..efe4403e2c 100644
--- a/patches/api/0447-Fix-DamageSource-API.patch
+++ b/patches/api/0448-Fix-DamageSource-API.patch
diff --git a/patches/api/0448-Expanded-Hopper-API.patch b/patches/api/0449-Expanded-Hopper-API.patch
index 51cb6dfee2..51cb6dfee2 100644
--- a/patches/api/0448-Expanded-Hopper-API.patch
+++ b/patches/api/0449-Expanded-Hopper-API.patch
diff --git a/patches/api/0449-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0450-Clone-mutables-to-prevent-unexpected-issues.patch
index 86b3ab4bcf..86b3ab4bcf 100644
--- a/patches/api/0449-Clone-mutables-to-prevent-unexpected-issues.patch
+++ b/patches/api/0450-Clone-mutables-to-prevent-unexpected-issues.patch
diff --git a/patches/api/0450-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0451-Add-BlockBreakProgressUpdateEvent.patch
index 9a1913895b..9a1913895b 100644
--- a/patches/api/0450-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/api/0451-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/api/0451-Deprecate-ItemStack-setType.patch b/patches/api/0452-Deprecate-ItemStack-setType.patch
index 84fbcf3899..84fbcf3899 100644
--- a/patches/api/0451-Deprecate-ItemStack-setType.patch
+++ b/patches/api/0452-Deprecate-ItemStack-setType.patch
diff --git a/patches/api/0452-Item-Mutation-Fixes.patch b/patches/api/0453-Item-Mutation-Fixes.patch
index ccd77b7fbc..ccd77b7fbc 100644
--- a/patches/api/0452-Item-Mutation-Fixes.patch
+++ b/patches/api/0453-Item-Mutation-Fixes.patch
diff --git a/patches/api/0453-API-for-checking-sent-chunks.patch b/patches/api/0454-API-for-checking-sent-chunks.patch
index 0c353a8070..0c353a8070 100644
--- a/patches/api/0453-API-for-checking-sent-chunks.patch
+++ b/patches/api/0454-API-for-checking-sent-chunks.patch
diff --git a/patches/api/0454-Add-CartographyItemEvent.patch b/patches/api/0455-Add-CartographyItemEvent.patch
index 8bfd237e0c..8bfd237e0c 100644
--- a/patches/api/0454-Add-CartographyItemEvent.patch
+++ b/patches/api/0455-Add-CartographyItemEvent.patch
diff --git a/patches/api/0455-More-Raid-API.patch b/patches/api/0456-More-Raid-API.patch
index 947b51c645..947b51c645 100644
--- a/patches/api/0455-More-Raid-API.patch
+++ b/patches/api/0456-More-Raid-API.patch
diff --git a/patches/api/0456-Fix-SpawnerEntry-Equipment-API.patch b/patches/api/0457-Fix-SpawnerEntry-Equipment-API.patch
index e170eabd17..e170eabd17 100644
--- a/patches/api/0456-Fix-SpawnerEntry-Equipment-API.patch
+++ b/patches/api/0457-Fix-SpawnerEntry-Equipment-API.patch
diff --git a/patches/api/0457-Fix-ItemFlags.patch b/patches/api/0458-Fix-ItemFlags.patch
index 3ca141cfa5..3ca141cfa5 100644
--- a/patches/api/0457-Fix-ItemFlags.patch
+++ b/patches/api/0458-Fix-ItemFlags.patch
diff --git a/patches/api/0458-Allow-modifying-library-loader-jars-bytecode.patch b/patches/api/0459-Allow-modifying-library-loader-jars-bytecode.patch
index 0c0311e790..0c0311e790 100644
--- a/patches/api/0458-Allow-modifying-library-loader-jars-bytecode.patch
+++ b/patches/api/0459-Allow-modifying-library-loader-jars-bytecode.patch
diff --git a/patches/api/0459-Add-hook-to-remap-library-jars.patch b/patches/api/0460-Add-hook-to-remap-library-jars.patch
index fe1609629e..fe1609629e 100644
--- a/patches/api/0459-Add-hook-to-remap-library-jars.patch
+++ b/patches/api/0460-Add-hook-to-remap-library-jars.patch
diff --git a/patches/api/0460-Add-GameMode-isInvulnerable.patch b/patches/api/0461-Add-GameMode-isInvulnerable.patch
index b4b81c5f52..b4b81c5f52 100644
--- a/patches/api/0460-Add-GameMode-isInvulnerable.patch
+++ b/patches/api/0461-Add-GameMode-isInvulnerable.patch
diff --git a/patches/api/0461-Expose-hasColor-to-leather-armor.patch b/patches/api/0462-Expose-hasColor-to-leather-armor.patch
index e2c609b4f0..e2c609b4f0 100644
--- a/patches/api/0461-Expose-hasColor-to-leather-armor.patch
+++ b/patches/api/0462-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/api/0462-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0463-Added-API-to-get-player-ha-proxy-address.patch
index 79b1804796..79b1804796 100644
--- a/patches/api/0462-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/api/0463-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/api/0463-More-Chest-Block-API.patch b/patches/api/0464-More-Chest-Block-API.patch
index 1fc3614c74..1fc3614c74 100644
--- a/patches/api/0463-More-Chest-Block-API.patch
+++ b/patches/api/0464-More-Chest-Block-API.patch
diff --git a/patches/api/0464-Brigadier-based-command-API.patch b/patches/api/0465-Brigadier-based-command-API.patch
index 2d29373bc2..2d29373bc2 100644
--- a/patches/api/0464-Brigadier-based-command-API.patch
+++ b/patches/api/0465-Brigadier-based-command-API.patch
diff --git a/patches/api/0465-Fix-issues-with-recipe-API.patch b/patches/api/0466-Fix-issues-with-recipe-API.patch
index 646143b638..646143b638 100644
--- a/patches/api/0465-Fix-issues-with-recipe-API.patch
+++ b/patches/api/0466-Fix-issues-with-recipe-API.patch
diff --git a/patches/api/0466-Fix-equipment-slot-and-group-API.patch b/patches/api/0467-Fix-equipment-slot-and-group-API.patch
index 81d91485d7..81d91485d7 100644
--- a/patches/api/0466-Fix-equipment-slot-and-group-API.patch
+++ b/patches/api/0467-Fix-equipment-slot-and-group-API.patch
diff --git a/patches/api/0467-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/api/0468-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 8a0f6e9468..8a0f6e9468 100644
--- a/patches/api/0467-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/api/0468-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/api/0468-General-ItemMeta-fixes.patch b/patches/api/0469-General-ItemMeta-fixes.patch
index 953fd2e49c..953fd2e49c 100644
--- a/patches/api/0468-General-ItemMeta-fixes.patch
+++ b/patches/api/0469-General-ItemMeta-fixes.patch
diff --git a/patches/api/0469-Add-missing-fishing-event-state.patch b/patches/api/0470-Add-missing-fishing-event-state.patch
index 94cba543ec..94cba543ec 100644
--- a/patches/api/0469-Add-missing-fishing-event-state.patch
+++ b/patches/api/0470-Add-missing-fishing-event-state.patch
diff --git a/patches/api/0470-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/api/0471-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index 3efcc02654..3efcc02654 100644
--- a/patches/api/0470-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/api/0471-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/api/0471-Registry-Modification-API.patch b/patches/api/0472-Registry-Modification-API.patch
index 6eca654483..6eca654483 100644
--- a/patches/api/0471-Registry-Modification-API.patch
+++ b/patches/api/0472-Registry-Modification-API.patch
diff --git a/patches/api/0472-Introduce-registry-entry-and-builders.patch b/patches/api/0473-Introduce-registry-entry-and-builders.patch
index 5d06fe4974..5d06fe4974 100644
--- a/patches/api/0472-Introduce-registry-entry-and-builders.patch
+++ b/patches/api/0473-Introduce-registry-entry-and-builders.patch
diff --git a/patches/api/0473-Proxy-ItemStack-to-CraftItemStack.patch b/patches/api/0474-Proxy-ItemStack-to-CraftItemStack.patch
index 246fa425d8..246fa425d8 100644
--- a/patches/api/0473-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/patches/api/0474-Proxy-ItemStack-to-CraftItemStack.patch
diff --git a/patches/api/0474-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/api/0475-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
index 0c48106249..0c48106249 100644
--- a/patches/api/0474-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
+++ b/patches/api/0475-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
diff --git a/patches/api/0475-Fix-HelpCommand-searching.patch b/patches/api/0476-Fix-HelpCommand-searching.patch
index beac489e87..beac489e87 100644
--- a/patches/api/0475-Fix-HelpCommand-searching.patch
+++ b/patches/api/0476-Fix-HelpCommand-searching.patch
diff --git a/patches/api/0476-add-Plugin-getDataPath.patch b/patches/api/0477-add-Plugin-getDataPath.patch
index 5085e262a9..5085e262a9 100644
--- a/patches/api/0476-add-Plugin-getDataPath.patch
+++ b/patches/api/0477-add-Plugin-getDataPath.patch
diff --git a/patches/api/0477-Fix-PickupStatus-getting-reset.patch b/patches/api/0478-Fix-PickupStatus-getting-reset.patch
index 6473947708..6473947708 100644
--- a/patches/api/0477-Fix-PickupStatus-getting-reset.patch
+++ b/patches/api/0478-Fix-PickupStatus-getting-reset.patch
diff --git a/patches/api/0478-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0479-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 9ee5f867c6..9ee5f867c6 100644
--- a/patches/api/0478-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/api/0479-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/api/0479-Improve-StandardMessenger-exception-messages.patch b/patches/api/0480-Improve-StandardMessenger-exception-messages.patch
index db8286512a..db8286512a 100644
--- a/patches/api/0479-Improve-StandardMessenger-exception-messages.patch
+++ b/patches/api/0480-Improve-StandardMessenger-exception-messages.patch
diff --git a/patches/api/0480-Add-even-more-Enchantment-API.patch b/patches/api/0481-Add-even-more-Enchantment-API.patch
index 7da290c673..7da290c673 100644
--- a/patches/api/0480-Add-even-more-Enchantment-API.patch
+++ b/patches/api/0481-Add-even-more-Enchantment-API.patch
diff --git a/patches/api/0481-Leashable-API.patch b/patches/api/0482-Leashable-API.patch
index b84951d969..b84951d969 100644
--- a/patches/api/0481-Leashable-API.patch
+++ b/patches/api/0482-Leashable-API.patch
diff --git a/patches/api/0482-Add-enchantment-seed-update-API.patch b/patches/api/0483-Add-enchantment-seed-update-API.patch
index 3b9ef102cd..3b9ef102cd 100644
--- a/patches/api/0482-Add-enchantment-seed-update-API.patch
+++ b/patches/api/0483-Add-enchantment-seed-update-API.patch
diff --git a/patches/api/0483-Deprecate-for-removal-all-OldEnum-related-methods.patch b/patches/api/0484-Deprecate-for-removal-all-OldEnum-related-methods.patch
index bac872611c..bac872611c 100644
--- a/patches/api/0483-Deprecate-for-removal-all-OldEnum-related-methods.patch
+++ b/patches/api/0484-Deprecate-for-removal-all-OldEnum-related-methods.patch
diff --git a/patches/api/0484-Add-FeatureFlag-API.patch b/patches/api/0485-Add-FeatureFlag-API.patch
index 9afc644014..9afc644014 100644
--- a/patches/api/0484-Add-FeatureFlag-API.patch
+++ b/patches/api/0485-Add-FeatureFlag-API.patch
diff --git a/patches/api/0485-Tag-Lifecycle-Events.patch b/patches/api/0486-Tag-Lifecycle-Events.patch
index 29aaad5c34..29aaad5c34 100644
--- a/patches/api/0485-Tag-Lifecycle-Events.patch
+++ b/patches/api/0486-Tag-Lifecycle-Events.patch
diff --git a/patches/api/0486-Item-serialization-as-json.patch b/patches/api/0487-Item-serialization-as-json.patch
index d2951870a1..d2951870a1 100644
--- a/patches/api/0486-Item-serialization-as-json.patch
+++ b/patches/api/0487-Item-serialization-as-json.patch
diff --git a/patches/api/0487-create-TileStateInventoryHolder.patch b/patches/api/0488-create-TileStateInventoryHolder.patch
index eafc877be4..eafc877be4 100644
--- a/patches/api/0487-create-TileStateInventoryHolder.patch
+++ b/patches/api/0488-create-TileStateInventoryHolder.patch
diff --git a/patches/api/0488-Add-enchantWithLevels-with-enchantment-registry-set.patch b/patches/api/0489-Add-enchantWithLevels-with-enchantment-registry-set.patch
index 1978c0b073..1978c0b073 100644
--- a/patches/api/0488-Add-enchantWithLevels-with-enchantment-registry-set.patch
+++ b/patches/api/0489-Add-enchantWithLevels-with-enchantment-registry-set.patch
diff --git a/patches/api/0489-Improve-entity-effect-API.patch b/patches/api/0490-Improve-entity-effect-API.patch
index 4804315568..4804315568 100644
--- a/patches/api/0489-Improve-entity-effect-API.patch
+++ b/patches/api/0490-Improve-entity-effect-API.patch
diff --git a/patches/api/0490-Add-recipeBrewTime.patch b/patches/api/0491-Add-recipeBrewTime.patch
index 16819bfe93..16819bfe93 100644
--- a/patches/api/0490-Add-recipeBrewTime.patch
+++ b/patches/api/0491-Add-recipeBrewTime.patch
diff --git a/patches/api/0491-Add-PlayerInsertLecternBookEvent.patch b/patches/api/0492-Add-PlayerInsertLecternBookEvent.patch
index 55cbd91d4a..55cbd91d4a 100644
--- a/patches/api/0491-Add-PlayerInsertLecternBookEvent.patch
+++ b/patches/api/0492-Add-PlayerInsertLecternBookEvent.patch
diff --git a/patches/api/0492-Void-damage-configuration-API.patch b/patches/api/0493-Void-damage-configuration-API.patch
index 26cbd83b18..26cbd83b18 100644
--- a/patches/api/0492-Void-damage-configuration-API.patch
+++ b/patches/api/0493-Void-damage-configuration-API.patch
diff --git a/patches/api/0493-Add-Offline-PDC-API.patch b/patches/api/0494-Add-Offline-PDC-API.patch
index 32bafdb4b3..32bafdb4b3 100644
--- a/patches/api/0493-Add-Offline-PDC-API.patch
+++ b/patches/api/0494-Add-Offline-PDC-API.patch
diff --git a/patches/api/0494-Add-AnvilView-bypassEnchantmentLevelRestriction.patch b/patches/api/0495-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
index 61af6b9321..61af6b9321 100644
--- a/patches/api/0494-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
+++ b/patches/api/0495-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
diff --git a/patches/api/0495-fix-DamageTypeTags-init.patch b/patches/api/0496-fix-DamageTypeTags-init.patch
index 2d775b1322..2d775b1322 100644
--- a/patches/api/0495-fix-DamageTypeTags-init.patch
+++ b/patches/api/0496-fix-DamageTypeTags-init.patch
diff --git a/patches/unapplied/server/0845-API-for-updating-recipes-on-clients.patch b/patches/server/0845-API-for-updating-recipes-on-clients.patch
index 7cae857359..0435961d1f 100644
--- a/patches/unapplied/server/0845-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0845-API-for-updating-recipes-on-clients.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] API for updating recipes on clients
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2912b15ccda373cf52cec020b0e06ac2c5cf2950..a6caf3a0df22f124a4ee1cfb3981bbeb23a8630e 100644
+index a9063533ea4b2b349d476127b99c822203d7dfcb..a1228d09b91dca3989a4be3120f9724a6e138040 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1490,6 +1490,13 @@ public abstract class PlayerList {
+@@ -1450,6 +1450,13 @@ public abstract class PlayerList {
      }
  
      public void reloadResources() {
@@ -22,27 +22,25 @@ index 2912b15ccda373cf52cec020b0e06ac2c5cf2950..a6caf3a0df22f124a4ee1cfb3981bbeb
          // CraftBukkit start
          /*Iterator iterator = this.advancements.values().iterator();
  
-@@ -1505,7 +1512,15 @@ public abstract class PlayerList {
+@@ -1465,7 +1472,13 @@ public abstract class PlayerList {
          }
          // CraftBukkit end
  
 +        // Paper start - API for updating recipes on clients
 +    }
 +    public void reloadTagData() {
-+        // Paper end - API for updating recipes on clients
          this.broadcastAll(new ClientboundUpdateTagsPacket(TagNetworkSerialization.serializeTagsToNetwork(this.registries)));
-+        // Paper start - API for updating recipes on clients
 +    }
 +    public void reloadRecipeData() {
 +        // Paper end - API for updating recipes on clients
-         ClientboundUpdateRecipesPacket packetplayoutrecipeupdate = new ClientboundUpdateRecipesPacket(this.server.getRecipeManager().getOrderedRecipes());
+         RecipeManager craftingmanager = this.server.getRecipeManager();
+         ClientboundUpdateRecipesPacket packetplayoutrecipeupdate = new ClientboundUpdateRecipesPacket(craftingmanager.getSynchronizedItemProperties(), craftingmanager.getSynchronizedStonecutterRecipes());
          Iterator iterator1 = this.players.iterator();
- 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bb89247a87067a74d793a1acc1eb95b98ace3d9e..75c222e592d676e98b293767d00de54a61411ae7 100644
+index 3cf3b353cfb4337abdbb3b6842fd8fa128271948..0433de3c2455cf18584d5ab651843f8d1d874036 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1176,6 +1176,18 @@ public final class CraftServer implements Server {
+@@ -1179,6 +1179,18 @@ public final class CraftServer implements Server {
          ReloadCommand.reload(this.console);
      }
  
@@ -61,7 +59,7 @@ index bb89247a87067a74d793a1acc1eb95b98ace3d9e..75c222e592d676e98b293767d00de54a
      private void loadIcon() {
          this.icon = new CraftIconCache(null);
          try {
-@@ -1555,6 +1567,13 @@ public final class CraftServer implements Server {
+@@ -1558,6 +1570,13 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean addRecipe(Recipe recipe) {
@@ -75,19 +73,19 @@ index bb89247a87067a74d793a1acc1eb95b98ace3d9e..75c222e592d676e98b293767d00de54a
          CraftRecipe toAdd;
          if (recipe instanceof CraftRecipe) {
              toAdd = (CraftRecipe) recipe;
-@@ -1584,6 +1603,11 @@ public final class CraftServer implements Server {
+@@ -1589,6 +1608,11 @@ public final class CraftServer implements Server {
              }
          }
          toAdd.addToCraftingManager();
 +        // Paper start - API for updating recipes on clients
-+        if (resendRecipes) {
++        if (true || resendRecipes) { // Always needs to be resent now... TODO
 +            this.playerList.reloadRecipeData();
 +        }
 +        // Paper end - API for updating recipes on clients
          return true;
      }
  
-@@ -1764,10 +1788,23 @@ public final class CraftServer implements Server {
+@@ -1769,9 +1793,23 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean removeRecipe(NamespacedKey recipeKey) {
@@ -100,15 +98,15 @@ index bb89247a87067a74d793a1acc1eb95b98ace3d9e..75c222e592d676e98b293767d00de54a
 +        // Paper end - API for updating recipes on clients
          Preconditions.checkArgument(recipeKey != null, "recipeKey == null");
  
-         ResourceLocation mcKey = CraftNamespacedKey.toMinecraft(recipeKey);
--        return this.getServer().getRecipeManager().removeRecipe(mcKey);
+-        return this.getServer().getRecipeManager().removeRecipe(CraftRecipe.toMinecraft(recipeKey));
 +        // Paper start - resend recipes on successful removal
-+        boolean removed = this.getServer().getRecipeManager().removeRecipe(mcKey);
-+        if (removed && resendRecipes) {
++        final ResourceKey<net.minecraft.world.item.crafting.Recipe<?>> minecraftKey = CraftRecipe.toMinecraft(recipeKey);
++        final boolean removed = this.getServer().getRecipeManager().removeRecipe(minecraftKey);
++        if (removed/* && resendRecipes*/) { // TODO Always need to resend them rn - deprecate this method?
 +            this.playerList.reloadRecipeData();
 +        }
 +        return removed;
-+        // Paper end
++        // Paper end - resend recipes on successful removal
      }
  
      @Override
diff --git a/patches/server/0845-Fix-custom-statistic-criteria-creation.patch b/patches/server/0846-Fix-custom-statistic-criteria-creation.patch
index 420f7179e9..420f7179e9 100644
--- a/patches/server/0845-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0846-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0846-Bandaid-fix-for-Effect.patch b/patches/server/0847-Bandaid-fix-for-Effect.patch
index 8c6534f28e..8c6534f28e 100644
--- a/patches/server/0846-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0847-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0847-SculkCatalyst-bloom-API.patch b/patches/server/0848-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0847-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0848-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0848-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0849-API-for-an-entity-s-scoreboard-name.patch
index 68f3c7789a..68f3c7789a 100644
--- a/patches/server/0848-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0849-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0849-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0850-Deprecate-and-replace-methods-with-old-StructureType.patch
index b4264b8b52..82cc3b4373 100644
--- a/patches/server/0849-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0850-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3cf3b353cfb4337abdbb3b6842fd8fa128271948..dbdf52a306d7018f0bf01fcf6c24a6d1dc269be5 100644
+index 0433de3c2455cf18584d5ab651843f8d1d874036..83c3de4ae733199f64fe0f967f9f816545d20f1c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1970,6 +1970,11 @@ public final class CraftServer implements Server {
+@@ -2008,6 +2008,11 @@ public final class CraftServer implements Server {
  
          ServerLevel worldServer = ((CraftWorld) world).getHandle();
          Location structureLocation = world.locateNearestStructure(location, structureType, radius, findUnexplored);
@@ -20,7 +20,7 @@ index 3cf3b353cfb4337abdbb3b6842fd8fa128271948..dbdf52a306d7018f0bf01fcf6c24a6d1
          BlockPos structurePosition = CraftLocation.toBlockPosition(structureLocation);
  
          // Create map with trackPlayer = true, unlimitedTracking = true
-@@ -1980,6 +1985,31 @@ public final class CraftServer implements Server {
+@@ -2018,6 +2023,31 @@ public final class CraftServer implements Server {
  
          return CraftItemStack.asBukkitCopy(stack);
      }
diff --git a/patches/server/0850-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0851-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 58454d7267..58454d7267 100644
--- a/patches/server/0850-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0851-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0851-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0852-Properly-handle-BlockBreakEvent-isDropItems.patch
index 6c61a65a1c..6c61a65a1c 100644
--- a/patches/server/0851-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0852-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0852-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0853-Fire-entity-death-event-for-ender-dragon.patch
index 0efcc781a4..0efcc781a4 100644
--- a/patches/server/0852-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0853-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0853-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0854-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 75dd71166a..75dd71166a 100644
--- a/patches/server/0853-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0854-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0854-Add-Listing-API-for-Player.patch b/patches/server/0855-Add-Listing-API-for-Player.patch
index e99f679a70..05d3d3e571 100644
--- a/patches/server/0854-Add-Listing-API-for-Player.patch
+++ b/patches/server/0855-Add-Listing-API-for-Player.patch
@@ -85,7 +85,7 @@ index 29b465fc1dc50e0e84ddb889c5303e80fe662874..4d67d98257b2cb9045d03c999cfd4ba2
  
      static class EntryBuilder {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a9063533ea4b2b349d476127b99c822203d7dfcb..218e18b9c7836bc4c9d3eba78e0717cabb9d6b61 100644
+index a1228d09b91dca3989a4be3120f9724a6e138040..fa951c6e33d583f9c2ca103fbaaa035e40c163f9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -363,14 +363,22 @@ public abstract class PlayerList {
diff --git a/patches/server/0855-Configurable-Region-Compression-Format.patch b/patches/server/0856-Configurable-Region-Compression-Format.patch
index 64a52a4ea2..64a52a4ea2 100644
--- a/patches/server/0855-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0856-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0856-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0857-Add-BlockFace-to-BlockDamageEvent.patch
index 2dcf331517..2dcf331517 100644
--- a/patches/server/0856-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0857-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0857-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0858-Fix-NPE-on-Boat-getStatus.patch
index 19f832054d..19f832054d 100644
--- a/patches/server/0857-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0858-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0858-Expand-Pose-API.patch b/patches/server/0859-Expand-Pose-API.patch
index 47312a8635..47312a8635 100644
--- a/patches/server/0858-Expand-Pose-API.patch
+++ b/patches/server/0859-Expand-Pose-API.patch
diff --git a/patches/server/0859-More-DragonBattle-API.patch b/patches/server/0860-More-DragonBattle-API.patch
index a752a4de81..a752a4de81 100644
--- a/patches/server/0859-More-DragonBattle-API.patch
+++ b/patches/server/0860-More-DragonBattle-API.patch
diff --git a/patches/server/0860-Add-PlayerPickItemEvent.patch b/patches/server/0861-Add-PlayerPickItemEvent.patch
index 8a28695a2b..8a28695a2b 100644
--- a/patches/server/0860-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0861-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0861-Allow-trident-custom-damage.patch b/patches/server/0862-Allow-trident-custom-damage.patch
index ee7ac1a043..ee7ac1a043 100644
--- a/patches/server/0861-Allow-trident-custom-damage.patch
+++ b/patches/server/0862-Allow-trident-custom-damage.patch
diff --git a/patches/server/0862-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0863-Expose-hand-in-BlockCanBuildEvent.patch
index f3ed54f3f9..f3ed54f3f9 100644
--- a/patches/server/0862-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0863-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0863-Optimize-nearest-structure-border-iteration.patch b/patches/server/0864-Optimize-nearest-structure-border-iteration.patch
index edd50774cc..edd50774cc 100644
--- a/patches/server/0863-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0864-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0864-Implement-OfflinePlayer-isConnected.patch b/patches/server/0865-Implement-OfflinePlayer-isConnected.patch
index ebef6c5101..ebef6c5101 100644
--- a/patches/server/0864-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0865-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0865-Fix-slot-desync.patch b/patches/server/0866-Fix-slot-desync.patch
index deb1575ede..deb1575ede 100644
--- a/patches/server/0865-Fix-slot-desync.patch
+++ b/patches/server/0866-Fix-slot-desync.patch
diff --git a/patches/server/0866-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0867-Add-titleOverride-to-InventoryOpenEvent.patch
index 1b98c1b4a0..1b98c1b4a0 100644
--- a/patches/server/0866-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0867-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0867-Configure-sniffer-egg-hatch-time.patch b/patches/server/0868-Configure-sniffer-egg-hatch-time.patch
index e39971b614..e39971b614 100644
--- a/patches/server/0867-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0868-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0868-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0869-Do-crystal-portal-proximity-check-before-entity-look.patch
index 0ba2ce3d55..0ba2ce3d55 100644
--- a/patches/server/0868-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0869-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0869-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0870-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0869-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0870-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0870-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0871-Add-slot-sanity-checks-in-container-clicks.patch
index 08f85bdb3b..08f85bdb3b 100644
--- a/patches/server/0870-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0871-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0871-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0872-Call-BlockRedstoneEvents-for-lecterns.patch
index 7726626d78..7726626d78 100644
--- a/patches/server/0871-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0872-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0872-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0873-Allow-proper-checking-of-empty-item-stacks.patch
index 85819379c1..85819379c1 100644
--- a/patches/server/0872-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0873-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0873-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0874-Fix-silent-equipment-change-for-mobs.patch
index 14b0a2dab0..14b0a2dab0 100644
--- a/patches/server/0873-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0874-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0874-Fix-spigot-s-Forced-Stats.patch b/patches/server/0875-Fix-spigot-s-Forced-Stats.patch
index 8e920d0d89..8e920d0d89 100644
--- a/patches/server/0874-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0875-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0875-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0876-Add-missing-InventoryHolders-to-inventories.patch
index d6bf23a4f8..d6bf23a4f8 100644
--- a/patches/server/0875-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0876-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0876-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0877-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index c55e56d157..c55e56d157 100644
--- a/patches/server/0876-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0877-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0877-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0878-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0877-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0878-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0878-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0879-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index b6ec32df61..b6ec32df61 100644
--- a/patches/server/0878-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0879-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0879-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0880-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0879-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0880-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0880-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0881-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0880-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0881-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0881-Fix-missing-map-initialize-event-call.patch b/patches/server/0882-Fix-missing-map-initialize-event-call.patch
index f2047845c6..f2047845c6 100644
--- a/patches/server/0881-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0882-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0882-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0883-Update-entity-data-when-attaching-firework-to-entity.patch
index f2c094976f..f2c094976f 100644
--- a/patches/server/0882-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0883-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0883-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0884-Fix-UnsafeValues-loadAdvancement.patch
index fa08d471ab..fa08d471ab 100644
--- a/patches/server/0883-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0884-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0884-Add-player-idle-duration-API.patch b/patches/server/0885-Add-player-idle-duration-API.patch
index 3bf9d659b7..3bf9d659b7 100644
--- a/patches/server/0884-Add-player-idle-duration-API.patch
+++ b/patches/server/0885-Add-player-idle-duration-API.patch
diff --git a/patches/server/0885-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0886-Don-t-check-if-we-can-see-non-visible-entities.patch
index 5078fe7f01..5078fe7f01 100644
--- a/patches/server/0885-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0886-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0886-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0887-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 3f44bad4f1..3f44bad4f1 100644
--- a/patches/server/0886-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0887-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0887-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0888-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index c5594fd831..c5594fd831 100644
--- a/patches/server/0887-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0888-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0888-Optimize-VarInts.patch b/patches/server/0889-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0888-Optimize-VarInts.patch
+++ b/patches/server/0889-Optimize-VarInts.patch
diff --git a/patches/server/0889-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0890-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 50464e50cb..50464e50cb 100644
--- a/patches/server/0889-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0890-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0890-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0891-Add-predicate-for-blocks-when-raytracing.patch
index fdeae8627c..fdeae8627c 100644
--- a/patches/server/0890-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0891-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0891-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0892-Broadcast-take-item-packets-with-collector-as-source.patch
index 03d6650dc1..03d6650dc1 100644
--- a/patches/server/0891-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0892-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0892-Expand-LingeringPotion-API.patch b/patches/server/0893-Expand-LingeringPotion-API.patch
index 3a58f0528a..3a58f0528a 100644
--- a/patches/server/0892-Expand-LingeringPotion-API.patch
+++ b/patches/server/0893-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0893-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0894-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index ac9852081f..ac9852081f 100644
--- a/patches/server/0893-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0894-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0894-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0895-Add-hand-to-fish-event-for-all-player-interactions.patch
index cb3197a1b2..cb3197a1b2 100644
--- a/patches/server/0894-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0895-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0895-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0896-Fix-several-issues-with-EntityBreedEvent.patch
index 7d7a988fc0..7d7a988fc0 100644
--- a/patches/server/0895-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0896-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0896-Add-UUID-attribute-modifier-API.patch b/patches/server/0897-Add-UUID-attribute-modifier-API.patch
index 4b5e695553..4b5e695553 100644
--- a/patches/server/0896-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0897-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0897-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0898-Fix-missing-event-call-for-entity-teleport-API.patch
index c00c1e49bd..c00c1e49bd 100644
--- a/patches/server/0897-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0898-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0898-Lazily-create-LootContext-for-criterions.patch b/patches/server/0899-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0898-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0899-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0899-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0900-Don-t-fire-sync-events-during-worldgen.patch
index 389d1d5fde..389d1d5fde 100644
--- a/patches/server/0899-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0900-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0900-Add-Structure-check-API.patch b/patches/server/0901-Add-Structure-check-API.patch
index d138a01f44..d138a01f44 100644
--- a/patches/server/0900-Add-Structure-check-API.patch
+++ b/patches/server/0901-Add-Structure-check-API.patch
diff --git a/patches/server/0901-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0902-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index db45e464ac..db45e464ac 100644
--- a/patches/server/0901-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0902-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0902-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0903-Restore-vanilla-entity-drops-behavior.patch
index bbad1a93c7..bbad1a93c7 100644
--- a/patches/server/0902-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0903-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0903-Dont-resend-blocks-on-interactions.patch b/patches/server/0904-Dont-resend-blocks-on-interactions.patch
index 04f0061970..04f0061970 100644
--- a/patches/server/0903-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0904-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0904-add-more-scoreboard-API.patch b/patches/server/0905-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0904-add-more-scoreboard-API.patch
+++ b/patches/server/0905-add-more-scoreboard-API.patch
diff --git a/patches/server/0905-Improve-Registry.patch b/patches/server/0906-Improve-Registry.patch
index d5769f63c0..d5769f63c0 100644
--- a/patches/server/0905-Improve-Registry.patch
+++ b/patches/server/0906-Improve-Registry.patch
diff --git a/patches/server/0906-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0907-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 394a12efc2..394a12efc2 100644
--- a/patches/server/0906-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0907-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0907-Add-experience-points-API.patch b/patches/server/0908-Add-experience-points-API.patch
index 1b8c5e9d3f..1b8c5e9d3f 100644
--- a/patches/server/0907-Add-experience-points-API.patch
+++ b/patches/server/0908-Add-experience-points-API.patch
diff --git a/patches/server/0908-Add-drops-to-shear-events.patch b/patches/server/0909-Add-drops-to-shear-events.patch
index 0ae1794dca..0ae1794dca 100644
--- a/patches/server/0908-Add-drops-to-shear-events.patch
+++ b/patches/server/0909-Add-drops-to-shear-events.patch
diff --git a/patches/server/0909-Add-PlayerShieldDisableEvent.patch b/patches/server/0910-Add-PlayerShieldDisableEvent.patch
index d2d860a028..d2d860a028 100644
--- a/patches/server/0909-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0910-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0910-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0911-Validate-ResourceLocation-in-NBT-reading.patch
index 5a6790a25d..5a6790a25d 100644
--- a/patches/server/0910-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0911-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0911-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0912-Properly-handle-experience-dropping-on-block-break.patch
index e5caf980cd..e5caf980cd 100644
--- a/patches/server/0911-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0912-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0912-Fixup-NamespacedKey-handling.patch b/patches/server/0913-Fixup-NamespacedKey-handling.patch
index 932cc370d8..932cc370d8 100644
--- a/patches/server/0912-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0913-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0913-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0914-Expose-LootTable-of-DecoratedPot.patch
index afa86977a9..afa86977a9 100644
--- a/patches/server/0913-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0914-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0914-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0915-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 2fd7060c00..2fd7060c00 100644
--- a/patches/server/0914-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0915-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0915-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0916-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 4ed1121ea1..4ed1121ea1 100644
--- a/patches/server/0915-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0916-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0916-Add-ShulkerDuplicateEvent.patch b/patches/server/0917-Add-ShulkerDuplicateEvent.patch
index f06c91ae48..f06c91ae48 100644
--- a/patches/server/0916-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/0917-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0917-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0918-Add-api-for-spawn-egg-texture-colors.patch
index ee55eb2e4a..ee55eb2e4a 100644
--- a/patches/server/0917-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0918-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/0918-Add-Lifecycle-Event-system.patch b/patches/server/0919-Add-Lifecycle-Event-system.patch
index d93b26d6b3..611ac65850 100644
--- a/patches/server/0918-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0919-Add-Lifecycle-Event-system.patch
@@ -727,7 +727,7 @@ index 2e96308696e131f3f013469a395e5ddda2c5d529..65a66e484c1c39c5f41d97db52f31c67
                  } catch (Throwable e) {
                      LOGGER.error("Failed to run bootstrapper for %s. This plugin will not be loaded.".formatted(provider.getSource()), e);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dbdf52a306d7018f0bf01fcf6c24a6d1dc269be5..fb55dced981d16a82e4cc233fbf25695850a1b99 100644
+index 83c3de4ae733199f64fe0f967f9f816545d20f1c..581a15957478fd9f394a27269c2bd68a117ad8c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1051,6 +1051,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0919-ItemStack-Tooltip-API.patch b/patches/server/0920-ItemStack-Tooltip-API.patch
index 7279f30261..7279f30261 100644
--- a/patches/server/0919-ItemStack-Tooltip-API.patch
+++ b/patches/server/0920-ItemStack-Tooltip-API.patch
diff --git a/patches/server/0920-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0921-Add-getChunkSnapshot-includeLightData-parameter.patch
index ba33560bab..ba33560bab 100644
--- a/patches/server/0920-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/0921-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0921-Add-FluidState-API.patch b/patches/server/0922-Add-FluidState-API.patch
index e1e2fe004f..e1e2fe004f 100644
--- a/patches/server/0921-Add-FluidState-API.patch
+++ b/patches/server/0922-Add-FluidState-API.patch
diff --git a/patches/server/0922-add-number-format-api.patch b/patches/server/0923-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0922-add-number-format-api.patch
+++ b/patches/server/0923-add-number-format-api.patch
diff --git a/patches/server/0923-improve-BanList-types.patch b/patches/server/0924-improve-BanList-types.patch
index 1b56c10b04..96871b48ee 100644
--- a/patches/server/0923-improve-BanList-types.patch
+++ b/patches/server/0924-improve-BanList-types.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] improve BanList types
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fb55dced981d16a82e4cc233fbf25695850a1b99..82a85a4e2dd58d22e6aad797e4bd8f7c5b355caf 100644
+index 581a15957478fd9f394a27269c2bd68a117ad8c2..f7e478a14ef17ad6d747d0ab56418b0b5b20492d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2223,6 +2223,21 @@ public final class CraftServer implements Server {
+@@ -2261,6 +2261,21 @@ public final class CraftServer implements Server {
          };
      }
  
diff --git a/patches/server/0924-Expanded-Hopper-API.patch b/patches/server/0925-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0924-Expanded-Hopper-API.patch
+++ b/patches/server/0925-Expanded-Hopper-API.patch
diff --git a/patches/server/0925-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0926-Add-BlockBreakProgressUpdateEvent.patch
index 2c5061f42f..2c5061f42f 100644
--- a/patches/server/0925-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0926-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0926-Deprecate-ItemStack-setType.patch b/patches/server/0927-Deprecate-ItemStack-setType.patch
index e58b22013f..e58b22013f 100644
--- a/patches/server/0926-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0927-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0927-Add-CartographyItemEvent.patch b/patches/server/0928-Add-CartographyItemEvent.patch
index b8a1377ce9..b8a1377ce9 100644
--- a/patches/server/0927-Add-CartographyItemEvent.patch
+++ b/patches/server/0928-Add-CartographyItemEvent.patch
diff --git a/patches/server/0928-More-Raid-API.patch b/patches/server/0929-More-Raid-API.patch
index 2039ffa00d..2039ffa00d 100644
--- a/patches/server/0928-More-Raid-API.patch
+++ b/patches/server/0929-More-Raid-API.patch
diff --git a/patches/server/0929-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0930-Add-onboarding-message-for-initial-server-start.patch
index 70718c71a4..70718c71a4 100644
--- a/patches/server/0929-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0930-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/0930-Configurable-max-block-fluid-ticks.patch b/patches/server/0931-Configurable-max-block-fluid-ticks.patch
index 15cd7fb486..15cd7fb486 100644
--- a/patches/server/0930-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0931-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0931-Fix-bees-aging-inside-hives.patch b/patches/server/0932-Fix-bees-aging-inside-hives.patch
index 8d4dcd0b64..8d4dcd0b64 100644
--- a/patches/server/0931-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0932-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0932-Disable-memory-reserve-allocating.patch b/patches/server/0933-Disable-memory-reserve-allocating.patch
index ea801f5092..ea801f5092 100644
--- a/patches/server/0932-Disable-memory-reserve-allocating.patch
+++ b/patches/server/0933-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0933-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0934-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index 3cf04503d8..3cf04503d8 100644
--- a/patches/server/0933-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/0934-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0934-Fix-DamageSource-API.patch b/patches/server/0935-Fix-DamageSource-API.patch
index 113d204bee..113d204bee 100644
--- a/patches/server/0934-Fix-DamageSource-API.patch
+++ b/patches/server/0935-Fix-DamageSource-API.patch
diff --git a/patches/server/0935-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0936-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index f476845b96..f476845b96 100644
--- a/patches/server/0935-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/server/0936-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0936-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0937-Fix-possible-StackOverflowError-for-some-dispenses.patch
index 7e0fabb39a..7e0fabb39a 100644
--- a/patches/server/0936-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/0937-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0937-Improve-tag-parser-handling.patch b/patches/server/0938-Improve-tag-parser-handling.patch
index c7b698366d..c7b698366d 100644
--- a/patches/server/0937-Improve-tag-parser-handling.patch
+++ b/patches/server/0938-Improve-tag-parser-handling.patch
diff --git a/patches/server/0938-Item-Mutation-Fixes.patch b/patches/server/0939-Item-Mutation-Fixes.patch
index f7242e591f..f7242e591f 100644
--- a/patches/server/0938-Item-Mutation-Fixes.patch
+++ b/patches/server/0939-Item-Mutation-Fixes.patch
diff --git a/patches/server/0939-Per-world-ticks-per-spawn-settings.patch b/patches/server/0940-Per-world-ticks-per-spawn-settings.patch
index a028a8c234..a028a8c234 100644
--- a/patches/server/0939-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0940-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0940-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0941-Properly-track-the-changed-item-from-dispense-events.patch
index 3885b9f8a2..3885b9f8a2 100644
--- a/patches/server/0940-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/0941-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0941-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0942-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 40895c886c..40895c886c 100644
--- a/patches/server/0941-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0942-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0942-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0943-Add-config-for-mobs-immune-to-default-effects.patch
index c3b01a16ed..c3b01a16ed 100644
--- a/patches/server/0942-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0943-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0943-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/0944-Deep-clone-nbt-tags-in-PDC.patch
index 559c6cddea..559c6cddea 100644
--- a/patches/server/0943-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/server/0944-Deep-clone-nbt-tags-in-PDC.patch
diff --git a/patches/server/0944-Support-old-UUID-format-for-NBT.patch b/patches/server/0945-Support-old-UUID-format-for-NBT.patch
index 68ff8a5255..68ff8a5255 100644
--- a/patches/server/0944-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0945-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0945-Fix-shield-disable-inconsistency.patch b/patches/server/0946-Fix-shield-disable-inconsistency.patch
index 8d372bca9d..8d372bca9d 100644
--- a/patches/server/0945-Fix-shield-disable-inconsistency.patch
+++ b/patches/server/0946-Fix-shield-disable-inconsistency.patch
diff --git a/patches/server/0946-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0947-Handle-Large-Packets-disconnecting-client.patch
index 32e463a242..32e463a242 100644
--- a/patches/server/0946-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0947-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0947-Fix-ItemFlags.patch b/patches/server/0948-Fix-ItemFlags.patch
index e045394f3c..e045394f3c 100644
--- a/patches/server/0947-Fix-ItemFlags.patch
+++ b/patches/server/0948-Fix-ItemFlags.patch
diff --git a/patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0949-Fix-helmet-damage-reduction-inconsistencies.patch
index ef4efc0ef7..ef4efc0ef7 100644
--- a/patches/server/0948-Fix-helmet-damage-reduction-inconsistencies.patch
+++ b/patches/server/0949-Fix-helmet-damage-reduction-inconsistencies.patch
diff --git a/patches/server/0949-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/0950-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index e31dca1bf5..e31dca1bf5 100644
--- a/patches/server/0949-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/0950-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/patches/server/0950-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/0951-improve-checking-handled-tags-in-itemmeta.patch
index 8d257c881d..8d257c881d 100644
--- a/patches/server/0950-improve-checking-handled-tags-in-itemmeta.patch
+++ b/patches/server/0951-improve-checking-handled-tags-in-itemmeta.patch
diff --git a/patches/server/0951-Expose-hasColor-to-leather-armor.patch b/patches/server/0952-Expose-hasColor-to-leather-armor.patch
index 9166ad6261..9166ad6261 100644
--- a/patches/server/0951-Expose-hasColor-to-leather-armor.patch
+++ b/patches/server/0952-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/server/0952-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/0953-Added-API-to-get-player-ha-proxy-address.patch
index 1871d14810..1871d14810 100644
--- a/patches/server/0952-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/server/0953-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/server/0953-General-ItemMeta-fixes.patch b/patches/server/0954-General-ItemMeta-fixes.patch
index ce6a04d22f..ce6a04d22f 100644
--- a/patches/server/0953-General-ItemMeta-fixes.patch
+++ b/patches/server/0954-General-ItemMeta-fixes.patch
diff --git a/patches/server/0954-More-Chest-Block-API.patch b/patches/server/0955-More-Chest-Block-API.patch
index d7c00f61e1..d7c00f61e1 100644
--- a/patches/server/0954-More-Chest-Block-API.patch
+++ b/patches/server/0955-More-Chest-Block-API.patch
diff --git a/patches/server/0955-Print-data-component-type-on-encoding-error.patch b/patches/server/0956-Print-data-component-type-on-encoding-error.patch
index f003f33b92..f003f33b92 100644
--- a/patches/server/0955-Print-data-component-type-on-encoding-error.patch
+++ b/patches/server/0956-Print-data-component-type-on-encoding-error.patch
diff --git a/patches/server/0956-Brigadier-based-command-API.patch b/patches/server/0957-Brigadier-based-command-API.patch
index 103527a38c..f305e6146b 100644
--- a/patches/server/0956-Brigadier-based-command-API.patch
+++ b/patches/server/0957-Brigadier-based-command-API.patch
@@ -2388,7 +2388,7 @@ index 2cef6390ce8cdc43ae7566683afc157cb3a6fd78..af3e0049beb5590520ed84b52d6df85a
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 82a85a4e2dd58d22e6aad797e4bd8f7c5b355caf..52710b4196dde7118eb1438a2f78b7c9557e00f8 100644
+index f7e478a14ef17ad6d747d0ab56418b0b5b20492d..15b406935047f591a7866d81b40841a5a9878f55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -275,11 +275,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0957-Fix-issues-with-Recipe-API.patch b/patches/server/0958-Fix-issues-with-Recipe-API.patch
index 63c059ad01..63c059ad01 100644
--- a/patches/server/0957-Fix-issues-with-Recipe-API.patch
+++ b/patches/server/0958-Fix-issues-with-Recipe-API.patch
diff --git a/patches/server/0958-Fix-equipment-slot-and-group-API.patch b/patches/server/0959-Fix-equipment-slot-and-group-API.patch
index 3248a82d09..3248a82d09 100644
--- a/patches/server/0958-Fix-equipment-slot-and-group-API.patch
+++ b/patches/server/0959-Fix-equipment-slot-and-group-API.patch
diff --git a/patches/server/0959-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/0960-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 8b39d13b43..8b39d13b43 100644
--- a/patches/server/0959-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/server/0960-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/server/0960-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0961-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 6f1042e767..6f1042e767 100644
--- a/patches/server/0960-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0961-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0961-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/0962-Prevent-NPE-if-hooked-entity-was-cleared.patch
index f51092a291..f51092a291 100644
--- a/patches/server/0961-Prevent-NPE-if-hooked-entity-was-cleared.patch
+++ b/patches/server/0962-Prevent-NPE-if-hooked-entity-was-cleared.patch
diff --git a/patches/server/0962-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/0963-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
index 6043bb02b6..6043bb02b6 100644
--- a/patches/server/0962-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
+++ b/patches/server/0963-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
diff --git a/patches/server/0963-Add-missing-fishing-event-state.patch b/patches/server/0964-Add-missing-fishing-event-state.patch
index 5bc1574135..5bc1574135 100644
--- a/patches/server/0963-Add-missing-fishing-event-state.patch
+++ b/patches/server/0964-Add-missing-fishing-event-state.patch
diff --git a/patches/server/0964-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0965-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index 3fc9866acf..3fc9866acf 100644
--- a/patches/server/0964-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/server/0965-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/server/0965-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/server/0966-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
index 1abf467e7e..1abf467e7e 100644
--- a/patches/server/0965-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
+++ b/patches/server/0966-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
diff --git a/patches/server/0966-Adopt-MaterialRerouting.patch b/patches/server/0967-Adopt-MaterialRerouting.patch
index 648057e1dd..648057e1dd 100644
--- a/patches/server/0966-Adopt-MaterialRerouting.patch
+++ b/patches/server/0967-Adopt-MaterialRerouting.patch
diff --git a/patches/server/0967-Suspicious-Effect-Entry-API.patch b/patches/server/0968-Suspicious-Effect-Entry-API.patch
index d2599dfa85..d2599dfa85 100644
--- a/patches/server/0967-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/0968-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0968-check-if-itemstack-is-stackable-first.patch b/patches/server/0969-check-if-itemstack-is-stackable-first.patch
index a7ddd8df5b..a7ddd8df5b 100644
--- a/patches/server/0968-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/0969-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0969-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0970-Fix-removing-recipes-from-RecipeIterator.patch
index a8f124b458..a8f124b458 100644
--- a/patches/server/0969-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0970-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0971-Configurable-damage-tick-when-blocking-with-shield.patch
index 33e21b4cb1..33e21b4cb1 100644
--- a/patches/server/0970-Configurable-damage-tick-when-blocking-with-shield.patch
+++ b/patches/server/0971-Configurable-damage-tick-when-blocking-with-shield.patch
diff --git a/patches/server/0971-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0972-Properly-remove-the-experimental-smithing-inventory-.patch
index 9ede88caa7..9ede88caa7 100644
--- a/patches/server/0971-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/server/0972-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/server/0972-disable-forced-empty-world-ticks.patch b/patches/server/0973-disable-forced-empty-world-ticks.patch
index 343cd32ea2..343cd32ea2 100644
--- a/patches/server/0972-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0973-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0973-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0974-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index f7d697b689..f7d697b689 100644
--- a/patches/server/0973-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0974-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0974-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0975-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index f4600638da..f4600638da 100644
--- a/patches/server/0974-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0975-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0975-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0976-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index e601a7c5a2..e601a7c5a2 100644
--- a/patches/server/0975-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0976-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0976-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0977-Allow-Saving-of-Oversized-Chunks.patch
index 7d1ee992f1..7d1ee992f1 100644
--- a/patches/server/0976-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0977-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0977-Flat-bedrock-generator-settings.patch b/patches/server/0978-Flat-bedrock-generator-settings.patch
index 1e4bccf2db..1e4bccf2db 100644
--- a/patches/server/0977-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0978-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0978-Entity-Activation-Range-2.0.patch b/patches/server/0979-Entity-Activation-Range-2.0.patch
index 6a879cf17f..6a879cf17f 100644
--- a/patches/server/0978-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0979-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0979-Anti-Xray.patch b/patches/server/0980-Anti-Xray.patch
index 7ab86199c5..1e72722f63 100644
--- a/patches/server/0979-Anti-Xray.patch
+++ b/patches/server/0980-Anti-Xray.patch
@@ -1157,7 +1157,7 @@ index cdd66e6ce96e2613afe7f06ca8da3cfaa6704b2d..dafa2cf7d3c49fc5bdcd68d2a9528127
          if (io.papermc.paper.event.packet.PlayerChunkLoadEvent.getHandlerList().getRegisteredListeners().length > 0) {
              new io.papermc.paper.event.packet.PlayerChunkLoadEvent(new org.bukkit.craftbukkit.CraftChunk(chunk), handler.getPlayer().getBukkitEntity()).callEvent();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 218e18b9c7836bc4c9d3eba78e0717cabb9d6b61..d12ac1b045c6721255780c5afbbad6e7103629eb 100644
+index fa951c6e33d583f9c2ca103fbaaa035e40c163f9..b0a43a24f2a43b1513600f26f1f02646c6031cef 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -427,7 +427,7 @@ public abstract class PlayerList {
@@ -1598,10 +1598,10 @@ index 5fc9e8e969debb3e15ed474b36a1c48b086d0449..f65cc95ab28e8a3b21eac2b16bd9ebe9
      private static final byte[] EMPTY_LIGHT = new byte[2048];
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 52710b4196dde7118eb1438a2f78b7c9557e00f8..8348ab336029848eab1cbe9b67b056abf1f5866f 100644
+index 15b406935047f591a7866d81b40841a5a9878f55..b29220ced6f5294594af23d9227532f5bb292e4c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2655,7 +2655,7 @@ public final class CraftServer implements Server {
+@@ -2693,7 +2693,7 @@ public final class CraftServer implements Server {
      public ChunkGenerator.ChunkData createChunkData(World world) {
          Preconditions.checkArgument(world != null, "World cannot be null");
          ServerLevel handle = ((CraftWorld) world).getHandle();
diff --git a/patches/server/0980-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0981-Use-Velocity-compression-and-cipher-natives.patch
index a57ddf2e84..a57ddf2e84 100644
--- a/patches/server/0980-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0981-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0981-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0982-Optimize-Collision-to-not-load-chunks.patch
index daa6249dc3..22bbfc1040 100644
--- a/patches/server/0981-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0982-Optimize-Collision-to-not-load-chunks.patch
@@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading
 massive amounts of surrounding chunks due to large AABB lookups.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d12ac1b045c6721255780c5afbbad6e7103629eb..59cc1702079f1d182bdbe8068aa37b5b979aa64d 100644
+index b0a43a24f2a43b1513600f26f1f02646c6031cef..aa245fe0945b267ef03700758e75edd445c7c60d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -827,6 +827,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0982-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0983-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index c4c7e7fd35..c4c7e7fd35 100644
--- a/patches/server/0982-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0983-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0983-Optimize-Hoppers.patch b/patches/server/0984-Optimize-Hoppers.patch
index bd4a72c0e2..bd4a72c0e2 100644
--- a/patches/server/0983-Optimize-Hoppers.patch
+++ b/patches/server/0984-Optimize-Hoppers.patch
diff --git a/patches/server/0984-Optimize-Voxel-Shape-Merging.patch b/patches/server/0985-Optimize-Voxel-Shape-Merging.patch
index 52246713b3..52246713b3 100644
--- a/patches/server/0984-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/0985-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0985-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0986-Optimize-Bit-Operations-by-inlining.patch
index 2c71fd1153..2c71fd1153 100644
--- a/patches/server/0985-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0986-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0986-Remove-streams-from-hot-code.patch b/patches/server/0987-Remove-streams-from-hot-code.patch
index 37416513dc..37416513dc 100644
--- a/patches/server/0986-Remove-streams-from-hot-code.patch
+++ b/patches/server/0987-Remove-streams-from-hot-code.patch
diff --git a/patches/server/0987-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0988-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index b32ebf6b4e..b32ebf6b4e 100644
--- a/patches/server/0987-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/0988-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0988-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0989-Fix-entity-type-tags-suggestions-in-selectors.patch
index 1b14145b71..1b14145b71 100644
--- a/patches/server/0988-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0989-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0989-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/0990-Handle-Oversized-block-entities-in-chunks.patch
index d3283fd63f..d3283fd63f 100644
--- a/patches/server/0989-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/0990-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/0990-Check-distance-in-entity-interactions.patch b/patches/server/0991-Check-distance-in-entity-interactions.patch
index f8d61a567e..f8d61a567e 100644
--- a/patches/server/0990-Check-distance-in-entity-interactions.patch
+++ b/patches/server/0991-Check-distance-in-entity-interactions.patch
diff --git a/patches/server/0991-Configurable-Sand-Duping.patch b/patches/server/0992-Configurable-Sand-Duping.patch
index d209e03e1e..d209e03e1e 100644
--- a/patches/server/0991-Configurable-Sand-Duping.patch
+++ b/patches/server/0992-Configurable-Sand-Duping.patch
diff --git a/patches/server/0992-Properly-resend-entities.patch b/patches/server/0993-Properly-resend-entities.patch
index e7bcb808c9..95bcb49a7c 100644
--- a/patches/server/0992-Properly-resend-entities.patch
+++ b/patches/server/0993-Properly-resend-entities.patch
@@ -102,7 +102,7 @@ index 52eafd99ed63f5fc9596225cf45175b1287f20a1..e5db85f858ab376b225172e22b92b841
                              }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 59cc1702079f1d182bdbe8068aa37b5b979aa64d..90c469193ecf9d04dd9e3f1a38157d47c5094985 100644
+index aa245fe0945b267ef03700758e75edd445c7c60d..f55d7f6ed653b19f28694f91ca5bcc54873e33c3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -397,7 +397,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0993-Registry-Modification-API.patch b/patches/server/0994-Registry-Modification-API.patch
index 9568730b7f..9568730b7f 100644
--- a/patches/server/0993-Registry-Modification-API.patch
+++ b/patches/server/0994-Registry-Modification-API.patch
diff --git a/patches/server/0994-Add-registry-entry-and-builders.patch b/patches/server/0995-Add-registry-entry-and-builders.patch
index 0355a6b299..0355a6b299 100644
--- a/patches/server/0994-Add-registry-entry-and-builders.patch
+++ b/patches/server/0995-Add-registry-entry-and-builders.patch
diff --git a/patches/server/0995-Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/0996-Proxy-ItemStack-to-CraftItemStack.patch
index f37751ee6f..f37751ee6f 100644
--- a/patches/server/0995-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/patches/server/0996-Proxy-ItemStack-to-CraftItemStack.patch
diff --git a/patches/server/0996-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/server/0997-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
index f0bd1ac5eb..f0bd1ac5eb 100644
--- a/patches/server/0996-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
+++ b/patches/server/0997-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
diff --git a/patches/server/0997-Prioritize-Minecraft-commands-in-function-parsing-an.patch b/patches/server/0998-Prioritize-Minecraft-commands-in-function-parsing-an.patch
index c22d5f09be..c22d5f09be 100644
--- a/patches/server/0997-Prioritize-Minecraft-commands-in-function-parsing-an.patch
+++ b/patches/server/0998-Prioritize-Minecraft-commands-in-function-parsing-an.patch
diff --git a/patches/server/0998-optimize-dirt-and-snow-spreading.patch b/patches/server/0999-optimize-dirt-and-snow-spreading.patch
index e89393b028..e89393b028 100644
--- a/patches/server/0998-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/0999-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/0999-Fix-NPE-for-Jukebox-setRecord.patch b/patches/server/1000-Fix-NPE-for-Jukebox-setRecord.patch
index c673e4f8c7..c673e4f8c7 100644
--- a/patches/server/0999-Fix-NPE-for-Jukebox-setRecord.patch
+++ b/patches/server/1000-Fix-NPE-for-Jukebox-setRecord.patch
diff --git a/patches/server/1000-fix-horse-inventories.patch b/patches/server/1001-fix-horse-inventories.patch
index 9737a4fa71..9737a4fa71 100644
--- a/patches/server/1000-fix-horse-inventories.patch
+++ b/patches/server/1001-fix-horse-inventories.patch
diff --git a/patches/server/1001-Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/server/1002-Only-call-EntityDamageEvents-before-actuallyHurt.patch
index fb40d00f9a..fb40d00f9a 100644
--- a/patches/server/1001-Only-call-EntityDamageEvents-before-actuallyHurt.patch
+++ b/patches/server/1002-Only-call-EntityDamageEvents-before-actuallyHurt.patch
diff --git a/patches/server/1002-Add-ItemType-getItemRarity.patch b/patches/server/1003-Add-ItemType-getItemRarity.patch
index 0863f02f5c..0863f02f5c 100644
--- a/patches/server/1002-Add-ItemType-getItemRarity.patch
+++ b/patches/server/1003-Add-ItemType-getItemRarity.patch
diff --git a/patches/server/1003-Add-plugin-info-at-startup.patch b/patches/server/1004-Add-plugin-info-at-startup.patch
index 051309bbed..051309bbed 100644
--- a/patches/server/1003-Add-plugin-info-at-startup.patch
+++ b/patches/server/1004-Add-plugin-info-at-startup.patch
diff --git a/patches/server/1004-Make-interaction-leniency-distance-configurable.patch b/patches/server/1005-Make-interaction-leniency-distance-configurable.patch
index ae6223c783..ae6223c783 100644
--- a/patches/server/1004-Make-interaction-leniency-distance-configurable.patch
+++ b/patches/server/1005-Make-interaction-leniency-distance-configurable.patch
diff --git a/patches/server/1005-Fix-PickupStatus-getting-reset.patch b/patches/server/1006-Fix-PickupStatus-getting-reset.patch
index 4f8f62e8bc..4f8f62e8bc 100644
--- a/patches/server/1005-Fix-PickupStatus-getting-reset.patch
+++ b/patches/server/1006-Fix-PickupStatus-getting-reset.patch
diff --git a/patches/server/1006-Check-for-block-type-in-SculkSensorBlock-canActivate.patch b/patches/server/1007-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
index b06a0b6c33..b06a0b6c33 100644
--- a/patches/server/1006-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
+++ b/patches/server/1007-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
diff --git a/patches/server/1007-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/server/1008-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 282bdd1de1..282bdd1de1 100644
--- a/patches/server/1007-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/server/1008-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/server/1008-Configuration-for-horizontal-only-item-merging.patch b/patches/server/1009-Configuration-for-horizontal-only-item-merging.patch
index 4b16b244dd..4b16b244dd 100644
--- a/patches/server/1008-Configuration-for-horizontal-only-item-merging.patch
+++ b/patches/server/1009-Configuration-for-horizontal-only-item-merging.patch
diff --git a/patches/server/1009-Add-skipping-world-symlink-scan.patch b/patches/server/1010-Add-skipping-world-symlink-scan.patch
index f3221508c6..f3221508c6 100644
--- a/patches/server/1009-Add-skipping-world-symlink-scan.patch
+++ b/patches/server/1010-Add-skipping-world-symlink-scan.patch
diff --git a/patches/server/1010-Add-even-more-Enchantment-API.patch b/patches/server/1011-Add-even-more-Enchantment-API.patch
index dfc79b5b19..dfc79b5b19 100644
--- a/patches/server/1010-Add-even-more-Enchantment-API.patch
+++ b/patches/server/1011-Add-even-more-Enchantment-API.patch
diff --git a/patches/server/1011-Leashable-API.patch b/patches/server/1012-Leashable-API.patch
index f3cf7dc395..f3cf7dc395 100644
--- a/patches/server/1011-Leashable-API.patch
+++ b/patches/server/1012-Leashable-API.patch
diff --git a/patches/server/1012-Fix-CraftBukkit-drag-system.patch b/patches/server/1013-Fix-CraftBukkit-drag-system.patch
index afd7345911..afd7345911 100644
--- a/patches/server/1012-Fix-CraftBukkit-drag-system.patch
+++ b/patches/server/1013-Fix-CraftBukkit-drag-system.patch
diff --git a/patches/server/1013-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch b/patches/server/1014-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
index c2857c2245..c2857c2245 100644
--- a/patches/server/1013-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
+++ b/patches/server/1014-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
diff --git a/patches/server/1014-Remove-set-damage-lootable-item-function-from-compas.patch b/patches/server/1015-Remove-set-damage-lootable-item-function-from-compas.patch
index ac0c0e3513..ac0c0e3513 100644
--- a/patches/server/1014-Remove-set-damage-lootable-item-function-from-compas.patch
+++ b/patches/server/1015-Remove-set-damage-lootable-item-function-from-compas.patch
diff --git a/patches/server/1015-Add-enchantment-seed-update-API.patch b/patches/server/1016-Add-enchantment-seed-update-API.patch
index 3725102979..3725102979 100644
--- a/patches/server/1015-Add-enchantment-seed-update-API.patch
+++ b/patches/server/1016-Add-enchantment-seed-update-API.patch
diff --git a/patches/server/1016-Fix-synchronise-sending-chat-to-client-with-updating.patch b/patches/server/1017-Fix-synchronise-sending-chat-to-client-with-updating.patch
index 63f9be4942..63f9be4942 100644
--- a/patches/server/1016-Fix-synchronise-sending-chat-to-client-with-updating.patch
+++ b/patches/server/1017-Fix-synchronise-sending-chat-to-client-with-updating.patch
diff --git a/patches/server/1017-Fix-InventoryOpenEvent-cancellation.patch b/patches/server/1018-Fix-InventoryOpenEvent-cancellation.patch
index 6f31e5f363..6f31e5f363 100644
--- a/patches/server/1017-Fix-InventoryOpenEvent-cancellation.patch
+++ b/patches/server/1018-Fix-InventoryOpenEvent-cancellation.patch
diff --git a/patches/server/1018-Fire-BlockExpEvent-on-grindstone-use.patch b/patches/server/1019-Fire-BlockExpEvent-on-grindstone-use.patch
index e5944fabfe..e5944fabfe 100644
--- a/patches/server/1018-Fire-BlockExpEvent-on-grindstone-use.patch
+++ b/patches/server/1019-Fire-BlockExpEvent-on-grindstone-use.patch
diff --git a/patches/server/1019-Check-dead-flag-in-isAlive.patch b/patches/server/1020-Check-dead-flag-in-isAlive.patch
index 2136c68a7a..2136c68a7a 100644
--- a/patches/server/1019-Check-dead-flag-in-isAlive.patch
+++ b/patches/server/1020-Check-dead-flag-in-isAlive.patch
diff --git a/patches/server/1020-Add-FeatureFlag-API.patch b/patches/server/1021-Add-FeatureFlag-API.patch
index cc3530746f..cc3530746f 100644
--- a/patches/server/1020-Add-FeatureFlag-API.patch
+++ b/patches/server/1021-Add-FeatureFlag-API.patch
diff --git a/patches/server/1021-Tag-Lifecycle-Events.patch b/patches/server/1022-Tag-Lifecycle-Events.patch
index a247efaccc..a247efaccc 100644
--- a/patches/server/1021-Tag-Lifecycle-Events.patch
+++ b/patches/server/1022-Tag-Lifecycle-Events.patch
diff --git a/patches/server/1022-Item-serialization-as-json.patch b/patches/server/1023-Item-serialization-as-json.patch
index 9e7e7399ca..9e7e7399ca 100644
--- a/patches/server/1022-Item-serialization-as-json.patch
+++ b/patches/server/1023-Item-serialization-as-json.patch
diff --git a/patches/server/1023-Validate-slot-in-PlayerInventory-setSlot.patch b/patches/server/1024-Validate-slot-in-PlayerInventory-setSlot.patch
index 3c402b2284..3c402b2284 100644
--- a/patches/server/1023-Validate-slot-in-PlayerInventory-setSlot.patch
+++ b/patches/server/1024-Validate-slot-in-PlayerInventory-setSlot.patch
diff --git a/patches/server/1024-Remove-wall-time-unused-skip-tick-protection.patch b/patches/server/1025-Remove-wall-time-unused-skip-tick-protection.patch
index da0d05dd0d..da0d05dd0d 100644
--- a/patches/server/1024-Remove-wall-time-unused-skip-tick-protection.patch
+++ b/patches/server/1025-Remove-wall-time-unused-skip-tick-protection.patch
diff --git a/patches/server/1025-Disable-pretty-printing-for-advancement-saving.patch b/patches/server/1026-Disable-pretty-printing-for-advancement-saving.patch
index c6ad9249f5..c6ad9249f5 100644
--- a/patches/server/1025-Disable-pretty-printing-for-advancement-saving.patch
+++ b/patches/server/1026-Disable-pretty-printing-for-advancement-saving.patch
diff --git a/patches/server/1026-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch b/patches/server/1027-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch
index 88334f2709..88334f2709 100644
--- a/patches/server/1026-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch
+++ b/patches/server/1027-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch
diff --git a/patches/server/1027-Add-enchantWithLevels-with-enchantment-registry-set.patch b/patches/server/1028-Add-enchantWithLevels-with-enchantment-registry-set.patch
index 61f5aced36..61f5aced36 100644
--- a/patches/server/1027-Add-enchantWithLevels-with-enchantment-registry-set.patch
+++ b/patches/server/1028-Add-enchantWithLevels-with-enchantment-registry-set.patch
diff --git a/patches/server/1028-Improve-entity-effect-API.patch b/patches/server/1029-Improve-entity-effect-API.patch
index 6599dd255e..6599dd255e 100644
--- a/patches/server/1028-Improve-entity-effect-API.patch
+++ b/patches/server/1029-Improve-entity-effect-API.patch
diff --git a/patches/server/1029-Add-recipeBrewTime.patch b/patches/server/1030-Add-recipeBrewTime.patch
index 39d7149206..39d7149206 100644
--- a/patches/server/1029-Add-recipeBrewTime.patch
+++ b/patches/server/1030-Add-recipeBrewTime.patch
diff --git a/patches/server/1030-Call-bucket-events-for-cauldrons.patch b/patches/server/1031-Call-bucket-events-for-cauldrons.patch
index ab192b82a4..ab192b82a4 100644
--- a/patches/server/1030-Call-bucket-events-for-cauldrons.patch
+++ b/patches/server/1031-Call-bucket-events-for-cauldrons.patch
diff --git a/patches/server/1031-Add-PlayerInsertLecternBookEvent.patch b/patches/server/1032-Add-PlayerInsertLecternBookEvent.patch
index e410ce7bc2..e410ce7bc2 100644
--- a/patches/server/1031-Add-PlayerInsertLecternBookEvent.patch
+++ b/patches/server/1032-Add-PlayerInsertLecternBookEvent.patch
diff --git a/patches/server/1032-Void-damage-configuration-API.patch b/patches/server/1033-Void-damage-configuration-API.patch
index 6270e63ff8..6270e63ff8 100644
--- a/patches/server/1032-Void-damage-configuration-API.patch
+++ b/patches/server/1033-Void-damage-configuration-API.patch
diff --git a/patches/server/1033-Add-Offline-PDC-API.patch b/patches/server/1034-Add-Offline-PDC-API.patch
index f1513955cb..f1513955cb 100644
--- a/patches/server/1033-Add-Offline-PDC-API.patch
+++ b/patches/server/1034-Add-Offline-PDC-API.patch
diff --git a/patches/server/1034-Add-AnvilView-bypassEnchantmentLevelRestriction.patch b/patches/server/1035-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
index f8c089a57c..f8c089a57c 100644
--- a/patches/server/1034-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
+++ b/patches/server/1035-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
diff --git a/patches/server/1035-Add-proper-async-player-disconnections.patch b/patches/server/1036-Add-proper-async-player-disconnections.patch
index 6369e9271b..6369e9271b 100644
--- a/patches/server/1035-Add-proper-async-player-disconnections.patch
+++ b/patches/server/1036-Add-proper-async-player-disconnections.patch
diff --git a/patches/server/1036-Always-send-Banner-patterns-to-the-client.patch b/patches/server/1037-Always-send-Banner-patterns-to-the-client.patch
index a5951afc90..a5951afc90 100644
--- a/patches/server/1036-Always-send-Banner-patterns-to-the-client.patch
+++ b/patches/server/1037-Always-send-Banner-patterns-to-the-client.patch
diff --git a/patches/server/1037-Rewrite-dataconverter-system.patch b/patches/server/1038-Rewrite-dataconverter-system.patch
index c56d13c873..c56d13c873 100644
--- a/patches/server/1037-Rewrite-dataconverter-system.patch
+++ b/patches/server/1038-Rewrite-dataconverter-system.patch
diff --git a/patches/server/1038-Moonrise-optimisation-patches.patch b/patches/server/1039-Moonrise-optimisation-patches.patch
index 2160af1a6b..8bd5172b96 100644
--- a/patches/server/1038-Moonrise-optimisation-patches.patch
+++ b/patches/server/1039-Moonrise-optimisation-patches.patch
@@ -28032,7 +28032,7 @@ index b7d29389a357f142237cecd75f8ca91cf1eb6b5b..e4b0dc3121101d54394a0c3a413dabf8
          this.generatingStep = generationStep;
          this.cache = chunks;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 90c469193ecf9d04dd9e3f1a38157d47c5094985..bbefb529607d1cffe8917b883389494a8fa126c0 100644
+index f55d7f6ed653b19f28694f91ca5bcc54873e33c3..a6964ceb3874acebdcb8cdc8fe0c128bd56bea48 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1422,7 +1422,7 @@ public abstract class PlayerList {
@@ -36000,10 +36000,10 @@ index f65cc95ab28e8a3b21eac2b16bd9ebe97e56e571..0074bc0e7147dc3a8c538e796f14ac9b
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8348ab336029848eab1cbe9b67b056abf1f5866f..a34e40e273a79a234c3d79b6ad360ce3a4d35ba3 100644
+index b29220ced6f5294594af23d9227532f5bb292e4c..d45d4d43f8e960f164c00bb534ebfbb6da6a803b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1421,7 +1421,7 @@ public final class CraftServer implements Server {
+@@ -1433,7 +1433,7 @@ public final class CraftServer implements Server {
          // Paper - Put world into worldlist before initing the world; move up
  
          this.getServer().prepareLevels(internal.getChunkSource().chunkMap.progressListener, internal);
@@ -36012,7 +36012,7 @@ index 8348ab336029848eab1cbe9b67b056abf1f5866f..a34e40e273a79a234c3d79b6ad360ce3
  
          this.pluginManager.callEvent(new WorldLoadEvent(internal.getWorld()));
          return internal.getWorld();
-@@ -1466,7 +1466,7 @@ public final class CraftServer implements Server {
+@@ -1478,7 +1478,7 @@ public final class CraftServer implements Server {
              }
  
              handle.getChunkSource().close(save);
@@ -36021,7 +36021,7 @@ index 8348ab336029848eab1cbe9b67b056abf1f5866f..a34e40e273a79a234c3d79b6ad360ce3
              handle.convertable.close();
          } catch (Exception ex) {
              this.getLogger().log(Level.SEVERE, null, ex);
-@@ -2478,7 +2478,7 @@ public final class CraftServer implements Server {
+@@ -2516,7 +2516,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
diff --git a/patches/server/1039-API-for-checking-sent-chunks.patch b/patches/server/1040-API-for-checking-sent-chunks.patch
index 7f0201844b..7f0201844b 100644
--- a/patches/server/1039-API-for-checking-sent-chunks.patch
+++ b/patches/server/1040-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1040-Fix-CraftWorld-isChunkGenerated.patch b/patches/server/1041-Fix-CraftWorld-isChunkGenerated.patch
index a1a60d71b0..a1a60d71b0 100644
--- a/patches/server/1040-Fix-CraftWorld-isChunkGenerated.patch
+++ b/patches/server/1041-Fix-CraftWorld-isChunkGenerated.patch
diff --git a/patches/server/1041-Add-startup-flag-to-disable-gamerule-limits.patch b/patches/server/1042-Add-startup-flag-to-disable-gamerule-limits.patch
index 426dd76265..426dd76265 100644
--- a/patches/server/1041-Add-startup-flag-to-disable-gamerule-limits.patch
+++ b/patches/server/1042-Add-startup-flag-to-disable-gamerule-limits.patch
diff --git a/patches/server/1042-Improved-Watchdog-Support.patch b/patches/server/1043-Improved-Watchdog-Support.patch
index 25ec240202..9ce6a1fe4a 100644
--- a/patches/server/1042-Improved-Watchdog-Support.patch
+++ b/patches/server/1043-Improved-Watchdog-Support.patch
@@ -302,7 +302,7 @@ index 3ed19896a0e06fe834953e6450f23abdc805a6cc..7a79541db29cc47c844d617fc8a4360f
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index bbefb529607d1cffe8917b883389494a8fa126c0..511e7254d938733aca508efd5de82e61678c7620 100644
+index a6964ceb3874acebdcb8cdc8fe0c128bd56bea48..3642444d45038fd1a07768ff96bfbd8678b02e04 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -554,7 +554,7 @@ public abstract class PlayerList {
diff --git a/patches/server/1043-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1044-Detail-more-information-in-watchdog-dumps.patch
index 6c08ae9d36..6c08ae9d36 100644
--- a/patches/server/1043-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1044-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/1044-Entity-load-save-limit-per-chunk.patch b/patches/server/1045-Entity-load-save-limit-per-chunk.patch
index 0b3fc48e43..0b3fc48e43 100644
--- a/patches/server/1044-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/1045-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1045-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1046-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 5c2ab9cfcd..5c2ab9cfcd 100644
--- a/patches/server/1045-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1046-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1046-Bundle-spark.patch b/patches/server/1047-Bundle-spark.patch
index 585f155a20..f66e0b42bb 100644
--- a/patches/server/1046-Bundle-spark.patch
+++ b/patches/server/1047-Bundle-spark.patch
@@ -334,7 +334,7 @@ index 7a79541db29cc47c844d617fc8a4360f61c73372..f8ee4b6c481d3fe15f48bf4a93696dd2
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a34e40e273a79a234c3d79b6ad360ce3a4d35ba3..742d4cd3b42c1f4807c8ecb27ffa6df905d7f0ac 100644
+index d45d4d43f8e960f164c00bb534ebfbb6da6a803b..4db0d960adc637c37cb322471357876837ef9e8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -312,6 +312,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/1047-Improve-performance-of-mass-crafts.patch b/patches/server/1048-Improve-performance-of-mass-crafts.patch
index 57f901bc5f..57f901bc5f 100644
--- a/patches/server/1047-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1048-Improve-performance-of-mass-crafts.patch