671 files changed, 96 insertions, 115 deletions

diff --git a/patches/server/0386-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0385-Add-PlayerRecipeBookClickEvent.patch
index 2a1e7d648e..2a1e7d648e 100644
--- a/patches/server/0386-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0385-Add-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0385-Improve-Arrow-API.patch b/patches/server/0385-Improve-Arrow-API.patch
deleted file mode 100644
index cbf5d4d815..0000000000
--- a/patches/server/0385-Improve-Arrow-API.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nesaak <[email protected]>
-Date: Sat, 23 May 2020 10:31:11 -0400
-Subject: [PATCH] Improve Arrow API
-
-Add method to get the arrow's itemstack and a method
-to set the arrow's "noclip" status
-
-Co-authored-by: Jake Potrebic <[email protected]>
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-index 35d8fbd9c5751568a1a3b8928017e23cd41bb163..762c395e45a681a11f3fe9d10e7f0ba310786e80 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-@@ -99,6 +99,23 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
-         this.getHandle().pickup = net.minecraft.world.entity.projectile.AbstractArrow.Pickup.byOrdinal(status.ordinal());
-     }
- 
-+    // Paper start
-+    @Override
-+    public org.bukkit.craftbukkit.inventory.CraftItemStack getItemStack() {
-+        return org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(getHandle().getPickupItem());
-+    }
-+
-+    @Override
-+    public void setNoPhysics(boolean noPhysics) {
-+        this.getHandle().setNoPhysics(noPhysics);
-+    }
-+
-+    @Override
-+    public boolean hasNoPhysics() {
-+        return this.getHandle().isNoPhysics();
-+    }
-+    // Paper end
-+
-     @Override
-     public void setTicksLived(int value) {
-         super.setTicksLived(value);
diff --git a/patches/server/0387-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0386-Hide-sync-chunk-writes-behind-flag.patch
index cf5c2534f0..cf5c2534f0 100644
--- a/patches/server/0387-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0386-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0388-Add-permission-for-command-blocks.patch b/patches/server/0387-Add-permission-for-command-blocks.patch
index 6134ce4262..6134ce4262 100644
--- a/patches/server/0388-Add-permission-for-command-blocks.patch
+++ b/patches/server/0387-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0389-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0388-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index fb16bb47ac..ca8fc43bc6 100644
--- a/patches/server/0389-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/server/0388-Ensure-Entity-position-and-AABB-are-never-invalid.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Entity position and AABB are never invalid
 Co-authored-by: Spottedleaf <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9c9689f4deffed50df9aaca6e451228d17154b8c..11a9142962637af5e26939a5eb8f35ba5f205793 100644
+index 23ee63119d55b40829c03a855ae0f8b214674e10..0c6680bf15b57cf314638ab70d849e033719c0e1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -652,8 +652,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0390-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0389-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index d7c2053bcb..d7c2053bcb 100644
--- a/patches/server/0390-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0389-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0391-Paper-dumpitem-command.patch b/patches/server/0390-Paper-dumpitem-command.patch
index 23f5287194..23f5287194 100644
--- a/patches/server/0391-Paper-dumpitem-command.patch
+++ b/patches/server/0390-Paper-dumpitem-command.patch
diff --git a/patches/server/0392-Improve-Legacy-Component-serialization-size.patch b/patches/server/0391-Improve-Legacy-Component-serialization-size.patch
index 00450d094b..00450d094b 100644
--- a/patches/server/0392-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0391-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0393-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0392-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 45d64256b9..45d64256b9 100644
--- a/patches/server/0393-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0392-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0394-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0393-Add-BlockStateMeta-clearBlockState.patch
index 86efcbf634..86efcbf634 100644
--- a/patches/server/0394-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/server/0393-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/server/0395-Support-old-UUID-format-for-NBT.patch b/patches/server/0394-Support-old-UUID-format-for-NBT.patch
index 590d6d62e6..590d6d62e6 100644
--- a/patches/server/0395-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0394-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0396-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0395-Convert-legacy-attributes-in-Item-Meta.patch
index 382b69e42d..382b69e42d 100644
--- a/patches/server/0396-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0395-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0397-Do-not-accept-invalid-client-settings.patch b/patches/server/0396-Do-not-accept-invalid-client-settings.patch
index 95b9f4d59e..95b9f4d59e 100644
--- a/patches/server/0397-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0396-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0398-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0397-Improve-fix-EntityTargetLivingEntityEvent.patch
index 513faeb27d..513faeb27d 100644
--- a/patches/server/0398-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/server/0397-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0399-Add-entity-liquid-API.patch b/patches/server/0398-Add-entity-liquid-API.patch
index a13db460a4..a13db460a4 100644
--- a/patches/server/0399-Add-entity-liquid-API.patch
+++ b/patches/server/0398-Add-entity-liquid-API.patch
diff --git a/patches/server/0400-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0399-Update-itemstack-legacy-name-and-lore.patch
index 49a60bd241..49a60bd241 100644
--- a/patches/server/0400-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/server/0399-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0401-Add-PrepareResultEvent.patch b/patches/server/0400-Add-PrepareResultEvent.patch
index 8426a573bd..8426a573bd 100644
--- a/patches/server/0401-Add-PrepareResultEvent.patch
+++ b/patches/server/0400-Add-PrepareResultEvent.patch
diff --git a/patches/server/0402-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0401-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index c744a5628c..c744a5628c 100644
--- a/patches/server/0402-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0401-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0403-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0402-Fix-arrows-never-despawning-MC-125757.patch
index d3111cf5b4..d3111cf5b4 100644
--- a/patches/server/0403-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0402-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0404-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0403-Thread-Safe-Vanilla-Command-permission-checking.patch
index d3ee9cbba1..d3ee9cbba1 100644
--- a/patches/server/0404-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0403-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0405-Fix-SPIGOT-5989.patch b/patches/server/0404-Fix-SPIGOT-5989.patch
index fc6ae89551..fc6ae89551 100644
--- a/patches/server/0405-Fix-SPIGOT-5989.patch
+++ b/patches/server/0404-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0406-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index 2e36f96bd3..2e36f96bd3 100644
--- a/patches/server/0406-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0407-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0406-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index 5bf7411f05..5bf7411f05 100644
--- a/patches/server/0407-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0406-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0408-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0407-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index f1039e4bf0..f1039e4bf0 100644
--- a/patches/server/0408-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0407-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0409-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0408-Optimize-NetworkManager-Exception-Handling.patch
index d1999714a1..d1999714a1 100644
--- a/patches/server/0409-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0408-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0410-Fix-some-rails-connecting-improperly.patch b/patches/server/0409-Fix-some-rails-connecting-improperly.patch
index 85d4d5d18d..85d4d5d18d 100644
--- a/patches/server/0410-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0409-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0411-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0410-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 75cd32bb83..75cd32bb83 100644
--- a/patches/server/0411-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0410-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0412-Brand-support.patch b/patches/server/0411-Brand-support.patch
index bccbce58fe..bccbce58fe 100644
--- a/patches/server/0412-Brand-support.patch
+++ b/patches/server/0411-Brand-support.patch
diff --git a/patches/server/0413-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0412-Add-playPickupItemAnimation-to-LivingEntity.patch
index c7055de757..c7055de757 100644
--- a/patches/server/0413-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0412-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0414-Don-t-require-FACING-data.patch b/patches/server/0413-Don-t-require-FACING-data.patch
index 98d0ef923f..98d0ef923f 100644
--- a/patches/server/0414-Don-t-require-FACING-data.patch
+++ b/patches/server/0413-Don-t-require-FACING-data.patch
diff --git a/patches/server/0415-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0414-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 9c8dcfe23c..9c8dcfe23c 100644
--- a/patches/server/0415-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0414-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0416-Add-moon-phase-API.patch b/patches/server/0415-Add-moon-phase-API.patch
index 7a3bfa49f6..7a3bfa49f6 100644
--- a/patches/server/0416-Add-moon-phase-API.patch
+++ b/patches/server/0415-Add-moon-phase-API.patch
diff --git a/patches/server/0417-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0416-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 6f37b0bcc0..6f37b0bcc0 100644
--- a/patches/server/0417-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0416-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0418-Prevent-headless-pistons-from-being-created.patch b/patches/server/0417-Prevent-headless-pistons-from-being-created.patch
index 2dbb5ee5de..2dbb5ee5de 100644
--- a/patches/server/0418-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0417-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0419-Add-BellRingEvent.patch b/patches/server/0418-Add-BellRingEvent.patch
index 58012313ff..58012313ff 100644
--- a/patches/server/0419-Add-BellRingEvent.patch
+++ b/patches/server/0418-Add-BellRingEvent.patch
diff --git a/patches/server/0420-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0419-Add-zombie-targets-turtle-egg-config.patch
index 240bf5e662..240bf5e662 100644
--- a/patches/server/0420-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0419-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0421-Buffer-joins-to-world.patch b/patches/server/0420-Buffer-joins-to-world.patch
index 35f2604677..35f2604677 100644
--- a/patches/server/0421-Buffer-joins-to-world.patch
+++ b/patches/server/0420-Buffer-joins-to-world.patch
diff --git a/patches/server/0422-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0421-Fix-hex-colors-not-working-in-some-kick-messages.patch
index c003ab2626..c003ab2626 100644
--- a/patches/server/0422-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0421-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0423-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0422-PortalCreateEvent-needs-to-know-its-entity.patch
index 910ff0e5d2..910ff0e5d2 100644
--- a/patches/server/0423-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0422-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0424-Add-more-Evoker-API.patch b/patches/server/0423-Add-more-Evoker-API.patch
index f44eceff55..f44eceff55 100644
--- a/patches/server/0424-Add-more-Evoker-API.patch
+++ b/patches/server/0423-Add-more-Evoker-API.patch
diff --git a/patches/server/0425-Add-methods-to-get-translation-keys.patch b/patches/server/0424-Add-methods-to-get-translation-keys.patch
index d602369647..d602369647 100644
--- a/patches/server/0425-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0424-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0426-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0425-Create-HoverEvent-from-ItemStack-Entity.patch
index 9e6e476351..9e6e476351 100644
--- a/patches/server/0426-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0425-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0427-Cache-block-data-strings.patch b/patches/server/0426-Cache-block-data-strings.patch
index 92b4d334d6..92b4d334d6 100644
--- a/patches/server/0427-Cache-block-data-strings.patch
+++ b/patches/server/0426-Cache-block-data-strings.patch
diff --git a/patches/server/0428-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0427-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 5fb2dcfe1f..8d60c2216a 100644
--- a/patches/server/0428-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0427-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -31,7 +31,7 @@ index 789576f8b7b3001c243972b320b7dffbbf3baa5f..3b73565d295c09a5ab0d610338498f01
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 11a9142962637af5e26939a5eb8f35ba5f205793..f839ab6dea7f1efd59f22bcef91d4e279b1c232a 100644
+index 0c6680bf15b57cf314638ab70d849e033719c0e1..f45b148884b305628411d57f7662ea454fde3906 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -162,6 +162,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0429-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0428-Add-additional-open-container-api-to-HumanEntity.patch
index 857657780a..857657780a 100644
--- a/patches/server/0429-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0428-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0430-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0429-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 572dc995c0..572dc995c0 100644
--- a/patches/server/0430-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0429-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0431-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0430-Extend-block-drop-capture-to-capture-all-items-added.patch
index aa2f0131c1..aa2f0131c1 100644
--- a/patches/server/0431-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0430-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0432-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0431-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 0710aed1e5..b01c302702 100644
--- a/patches/server/0432-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0431-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f839ab6dea7f1efd59f22bcef91d4e279b1c232a..0281f4c4f7bc609ff7f35dcc8a7c13f6813d6548 100644
+index f45b148884b305628411d57f7662ea454fde3906..44610d4e3fb69e6cf5629d9e895e93d8dd5e09e9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4411,4 +4411,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0433-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0432-Lazily-track-plugin-scoreboards-by-default.patch
index 28ae9df043..28ae9df043 100644
--- a/patches/server/0433-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0432-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0434-Entity-isTicking.patch b/patches/server/0433-Entity-isTicking.patch
index 2d53b98026..205f3da8d5 100644
--- a/patches/server/0434-Entity-isTicking.patch
+++ b/patches/server/0433-Entity-isTicking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0281f4c4f7bc609ff7f35dcc8a7c13f6813d6548..f33067ea049793d898def3c83bff5b36490f8232 100644
+index 44610d4e3fb69e6cf5629d9e895e93d8dd5e09e9..2c0c41ae455ae5894e6bd85830741143c3d8aaa5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4416,5 +4416,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0435-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0434-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index ad63085c7a..ad63085c7a 100644
--- a/patches/server/0435-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0434-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0436-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0435-Fix-Concurrency-issue-in-ShufflingList.patch
index 36f5a879a8..36f5a879a8 100644
--- a/patches/server/0436-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0435-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0437-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0436-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index 3a8fa9719c..3a8fa9719c 100644
--- a/patches/server/0437-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0436-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0438-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0437-Fix-for-large-move-vectors-crashing-server.patch
index 572b5d2307..572b5d2307 100644
--- a/patches/server/0438-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0437-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0439-Optimise-getType-calls.patch b/patches/server/0438-Optimise-getType-calls.patch
index 6dd01d7860..6dd01d7860 100644
--- a/patches/server/0439-Optimise-getType-calls.patch
+++ b/patches/server/0438-Optimise-getType-calls.patch
diff --git a/patches/server/0440-Villager-resetOffers.patch b/patches/server/0439-Villager-resetOffers.patch
index 6068c580b9..6068c580b9 100644
--- a/patches/server/0440-Villager-resetOffers.patch
+++ b/patches/server/0439-Villager-resetOffers.patch
diff --git a/patches/server/0441-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0440-Retain-block-place-order-when-capturing-blockstates.patch
index f568cd0d92..f568cd0d92 100644
--- a/patches/server/0441-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0440-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0442-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0441-Reduce-blockpos-allocation-from-pathfinding.patch
index 8d14eb1a05..8d14eb1a05 100644
--- a/patches/server/0442-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/server/0441-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0443-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0442-Fix-item-locations-dropped-from-campfires.patch
index d96bf626d4..d96bf626d4 100644
--- a/patches/server/0443-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0442-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0444-Fix-bell-block-entity-memory-leak.patch b/patches/server/0443-Fix-bell-block-entity-memory-leak.patch
index 91b7136c9d..91b7136c9d 100644
--- a/patches/server/0444-Fix-bell-block-entity-memory-leak.patch
+++ b/patches/server/0443-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0445-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0444-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 741bc6d269..741bc6d269 100644
--- a/patches/server/0445-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0444-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0446-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0445-Add-getOfflinePlayerIfCached-String.patch
index d72a0cdabe..d72a0cdabe 100644
--- a/patches/server/0446-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0445-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0447-Add-ignore-discounts-API.patch b/patches/server/0446-Add-ignore-discounts-API.patch
index a0354c3ea6..a0354c3ea6 100644
--- a/patches/server/0447-Add-ignore-discounts-API.patch
+++ b/patches/server/0446-Add-ignore-discounts-API.patch
diff --git a/patches/server/0448-Toggle-for-removing-existing-dragon.patch b/patches/server/0447-Toggle-for-removing-existing-dragon.patch
index 410f6cec83..410f6cec83 100644
--- a/patches/server/0448-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0447-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0449-Fix-client-lag-on-advancement-loading.patch b/patches/server/0448-Fix-client-lag-on-advancement-loading.patch
index 4882b3fd23..4882b3fd23 100644
--- a/patches/server/0449-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0448-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0450-Item-no-age-no-player-pickup.patch b/patches/server/0449-Item-no-age-no-player-pickup.patch
index 1fffbaf558..1fffbaf558 100644
--- a/patches/server/0450-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0449-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0451-Beacon-API-custom-effect-ranges.patch b/patches/server/0450-Beacon-API-custom-effect-ranges.patch
index 88e2a56086..88e2a56086 100644
--- a/patches/server/0451-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0450-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0452-Add-API-for-quit-reason.patch b/patches/server/0451-Add-API-for-quit-reason.patch
index b506a95e94..b506a95e94 100644
--- a/patches/server/0452-Add-API-for-quit-reason.patch
+++ b/patches/server/0451-Add-API-for-quit-reason.patch
diff --git a/patches/server/0453-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0452-Add-Wandering-Trader-spawn-rate-config-options.patch
index e14e51ab48..e14e51ab48 100644
--- a/patches/server/0453-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0452-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0454-Expose-world-spawn-angle.patch b/patches/server/0453-Expose-world-spawn-angle.patch
index ccaebc75f6..ccaebc75f6 100644
--- a/patches/server/0454-Expose-world-spawn-angle.patch
+++ b/patches/server/0453-Expose-world-spawn-angle.patch
diff --git a/patches/server/0455-Add-Destroy-Speed-API.patch b/patches/server/0454-Add-Destroy-Speed-API.patch
index 3b44bc9efc..3b44bc9efc 100644
--- a/patches/server/0455-Add-Destroy-Speed-API.patch
+++ b/patches/server/0454-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0456-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0455-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 55306da79d..55306da79d 100644
--- a/patches/server/0456-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0455-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0457-Add-LivingEntity-clearActiveItem.patch b/patches/server/0456-Add-LivingEntity-clearActiveItem.patch
index 54d5de0aa1..54d5de0aa1 100644
--- a/patches/server/0457-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0456-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0458-Add-PlayerItemCooldownEvent.patch b/patches/server/0457-Add-PlayerItemCooldownEvent.patch
index 4b90903dd2..4b90903dd2 100644
--- a/patches/server/0458-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0457-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0459-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0458-Significantly-improve-performance-of-the-end-generat.patch
index dc7812a211..dc7812a211 100644
--- a/patches/server/0459-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0458-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0460-More-lightning-API.patch b/patches/server/0459-More-lightning-API.patch
index 967871902a..967871902a 100644
--- a/patches/server/0460-More-lightning-API.patch
+++ b/patches/server/0459-More-lightning-API.patch
diff --git a/patches/server/0461-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0460-Climbing-should-not-bypass-cramming-gamerule.patch
index e615ac322f..6d2f4c2108 100644
--- a/patches/server/0461-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0460-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f33067ea049793d898def3c83bff5b36490f8232..3b9c691973f11b7d4db8fb77d2b02aa0d07ed7b5 100644
+index 2c0c41ae455ae5894e6bd85830741143c3d8aaa5..82ccfd91dfd3cce35a35edf8f73ccdd1ddd1fd6a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1983,6 +1983,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0462-Add-missing-default-perms-for-commands.patch b/patches/server/0461-Add-missing-default-perms-for-commands.patch
index c2cc3ce8cc..c2cc3ce8cc 100644
--- a/patches/server/0462-Add-missing-default-perms-for-commands.patch
+++ b/patches/server/0461-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0463-Add-PlayerShearBlockEvent.patch b/patches/server/0462-Add-PlayerShearBlockEvent.patch
index 140bb100a4..140bb100a4 100644
--- a/patches/server/0463-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0462-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0464-Limit-recipe-packets.patch b/patches/server/0463-Limit-recipe-packets.patch
index e6120b59a6..e6120b59a6 100644
--- a/patches/server/0464-Limit-recipe-packets.patch
+++ b/patches/server/0463-Limit-recipe-packets.patch
diff --git a/patches/server/0465-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0464-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0465-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0464-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0466-Player-Chunk-Load-Unload-Events.patch b/patches/server/0465-Player-Chunk-Load-Unload-Events.patch
index 241610bb61..241610bb61 100644
--- a/patches/server/0466-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0465-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0467-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0466-Optimize-Dynamic-get-Missing-Keys.patch
index e58939559a..e58939559a 100644
--- a/patches/server/0467-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0466-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0468-Expose-LivingEntity-hurt-direction.patch b/patches/server/0467-Expose-LivingEntity-hurt-direction.patch
index 73f36c0bb3..73f36c0bb3 100644
--- a/patches/server/0468-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0467-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0469-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0468-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 27ff4645d2..27ff4645d2 100644
--- a/patches/server/0469-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0468-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0470-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0469-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
index 50044a8342..50044a8342 100644
--- a/patches/server/0470-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
+++ b/patches/server/0469-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0471-Add-TargetHitEvent.patch b/patches/server/0470-Add-TargetHitEvent.patch
index f623f8091b..f623f8091b 100644
--- a/patches/server/0471-Add-TargetHitEvent.patch
+++ b/patches/server/0470-Add-TargetHitEvent.patch
diff --git a/patches/server/0472-MC-4-Fix-item-position-desync.patch b/patches/server/0471-MC-4-Fix-item-position-desync.patch
index f1fa7d66d3..5b680e0dd0 100644
--- a/patches/server/0472-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0471-MC-4-Fix-item-position-desync.patch
@@ -28,7 +28,7 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..3c4ac79c094dc2fff7de94150a34b7bf
  
      public Vec3 decode(long x, long y, long z) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3b9c691973f11b7d4db8fb77d2b02aa0d07ed7b5..df389ebaaef8ef307adb6c604ce22a192a522ba4 100644
+index 82ccfd91dfd3cce35a35edf8f73ccdd1ddd1fd6a..18cf11ddcf51e8b6251fd6df97f85e0ed15900c4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4186,6 +4186,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0473-Additional-Block-Material-API.patch b/patches/server/0472-Additional-Block-Material-API.patch
index 81728edf48..81728edf48 100644
--- a/patches/server/0473-Additional-Block-Material-API.patch
+++ b/patches/server/0472-Additional-Block-Material-API.patch
diff --git a/patches/server/0474-Fix-harming-potion-dupe.patch b/patches/server/0473-Fix-harming-potion-dupe.patch
index d7fda01e2c..d7fda01e2c 100644
--- a/patches/server/0474-Fix-harming-potion-dupe.patch
+++ b/patches/server/0473-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0475-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0474-API-to-get-Material-from-Boats-and-Minecarts.patch
index 9bcb17ad14..9bcb17ad14 100644
--- a/patches/server/0475-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/server/0474-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0476-Cache-burn-durations.patch b/patches/server/0475-Cache-burn-durations.patch
index 32d702d124..32d702d124 100644
--- a/patches/server/0476-Cache-burn-durations.patch
+++ b/patches/server/0475-Cache-burn-durations.patch
diff --git a/patches/server/0477-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0476-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index 40171ab920..40171ab920 100644
--- a/patches/server/0477-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0476-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0478-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0477-Fix-Not-a-string-Map-Conversion-spam.patch
index e434023f48..e434023f48 100644
--- a/patches/server/0478-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0477-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0479-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0478-Add-PlayerFlowerPotManipulateEvent.patch
index bad384da72..bad384da72 100644
--- a/patches/server/0479-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0478-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0480-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0479-Fix-interact-event-not-being-called-sometimes.patch
index b4f8b3eada..b4f8b3eada 100644
--- a/patches/server/0480-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0479-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0481-Zombie-API-breaking-doors.patch b/patches/server/0480-Zombie-API-breaking-doors.patch
index 50bb6965cf..50bb6965cf 100644
--- a/patches/server/0481-Zombie-API-breaking-doors.patch
+++ b/patches/server/0480-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0482-Fix-nerfed-slime-when-splitting.patch b/patches/server/0481-Fix-nerfed-slime-when-splitting.patch
index 91c9da2246..91c9da2246 100644
--- a/patches/server/0482-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0481-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0483-Add-EntityLoadCrossbowEvent.patch b/patches/server/0482-Add-EntityLoadCrossbowEvent.patch
index ae4000c9dc..ae4000c9dc 100644
--- a/patches/server/0483-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0482-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0484-Add-WorldGameRuleChangeEvent.patch b/patches/server/0483-Add-WorldGameRuleChangeEvent.patch
index 634bd091ff..634bd091ff 100644
--- a/patches/server/0484-Add-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0483-Add-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0485-Add-ServerResourcesReloadedEvent.patch b/patches/server/0484-Add-ServerResourcesReloadedEvent.patch
index b01f7c1460..b01f7c1460 100644
--- a/patches/server/0485-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0484-Add-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0486-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0485-Add-world-settings-for-mobs-picking-up-loot.patch
index 4c4ee0656d..4c4ee0656d 100644
--- a/patches/server/0486-Add-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0485-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0487-Add-BlockFailedDispenseEvent.patch b/patches/server/0486-Add-BlockFailedDispenseEvent.patch
index 6c46c1fc7e..6c46c1fc7e 100644
--- a/patches/server/0487-Add-BlockFailedDispenseEvent.patch
+++ b/patches/server/0486-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0488-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0487-Add-PlayerLecternPageChangeEvent.patch
index 2e62d2becf..2e62d2becf 100644
--- a/patches/server/0488-Add-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0487-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0489-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0488-Add-PlayerLoomPatternSelectEvent.patch
index 382268afcd..382268afcd 100644
--- a/patches/server/0489-Add-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0488-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0490-Configurable-door-breaking-difficulty.patch b/patches/server/0489-Configurable-door-breaking-difficulty.patch
index c0ec74016c..c0ec74016c 100644
--- a/patches/server/0490-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0489-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0491-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0490-Empty-commands-shall-not-be-dispatched.patch
index 7a48e3018e..7a48e3018e 100644
--- a/patches/server/0491-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0490-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0492-Remove-stale-POIs.patch b/patches/server/0491-Remove-stale-POIs.patch
index ca376b9ba7..ca376b9ba7 100644
--- a/patches/server/0492-Remove-stale-POIs.patch
+++ b/patches/server/0491-Remove-stale-POIs.patch
diff --git a/patches/server/0493-Fix-villager-boat-exploit.patch b/patches/server/0492-Fix-villager-boat-exploit.patch
index 1f01745885..1f01745885 100644
--- a/patches/server/0493-Fix-villager-boat-exploit.patch
+++ b/patches/server/0492-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0494-Add-sendOpLevel-API.patch b/patches/server/0493-Add-sendOpLevel-API.patch
index e5fdb1c643..e5fdb1c643 100644
--- a/patches/server/0494-Add-sendOpLevel-API.patch
+++ b/patches/server/0493-Add-sendOpLevel-API.patch
diff --git a/patches/server/0495-TODO-Registry-Modification-API.patch b/patches/server/0494-TODO-Registry-Modification-API.patch
index b47ca6aff7..b47ca6aff7 100644
--- a/patches/server/0495-TODO-Registry-Modification-API.patch
+++ b/patches/server/0494-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0496-Add-StructuresLocateEvent.patch b/patches/server/0495-Add-StructuresLocateEvent.patch
index 5f8804f44d..5f8804f44d 100644
--- a/patches/server/0496-Add-StructuresLocateEvent.patch
+++ b/patches/server/0495-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0497-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0496-Collision-option-for-requiring-a-player-participant.patch
index c029c3a902..176ae99bc8 100644
--- a/patches/server/0497-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0496-Collision-option-for-requiring-a-player-participant.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index df389ebaaef8ef307adb6c604ce22a192a522ba4..fa5d634cefcf73afd3e090f91c4c589edb988352 100644
+index 18cf11ddcf51e8b6251fd6df97f85e0ed15900c4..2d8c476eb9f329ee6827340b6cec26a84901c56a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1848,6 +1848,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0498-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0497-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index 95ecd8b67e..95ecd8b67e 100644
--- a/patches/server/0498-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0497-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0499-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0498-Return-chat-component-with-empty-text-instead-of-thr.patch
index ba3a6a7f92..ba3a6a7f92 100644
--- a/patches/server/0499-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0498-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0500-Make-schedule-command-per-world.patch b/patches/server/0499-Make-schedule-command-per-world.patch
index f1854ba4c9..f1854ba4c9 100644
--- a/patches/server/0500-Make-schedule-command-per-world.patch
+++ b/patches/server/0499-Make-schedule-command-per-world.patch
diff --git a/patches/server/0501-Configurable-max-leash-distance.patch b/patches/server/0500-Configurable-max-leash-distance.patch
index 99a4a50ca9..99a4a50ca9 100644
--- a/patches/server/0501-Configurable-max-leash-distance.patch
+++ b/patches/server/0500-Configurable-max-leash-distance.patch
diff --git a/patches/server/0502-Add-BlockPreDispenseEvent.patch b/patches/server/0501-Add-BlockPreDispenseEvent.patch
index 7772764b33..7772764b33 100644
--- a/patches/server/0502-Add-BlockPreDispenseEvent.patch
+++ b/patches/server/0501-Add-BlockPreDispenseEvent.patch
diff --git a/patches/server/0503-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0502-Add-PlayerChangeBeaconEffectEvent.patch
index 0187e55e0c..0187e55e0c 100644
--- a/patches/server/0503-Add-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0502-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0504-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0503-Add-toggle-for-always-placing-the-dragon-egg.patch
index 7d6769dff8..7d6769dff8 100644
--- a/patches/server/0504-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0503-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0505-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0504-Add-PlayerStonecutterRecipeSelectEvent.patch
index 6aad83c0bc..6aad83c0bc 100644
--- a/patches/server/0505-Add-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0504-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0506-Expand-EntityUnleashEvent.patch b/patches/server/0505-Expand-EntityUnleashEvent.patch
index 5586344bbe..5586344bbe 100644
--- a/patches/server/0506-Expand-EntityUnleashEvent.patch
+++ b/patches/server/0505-Expand-EntityUnleashEvent.patch
diff --git a/patches/server/0507-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0506-Reset-shield-blocking-on-dimension-change.patch
index b59a53ac0f..b59a53ac0f 100644
--- a/patches/server/0507-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0506-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0508-Add-DragonEggFormEvent.patch b/patches/server/0507-Add-DragonEggFormEvent.patch
index b92df234cd..b92df234cd 100644
--- a/patches/server/0508-Add-DragonEggFormEvent.patch
+++ b/patches/server/0507-Add-DragonEggFormEvent.patch
diff --git a/patches/server/0509-Add-EntityMoveEvent.patch b/patches/server/0508-Add-EntityMoveEvent.patch
index 54dd0d6264..54dd0d6264 100644
--- a/patches/server/0509-Add-EntityMoveEvent.patch
+++ b/patches/server/0508-Add-EntityMoveEvent.patch
diff --git a/patches/server/0510-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0509-added-option-to-disable-pathfinding-updates-on-block.patch
index fbf9bd1483..fbf9bd1483 100644
--- a/patches/server/0510-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0509-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0511-Inline-shift-direction-fields.patch b/patches/server/0510-Inline-shift-direction-fields.patch
index 4f26750f0e..4f26750f0e 100644
--- a/patches/server/0511-Inline-shift-direction-fields.patch
+++ b/patches/server/0510-Inline-shift-direction-fields.patch
diff --git a/patches/server/0512-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0511-Allow-adding-items-to-BlockDropItemEvent.patch
index 65b594a18e..65b594a18e 100644
--- a/patches/server/0512-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0511-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0513-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0512-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 57d54a0434..57d54a0434 100644
--- a/patches/server/0513-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0512-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0514-living-entity-allow-attribute-registration.patch b/patches/server/0513-living-entity-allow-attribute-registration.patch
index 6982e40447..6982e40447 100644
--- a/patches/server/0514-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0513-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0515-fix-dead-slime-setSize-invincibility.patch b/patches/server/0514-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0515-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0514-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0516-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0515-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0516-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0515-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0517-Expose-Tracked-Players.patch b/patches/server/0516-Expose-Tracked-Players.patch
index e31f586e35..e31f586e35 100644
--- a/patches/server/0517-Expose-Tracked-Players.patch
+++ b/patches/server/0516-Expose-Tracked-Players.patch
diff --git a/patches/server/0518-Improve-ServerGUI.patch b/patches/server/0517-Improve-ServerGUI.patch
index ea0b4bbc77..ea0b4bbc77 100644
--- a/patches/server/0518-Improve-ServerGUI.patch
+++ b/patches/server/0517-Improve-ServerGUI.patch
diff --git a/patches/server/0519-fix-converting-txt-to-json-file.patch b/patches/server/0518-fix-converting-txt-to-json-file.patch
index 5f13006cc4..5f13006cc4 100644
--- a/patches/server/0519-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0518-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0520-Add-worldborder-events.patch b/patches/server/0519-Add-worldborder-events.patch
index f39382cd63..f39382cd63 100644
--- a/patches/server/0520-Add-worldborder-events.patch
+++ b/patches/server/0519-Add-worldborder-events.patch
diff --git a/patches/server/0521-Add-PlayerNameEntityEvent.patch b/patches/server/0520-Add-PlayerNameEntityEvent.patch
index eec1c1a2eb..eec1c1a2eb 100644
--- a/patches/server/0521-Add-PlayerNameEntityEvent.patch
+++ b/patches/server/0520-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0522-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0521-Prevent-grindstones-from-overstacking-items.patch
index d98bb3f1c4..d98bb3f1c4 100644
--- a/patches/server/0522-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0521-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0523-Add-recipe-to-cook-events.patch b/patches/server/0522-Add-recipe-to-cook-events.patch
index 75eb9efb8b..75eb9efb8b 100644
--- a/patches/server/0523-Add-recipe-to-cook-events.patch
+++ b/patches/server/0522-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0524-Add-Block-isValidTool.patch b/patches/server/0523-Add-Block-isValidTool.patch
index 5f36fb047c..5f36fb047c 100644
--- a/patches/server/0524-Add-Block-isValidTool.patch
+++ b/patches/server/0523-Add-Block-isValidTool.patch
diff --git a/patches/server/0525-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0524-Allow-using-signs-inside-spawn-protection.patch
index 0eefa73f3f..0eefa73f3f 100644
--- a/patches/server/0525-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0524-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0526-Expand-world-key-API.patch b/patches/server/0525-Expand-world-key-API.patch
index b4d1977540..b4d1977540 100644
--- a/patches/server/0526-Expand-world-key-API.patch
+++ b/patches/server/0525-Expand-world-key-API.patch
diff --git a/patches/server/0527-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0526-Add-fast-alternative-constructor-for-Rotations.patch
index 9b38f8f90d..9b38f8f90d 100644
--- a/patches/server/0527-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0526-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0528-Item-Rarity-API.patch b/patches/server/0527-Item-Rarity-API.patch
index d0d483075a..d0d483075a 100644
--- a/patches/server/0528-Item-Rarity-API.patch
+++ b/patches/server/0527-Item-Rarity-API.patch
diff --git a/patches/server/0529-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0528-Drop-carried-item-when-player-has-disconnected.patch
index c5c564c74e..c5c564c74e 100644
--- a/patches/server/0529-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0528-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0530-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0529-forced-whitelist-use-configurable-kick-message.patch
index 48f96930a9..48f96930a9 100644
--- a/patches/server/0530-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0529-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0531-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0530-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index ff433de537..ff433de537 100644
--- a/patches/server/0531-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0530-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0532-Expose-protocol-version.patch b/patches/server/0531-Expose-protocol-version.patch
index e81a519f77..e81a519f77 100644
--- a/patches/server/0532-Expose-protocol-version.patch
+++ b/patches/server/0531-Expose-protocol-version.patch
diff --git a/patches/server/0533-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0532-Enhance-console-tab-completions-for-brigadier-comman.patch
index c1c74a8470..c1c74a8470 100644
--- a/patches/server/0533-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0532-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0534-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0533-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 23fd145ca7..23fd145ca7 100644
--- a/patches/server/0534-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0533-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0535-Add-bypass-host-check.patch b/patches/server/0534-Add-bypass-host-check.patch
index b53ee2c2d8..b53ee2c2d8 100644
--- a/patches/server/0535-Add-bypass-host-check.patch
+++ b/patches/server/0534-Add-bypass-host-check.patch
diff --git a/patches/server/0536-Set-area-affect-cloud-rotation.patch b/patches/server/0535-Set-area-affect-cloud-rotation.patch
index 1904854b96..1904854b96 100644
--- a/patches/server/0536-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0535-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0537-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0536-add-isDeeplySleeping-to-HumanEntity.patch
index 61a0d0fb11..61a0d0fb11 100644
--- a/patches/server/0537-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0536-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0538-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0537-add-consumeFuel-to-FurnaceBurnEvent.patch
index bfdd2e8c45..bfdd2e8c45 100644
--- a/patches/server/0538-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0537-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0539-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0538-add-get-set-drop-chance-to-EntityEquipment.patch
index fd7cafa884..fd7cafa884 100644
--- a/patches/server/0539-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0538-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0540-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0539-fix-PigZombieAngerEvent-cancellation.patch
index 8b29ccdead..8b29ccdead 100644
--- a/patches/server/0540-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0539-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0541-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0540-fix-PlayerItemHeldEvent-firing-twice.patch
index 8a5876c2cb..8a5876c2cb 100644
--- a/patches/server/0541-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0540-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0542-Add-PlayerDeepSleepEvent.patch b/patches/server/0541-Add-PlayerDeepSleepEvent.patch
index 4ae6ac9026..4ae6ac9026 100644
--- a/patches/server/0542-Add-PlayerDeepSleepEvent.patch
+++ b/patches/server/0541-Add-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0543-More-World-API.patch b/patches/server/0542-More-World-API.patch
index 7f887ba98d..7f887ba98d 100644
--- a/patches/server/0543-More-World-API.patch
+++ b/patches/server/0542-More-World-API.patch
diff --git a/patches/server/0544-Add-PlayerBedFailEnterEvent.patch b/patches/server/0543-Add-PlayerBedFailEnterEvent.patch
index 945dacae7c..945dacae7c 100644
--- a/patches/server/0544-Add-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0543-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0545-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0544-Implement-methods-to-convert-between-Component-and-B.patch
index ebc86dc755..ebc86dc755 100644
--- a/patches/server/0545-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0544-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0546-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0545-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index 95d33b962c..95d33b962c 100644
--- a/patches/server/0546-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
+++ b/patches/server/0545-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
diff --git a/patches/server/0547-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0546-Introduce-beacon-activation-deactivation-events.patch
index f793b533a2..f793b533a2 100644
--- a/patches/server/0547-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0546-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0548-Add-Channel-initialization-listeners.patch b/patches/server/0547-Add-Channel-initialization-listeners.patch
index 51eee16dd9..51eee16dd9 100644
--- a/patches/server/0548-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0547-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0549-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0548-Send-empty-commands-if-tab-completion-is-disabled.patch
index f385186300..f385186300 100644
--- a/patches/server/0549-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0548-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0550-Add-more-WanderingTrader-API.patch b/patches/server/0549-Add-more-WanderingTrader-API.patch
index 6e3c9d60f5..6e3c9d60f5 100644
--- a/patches/server/0550-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0549-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0551-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0550-Add-EntityBlockStorage-clearEntities.patch
index 1297267437..1297267437 100644
--- a/patches/server/0551-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0550-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0552-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 4a803357b6..4a803357b6 100644
--- a/patches/server/0552-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0553-Add-HiddenPotionEffect-API.patch b/patches/server/0552-Add-HiddenPotionEffect-API.patch
index 5f9960d071..5f9960d071 100644
--- a/patches/server/0553-Add-HiddenPotionEffect-API.patch
+++ b/patches/server/0552-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0554-Inventory-close.patch b/patches/server/0553-Inventory-close.patch
index 9ca8b717ab..9ca8b717ab 100644
--- a/patches/server/0554-Inventory-close.patch
+++ b/patches/server/0553-Inventory-close.patch
diff --git a/patches/server/0555-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 1d2850637b..1d2850637b 100644
--- a/patches/server/0555-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0556-Add-basic-Datapack-API.patch b/patches/server/0555-Add-basic-Datapack-API.patch
index 93aebb5a94..93aebb5a94 100644
--- a/patches/server/0556-Add-basic-Datapack-API.patch
+++ b/patches/server/0555-Add-basic-Datapack-API.patch
diff --git a/patches/server/0557-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0556-Add-environment-variable-to-disable-server-gui.patch
index 5cb0f04643..5cb0f04643 100644
--- a/patches/server/0557-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0556-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0558-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0557-Expand-PlayerGameModeChangeEvent.patch
index 12c30b462b..12c30b462b 100644
--- a/patches/server/0558-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0557-Expand-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0559-ItemStack-repair-check-API.patch b/patches/server/0558-ItemStack-repair-check-API.patch
index daefbc2d1d..daefbc2d1d 100644
--- a/patches/server/0559-ItemStack-repair-check-API.patch
+++ b/patches/server/0558-ItemStack-repair-check-API.patch
diff --git a/patches/server/0560-More-Enchantment-API.patch b/patches/server/0559-More-Enchantment-API.patch
index 826f3c58ee..826f3c58ee 100644
--- a/patches/server/0560-More-Enchantment-API.patch
+++ b/patches/server/0559-More-Enchantment-API.patch
diff --git a/patches/server/0561-Move-range-check-for-block-placing-up.patch b/patches/server/0560-Move-range-check-for-block-placing-up.patch
index 6ba529d1a6..6ba529d1a6 100644
--- a/patches/server/0561-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0560-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0562-Add-Mob-lookAt-API.patch b/patches/server/0561-Add-Mob-lookAt-API.patch
index ddfa31827a..ddfa31827a 100644
--- a/patches/server/0562-Add-Mob-lookAt-API.patch
+++ b/patches/server/0561-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0563-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
index 5ca75e86a3..5ca75e86a3 100644
--- a/patches/server/0563-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/server/0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0564-Add-Unix-domain-socket-support.patch b/patches/server/0563-Add-Unix-domain-socket-support.patch
index 297b991d83..297b991d83 100644
--- a/patches/server/0564-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0563-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0565-Add-EntityInsideBlockEvent.patch b/patches/server/0564-Add-EntityInsideBlockEvent.patch
index a63f8ecbfe..a63f8ecbfe 100644
--- a/patches/server/0565-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0564-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0566-Attributes-API-for-item-defaults.patch b/patches/server/0565-Attributes-API-for-item-defaults.patch
index 65265cb696..65265cb696 100644
--- a/patches/server/0566-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0565-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0567-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0566-Add-cause-to-Weather-ThunderChangeEvents.patch
index f8ab56bacb..f8ab56bacb 100644
--- a/patches/server/0567-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0566-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0568-More-Lidded-Block-API.patch b/patches/server/0567-More-Lidded-Block-API.patch
index d36768f000..d36768f000 100644
--- a/patches/server/0568-More-Lidded-Block-API.patch
+++ b/patches/server/0567-More-Lidded-Block-API.patch
diff --git a/patches/server/0569-Limit-item-frame-cursors-on-maps.patch b/patches/server/0568-Limit-item-frame-cursors-on-maps.patch
index 8b38d8900a..8b38d8900a 100644
--- a/patches/server/0569-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0568-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0570-Add-PlayerKickEvent-causes.patch b/patches/server/0569-Add-PlayerKickEvent-causes.patch
index cba228a0e1..cba228a0e1 100644
--- a/patches/server/0570-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0569-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0571-Add-PufferFishStateChangeEvent.patch b/patches/server/0570-Add-PufferFishStateChangeEvent.patch
index 091a042a02..091a042a02 100644
--- a/patches/server/0571-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0570-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0572-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 8ac91b4842..8ac91b4842 100644
--- a/patches/server/0572-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0573-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 12b8b851c3..12b8b851c3 100644
--- a/patches/server/0573-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0574-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0573-Add-option-to-fix-items-merging-through-walls.patch
index 718a84a02c..718a84a02c 100644
--- a/patches/server/0574-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0573-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0575-Add-BellRevealRaiderEvent.patch b/patches/server/0574-Add-BellRevealRaiderEvent.patch
index 58719e8164..58719e8164 100644
--- a/patches/server/0575-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0574-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0576-Fix-invulnerable-end-crystals.patch b/patches/server/0575-Fix-invulnerable-end-crystals.patch
index 75347e76f0..75347e76f0 100644
--- a/patches/server/0576-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0575-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0577-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0576-Add-ElderGuardianAppearanceEvent.patch
index bd92518e4b..bd92518e4b 100644
--- a/patches/server/0577-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0576-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0578-Fix-dangerous-end-portal-logic.patch b/patches/server/0577-Fix-dangerous-end-portal-logic.patch
index 3c92033da9..1b1c9918ec 100644
--- a/patches/server/0578-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0577-Fix-dangerous-end-portal-logic.patch
@@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was
 designed to happen in the first place.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fa5d634cefcf73afd3e090f91c4c589edb988352..e9a12d9b7c8789f3d07ba5a799c941ca25eb3e63 100644
+index 2d8c476eb9f329ee6827340b6cec26a84901c56a..e3647763bcede42f06250550985e149e39f2b0b8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -421,6 +421,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0579-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 53a98e7fb8..53a98e7fb8 100644
--- a/patches/server/0579-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0580-Make-item-validations-configurable.patch b/patches/server/0579-Make-item-validations-configurable.patch
index e82f39807e..e82f39807e 100644
--- a/patches/server/0580-Make-item-validations-configurable.patch
+++ b/patches/server/0579-Make-item-validations-configurable.patch
diff --git a/patches/server/0581-Line-Of-Sight-Changes.patch b/patches/server/0580-Line-Of-Sight-Changes.patch
index e828baea33..e828baea33 100644
--- a/patches/server/0581-Line-Of-Sight-Changes.patch
+++ b/patches/server/0580-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0582-add-per-world-spawn-limits.patch b/patches/server/0581-add-per-world-spawn-limits.patch
index 5433a49ee8..5433a49ee8 100644
--- a/patches/server/0582-add-per-world-spawn-limits.patch
+++ b/patches/server/0581-add-per-world-spawn-limits.patch
diff --git a/patches/server/0583-Fix-potions-splash-events.patch b/patches/server/0582-Fix-potions-splash-events.patch
index 15190dbc0f..15190dbc0f 100644
--- a/patches/server/0583-Fix-potions-splash-events.patch
+++ b/patches/server/0582-Fix-potions-splash-events.patch
diff --git a/patches/server/0584-Add-more-LimitedRegion-API.patch b/patches/server/0583-Add-more-LimitedRegion-API.patch
index ff692d5181..ff692d5181 100644
--- a/patches/server/0584-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0583-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0585-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0584-Fix-PlayerDropItemEvent-using-wrong-item.patch
index e0ef67f1e5..e0ef67f1e5 100644
--- a/patches/server/0585-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0584-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0586-Missing-Entity-API.patch b/patches/server/0585-Missing-Entity-API.patch
index b2f850af74..d12a12082a 100644
--- a/patches/server/0586-Missing-Entity-API.patch
+++ b/patches/server/0585-Missing-Entity-API.patch
@@ -39,6 +39,7 @@ Co-authored-by: booky10 <[email protected]>
 Co-authored-by: Amin <[email protected]>
 Co-authored-by: TrollyLoki <[email protected]>
 Co-authored-by: FireInstall <[email protected]>
+Co-authored-by: maxcom1 <[email protected]>
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 index 8117578ced94aa6bf01871f6526a388385c4adf2..59699c59fdfc611177fdb3136f84ab539b17d9c9 100644
@@ -670,26 +671,36 @@ index fc0f0e841dc974d080e1abb9bbafb5165801131f..d657fd2c507a5b215aeab0a5f3e9c2ee
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 07158732dd6a5b7d622b7f2ea10ca87b50365b8a..dd1ca63d2d6e4c8606c28380f81b79b7ee211a35 100644
+index 07158732dd6a5b7d622b7f2ea10ca87b50365b8a..ebbefcdea6356384f27e964bd551bad2f9e696e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1078,4 +1078,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1078,4 +1078,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return set;
      }
      // Paper end
 +
-+    // Paper start - move up invisibility
++    // Paper start - missing entity api
 +    @Override
-+    public boolean isInvisible() {
++    public boolean isInvisible() {  // Paper - moved up from LivingEntity
 +        return this.getHandle().isInvisible();
 +    }
 +
 +    @Override
-+    public void setInvisible(boolean invisible) {
++    public void setInvisible(boolean invisible) {  // Paper - moved up from LivingEntity
 +        this.getHandle().persistentInvisibility = invisible;
 +        this.getHandle().setSharedFlag(Entity.FLAG_INVISIBLE, invisible);
 +    }
-+    // Paper end - move up invisibility
++
++    @Override
++    public void setNoPhysics(boolean noPhysics) {
++        this.getHandle().noPhysics = noPhysics;
++    }
++
++    @Override
++    public boolean hasNoPhysics() {
++        return this.getHandle().noPhysics;
++    }
++    // Paper end - missing entity api
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
 index 73cb7aa01af3eed71b05b1a539f082b26dcd8d60..e1a2f0924da6ebcdf332040f922226af5d8a2d45 100644
diff --git a/patches/server/0587-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 20f139446c..20f139446c 100644
--- a/patches/server/0587-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0588-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index a5c4eefb9a..a5c4eefb9a 100644
--- a/patches/server/0588-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0589-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0588-Use-getChunkIfLoadedImmediately-in-places.patch
index b45da09501..b45da09501 100644
--- a/patches/server/0589-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0588-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0590-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0589-Fix-commands-from-signs-not-firing-command-events.patch
index 67851c6f82..67851c6f82 100644
--- a/patches/server/0590-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0589-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0591-Add-PlayerArmSwingEvent.patch b/patches/server/0590-Add-PlayerArmSwingEvent.patch
index d3f4757d38..d3f4757d38 100644
--- a/patches/server/0591-Add-PlayerArmSwingEvent.patch
+++ b/patches/server/0590-Add-PlayerArmSwingEvent.patch
diff --git a/patches/server/0592-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0591-Fix-kick-event-leave-message-not-being-sent.patch
index cbe89274cd..cbe89274cd 100644
--- a/patches/server/0592-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0591-Fix-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0593-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0592-Add-config-for-mobs-immune-to-default-effects.patch
index 756da20f44..756da20f44 100644
--- a/patches/server/0593-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0592-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0594-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0593-Don-t-apply-cramming-damage-to-players.patch
index 0882572dff..0882572dff 100644
--- a/patches/server/0594-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0593-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0595-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0594-Rate-options-and-timings-for-sensors-and-behaviors.patch
index b90b81a68f..b90b81a68f 100644
--- a/patches/server/0595-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0594-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0596-Add-missing-forceDrop-toggles.patch b/patches/server/0595-Add-missing-forceDrop-toggles.patch
index 273710ee36..273710ee36 100644
--- a/patches/server/0596-Add-missing-forceDrop-toggles.patch
+++ b/patches/server/0595-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0597-Stinger-API.patch b/patches/server/0596-Stinger-API.patch
index 262a4a8481..d5e15af3c0 100644
--- a/patches/server/0597-Stinger-API.patch
+++ b/patches/server/0596-Stinger-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 9a7a670c1e99674e8a554342165b7b77001083fc..e1092bb514e01e978a8d624bd5a7cba5b4b5fe81 100644
+index 6218f15194b7ae0b17f7f1dab78b1337779edb27..9fed7d8500481493de32efd16de6b271b9ed446d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -338,6 +338,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0598-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index 926fba2c7f..926fba2c7f 100644
--- a/patches/server/0598-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0599-Add-System.out-err-catcher.patch b/patches/server/0598-Add-System.out-err-catcher.patch
index c9b1688452..c9b1688452 100644
--- a/patches/server/0599-Add-System.out-err-catcher.patch
+++ b/patches/server/0598-Add-System.out-err-catcher.patch
diff --git a/patches/server/0600-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index e3b686c58c..e3b686c58c 100644
--- a/patches/server/0600-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0601-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch
index 8ab33daef9..8ab33daef9 100644
--- a/patches/server/0601-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0602-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0601-Allow-skipping-writing-of-comments-to-server.propert.patch
index 5edf383235..5edf383235 100644
--- a/patches/server/0602-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0601-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0603-Add-PlayerSetSpawnEvent.patch b/patches/server/0602-Add-PlayerSetSpawnEvent.patch
index aae9495179..aae9495179 100644
--- a/patches/server/0603-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0602-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0604-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch
index 77dfd12340..0de1d33a58 100644
--- a/patches/server/0604-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make hoppers respect inventory max stack size
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 8aabefdcbeb3fc5fb7d11fe04ee629fe7bc612c2..4dda44608320c2a872b23053a1c3de63b79741c2 100644
+index f0b4b8eb5d2740cd73b4338fd0c2acc3b06df1f6..e3b6f2bf93710ea695b0c25c0b6968a8f24f0829 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -438,15 +438,17 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
diff --git a/patches/server/0605-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0604-Optimize-entity-tracker-passenger-checks.patch
index 0908da4471..0908da4471 100644
--- a/patches/server/0605-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0604-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0606-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0605-Config-option-for-Piglins-guarding-chests.patch
index 5b025d0fbb..5b025d0fbb 100644
--- a/patches/server/0606-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0605-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0607-Add-EntityDamageItemEvent.patch b/patches/server/0606-Add-EntityDamageItemEvent.patch
index 99df36aea0..99df36aea0 100644
--- a/patches/server/0607-Add-EntityDamageItemEvent.patch
+++ b/patches/server/0606-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0608-Optimize-indirect-passenger-iteration.patch b/patches/server/0607-Optimize-indirect-passenger-iteration.patch
index 92ffa35c2c..cdd80aa9b6 100644
--- a/patches/server/0608-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0607-Optimize-indirect-passenger-iteration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e9a12d9b7c8789f3d07ba5a799c941ca25eb3e63..96ed3d345085c7d86643166fb4c124675e6b07d4 100644
+index e3647763bcede42f06250550985e149e39f2b0b8..f93e74226e3306a59e17dce1e4f8e72d61d75d49 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3842,20 +3842,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0609-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0608-Configurable-item-frame-map-cursor-update-interval.patch
index 382372348e..382372348e 100644
--- a/patches/server/0609-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0608-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0610-Clear-bucket-NBT-after-dispense.patch b/patches/server/0609-Clear-bucket-NBT-after-dispense.patch
index 24eb614ec7..24eb614ec7 100644
--- a/patches/server/0610-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0609-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0611-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0610-Change-EnderEye-target-without-changing-other-things.patch
index 496056ab98..496056ab98 100644
--- a/patches/server/0611-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0610-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0612-Add-BlockBreakBlockEvent.patch b/patches/server/0611-Add-BlockBreakBlockEvent.patch
index d621301d17..d621301d17 100644
--- a/patches/server/0612-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0611-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0613-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 32a2c26212..32a2c26212 100644
--- a/patches/server/0613-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0614-More-CommandBlock-API.patch b/patches/server/0613-More-CommandBlock-API.patch
index 65a5093980..65a5093980 100644
--- a/patches/server/0614-More-CommandBlock-API.patch
+++ b/patches/server/0613-More-CommandBlock-API.patch
diff --git a/patches/server/0615-Add-missing-team-sidebar-display-slots.patch b/patches/server/0614-Add-missing-team-sidebar-display-slots.patch
index 2a080ce725..2a080ce725 100644
--- a/patches/server/0615-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0614-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0616-Add-back-EntityPortalExitEvent.patch b/patches/server/0615-Add-back-EntityPortalExitEvent.patch
index 5e091febda..566d9576da 100644
--- a/patches/server/0616-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0615-Add-back-EntityPortalExitEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 96ed3d345085c7d86643166fb4c124675e6b07d4..822666e1199e0851136d88b2b556d8d17843d902 100644
+index f93e74226e3306a59e17dce1e4f8e72d61d75d49..7dbbf0884b70acb37c3400364736fa8f6b68c964 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3291,6 +3291,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0617-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0616-Add-methods-to-find-targets-for-lightning-strikes.patch
index 9958d9851d..9958d9851d 100644
--- a/patches/server/0617-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0616-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0618-Get-entity-default-attributes.patch b/patches/server/0617-Get-entity-default-attributes.patch
index a157e222b1..a157e222b1 100644
--- a/patches/server/0618-Get-entity-default-attributes.patch
+++ b/patches/server/0617-Get-entity-default-attributes.patch
diff --git a/patches/server/0619-Left-handed-API.patch b/patches/server/0618-Left-handed-API.patch
index d59098ccdf..d59098ccdf 100644
--- a/patches/server/0619-Left-handed-API.patch
+++ b/patches/server/0618-Left-handed-API.patch
diff --git a/patches/server/0620-Add-more-advancement-API.patch b/patches/server/0619-Add-more-advancement-API.patch
index 98836b6fe4..98836b6fe4 100644
--- a/patches/server/0620-Add-more-advancement-API.patch
+++ b/patches/server/0619-Add-more-advancement-API.patch
diff --git a/patches/server/0621-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0620-Add-ItemFactory-getSpawnEgg-API.patch
index c1c7ed6a2c..c1c7ed6a2c 100644
--- a/patches/server/0621-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0620-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0622-Add-critical-damage-API.patch b/patches/server/0621-Add-critical-damage-API.patch
index 56413a796a..56413a796a 100644
--- a/patches/server/0622-Add-critical-damage-API.patch
+++ b/patches/server/0621-Add-critical-damage-API.patch
diff --git a/patches/server/0623-Fix-issues-with-mob-conversion.patch b/patches/server/0622-Fix-issues-with-mob-conversion.patch
index 657dd4ec5d..657dd4ec5d 100644
--- a/patches/server/0623-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0622-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0624-Add-isCollidable-methods-to-various-places.patch b/patches/server/0623-Add-isCollidable-methods-to-various-places.patch
index ce6e50fe3c..ce6e50fe3c 100644
--- a/patches/server/0624-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0623-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0625-Goat-ram-API.patch b/patches/server/0624-Goat-ram-API.patch
index 04a1b6c686..04a1b6c686 100644
--- a/patches/server/0625-Goat-ram-API.patch
+++ b/patches/server/0624-Goat-ram-API.patch
diff --git a/patches/server/0626-Add-API-for-resetting-a-single-score.patch b/patches/server/0625-Add-API-for-resetting-a-single-score.patch
index b9dd1c2be3..b9dd1c2be3 100644
--- a/patches/server/0626-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0625-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0626-Add-Raw-Byte-Entity-Serialization.patch
index b57a9d9bb2..ad5e5a0031 100644
--- a/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0626-Add-Raw-Byte-Entity-Serialization.patch
@@ -27,7 +27,7 @@ index 7dbbf0884b70acb37c3400364736fa8f6b68c964..5dce3d38ecd7b7639f02f3e1e92f3723
          return this.isPassenger() ? false : this.saveAsPassenger(nbt);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 08d63e104ddc079af6349b6b3665cadae1c619ad..6a31fb773798e911e731c35e2d52eb1073ed9f07 100644
+index ebbefcdea6356384f27e964bd551bad2f9e696e8..06febdb103f98dd16cca32d7345b0ca6b52dcade 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1077,6 +1077,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -46,7 +46,7 @@ index 08d63e104ddc079af6349b6b3665cadae1c619ad..6a31fb773798e911e731c35e2d52eb10
 +    }
      // Paper end
  
-     // Paper start - move up invisibility
+     // Paper start - missing entity api
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 index 609b103cb9af3b0554bf1116306874fe98c8534c..3f582c5653e13875cce4ef8ecd279d8a3d2b2dc2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
diff --git a/patches/server/0628-Vanilla-command-permission-fixes.patch b/patches/server/0627-Vanilla-command-permission-fixes.patch
index 25c28237d6..25c28237d6 100644
--- a/patches/server/0628-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0627-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0629-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index e55fef3b36..e55fef3b36 100644
--- a/patches/server/0629-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0630-Fix-GameProfileCache-concurrency.patch b/patches/server/0629-Fix-GameProfileCache-concurrency.patch
index 9c0776cd51..9c0776cd51 100644
--- a/patches/server/0630-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0629-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0631-Improve-and-expand-AsyncCatcher.patch b/patches/server/0630-Improve-and-expand-AsyncCatcher.patch
index 70908f281c..3da2f1c96b 100644
--- a/patches/server/0631-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0630-Improve-and-expand-AsyncCatcher.patch
@@ -202,7 +202,7 @@ index ca68faef4232859e833adfd86a0ce13f7c2ad00e..df57157317fc6c84f69751fd8a120761
  
          ClientboundSoundEntityPacket packet = new ClientboundSoundEntityPacket(Holder.direct(SoundEvent.createVariableRangeEvent(new ResourceLocation(sound))), net.minecraft.sounds.SoundSource.valueOf(category.name()), craftEntity.getHandle(), volume, pitch, seed);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e1092bb514e01e978a8d624bd5a7cba5b4b5fe81..1170cf9b3b61fae099ed8574888187cf4f20ffd1 100644
+index 9fed7d8500481493de32efd16de6b271b9ed446d..a67570fedb8f09a118351b1b5c3d47bc568f5c0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -501,6 +501,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0632-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0631-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 5de3695498..5de3695498 100644
--- a/patches/server/0632-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0631-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0633-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0632-Sanitize-ResourceLocation-error-logging.patch
index 1359f8648a..1359f8648a 100644
--- a/patches/server/0633-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0632-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0634-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0633-Manually-inline-methods-in-BlockPosition.patch
index e97ce21f71..e97ce21f71 100644
--- a/patches/server/0634-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0633-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0635-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0634-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 30f250f235..30f250f235 100644
--- a/patches/server/0635-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0634-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0636-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 3834fdb183..3834fdb183 100644
--- a/patches/server/0636-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0637-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 538ac56665..538ac56665 100644
--- a/patches/server/0637-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0638-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index 0ab3e48f48..0ab3e48f48 100644
--- a/patches/server/0638-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
+++ b/patches/server/0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0639-Time-scoreboard-search.patch b/patches/server/0638-Time-scoreboard-search.patch
index 8d15084758..8d15084758 100644
--- a/patches/server/0639-Time-scoreboard-search.patch
+++ b/patches/server/0638-Time-scoreboard-search.patch
diff --git a/patches/server/0640-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0639-Oprimise-map-impl-for-tracked-players.patch
index c8c75040be..c8c75040be 100644
--- a/patches/server/0640-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0639-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0641-Add-missing-InventoryType.patch b/patches/server/0640-Add-missing-InventoryType.patch
index a49bdf073d..a49bdf073d 100644
--- a/patches/server/0641-Add-missing-InventoryType.patch
+++ b/patches/server/0640-Add-missing-InventoryType.patch
diff --git a/patches/server/0642-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0641-Optimise-BlockSoil-nearby-water-lookup.patch
index b192406016..b192406016 100644
--- a/patches/server/0642-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0641-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0643-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 76d51d8295..76d51d8295 100644
--- a/patches/server/0643-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0644-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0643-Check-requirement-before-suggesting-root-nodes.patch
index fce5e326f9..fce5e326f9 100644
--- a/patches/server/0644-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0643-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0645-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index d80840a79c..d80840a79c 100644
--- a/patches/server/0645-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0646-Add-packet-limiter-config.patch b/patches/server/0645-Add-packet-limiter-config.patch
index dd045eca75..dd045eca75 100644
--- a/patches/server/0646-Add-packet-limiter-config.patch
+++ b/patches/server/0645-Add-packet-limiter-config.patch
diff --git a/patches/server/0647-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 341421e59d..341421e59d 100644
--- a/patches/server/0647-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0648-Ensure-valid-vehicle-status.patch b/patches/server/0647-Ensure-valid-vehicle-status.patch
index 24e12fde1c..24e12fde1c 100644
--- a/patches/server/0648-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0647-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0649-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0648-Prevent-softlocked-end-exit-portal-generation.patch
index 67312cbfe5..67312cbfe5 100644
--- a/patches/server/0649-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0648-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0650-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index b766f53247..b766f53247 100644
--- a/patches/server/0650-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0651-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0650-Don-t-log-debug-logging-being-disabled.patch
index 8daedd938d..8daedd938d 100644
--- a/patches/server/0651-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0650-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0652-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0651-fix-various-menus-with-empty-level-accesses.patch
index efe5d1ddce..efe5d1ddce 100644
--- a/patches/server/0652-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0651-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0653-Preserve-overstacked-loot.patch b/patches/server/0652-Preserve-overstacked-loot.patch
index 004c7c6f77..004c7c6f77 100644
--- a/patches/server/0653-Preserve-overstacked-loot.patch
+++ b/patches/server/0652-Preserve-overstacked-loot.patch
diff --git a/patches/server/0654-Update-head-rotation-in-missing-places.patch b/patches/server/0653-Update-head-rotation-in-missing-places.patch
index d43abb0d8a..5fdcb1a6cb 100644
--- a/patches/server/0654-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0653-Update-head-rotation-in-missing-places.patch
@@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e6ef67a7a2eab5314c95e751895b4d4ce71c91b8..efdc94c6e57dcd5c122300f77ca0cc058651aa7e 100644
+index 5dce3d38ecd7b7639f02f3e1e92f3723f4a42c39..ec23aa4f86fed6890273d06b8cfb4000daf3c515 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1790,6 +1790,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0655-prevent-unintended-light-block-manipulation.patch b/patches/server/0654-prevent-unintended-light-block-manipulation.patch
index 90c181a20a..90c181a20a 100644
--- a/patches/server/0655-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0654-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0656-Fix-CraftCriteria-defaults-map.patch b/patches/server/0655-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0656-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0655-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0657-Fix-upstreams-block-state-factories.patch b/patches/server/0656-Fix-upstreams-block-state-factories.patch
index cd44e53b99..b930948485 100644
--- a/patches/server/0657-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0656-Fix-upstreams-block-state-factories.patch
@@ -26,7 +26,7 @@ index 53443b472d21633f49c102b330c8406c92f09d8d..4893eaf93738da860014ddf3ad003334
          if (state instanceof InventoryHolder) return (InventoryHolder) state;
          return null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index f1f6d85399db86ce7aee1fccde51d6259b427e7e..53d466bfa66573f178fd0e0247bcefc04902c38f 100644
+index ff3f88f107a4c059688566b69dcdf48bc01210ab..7cd0fae59c497861063827eda4243cc6c11e7cff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -13,7 +13,7 @@ import org.bukkit.persistence.PersistentDataContainer;
diff --git a/patches/server/0658-Configurable-feature-seeds.patch b/patches/server/0657-Configurable-feature-seeds.patch
index 0cfc074f8f..0cfc074f8f 100644
--- a/patches/server/0658-Configurable-feature-seeds.patch
+++ b/patches/server/0657-Configurable-feature-seeds.patch
diff --git a/patches/server/0659-Add-root-admin-user-detection.patch b/patches/server/0658-Add-root-admin-user-detection.patch
index 74f125cf61..74f125cf61 100644
--- a/patches/server/0659-Add-root-admin-user-detection.patch
+++ b/patches/server/0658-Add-root-admin-user-detection.patch
diff --git a/patches/server/0660-Always-allow-item-changing-in-Fireball.patch b/patches/server/0659-Always-allow-item-changing-in-Fireball.patch
index f8453901a9..f8453901a9 100644
--- a/patches/server/0660-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0659-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0661-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0660-don-t-attempt-to-teleport-dead-entities.patch
index 5eff5788eb..96f8ca01bb 100644
--- a/patches/server/0661-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0660-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index efdc94c6e57dcd5c122300f77ca0cc058651aa7e..5691ce8e654b05d466f179f87b17cc627de98fcb 100644
+index ec23aa4f86fed6890273d06b8cfb4000daf3c515..a89cd343bee7ea919c3ba5789e37b05e6a1cf334 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -718,7 +718,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0662-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0661-Prevent-excessive-velocity-through-repeated-crits.patch
index e77b1154c2..e77b1154c2 100644
--- a/patches/server/0662-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0661-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0663-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0662-Remove-client-side-code-using-deprecated-for-removal.patch
index 2ed18ebaeb..2ed18ebaeb 100644
--- a/patches/server/0663-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0662-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0664-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0663-Fix-removing-recipes-from-RecipeIterator.patch
index fb78c572eb..fb78c572eb 100644
--- a/patches/server/0664-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0663-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0665-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0664-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 66da8d4997..66da8d4997 100644
--- a/patches/server/0665-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0664-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0666-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0665-Hide-unnecessary-itemmeta-from-clients.patch
index 6224365ef1..6224365ef1 100644
--- a/patches/server/0666-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0665-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0667-Fix-Spigot-growth-modifiers.patch b/patches/server/0666-Fix-Spigot-growth-modifiers.patch
index 92cddad5f1..92cddad5f1 100644
--- a/patches/server/0667-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0666-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0668-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 9dbace63bd..9dbace63bd 100644
--- a/patches/server/0668-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0669-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0668-Add-PlayerItemFrameChangeEvent.patch
index e46cc3be4c..7dd61945d1 100644
--- a/patches/server/0669-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0668-Add-PlayerItemFrameChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerItemFrameChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-index 8289ea080aa297f75cdbc8d591d6efa6a0def0ea..3ff1ae5ae705cd8d5c8529e1dcdd5ccaed908830 100644
+index 5c507b1160835fd4beb3b2d5b621250540545d4e..ab85050a64d4897aff11d0780d8cb26660918ac7 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 @@ -3,6 +3,7 @@ package net.minecraft.world.entity.decoration;
diff --git a/patches/server/0670-Optimize-HashMapPalette.patch b/patches/server/0669-Optimize-HashMapPalette.patch
index a8cf001da1..a8cf001da1 100644
--- a/patches/server/0670-Optimize-HashMapPalette.patch
+++ b/patches/server/0669-Optimize-HashMapPalette.patch
diff --git a/patches/server/0671-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0670-Allow-delegation-to-vanilla-chunk-gen.patch
index 7c8b0a2c4a..7c8b0a2c4a 100644
--- a/patches/server/0671-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0670-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0672-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index f451e896f8..f451e896f8 100644
--- a/patches/server/0672-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0673-Add-more-Campfire-API.patch b/patches/server/0672-Add-more-Campfire-API.patch
index 1133eb93bf..1133eb93bf 100644
--- a/patches/server/0673-Add-more-Campfire-API.patch
+++ b/patches/server/0672-Add-more-Campfire-API.patch
diff --git a/patches/server/0674-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 4d74f60751..4d74f60751 100644
--- a/patches/server/0674-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0675-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0674-Forward-CraftEntity-in-teleport-command.patch
index 493db169a4..18a8c45967 100644
--- a/patches/server/0675-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0674-Forward-CraftEntity-in-teleport-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5691ce8e654b05d466f179f87b17cc627de98fcb..653b5bedf9b6132a5410be5f9c36a36cf99b6f68 100644
+index a89cd343bee7ea919c3ba5789e37b05e6a1cf334..6c8478c9ad154b25e11085ac47552b5855b5e9d1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3263,6 +3263,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0676-Improve-scoreboard-entries.patch b/patches/server/0675-Improve-scoreboard-entries.patch
index 8acac86ce3..8acac86ce3 100644
--- a/patches/server/0676-Improve-scoreboard-entries.patch
+++ b/patches/server/0675-Improve-scoreboard-entries.patch
diff --git a/patches/server/0677-Entity-powdered-snow-API.patch b/patches/server/0676-Entity-powdered-snow-API.patch
index e06e388df9..60a2d3839b 100644
--- a/patches/server/0677-Entity-powdered-snow-API.patch
+++ b/patches/server/0676-Entity-powdered-snow-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Entity powdered snow API
 public net.minecraft.world.entity.monster.Skeleton inPowderSnowTime
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 6a31fb773798e911e731c35e2d52eb1073ed9f07..6a8251ae85f192925493b3e084c0e53820a9be97 100644
+index 06febdb103f98dd16cca32d7345b0ca6b52dcade..8f0df02a81c36244a3906efa6605f5eba030bfb9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1087,6 +1087,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -21,7 +21,7 @@ index 6a31fb773798e911e731c35e2d52eb1073ed9f07..6a8251ae85f192925493b3e084c0e538
 +    }
      // Paper end
  
-     // Paper start - move up invisibility
+     // Paper start - missing entity api
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
 index a0ea54181de6c6685deef265cbe9f66aabbca42b..6f98da9be6aef35e3b5c940188b872459a383c8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
diff --git a/patches/server/0678-Add-API-for-item-entity-health.patch b/patches/server/0677-Add-API-for-item-entity-health.patch
index cd2757b544..cd2757b544 100644
--- a/patches/server/0678-Add-API-for-item-entity-health.patch
+++ b/patches/server/0677-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0679-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0678-Configurable-max-block-light-for-monster-spawning.patch
index deae03d87c..deae03d87c 100644
--- a/patches/server/0679-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0678-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0680-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 00fea74b71..00fea74b71 100644
--- a/patches/server/0680-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0681-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0680-Load-effect-amplifiers-greater-than-127-correctly.patch
index 3e88533e6f..3e88533e6f 100644
--- a/patches/server/0681-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0680-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0682-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index d7ccde8439..d7ccde8439 100644
--- a/patches/server/0682-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0683-Fix-bees-aging-inside-hives.patch b/patches/server/0682-Fix-bees-aging-inside-hives.patch
index 2c8d2209d5..2c8d2209d5 100644
--- a/patches/server/0683-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0682-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0684-Bucketable-API.patch b/patches/server/0683-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0684-Bucketable-API.patch
+++ b/patches/server/0683-Bucketable-API.patch
diff --git a/patches/server/0685-Validate-usernames.patch b/patches/server/0684-Validate-usernames.patch
index a4e02c238d..a4e02c238d 100644
--- a/patches/server/0685-Validate-usernames.patch
+++ b/patches/server/0684-Validate-usernames.patch
diff --git a/patches/server/0686-Make-water-animal-spawn-height-configurable.patch b/patches/server/0685-Make-water-animal-spawn-height-configurable.patch
index e523ed36f4..e523ed36f4 100644
--- a/patches/server/0686-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0685-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0687-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 2d40d8b668..2d40d8b668 100644
--- a/patches/server/0687-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0688-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0687-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0688-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0687-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0689-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0688-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
index be0eedab93..be0eedab93 100644
--- a/patches/server/0689-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/server/0688-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0690-Multiple-Entries-with-Scoreboards.patch b/patches/server/0689-Multiple-Entries-with-Scoreboards.patch
index 9bfd7660c6..9bfd7660c6 100644
--- a/patches/server/0690-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0689-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0691-Reset-placed-block-on-exception.patch b/patches/server/0690-Reset-placed-block-on-exception.patch
index b6bf08780c..b6bf08780c 100644
--- a/patches/server/0691-Reset-placed-block-on-exception.patch
+++ b/patches/server/0690-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0692-Add-configurable-height-for-slime-spawn.patch b/patches/server/0691-Add-configurable-height-for-slime-spawn.patch
index 08dbacd3f1..08dbacd3f1 100644
--- a/patches/server/0692-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0691-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0693-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0692-Fix-xp-reward-for-baby-zombies.patch
index f3c6e8841b..f3c6e8841b 100644
--- a/patches/server/0693-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0692-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0694-Multi-Block-Change-API-Implementation.patch b/patches/server/0693-Multi-Block-Change-API-Implementation.patch
index 86eb7ab941..86eb7ab941 100644
--- a/patches/server/0694-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0693-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0695-Fix-NotePlayEvent.patch b/patches/server/0694-Fix-NotePlayEvent.patch
index 85437cdf17..85437cdf17 100644
--- a/patches/server/0695-Fix-NotePlayEvent.patch
+++ b/patches/server/0694-Fix-NotePlayEvent.patch
diff --git a/patches/server/0696-Freeze-Tick-Lock-API.patch b/patches/server/0695-Freeze-Tick-Lock-API.patch
index 7ca49418f1..65e67e5965 100644
--- a/patches/server/0696-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0695-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 653b5bedf9b6132a5410be5f9c36a36cf99b6f68..80d5a7a77fab3b978ee4a1a76b992eb666486792 100644
+index 6c8478c9ad154b25e11085ac47552b5855b5e9d1..7e6ea850078179f7c63b597a788ef105802a0260 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -405,6 +405,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -59,7 +59,7 @@ index 9af308ef5e55df9ce08b25e358e48d1c6f67d663..511e8e789932df77999689659d1efbe3
  
              if (this.isInPowderSnow && this.canFreeze()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 71f9b7bbbabae9291fdb9f902f3f69c13e715c0e..a5a9c34709d3bb716e2dc9bb6bd548992df74f46 100644
+index 8f0df02a81c36244a3906efa6605f5eba030bfb9..88e05b8ec5f442b3ad14e3b39a06beeca5c169ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -321,6 +321,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0697-More-PotionEffectType-API.patch b/patches/server/0696-More-PotionEffectType-API.patch
index e23c6e0c5f..e23c6e0c5f 100644
--- a/patches/server/0697-More-PotionEffectType-API.patch
+++ b/patches/server/0696-More-PotionEffectType-API.patch
diff --git a/patches/server/0698-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 1b86e32b63..1b86e32b63 100644
--- a/patches/server/0698-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0699-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0698-API-for-creating-command-sender-which-forwards-feedb.patch
index cceecc25ea..cceecc25ea 100644
--- a/patches/server/0699-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0698-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0700-Add-missing-structure-set-seed-configs.patch b/patches/server/0699-Add-missing-structure-set-seed-configs.patch
index b6627026af..b6627026af 100644
--- a/patches/server/0700-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0699-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0701-Implement-regenerateChunk.patch b/patches/server/0700-Implement-regenerateChunk.patch
index b65be58c1e..b65be58c1e 100644
--- a/patches/server/0701-Implement-regenerateChunk.patch
+++ b/patches/server/0700-Implement-regenerateChunk.patch
diff --git a/patches/server/0702-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0701-Fix-cancelled-powdered-snow-bucket-placement.patch
index 80c4ffe9f2..80c4ffe9f2 100644
--- a/patches/server/0702-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0701-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0703-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 971d368008..971d368008 100644
--- a/patches/server/0703-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0704-Add-GameEvent-tags.patch b/patches/server/0703-Add-GameEvent-tags.patch
index 0a4355d93a..0a4355d93a 100644
--- a/patches/server/0704-Add-GameEvent-tags.patch
+++ b/patches/server/0703-Add-GameEvent-tags.patch
diff --git a/patches/server/0705-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 06c9d9f99a..06c9d9f99a 100644
--- a/patches/server/0705-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0706-Furnace-RecipesUsed-API.patch b/patches/server/0705-Furnace-RecipesUsed-API.patch
index 075cd97b56..075cd97b56 100644
--- a/patches/server/0706-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0705-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0707-Configurable-sculk-sensor-listener-range.patch b/patches/server/0706-Configurable-sculk-sensor-listener-range.patch
index f4bdef4317..f4bdef4317 100644
--- a/patches/server/0707-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0706-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0708-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0707-Add-missing-block-data-mins-and-maxes.patch
index defc7411be..defc7411be 100644
--- a/patches/server/0708-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0707-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0709-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 903a710120..903a710120 100644
--- a/patches/server/0709-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0710-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0709-Put-world-into-worldlist-before-initing-the-world.patch
index 998c2caea6..998c2caea6 100644
--- a/patches/server/0710-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0709-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0711-Fix-Entity-Position-Desync.patch b/patches/server/0710-Fix-Entity-Position-Desync.patch
index 1fe60a4f46..1fe60a4f46 100644
--- a/patches/server/0711-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0710-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0712-Custom-Potion-Mixes.patch b/patches/server/0711-Custom-Potion-Mixes.patch
index edb4c6d4f4..edb4c6d4f4 100644
--- a/patches/server/0712-Custom-Potion-Mixes.patch
+++ b/patches/server/0711-Custom-Potion-Mixes.patch
diff --git a/patches/server/0713-Force-close-world-loading-screen.patch b/patches/server/0712-Force-close-world-loading-screen.patch
index a62795f9be..a62795f9be 100644
--- a/patches/server/0713-Force-close-world-loading-screen.patch
+++ b/patches/server/0712-Force-close-world-loading-screen.patch
diff --git a/patches/server/0714-Fix-falling-block-spawn-methods.patch b/patches/server/0713-Fix-falling-block-spawn-methods.patch
index 5181c49b28..5181c49b28 100644
--- a/patches/server/0714-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0713-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0715-Expose-furnace-minecart-push-values.patch b/patches/server/0714-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0715-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0714-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0716-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0715-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index d80acbf9d0..d80acbf9d0 100644
--- a/patches/server/0716-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0715-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0717-More-Projectile-API.patch b/patches/server/0716-More-Projectile-API.patch
index ef828fda14..30d520d8be 100644
--- a/patches/server/0717-More-Projectile-API.patch
+++ b/patches/server/0716-More-Projectile-API.patch
@@ -133,7 +133,7 @@ index 91c2d0b40d3fca86938cd454e1415a4eea3df7c7..c1c52f4fc5f900fac4098e5e37c52dfc
 +    // Paper end - More projectile API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-index 762c395e45a681a11f3fe9d10e7f0ba310786e80..6d2fe30742f8b41d53dd2cbff120fcc042ea0e0c 100644
+index 35d8fbd9c5751568a1a3b8928017e23cd41bb163..3a749f78be3968e499e096196eaaa0b433a53c06 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
 @@ -58,20 +58,7 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
@@ -158,10 +158,17 @@ index 762c395e45a681a11f3fe9d10e7f0ba310786e80..6d2fe30742f8b41d53dd2cbff120fcc0
  
      @Override
      public boolean isInBlock() {
-@@ -105,6 +92,27 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
-         return org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(getHandle().getPickupItem());
+@@ -99,6 +86,35 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
+         this.getHandle().pickup = net.minecraft.world.entity.projectile.AbstractArrow.Pickup.byOrdinal(status.ordinal());
      }
  
++    // Paper start
++    @Override
++    @org.jetbrains.annotations.NotNull
++    public org.bukkit.craftbukkit.inventory.CraftItemStack getItemStack() {
++        return org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(getHandle().getPickupItem());
++    }
++
 +    @Override
 +    public void setLifetimeTicks(int ticks) {
 +        this.getHandle().life = ticks;
@@ -182,12 +189,13 @@ index 762c395e45a681a11f3fe9d10e7f0ba310786e80..6d2fe30742f8b41d53dd2cbff120fcc0
 +    public void setHitSound(@org.jetbrains.annotations.NotNull org.bukkit.Sound sound) {
 +        this.getHandle().setSoundEvent(org.bukkit.craftbukkit.CraftSound.bukkitToMinecraft(sound));
 +    }
++    // Paper end
 +
      @Override
-     public void setNoPhysics(boolean noPhysics) {
-         this.getHandle().setNoPhysics(noPhysics);
+     public void setTicksLived(int value) {
+         super.setTicksLived(value);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
-index 73cb7aa01af3eed71b05b1a539f082b26dcd8d60..2783e218d5e5c24787429237974e196761f4d02b 100644
+index e1a2f0924da6ebcdf332040f922226af5d8a2d45..a8699b274b51c5f6691557c3c3db88436f05e304 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
 @@ -32,20 +32,7 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
diff --git a/patches/server/0718-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0717-Fix-swamp-hut-cat-generation-deadlock.patch
index bac78b77ff..bac78b77ff 100644
--- a/patches/server/0718-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0717-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0719-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0718-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index cf48604618..cf48604618 100644
--- a/patches/server/0719-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0718-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0720-Implement-getComputedBiome-API.patch b/patches/server/0719-Implement-getComputedBiome-API.patch
index 851c8f573b..851c8f573b 100644
--- a/patches/server/0720-Implement-getComputedBiome-API.patch
+++ b/patches/server/0719-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0721-Make-some-itemstacks-nonnull.patch b/patches/server/0720-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0721-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0720-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0722-Implement-enchantWithLevels-API.patch b/patches/server/0721-Implement-enchantWithLevels-API.patch
index ed80635228..ed80635228 100644
--- a/patches/server/0722-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0721-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0723-Fix-saving-in-unloadWorld.patch b/patches/server/0722-Fix-saving-in-unloadWorld.patch
index a844d1cd8e..a844d1cd8e 100644
--- a/patches/server/0723-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0722-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0724-Buffer-OOB-setBlock-calls.patch b/patches/server/0723-Buffer-OOB-setBlock-calls.patch
index ae47164389..ae47164389 100644
--- a/patches/server/0724-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0723-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0725-Add-TameableDeathMessageEvent.patch b/patches/server/0724-Add-TameableDeathMessageEvent.patch
index 58ea5cd5d1..58ea5cd5d1 100644
--- a/patches/server/0725-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0724-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0726-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0725-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 6d27ca622a..6d27ca622a 100644
--- a/patches/server/0726-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0725-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0727-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0726-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 185fdf4437..185fdf4437 100644
--- a/patches/server/0727-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0726-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0728-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0727-Ensure-entity-passenger-world-matches-ridden-entity.patch
index 846f0c230c..a841c24fcd 100644
--- a/patches/server/0728-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0727-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 80d5a7a77fab3b978ee4a1a76b992eb666486792..3d0f7310840742a5b16f0c0a7115dc0c90202919 100644
+index 7e6ea850078179f7c63b597a788ef105802a0260..2476b3fa3ecd976c6f6fb27dc3ad815bbab0165f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2580,7 +2580,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0729-cache-resource-keys.patch b/patches/server/0728-cache-resource-keys.patch
index d444813b7a..d444813b7a 100644
--- a/patches/server/0729-cache-resource-keys.patch
+++ b/patches/server/0728-cache-resource-keys.patch
diff --git a/patches/server/0730-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0729-Allow-changing-the-EnderDragon-podium.patch
index fc8eed08e4..fc8eed08e4 100644
--- a/patches/server/0730-Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/server/0729-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0731-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0730-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index aa5772fe8a..aa5772fe8a 100644
--- a/patches/server/0731-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0730-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0732-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0731-Prevent-tile-entity-copies-loading-chunks.patch
index 209f21dc24..209f21dc24 100644
--- a/patches/server/0732-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0731-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0733-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0732-Use-username-instead-of-display-name-in-PlayerList-g.patch
index ce925b89b7..ce925b89b7 100644
--- a/patches/server/0733-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0732-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0734-Expand-PlayerItemDamageEvent.patch b/patches/server/0733-Expand-PlayerItemDamageEvent.patch
index bb173a36a5..bb173a36a5 100644
--- a/patches/server/0734-Expand-PlayerItemDamageEvent.patch
+++ b/patches/server/0733-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0735-WorldCreator-keepSpawnLoaded.patch b/patches/server/0734-WorldCreator-keepSpawnLoaded.patch
index 97cbe705e8..97cbe705e8 100644
--- a/patches/server/0735-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0734-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0736-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0735-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index feadff040a..feadff040a 100644
--- a/patches/server/0736-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0735-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0737-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0736-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 9606b571be..9606b571be 100644
--- a/patches/server/0737-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0736-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0738-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0737-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 758be4b481..758be4b481 100644
--- a/patches/server/0738-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0737-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0739-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0738-Fire-CauldronLevelChange-on-initial-fill.patch
index 0ad967e4e4..0ad967e4e4 100644
--- a/patches/server/0739-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0738-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0740-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0739-fix-powder-snow-cauldrons-not-turning-to-water.patch
index 1d388d0504..1d388d0504 100644
--- a/patches/server/0740-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0739-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0741-Add-PlayerStopUsingItemEvent.patch b/patches/server/0740-Add-PlayerStopUsingItemEvent.patch
index fad59d6983..fad59d6983 100644
--- a/patches/server/0741-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0740-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0742-Don-t-tick-markers.patch b/patches/server/0741-Don-t-tick-markers.patch
index f920e6b436..f920e6b436 100644
--- a/patches/server/0742-Don-t-tick-markers.patch
+++ b/patches/server/0741-Don-t-tick-markers.patch
diff --git a/patches/server/0743-Expand-FallingBlock-API.patch b/patches/server/0742-Expand-FallingBlock-API.patch
index 3f57a2d718..3f57a2d718 100644
--- a/patches/server/0743-Expand-FallingBlock-API.patch
+++ b/patches/server/0742-Expand-FallingBlock-API.patch
diff --git a/patches/server/0744-Add-support-for-Proxy-Protocol.patch b/patches/server/0743-Add-support-for-Proxy-Protocol.patch
index 278aa4c803..278aa4c803 100644
--- a/patches/server/0744-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0743-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0745-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0744-Fix-OfflinePlayer-getBedSpawnLocation.patch
index e67e0fc286..e67e0fc286 100644
--- a/patches/server/0745-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0744-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0746-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0745-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index ef7517367b..ef7517367b 100644
--- a/patches/server/0746-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0745-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0747-properly-read-and-store-sus-effect-duration.patch b/patches/server/0746-properly-read-and-store-sus-effect-duration.patch
index 94589408f4..94589408f4 100644
--- a/patches/server/0747-properly-read-and-store-sus-effect-duration.patch
+++ b/patches/server/0746-properly-read-and-store-sus-effect-duration.patch
diff --git a/patches/server/0748-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0747-Sanitize-sent-BlockEntity-NBT.patch
index f607c4b19b..f607c4b19b 100644
--- a/patches/server/0748-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/server/0747-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0749-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0748-Disable-component-selector-resolving-in-books-by-def.patch
index 33fd8e47d0..33fd8e47d0 100644
--- a/patches/server/0749-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0748-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0750-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0749-Prevent-entity-loading-causing-async-lookups.patch
index c9ec6cc4c0..17a6ab001e 100644
--- a/patches/server/0750-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0749-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3d0f7310840742a5b16f0c0a7115dc0c90202919..45712b358e97b65396f63b34c09debc1d42fdbb9 100644
+index 2476b3fa3ecd976c6f6fb27dc3ad815bbab0165f..455cfdc2ce0960347605e149b88afab5ad8a3b05 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -727,6 +727,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0751-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0750-Throw-exception-on-world-create-while-being-ticked.patch
index 34fcf49e25..34fcf49e25 100644
--- a/patches/server/0751-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0750-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0752-Dont-resent-entity-on-art-update.patch b/patches/server/0751-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0752-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0751-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0753-Add-WardenAngerChangeEvent.patch b/patches/server/0752-Add-WardenAngerChangeEvent.patch
index 9344bd47cf..9344bd47cf 100644
--- a/patches/server/0753-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0752-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0754-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0753-Add-option-for-strict-advancement-dimension-checks.patch
index 3dd4e6d490..3dd4e6d490 100644
--- a/patches/server/0754-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0753-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0755-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0754-Add-missing-important-BlockStateListPopulator-method.patch
index 5db34c9fe3..5db34c9fe3 100644
--- a/patches/server/0755-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0754-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0756-Nameable-Banner-API.patch b/patches/server/0755-Nameable-Banner-API.patch
index 351d3597e0..351d3597e0 100644
--- a/patches/server/0756-Nameable-Banner-API.patch
+++ b/patches/server/0755-Nameable-Banner-API.patch
diff --git a/patches/server/0757-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0756-Don-t-broadcast-messages-to-command-blocks.patch
index fa6488648d..fa6488648d 100644
--- a/patches/server/0757-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0756-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0758-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0757-Prevent-empty-items-from-being-added-to-world.patch
index c3d0b8413a..c3d0b8413a 100644
--- a/patches/server/0758-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0757-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0759-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0758-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index 5816232b91..5816232b91 100644
--- a/patches/server/0759-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0758-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0760-Add-Player-getFishHook.patch b/patches/server/0759-Add-Player-getFishHook.patch
index d539d68f07..d539d68f07 100644
--- a/patches/server/0760-Add-Player-getFishHook.patch
+++ b/patches/server/0759-Add-Player-getFishHook.patch
diff --git a/patches/server/0761-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0760-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 8b8d15552f..8b8d15552f 100644
--- a/patches/server/0761-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0760-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0762-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0761-Add-various-missing-EntityDropItemEvent-calls.patch
index ad1ba5c540..a4e7c5b7d4 100644
--- a/patches/server/0762-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0761-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 45712b358e97b65396f63b34c09debc1d42fdbb9..e5b15ef69bedfd94398f1a8d7a84d0fbf3773919 100644
+index 455cfdc2ce0960347605e149b88afab5ad8a3b05..007e5fc95dd5cb3973f45fd6a435cc102d133728 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2491,6 +2491,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0763-Fix-Bee-flower-NPE.patch b/patches/server/0762-Fix-Bee-flower-NPE.patch
index 21a3d68e76..21a3d68e76 100644
--- a/patches/server/0763-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0762-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0764-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0763-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 9c4e396ae4..9c4e396ae4 100644
--- a/patches/server/0764-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0763-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0765-More-Teleport-API.patch b/patches/server/0764-More-Teleport-API.patch
index aa88800118..c593fa72c5 100644
--- a/patches/server/0765-More-Teleport-API.patch
+++ b/patches/server/0764-More-Teleport-API.patch
@@ -29,7 +29,7 @@ index 5775d071f714e7b9d959bfa94510b865f489e68e..27eb4bc4d1276ea36b97d0faeed2acee
              d0 = to.getX();
              d1 = to.getY();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a5a9c34709d3bb716e2dc9bb6bd548992df74f46..9ea189c26c6a5fae84bcc7ed098426d8c001cd5e 100644
+index 88e05b8ec5f442b3ad14e3b39a06beeca5c169ae..70c1b20c2b25fbe53255f1753d86570c975767ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -219,15 +219,36 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0766-Add-EntityPortalReadyEvent.patch b/patches/server/0765-Add-EntityPortalReadyEvent.patch
index 1d064ea6c7..41d4a4e570 100644
--- a/patches/server/0766-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0765-Add-EntityPortalReadyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e5b15ef69bedfd94398f1a8d7a84d0fbf3773919..45a7b217ab6ef3a7c4ad1c07824d7185d4847086 100644
+index 007e5fc95dd5cb3973f45fd6a435cc102d133728..06fbea11c20db3a1585b969b1578073821c5b316 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2832,6 +2832,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0767-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0766-Don-t-use-level-random-in-entity-constructors.patch
index ef3475e3a3..ef3475e3a3 100644
--- a/patches/server/0767-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0766-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0768-Send-block-entities-after-destroy-prediction.patch b/patches/server/0767-Send-block-entities-after-destroy-prediction.patch
index c1bc860181..c1bc860181 100644
--- a/patches/server/0768-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0767-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0769-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0768-Warn-on-plugins-accessing-faraway-chunks.patch
index cf8698ba32..cf8698ba32 100644
--- a/patches/server/0769-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0768-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0770-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0769-Custom-Chat-Completion-Suggestions-API.patch
index f48547cc9c..f48547cc9c 100644
--- a/patches/server/0770-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0769-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0771-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0770-Add-and-fix-missing-BlockFadeEvents.patch
index 2813257f0f..2813257f0f 100644
--- a/patches/server/0771-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0770-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0772-Collision-API.patch b/patches/server/0771-Collision-API.patch
index da2d02ef43..8cc69f84e5 100644
--- a/patches/server/0772-Collision-API.patch
+++ b/patches/server/0771-Collision-API.patch
@@ -22,13 +22,13 @@ index fbcf1320ef9c1817b24aa8724cd6cf07319c20b9..5680e9772a2d90e997d2d0aacdda9edd
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a47e8994b52576d88fa90b7a86cbe0fb7493fa6d..3cdc8787c6a481da6cb294208eebce0636a58d4f 100644
+index 70c1b20c2b25fbe53255f1753d86570c975767ab..254df37281a358cc0ac99b46f34daf2fd9774d5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1138,4 +1138,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-         this.getHandle().setSharedFlag(Entity.FLAG_INVISIBLE, invisible);
+@@ -1148,4 +1148,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+         return this.getHandle().noPhysics;
      }
-     // Paper end - move up invisibility
+     // Paper end - missing entity api
 +
 +    // Paper start - Collision API
 +    @Override
diff --git a/patches/server/0773-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0772-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 8645146d61..8645146d61 100644
--- a/patches/server/0773-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0772-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0774-Block-Ticking-API.patch b/patches/server/0773-Block-Ticking-API.patch
index 9afbc4d4b1..9afbc4d4b1 100644
--- a/patches/server/0774-Block-Ticking-API.patch
+++ b/patches/server/0773-Block-Ticking-API.patch
diff --git a/patches/server/0775-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0774-Add-Velocity-IP-Forwarding-Support.patch
index 64983350da..64983350da 100644
--- a/patches/server/0775-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0774-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0776-Add-NamespacedKey-biome-methods.patch b/patches/server/0775-Add-NamespacedKey-biome-methods.patch
index bf854146f4..bf854146f4 100644
--- a/patches/server/0776-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0775-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0777-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0776-Fix-plugin-loggers-on-server-shutdown.patch
index f27e838474..4f2b23f29b 100644
--- a/patches/server/0777-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0776-Fix-plugin-loggers-on-server-shutdown.patch
@@ -49,7 +49,7 @@ index ab1f4e62b2ffed99b47ae23cae172f20ed586b27..97dbe5a44d2791c6dee830654c3935f4
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index db6398c1822f6ad499feddd6a915984ef9917777..d931a4c6e633bf9c1b3e5e18e880e2ddbfe4aa2a 100644
+index 44f49cc8b7800eebda426a1a04a311979e4516b9..b131a84865d9160d1b5d411515b69e967dbda66c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -18,6 +18,12 @@ public class Main {
diff --git a/patches/server/0778-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0777-Stop-large-look-changes-from-crashing-the-server.patch
index 92ac8e787a..92ac8e787a 100644
--- a/patches/server/0778-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0777-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0779-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0778-Fire-EntityChangeBlockEvent-in-more-places.patch
index 5d703466dc..5d703466dc 100644
--- a/patches/server/0779-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0778-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0780-Missing-eating-regain-reason.patch b/patches/server/0779-Missing-eating-regain-reason.patch
index 1a46d0af82..1a46d0af82 100644
--- a/patches/server/0780-Missing-eating-regain-reason.patch
+++ b/patches/server/0779-Missing-eating-regain-reason.patch
diff --git a/patches/server/0781-Missing-effect-cause.patch b/patches/server/0780-Missing-effect-cause.patch
index 6710474f4b..6710474f4b 100644
--- a/patches/server/0781-Missing-effect-cause.patch
+++ b/patches/server/0780-Missing-effect-cause.patch
diff --git a/patches/server/0782-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0781-Added-byte-array-serialization-deserialization-for-P.patch
index f2a4d437f0..f2a4d437f0 100644
--- a/patches/server/0782-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0781-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0783-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0782-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index ff24a5400c..e097dea832 100644
--- a/patches/server/0783-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0782-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 1170cf9b3b61fae099ed8574888187cf4f20ffd1..e559af05c58b7d9c940cea9f48c0f4bd0aad756c 100644
+index a67570fedb8f09a118351b1b5c3d47bc568f5c0c..354c32f67d06228477c723f7e4dbe27116e59a9b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -546,8 +546,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0784-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0783-Call-BlockPhysicsEvent-more-often.patch
index 3fda4c8065..3fda4c8065 100644
--- a/patches/server/0784-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0783-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0785-Configurable-chat-thread-limit.patch b/patches/server/0784-Configurable-chat-thread-limit.patch
index 4ce6896216..4ce6896216 100644
--- a/patches/server/0785-Configurable-chat-thread-limit.patch
+++ b/patches/server/0784-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0786-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0785-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index ffb644e841..ffb644e841 100644
--- a/patches/server/0786-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0785-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0787-fix-Jigsaw-block-kicking-user.patch b/patches/server/0786-fix-Jigsaw-block-kicking-user.patch
index 3c04241bd6..3c04241bd6 100644
--- a/patches/server/0787-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0786-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0788-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0787-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 2da3483da9..2da3483da9 100644
--- a/patches/server/0788-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0787-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0789-Add-getDrops-to-BlockState.patch b/patches/server/0788-Add-getDrops-to-BlockState.patch
index 93f48ad578..93f48ad578 100644
--- a/patches/server/0789-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0788-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0790-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0789-Fix-a-bunch-of-vanilla-bugs.patch
index abd857f514..80d7e8f072 100644
--- a/patches/server/0790-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0789-Fix-a-bunch-of-vanilla-bugs.patch
@@ -317,7 +317,7 @@ index 56cc6ecf7f95687db7c7c062b4ee979bfe49844b..94dd97662ba07689fbfa16ef5c7d99fe
  
      public void equipArmor(Player player, ItemStack stack) {
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-index 3ff1ae5ae705cd8d5c8529e1dcdd5ccaed908830..0c952bfc01b367a297e81768cab436c5474830f1 100644
+index ab85050a64d4897aff11d0780d8cb26660918ac7..bfb9694087821de206fafe867f207e07a4a6a988 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 @@ -282,6 +282,14 @@ public class ItemFrame extends HangingEntity {
diff --git a/patches/server/0791-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0790-Remove-unnecessary-onTrackingStart-during-navigation.patch
index ea3e8cfcd2..ea3e8cfcd2 100644
--- a/patches/server/0791-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0790-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0792-Fix-custom-piglin-loved-items.patch b/patches/server/0791-Fix-custom-piglin-loved-items.patch
index 6a9dc8a7d4..6a9dc8a7d4 100644
--- a/patches/server/0792-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0791-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0793-EntityPickupItemEvent-fixes.patch b/patches/server/0792-EntityPickupItemEvent-fixes.patch
index b378f986f4..b378f986f4 100644
--- a/patches/server/0793-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0792-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0794-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0793-Correctly-handle-interactions-with-items-on-cooldown.patch
index acbf650a19..acbf650a19 100644
--- a/patches/server/0794-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0793-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0795-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0794-Add-PlayerInventorySlotChangeEvent.patch
index 7c9e04e6e8..7c9e04e6e8 100644
--- a/patches/server/0795-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0794-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0796-Elder-Guardian-appearance-API.patch b/patches/server/0795-Elder-Guardian-appearance-API.patch
index ee040588dd..ee040588dd 100644
--- a/patches/server/0796-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0795-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0797-Allow-changing-bed-s-occupied-property.patch b/patches/server/0796-Allow-changing-bed-s-occupied-property.patch
index f1d50caf78..f1d50caf78 100644
--- a/patches/server/0797-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0796-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0798-Add-entity-knockback-API.patch b/patches/server/0797-Add-entity-knockback-API.patch
index afe4ca229a..afe4ca229a 100644
--- a/patches/server/0798-Add-entity-knockback-API.patch
+++ b/patches/server/0797-Add-entity-knockback-API.patch
diff --git a/patches/server/0799-Detect-headless-JREs.patch b/patches/server/0798-Detect-headless-JREs.patch
index 98f0b6a330..98f0b6a330 100644
--- a/patches/server/0799-Detect-headless-JREs.patch
+++ b/patches/server/0798-Detect-headless-JREs.patch
diff --git a/patches/server/0800-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0799-fix-entity-vehicle-collision-event-not-called.patch
index 9fe5a7cf02..9fe5a7cf02 100644
--- a/patches/server/0800-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0799-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0801-Add-EntityToggleSitEvent.patch b/patches/server/0800-Add-EntityToggleSitEvent.patch
index e149e09cf1..e149e09cf1 100644
--- a/patches/server/0801-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0800-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0802-Add-fire-tick-delay-option.patch b/patches/server/0801-Add-fire-tick-delay-option.patch
index b38e866fe5..b38e866fe5 100644
--- a/patches/server/0802-Add-fire-tick-delay-option.patch
+++ b/patches/server/0801-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0803-Add-Moving-Piston-API.patch b/patches/server/0802-Add-Moving-Piston-API.patch
index b0b64257f1..b0b64257f1 100644
--- a/patches/server/0803-Add-Moving-Piston-API.patch
+++ b/patches/server/0802-Add-Moving-Piston-API.patch
diff --git a/patches/server/0804-Ignore-impossible-spawn-tick.patch b/patches/server/0803-Ignore-impossible-spawn-tick.patch
index 116d0fd7f6..116d0fd7f6 100644
--- a/patches/server/0804-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0803-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0805-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0804-Track-projectile-source-for-fireworks-from-dispenser.patch
index b78dda85fc..b78dda85fc 100644
--- a/patches/server/0805-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/server/0804-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0806-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0805-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index 8a2c14c67d..8a2c14c67d 100644
--- a/patches/server/0806-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0805-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0807-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0806-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index efc81025ac..9908d15463 100644
--- a/patches/server/0807-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0806-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 45a7b217ab6ef3a7c4ad1c07824d7185d4847086..ea65396e55476dc4e91fe2c26a5c5bd658184d5e 100644
+index 06fbea11c20db3a1585b969b1578073821c5b316..3778d900c272a815e67f79c6d2827be2bbe8195f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3111,6 +3111,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0808-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0807-Add-PrePlayerAttackEntityEvent.patch
index 7541ba69cb..7541ba69cb 100644
--- a/patches/server/0808-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0807-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0809-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0808-ensure-reset-EnderDragon-boss-event-name.patch
index 07dc251b4d..07dc251b4d 100644
--- a/patches/server/0809-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0808-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0810-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0809-fix-MC-252817-green-map-markers-do-not-disappear.patch
index 6f61c88362..025e7cbcea 100644
--- a/patches/server/0810-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0809-fix-MC-252817-green-map-markers-do-not-disappear.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix MC-252817 (green map markers do not disappear).
 this bug is caused by the fact that the itemframe's item is set to empty before the green marker is requested to be removed. this is fixed by getting the mapid from this method's parameter, rather than the air block now stored by the item frame.
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-index 0c952bfc01b367a297e81768cab436c5474830f1..0cd57021cf308984415ca670f727ae61ac343fe7 100644
+index bfb9694087821de206fafe867f207e07a4a6a988..e875196824ef9618a52ca3f172f202d5584990df 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 @@ -291,7 +291,9 @@ public class ItemFrame extends HangingEntity {
diff --git a/patches/server/0811-Add-Player-Warden-Warning-API.patch b/patches/server/0810-Add-Player-Warden-Warning-API.patch
index e38acd3ff2..e38acd3ff2 100644
--- a/patches/server/0811-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0810-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0812-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0811-More-vanilla-friendly-methods-to-update-trades.patch
index d992c79d48..d992c79d48 100644
--- a/patches/server/0812-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0811-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0813-Add-paper-dumplisteners-command.patch b/patches/server/0812-Add-paper-dumplisteners-command.patch
index ba293d1dad..ba293d1dad 100644
--- a/patches/server/0813-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0812-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0814-check-global-player-list-where-appropriate.patch b/patches/server/0813-check-global-player-list-where-appropriate.patch
index 9905886fc6..9905886fc6 100644
--- a/patches/server/0814-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0813-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0815-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0814-Fix-async-entity-add-due-to-fungus-trees.patch
index 63a99ea749..63a99ea749 100644
--- a/patches/server/0815-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0814-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0816-ItemStack-damage-API.patch b/patches/server/0815-ItemStack-damage-API.patch
index 9525df8c4c..9525df8c4c 100644
--- a/patches/server/0816-ItemStack-damage-API.patch
+++ b/patches/server/0815-ItemStack-damage-API.patch
diff --git a/patches/server/0817-Friction-API.patch b/patches/server/0816-Friction-API.patch
index c7825d86c1..c7825d86c1 100644
--- a/patches/server/0817-Friction-API.patch
+++ b/patches/server/0816-Friction-API.patch
diff --git a/patches/server/0818-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0817-Ability-to-control-player-s-insomnia-and-phantoms.patch
index a5a831fc6e..a5a831fc6e 100644
--- a/patches/server/0818-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0817-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0819-Fix-player-kick-on-shutdown.patch b/patches/server/0818-Fix-player-kick-on-shutdown.patch
index 0c36dc9398..0c36dc9398 100644
--- a/patches/server/0819-Fix-player-kick-on-shutdown.patch
+++ b/patches/server/0818-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0820-Sync-offhand-slot-in-menus.patch b/patches/server/0819-Sync-offhand-slot-in-menus.patch
index 19c9999a04..19c9999a04 100644
--- a/patches/server/0820-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0819-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0821-Player-Entity-Tracking-Events.patch b/patches/server/0820-Player-Entity-Tracking-Events.patch
index 37d60f62c0..bcba3dec8b 100644
--- a/patches/server/0821-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0820-Player-Entity-Tracking-Events.patch
@@ -21,7 +21,7 @@ index 43c8f6a0615f392cc560b2259b116cc9d5fba4e7..ca24463405f138deb882f319bf84696f
                  } else if (this.seenBy.remove(player.connection)) {
                      this.serverEntity.removePairing(player);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ea65396e55476dc4e91fe2c26a5c5bd658184d5e..e7b260c85ce8054f612089be5d39c5df35ab2d88 100644
+index 3778d900c272a815e67f79c6d2827be2bbe8195f..cce640b055932e2fe26800107ad699743324ee4f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3837,7 +3837,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0822-Limit-pet-look-distance.patch b/patches/server/0821-Limit-pet-look-distance.patch
index 915187e43e..915187e43e 100644
--- a/patches/server/0822-Limit-pet-look-distance.patch
+++ b/patches/server/0821-Limit-pet-look-distance.patch
diff --git a/patches/server/0823-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0822-Fixes-and-additions-to-the-SpawnReason-API.patch
index 56f1ab09f3..56f1ab09f3 100644
--- a/patches/server/0823-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0822-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0824-fix-Instruments.patch b/patches/server/0823-fix-Instruments.patch
index fa96e40eb2..fa96e40eb2 100644
--- a/patches/server/0824-fix-Instruments.patch
+++ b/patches/server/0823-fix-Instruments.patch
diff --git a/patches/server/0825-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0824-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 0394a26686..0394a26686 100644
--- a/patches/server/0825-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0824-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0826-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0825-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index afdba86d79..afdba86d79 100644
--- a/patches/server/0826-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0825-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0827-Add-BlockLockCheckEvent.patch b/patches/server/0826-Add-BlockLockCheckEvent.patch
index 3ac83356d3..3ac83356d3 100644
--- a/patches/server/0827-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0826-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0828-Add-Sneaking-API-for-Entities.patch b/patches/server/0827-Add-Sneaking-API-for-Entities.patch
index 675c2e6539..3c82fcadf9 100644
--- a/patches/server/0828-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0827-Add-Sneaking-API-for-Entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Sneaking API for Entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b7fceba1c7138a5c1d78bf058c9f2d32dbc1d292..69dc7d9cc9ebd681d842099e2de521fd11ff5242 100644
+index 254df37281a358cc0ac99b46f34daf2fd9774d5a..b4ed7612a019a3d4d473dfbfed2067ea437fee06 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -872,6 +872,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0829-Improve-logging-and-errors.patch b/patches/server/0828-Improve-logging-and-errors.patch
index fe00d91a4b..fe00d91a4b 100644
--- a/patches/server/0829-Improve-logging-and-errors.patch
+++ b/patches/server/0828-Improve-logging-and-errors.patch
diff --git a/patches/server/0830-Improve-PortalEvents.patch b/patches/server/0829-Improve-PortalEvents.patch
index c8e1fcfb1f..5ba3f4895a 100644
--- a/patches/server/0830-Improve-PortalEvents.patch
+++ b/patches/server/0829-Improve-PortalEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e7b260c85ce8054f612089be5d39c5df35ab2d88..c4b925eaa94e48ffa04fb6fb9a5fa61f1d391ec8 100644
+index cce640b055932e2fe26800107ad699743324ee4f..66266651194cca02bf3814594e6f43b77741808c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3495,7 +3495,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0831-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0830-Add-config-option-for-spider-worldborder-climbing.patch
index c4325b822a..c4325b822a 100644
--- a/patches/server/0831-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0830-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0832-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0831-Add-missing-SpigotConfig-logCommands-check.patch
index a6135e7f58..a6135e7f58 100644
--- a/patches/server/0832-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0831-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0833-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0832-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0833-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0832-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0834-Flying-Fall-Damage.patch b/patches/server/0833-Flying-Fall-Damage.patch
index be35e97f74..be35e97f74 100644
--- a/patches/server/0834-Flying-Fall-Damage.patch
+++ b/patches/server/0833-Flying-Fall-Damage.patch
diff --git a/patches/server/0835-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0834-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index 87f093c66c..87f093c66c 100644
--- a/patches/server/0835-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/server/0834-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0836-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0835-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 02a7125dd4..b9fa911513 100644
--- a/patches/server/0836-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0835-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c4b925eaa94e48ffa04fb6fb9a5fa61f1d391ec8..d24c2e23a12a196e1f6dc4f5c6d3c69472ddc704 100644
+index 66266651194cca02bf3814594e6f43b77741808c..cf2d4d56dfebeae2baa0712683102b163bdaa9ce 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -957,6 +957,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0837-config-for-disabling-entity-tag-tags.patch b/patches/server/0836-config-for-disabling-entity-tag-tags.patch
index 822a325fe5..822a325fe5 100644
--- a/patches/server/0837-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0836-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0838-Use-single-player-info-update-packet-on-join.patch b/patches/server/0837-Use-single-player-info-update-packet-on-join.patch
index ff64d83371..ff64d83371 100644
--- a/patches/server/0838-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0837-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0839-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 6aeabf242c..6aeabf242c 100644
--- a/patches/server/0839-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0840-Win-Screen-API.patch b/patches/server/0839-Win-Screen-API.patch
index 25f9952de7..25f9952de7 100644
--- a/patches/server/0840-Win-Screen-API.patch
+++ b/patches/server/0839-Win-Screen-API.patch
diff --git a/patches/server/0841-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0840-Remove-CraftItemStack-setAmount-null-assignment.patch
index 8d4f6df398..8d4f6df398 100644
--- a/patches/server/0841-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0840-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0842-Fix-force-opening-enchantment-tables.patch b/patches/server/0841-Fix-force-opening-enchantment-tables.patch
index 70439d1f0f..70439d1f0f 100644
--- a/patches/server/0842-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0841-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0843-Add-Entity-Body-Yaw-API.patch b/patches/server/0842-Add-Entity-Body-Yaw-API.patch
index 526a085ebb..87974f97d5 100644
--- a/patches/server/0843-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0842-Add-Entity-Body-Yaw-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Entity Body Yaw API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 034bfd80ea7d1958eba3e057010379bf4b3661c9..dbb463e8aabe4afce6e119f0d91caff96911384d 100644
+index b4ed7612a019a3d4d473dfbfed2067ea437fee06..509550bbfb7c6bcff5dffa535f40af12aab898a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1136,6 +1136,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -39,7 +39,7 @@ index 034bfd80ea7d1958eba3e057010379bf4b3661c9..dbb463e8aabe4afce6e119f0d91caff9
 +    }
      // Paper end
  
-     // Paper start - move up invisibility
+     // Paper start - missing entity api
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 index e8ef40fed546608d995fd31dc8a9721c00537749..fbe1d5051f8767db240e4d0c256f4a1088c4339c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
diff --git a/patches/server/0844-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0843-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index efaf1a6e90..efaf1a6e90 100644
--- a/patches/server/0844-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0843-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0845-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0844-Update-the-flag-when-a-captured-block-state-is-outda.patch
index acec71e5bc..acec71e5bc 100644
--- a/patches/server/0845-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0844-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0846-Add-EntityFertilizeEggEvent.patch b/patches/server/0845-Add-EntityFertilizeEggEvent.patch
index f1e109f30c..f1e109f30c 100644
--- a/patches/server/0846-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0845-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0847-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0846-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 39cf518fa6..39cf518fa6 100644
--- a/patches/server/0847-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0846-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0848-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0847-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index a1fa4eea77..a1fa4eea77 100644
--- a/patches/server/0848-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0847-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0849-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0848-Correctly-handle-ArmorStand-invisibility.patch
index ea22d29006..ea22d29006 100644
--- a/patches/server/0849-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0848-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0850-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0849-Fix-advancement-triggers-for-entity-damage.patch
index 60dd2d1db4..60dd2d1db4 100644
--- a/patches/server/0850-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0849-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0851-Fix-text-display-error-on-spawn.patch b/patches/server/0850-Fix-text-display-error-on-spawn.patch
index 7074ea7170..7074ea7170 100644
--- a/patches/server/0851-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0850-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0852-Fix-inventories-returning-null-Locations.patch b/patches/server/0851-Fix-inventories-returning-null-Locations.patch
index 763bde3953..763bde3953 100644
--- a/patches/server/0852-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0851-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0853-Add-Shearable-API.patch b/patches/server/0852-Add-Shearable-API.patch
index f97657b8e1..f97657b8e1 100644
--- a/patches/server/0853-Add-Shearable-API.patch
+++ b/patches/server/0852-Add-Shearable-API.patch
diff --git a/patches/server/0854-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0853-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 682696f502..682696f502 100644
--- a/patches/server/0854-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0853-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0855-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0854-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index 576441539c..576441539c 100644
--- a/patches/server/0855-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0854-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0856-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0855-Treat-sequence-violations-like-they-should-be.patch
index d67cd31a14..d67cd31a14 100644
--- a/patches/server/0856-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0855-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0857-remove-duplicate-animate-packet-for-records.patch b/patches/server/0856-remove-duplicate-animate-packet-for-records.patch
index 9254f5b8cf..9254f5b8cf 100644
--- a/patches/server/0857-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0856-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0858-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0857-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 3649dc015b..3649dc015b 100644
--- a/patches/server/0858-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0857-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0859-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0858-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index b0714f833f..b0714f833f 100644
--- a/patches/server/0859-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0858-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0860-Use-array-for-gamerule-storage.patch b/patches/server/0859-Use-array-for-gamerule-storage.patch
index 1a7c2006a5..1a7c2006a5 100644
--- a/patches/server/0860-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0859-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0861-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0860-Fix-a-couple-of-upstream-bed-issues.patch
index 6740daf4d1..6740daf4d1 100644
--- a/patches/server/0861-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0860-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0862-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0861-Fix-demo-flag-not-enabling-demo-mode.patch
index 65ea83a2c1..65ea83a2c1 100644
--- a/patches/server/0862-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0861-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0863-Add-Mob-Experience-reward-API.patch b/patches/server/0862-Add-Mob-Experience-reward-API.patch
index 874d481524..874d481524 100644
--- a/patches/server/0863-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0862-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0864-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0863-Break-redstone-on-top-of-trap-doors-early.patch
index fd04a38431..fd04a38431 100644
--- a/patches/server/0864-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0863-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0865-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0864-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index 346c3fd86c..346c3fd86c 100644
--- a/patches/server/0865-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0864-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0866-More-accurate-isInOpenWater-impl.patch b/patches/server/0865-More-accurate-isInOpenWater-impl.patch
index ca26fd9045..ca26fd9045 100644
--- a/patches/server/0866-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0865-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0867-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0866-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
index 01fcd2b852..01fcd2b852 100644
--- a/patches/server/0867-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
+++ b/patches/server/0866-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0868-Expand-PlayerItemMendEvent.patch b/patches/server/0867-Expand-PlayerItemMendEvent.patch
index 013c1be8fd..013c1be8fd 100644
--- a/patches/server/0868-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0867-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0868-Refresh-ProjectileSource-for-projectiles.patch
index 1e23e270a4..1dabec492f 100644
--- a/patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0868-Refresh-ProjectileSource-for-projectiles.patch
@@ -14,7 +14,7 @@ clearing the owner.
 Co-authored-by: Warrior <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d24c2e23a12a196e1f6dc4f5c6d3c69472ddc704..c173ecd1283331afcf4db010e65764e5ed6e1eff 100644
+index cf2d4d56dfebeae2baa0712683102b163bdaa9ce..0479dbdf0da7a06735ee08d068ead5fa12fc9860 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -384,6 +384,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0870-Add-transient-modifier-API.patch b/patches/server/0869-Add-transient-modifier-API.patch
index 8144e5dc44..8144e5dc44 100644
--- a/patches/server/0870-Add-transient-modifier-API.patch
+++ b/patches/server/0869-Add-transient-modifier-API.patch
diff --git a/patches/server/0871-Fix-block-place-logic.patch b/patches/server/0870-Fix-block-place-logic.patch
index 10b444c4dc..10b444c4dc 100644
--- a/patches/server/0871-Fix-block-place-logic.patch
+++ b/patches/server/0870-Fix-block-place-logic.patch
diff --git a/patches/server/0872-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0871-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index 288b2c3711..288b2c3711 100644
--- a/patches/server/0872-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0871-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0873-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0872-Call-BlockGrowEvent-for-missing-blocks.patch
index 9054b42b6b..9054b42b6b 100644
--- a/patches/server/0873-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0872-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0874-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0873-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 954f7480a5..954f7480a5 100644
--- a/patches/server/0874-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0873-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0875-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0874-fix-MapLike-spam-for-missing-key-selector.patch
index 2fee78531f..2fee78531f 100644
--- a/patches/server/0875-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0874-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0876-Fix-sniffer-removeExploredLocation.patch b/patches/server/0875-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0876-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0875-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0877-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0876-Add-method-to-remove-all-active-potion-effects.patch
index 20554be569..d2aa5b28fd 100644
--- a/patches/server/0877-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0876-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 3302d8e9b7c2c48b20dd257f4699b263d3bc52dc..3f952d1409118535f325f614f1a6507c40efa4d6 100644
+index fbe1d5051f8767db240e4d0c256f4a1088c4339c..993844ee3d76591be38e8d27eba37ff8723443b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -540,6 +540,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0878-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0877-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index cfcf15909a..cfcf15909a 100644
--- a/patches/server/0878-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0877-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0879-Add-event-for-player-editing-sign.patch b/patches/server/0878-Add-event-for-player-editing-sign.patch
index 321cccc3d6..321cccc3d6 100644
--- a/patches/server/0879-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0878-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0880-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0879-Only-tick-item-frames-if-players-can-see-it.patch
index decd7a346e..decd7a346e 100644
--- a/patches/server/0880-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0879-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0881-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0880-Fix-cmd-permission-levels-for-command-blocks.patch
index 8bc99edf2c..8bc99edf2c 100644
--- a/patches/server/0881-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0880-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0882-Add-option-to-disable-block-updates.patch b/patches/server/0881-Add-option-to-disable-block-updates.patch
index 5550b0c010..5550b0c010 100644
--- a/patches/server/0882-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0881-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0883-Call-missing-BlockDispenseEvent.patch b/patches/server/0882-Call-missing-BlockDispenseEvent.patch
index dc2929f750..dc2929f750 100644
--- a/patches/server/0883-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0882-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0884-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0883-Don-t-load-chunks-for-supporting-block-checks.patch
index 2fc45560a6..925e5e90ff 100644
--- a/patches/server/0884-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0883-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c173ecd1283331afcf4db010e65764e5ed6e1eff..626f2180b87daa1c00e97dc24b1a78aec4d9f033 100644
+index 0479dbdf0da7a06735ee08d068ead5fa12fc9860..927c298c1922fdd1016ffc72d2ca196adaccd377 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1200,7 +1200,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0885-Optimize-player-lookups-for-beacons.patch b/patches/server/0884-Optimize-player-lookups-for-beacons.patch
index 3b3d11c547..3b3d11c547 100644
--- a/patches/server/0885-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0884-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0886-Add-Sign-getInteractableSideFor.patch b/patches/server/0885-Add-Sign-getInteractableSideFor.patch
index c5009d0b42..c5009d0b42 100644
--- a/patches/server/0886-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0885-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0887-Array-backed-synched-entity-data.patch b/patches/server/0886-Array-backed-synched-entity-data.patch
index 2345458940..2345458940 100644
--- a/patches/server/0887-Array-backed-synched-entity-data.patch
+++ b/patches/server/0886-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0888-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0887-fix-item-meta-for-tadpole-buckets.patch
index 7dc82282e5..7dc82282e5 100644
--- a/patches/server/0888-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0887-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0889-Fix-BanList-API.patch b/patches/server/0888-Fix-BanList-API.patch
index ec8005e221..ec8005e221 100644
--- a/patches/server/0889-Fix-BanList-API.patch
+++ b/patches/server/0888-Fix-BanList-API.patch
diff --git a/patches/server/0890-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0889-Determine-lava-and-water-fluid-explosion-resistance-.patch
index bea2e1c86f..bea2e1c86f 100644
--- a/patches/server/0890-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0889-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0891-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0890-Fix-possible-NPE-on-painting-creation.patch
index a503b8ac40..a503b8ac40 100644
--- a/patches/server/0891-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0890-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0892-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0891-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 54c442e544..54c442e544 100644
--- a/patches/server/0892-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0891-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0893-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0892-ExperienceOrb-should-call-EntitySpawnEvent.patch
index cc8338c2f5..cc8338c2f5 100644
--- a/patches/server/0893-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0892-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0894-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0893-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 96b4aa8c41..96b4aa8c41 100644
--- a/patches/server/0894-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0893-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0895-Add-whitelist-events.patch b/patches/server/0894-Add-whitelist-events.patch
index 44cddb390d..44cddb390d 100644
--- a/patches/server/0895-Add-whitelist-events.patch
+++ b/patches/server/0894-Add-whitelist-events.patch
diff --git a/patches/server/0896-Implement-PlayerFailMoveEvent.patch b/patches/server/0895-Implement-PlayerFailMoveEvent.patch
index 67cf55983c..67cf55983c 100644
--- a/patches/server/0896-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0895-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0897-Folia-scheduler-and-owned-region-API.patch b/patches/server/0896-Folia-scheduler-and-owned-region-API.patch
index ec5f0abb4d..92d708382e 100644
--- a/patches/server/0897-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0896-Folia-scheduler-and-owned-region-API.patch
@@ -1185,7 +1185,7 @@ index 0747b0042446271385371f1ca9c8fefdebd851b8..fade1e36037075aae968eb90bbfeac76
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 626f2180b87daa1c00e97dc24b1a78aec4d9f033..abbd6a866b666978ce29211e4027f2b08b0c2e3d 100644
+index 927c298c1922fdd1016ffc72d2ca196adaccd377..ecd7deadbddeb9571b2b8975214e4167c8333ce0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -247,11 +247,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1332,7 +1332,7 @@ index 56a6b3921c74bdeb27f8736302503bee1f731065..b5140b37d2161d89c6c5d6465949e96f
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
          ConfigurationSerialization.registerClass(CraftPlayerProfile.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ba915f1b3cd00c8afe39ece9c9e68737673777f5..282a1cebc0cdb6253d024dd399ef794335883662 100644
+index 509550bbfb7c6bcff5dffa535f40af12aab898a8..8086eae45b03fd53bc7cac625b51fc10d8523f4f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -68,6 +68,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0898-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0897-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0898-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0897-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0899-API-for-updating-recipes-on-clients.patch b/patches/server/0898-API-for-updating-recipes-on-clients.patch
index 7fbba42341..7fbba42341 100644
--- a/patches/server/0899-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0898-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0900-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0899-Fix-rotation-when-spawning-display-entities.patch
index afe854d47e..afe854d47e 100644
--- a/patches/server/0900-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0899-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0901-Only-capture-actual-tree-growth.patch b/patches/server/0900-Only-capture-actual-tree-growth.patch
index 96167911d0..96167911d0 100644
--- a/patches/server/0901-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0900-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0902-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0901-Use-correct-source-for-mushroom-block-spread-event.patch
index ef72acd36e..ef72acd36e 100644
--- a/patches/server/0902-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0901-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0903-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0902-Respect-randomizeData-on-more-entities-when-spawning.patch
index 0b50ce9b7b..0b50ce9b7b 100644
--- a/patches/server/0903-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0902-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0904-Use-correct-seed-on-api-world-load.patch b/patches/server/0903-Use-correct-seed-on-api-world-load.patch
index a39775a339..a39775a339 100644
--- a/patches/server/0904-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0903-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0905-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0904-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 6701e32f16..6701e32f16 100644
--- a/patches/server/0905-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0904-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0906-Cache-map-ids-on-item-frames.patch b/patches/server/0905-Cache-map-ids-on-item-frames.patch
index a65e4d7021..7966ccb012 100644
--- a/patches/server/0906-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0905-Cache-map-ids-on-item-frames.patch
@@ -18,7 +18,7 @@ index 1f0931bdd4d82c05d7b5f8b8e5c2cc6d23905c73..da45984c9b2d3a55256efddde9458050
  
                      if (worldmap != null) {
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-index 0cd57021cf308984415ca670f727ae61ac343fe7..80303f9466b8c7097151be313afc9a383693d18a 100644
+index e875196824ef9618a52ca3f172f202d5584990df..c34701f95580e4cf45fe086115563127432a28c5 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 @@ -50,6 +50,7 @@ public class ItemFrame extends HangingEntity {
diff --git a/patches/server/0907-Fix-custom-statistic-criteria-creation.patch b/patches/server/0906-Fix-custom-statistic-criteria-creation.patch
index a8aba99c9f..a8aba99c9f 100644
--- a/patches/server/0907-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0906-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0908-Bandaid-fix-for-Effect.patch b/patches/server/0907-Bandaid-fix-for-Effect.patch
index 92c731798f..92c731798f 100644
--- a/patches/server/0908-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0907-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0909-SculkCatalyst-bloom-API.patch b/patches/server/0908-SculkCatalyst-bloom-API.patch
index 77742addde..77742addde 100644
--- a/patches/server/0909-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0908-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0910-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0909-API-for-an-entity-s-scoreboard-name.patch
index a93b609b72..dbff93ae56 100644
--- a/patches/server/0910-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0909-API-for-an-entity-s-scoreboard-name.patch
@@ -7,10 +7,10 @@ Was obtainable through different methods, but you had to use different
 methods depending on the implementation of Entity you were working with.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 1de3a2ed64dcd222bc90d3917c08e12af56450b4..fd7a3176cdd07f50e4e56d98827672042cdf5944 100644
+index 8086eae45b03fd53bc7cac625b51fc10d8523f4f..d91d56175e91fb06138901bad56c1c2544b3d20e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1206,4 +1206,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1216,4 +1216,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return !this.getHandle().level().noCollision(this.getHandle(), aabb);
      }
      // Paper end - Collision API
diff --git a/patches/server/0911-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0910-Deprecate-and-replace-methods-with-old-StructureType.patch
index ff4c42a8ca..ff4c42a8ca 100644
--- a/patches/server/0911-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0910-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0912-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0911-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index e3fb817061..e3fb817061 100644
--- a/patches/server/0912-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0911-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0913-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0912-Properly-handle-BlockBreakEvent-isDropItems.patch
index 025a223021..025a223021 100644
--- a/patches/server/0913-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0912-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0914-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0913-Fire-entity-death-event-for-ender-dragon.patch
index 46c12c1b61..46c12c1b61 100644
--- a/patches/server/0914-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0913-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0915-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0914-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 81dacf5aab..81dacf5aab 100644
--- a/patches/server/0915-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0914-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0916-Add-Listing-API-for-Player.patch b/patches/server/0915-Add-Listing-API-for-Player.patch
index fa29159689..fa29159689 100644
--- a/patches/server/0916-Add-Listing-API-for-Player.patch
+++ b/patches/server/0915-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0917-Configurable-Region-Compression-Format.patch b/patches/server/0916-Configurable-Region-Compression-Format.patch
index 25a1d4bb16..25a1d4bb16 100644
--- a/patches/server/0917-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0916-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0918-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0917-Add-BlockFace-to-BlockDamageEvent.patch
index 66bd2d2f29..66bd2d2f29 100644
--- a/patches/server/0918-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0917-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0919-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0918-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0919-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0918-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0920-Expand-Pose-API.patch b/patches/server/0919-Expand-Pose-API.patch
index 660dffd43c..33bb7d2bc7 100644
--- a/patches/server/0920-Expand-Pose-API.patch
+++ b/patches/server/0919-Expand-Pose-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index abbd6a866b666978ce29211e4027f2b08b0c2e3d..bbc3f09105b19eabd3ebb8b9589412b8871739a1 100644
+index ecd7deadbddeb9571b2b8975214e4167c8333ce0..4db254f76bc2fb9867441016b3ac4f45f19d3bea 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -419,6 +419,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -25,7 +25,7 @@ index abbd6a866b666978ce29211e4027f2b08b0c2e3d..bbc3f09105b19eabd3ebb8b9589412b8
          if (pose == this.getPose()) {
              return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index fec2f96cfc42559c44d5d2e907d0706c674dfda7..089eb25d532990773161063658f123f1e5bef2b3 100644
+index d91d56175e91fb06138901bad56c1c2544b3d20e..a81c8a9d76c1d9fdee19132a9a40ffc2ab4d107e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -897,6 +897,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0921-More-DragonBattle-API.patch b/patches/server/0920-More-DragonBattle-API.patch
index 1ff4688b56..1ff4688b56 100644
--- a/patches/server/0921-More-DragonBattle-API.patch
+++ b/patches/server/0920-More-DragonBattle-API.patch
diff --git a/patches/server/0922-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0921-Deep-clone-unhandled-nbt-tags.patch
index 0f522edd88..0f522edd88 100644
--- a/patches/server/0922-Deep-clone-unhandled-nbt-tags.patch
+++ b/patches/server/0921-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/0923-Add-PlayerPickItemEvent.patch b/patches/server/0922-Add-PlayerPickItemEvent.patch
index 5ddf5f6a12..5ddf5f6a12 100644
--- a/patches/server/0923-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0922-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0924-Allow-trident-custom-damage.patch b/patches/server/0923-Allow-trident-custom-damage.patch
index fb6397821e..fb6397821e 100644
--- a/patches/server/0924-Allow-trident-custom-damage.patch
+++ b/patches/server/0923-Allow-trident-custom-damage.patch
diff --git a/patches/server/0925-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0924-Expose-hand-in-BlockCanBuildEvent.patch
index ab17992d38..ab17992d38 100644
--- a/patches/server/0925-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0924-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0926-Optimize-nearest-structure-border-iteration.patch b/patches/server/0925-Optimize-nearest-structure-border-iteration.patch
index e073d7a1df..e073d7a1df 100644
--- a/patches/server/0926-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0925-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0927-Implement-OfflinePlayer-isConnected.patch b/patches/server/0926-Implement-OfflinePlayer-isConnected.patch
index 50c30ac481..50c30ac481 100644
--- a/patches/server/0927-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0926-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0928-Fix-inventory-desync.patch b/patches/server/0927-Fix-inventory-desync.patch
index 4345fa9aa5..4345fa9aa5 100644
--- a/patches/server/0928-Fix-inventory-desync.patch
+++ b/patches/server/0927-Fix-inventory-desync.patch
diff --git a/patches/server/0929-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0928-Add-titleOverride-to-InventoryOpenEvent.patch
index 06ad83c295..06ad83c295 100644
--- a/patches/server/0929-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0928-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0930-Configure-sniffer-egg-hatch-time.patch b/patches/server/0929-Configure-sniffer-egg-hatch-time.patch
index b42c26e59c..b42c26e59c 100644
--- a/patches/server/0930-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0929-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0931-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0930-Do-crystal-portal-proximity-check-before-entity-look.patch
index 43740a74f0..43740a74f0 100644
--- a/patches/server/0931-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0930-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0932-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0931-Skip-POI-finding-if-stuck-in-vehicle.patch
index e0235836a4..e0235836a4 100644
--- a/patches/server/0932-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0931-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0933-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0932-Add-slot-sanity-checks-in-container-clicks.patch
index 269657c258..269657c258 100644
--- a/patches/server/0933-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0932-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0934-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0933-Call-BlockRedstoneEvents-for-lecterns.patch
index c5d3495f31..c5d3495f31 100644
--- a/patches/server/0934-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0933-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0935-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0934-Allow-proper-checking-of-empty-item-stacks.patch
index eefdaefa4b..eefdaefa4b 100644
--- a/patches/server/0935-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0934-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0936-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0935-Fix-silent-equipment-change-for-mobs.patch
index f9d34b89ae..f9d34b89ae 100644
--- a/patches/server/0936-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0935-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0937-Fix-spigot-s-Forced-Stats.patch b/patches/server/0936-Fix-spigot-s-Forced-Stats.patch
index a138a58b79..a138a58b79 100644
--- a/patches/server/0937-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0936-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0938-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0937-Add-missing-InventoryHolders-to-inventories.patch
index e6954fc31c..e6954fc31c 100644
--- a/patches/server/0938-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0937-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0939-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0938-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index a5090d6c00..a5090d6c00 100644
--- a/patches/server/0939-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0938-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0940-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0939-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0940-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0939-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0941-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/0940-Remove-Spigot-Bug-Fix-for-MC-109346.patch
index 8cd300599d..8cd300599d 100644
--- a/patches/server/0941-Remove-Spigot-Bug-Fix-for-MC-109346.patch
+++ b/patches/server/0940-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/0942-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0941-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e2c7a15a63..e2c7a15a63 100644
--- a/patches/server/0942-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0941-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0943-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0942-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0943-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0942-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0944-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0943-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0944-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0943-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0945-Fix-missing-map-initialize-event-call.patch b/patches/server/0944-Fix-missing-map-initialize-event-call.patch
index 20b3a50d58..20b3a50d58 100644
--- a/patches/server/0945-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0944-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0946-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0945-Update-entity-data-when-attaching-firework-to-entity.patch
index 8cbc0f974a..8cbc0f974a 100644
--- a/patches/server/0946-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0945-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0947-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/0946-Use-correct-variable-for-initializing-CraftLootTable.patch
index ab46cdf78a..ab46cdf78a 100644
--- a/patches/server/0947-Use-correct-variable-for-initializing-CraftLootTable.patch
+++ b/patches/server/0946-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/0948-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0947-Fix-UnsafeValues-loadAdvancement.patch
index 0de7a22d6d..0de7a22d6d 100644
--- a/patches/server/0948-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0947-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0949-Add-player-idle-duration-API.patch b/patches/server/0948-Add-player-idle-duration-API.patch
index 717b1d7291..717b1d7291 100644
--- a/patches/server/0949-Add-player-idle-duration-API.patch
+++ b/patches/server/0948-Add-player-idle-duration-API.patch
diff --git a/patches/server/0950-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0949-Don-t-check-if-we-can-see-non-visible-entities.patch
index 1c1aa40a97..1c1aa40a97 100644
--- a/patches/server/0950-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0949-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0951-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0950-Fix-NPE-in-SculkBloomEvent-world-access.patch
index b66e61a522..b66e61a522 100644
--- a/patches/server/0951-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0950-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0952-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0951-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 72c810300c..72c810300c 100644
--- a/patches/server/0952-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0951-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0953-Optimize-VarInts.patch b/patches/server/0952-Optimize-VarInts.patch
index 19e7fc574a..19e7fc574a 100644
--- a/patches/server/0953-Optimize-VarInts.patch
+++ b/patches/server/0952-Optimize-VarInts.patch
diff --git a/patches/server/0954-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0953-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 9794102b95..9794102b95 100644
--- a/patches/server/0954-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0953-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0955-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0954-Add-predicate-for-blocks-when-raytracing.patch
index 2a30c191f6..2a30c191f6 100644
--- a/patches/server/0955-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0954-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0956-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0955-Broadcast-take-item-packets-with-collector-as-source.patch
index ad908f281c..ad908f281c 100644
--- a/patches/server/0956-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0955-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0957-Expand-LingeringPotion-API.patch b/patches/server/0956-Expand-LingeringPotion-API.patch
index abc4c72435..abc4c72435 100644
--- a/patches/server/0957-Expand-LingeringPotion-API.patch
+++ b/patches/server/0956-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0958-Add-MaterialTagsTest.patch b/patches/server/0957-Add-MaterialTagsTest.patch
index 34233ba1ca..34233ba1ca 100644
--- a/patches/server/0958-Add-MaterialTagsTest.patch
+++ b/patches/server/0957-Add-MaterialTagsTest.patch
diff --git a/patches/server/0959-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0958-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index 69084fab3f..69084fab3f 100644
--- a/patches/server/0959-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0958-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0960-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0959-Add-hand-to-fish-event-for-all-player-interactions.patch
index 39764d836e..39764d836e 100644
--- a/patches/server/0960-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0959-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0961-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0960-Fix-several-issues-with-EntityBreedEvent.patch
index e7f91ee16c..e7f91ee16c 100644
--- a/patches/server/0961-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0960-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0962-Add-UUID-attribute-modifier-API.patch b/patches/server/0961-Add-UUID-attribute-modifier-API.patch
index 37efcab4b6..37efcab4b6 100644
--- a/patches/server/0962-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0961-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0963-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0962-Fix-missing-event-call-for-entity-teleport-API.patch
index 1d122c2f15..7da83443f1 100644
--- a/patches/server/0963-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0962-Fix-missing-event-call-for-entity-teleport-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix missing event call for entity teleport API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 089eb25d532990773161063658f123f1e5bef2b3..9f657dc4075ce01c3a8f871c4a60e5ca5d8eb535 100644
+index a81c8a9d76c1d9fdee19132a9a40ffc2ab4d107e..38c14e06bcada9678b64c6eacf351de10232ee56 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -256,6 +256,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0964-Lazily-create-LootContext-for-criterions.patch b/patches/server/0963-Lazily-create-LootContext-for-criterions.patch
index 293dfbd694..293dfbd694 100644
--- a/patches/server/0964-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0963-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0965-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0964-Don-t-fire-sync-events-during-worldgen.patch
index 2654c1f60d..58ccbc1f04 100644
--- a/patches/server/0965-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0964-Don-t-fire-sync-events-during-worldgen.patch
@@ -31,7 +31,7 @@ index 8235dace0f4a1090dfbd403db34231ccafe5f30e..9816913ad729fd39c173364b92e5db06
          if (entity.valid) {
              MinecraftServer.LOGGER.error("Attempted Double World add on {}", entity, new Throwable());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 919c9ff3dd97d4bd2d41631176f9671f1987ad91..1de77621f159608f572ab4935ceb78863bb82c59 100644
+index 4db254f76bc2fb9867441016b3ac4f45f19d3bea..4125802dda07d79dd0e1f7e7dc3c0ee85fa0383c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -637,7 +637,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0966-Add-Structure-check-API.patch b/patches/server/0965-Add-Structure-check-API.patch
index b291fdf604..b291fdf604 100644
--- a/patches/server/0966-Add-Structure-check-API.patch
+++ b/patches/server/0965-Add-Structure-check-API.patch
diff --git a/patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0966-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index bbc3e41f85..bbc3e41f85 100644
--- a/patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0966-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0968-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0967-Restore-vanilla-entity-drops-behavior.patch
index e6db1df680..a82abb4271 100644
--- a/patches/server/0968-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0967-Restore-vanilla-entity-drops-behavior.patch
@@ -50,7 +50,7 @@ index 7272dc058c575efee5ac2643ce41b7d12e346e89..ae5a2136a0e266d4c35190f5d3355299
          if (entityitem == null) {
              return null;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1de77621f159608f572ab4935ceb78863bb82c59..5ab9ca815cb324c47c3e25a4d84a1b432bb393be 100644
+index 4125802dda07d79dd0e1f7e7dc3c0ee85fa0383c..7c99742e01e894bcc7d89a8588b2f128cf9b765d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2496,6 +2496,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0969-Dont-resend-blocks-on-interactions.patch b/patches/server/0968-Dont-resend-blocks-on-interactions.patch
index 8a8a5bb4ed..8a8a5bb4ed 100644
--- a/patches/server/0969-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0968-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0970-add-more-scoreboard-API.patch b/patches/server/0969-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0970-add-more-scoreboard-API.patch
+++ b/patches/server/0969-add-more-scoreboard-API.patch
diff --git a/patches/server/0971-Improve-Registry.patch b/patches/server/0970-Improve-Registry.patch
index b3e7a17ff6..b3e7a17ff6 100644
--- a/patches/server/0971-Improve-Registry.patch
+++ b/patches/server/0970-Improve-Registry.patch
diff --git a/patches/server/0972-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0971-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 5ef39afe5c..5ef39afe5c 100644
--- a/patches/server/0972-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0971-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0973-Add-experience-points-API.patch b/patches/server/0972-Add-experience-points-API.patch
index 5256a6ae70..5256a6ae70 100644
--- a/patches/server/0973-Add-experience-points-API.patch
+++ b/patches/server/0972-Add-experience-points-API.patch
diff --git a/patches/server/0974-Add-drops-to-shear-events.patch b/patches/server/0973-Add-drops-to-shear-events.patch
index 57405a32c2..57405a32c2 100644
--- a/patches/server/0974-Add-drops-to-shear-events.patch
+++ b/patches/server/0973-Add-drops-to-shear-events.patch
diff --git a/patches/server/0975-Add-PlayerShieldDisableEvent.patch b/patches/server/0974-Add-PlayerShieldDisableEvent.patch
index a02011827d..a02011827d 100644
--- a/patches/server/0975-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0974-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0976-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0975-Validate-ResourceLocation-in-NBT-reading.patch
index 74748ab8d8..74748ab8d8 100644
--- a/patches/server/0976-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0975-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0977-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0976-Properly-handle-experience-dropping-on-block-break.patch
index f7d4494ec0..f7d4494ec0 100644
--- a/patches/server/0977-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0976-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0978-Fixup-NamespacedKey-handling.patch b/patches/server/0977-Fixup-NamespacedKey-handling.patch
index 14ddcf111d..14ddcf111d 100644
--- a/patches/server/0978-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0977-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0979-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0978-Expose-LootTable-of-DecoratedPot.patch
index 6d5e2738de..6d5e2738de 100644
--- a/patches/server/0979-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0978-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0980-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0979-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index d6756e53cf..d6756e53cf 100644
--- a/patches/server/0980-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0979-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0981-Rewrite-dataconverter-system.patch b/patches/server/0980-Rewrite-dataconverter-system.patch
index 0d62473208..0d62473208 100644
--- a/patches/server/0981-Rewrite-dataconverter-system.patch
+++ b/patches/server/0980-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0982-Starlight.patch b/patches/server/0981-Starlight.patch
index b4e6c66968..b4e6c66968 100644
--- a/patches/server/0982-Starlight.patch
+++ b/patches/server/0981-Starlight.patch
diff --git a/patches/server/0983-Rewrite-chunk-system.patch b/patches/server/0982-Rewrite-chunk-system.patch
index 2a35933def..12bc4a8ec8 100644
--- a/patches/server/0983-Rewrite-chunk-system.patch
+++ b/patches/server/0982-Rewrite-chunk-system.patch
@@ -19375,7 +19375,7 @@ index 640db9f71608310a64e09f1e3e677c01e6ccd98a..f2a7cb6ebed7a4b4019a09af2a025f62
                          if (flag1) {
                              ++this.converted;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5ab9ca815cb324c47c3e25a4d84a1b432bb393be..42d01cec6eba11183409c9a93d068e61f5010153 100644
+index 7c99742e01e894bcc7d89a8588b2f128cf9b765d..3f620c4b8415f09a8d4664481b2d41d421ee836e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -480,6 +480,58 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0984-incremental-chunk-and-player-saving.patch b/patches/server/0983-incremental-chunk-and-player-saving.patch
index c140932b29..c140932b29 100644
--- a/patches/server/0984-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0983-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 622feb95fb..622feb95fb 100644
--- a/patches/server/0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 811439226f..811439226f 100644
--- a/patches/server/0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 9aded39822..9aded39822 100644
--- a/patches/server/0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 6ab7cbf215..6ab7cbf215 100644
--- a/patches/server/0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0988-Allow-Saving-of-Oversized-Chunks.patch
index f6a81ca166..f6a81ca166 100644
--- a/patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0988-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0990-Fix-World-isChunkGenerated-calls.patch b/patches/server/0989-Fix-World-isChunkGenerated-calls.patch
index 0b3eebad3f..0b3eebad3f 100644
--- a/patches/server/0990-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0989-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0991-Flat-bedrock-generator-settings.patch b/patches/server/0990-Flat-bedrock-generator-settings.patch
index 7e54f34f22..7e54f34f22 100644
--- a/patches/server/0991-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0990-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0992-Entity-Activation-Range-2.0.patch b/patches/server/0991-Entity-Activation-Range-2.0.patch
index 4bec5ca13e..fd890e7432 100644
--- a/patches/server/0992-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0991-Entity-Activation-Range-2.0.patch
@@ -111,7 +111,7 @@ index bd8c96e914b156284bdbb960f168e63e1f122920..abb4c32e8b35de332fa517523e8c598e
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 42d01cec6eba11183409c9a93d068e61f5010153..1f892783c16ab8fd863832255a2b03df381aa84e 100644
+index 3f620c4b8415f09a8d4664481b2d41d421ee836e..703b32362cf6a23dfe9326aa4e0ee74511e0d2cb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -412,6 +412,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0993-Optional-per-player-mob-spawns.patch b/patches/server/0992-Optional-per-player-mob-spawns.patch
index b80d633556..b80d633556 100644
--- a/patches/server/0993-Optional-per-player-mob-spawns.patch
+++ b/patches/server/0992-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/0994-Anti-Xray.patch b/patches/server/0993-Anti-Xray.patch
index 65f22d8479..65f22d8479 100644
--- a/patches/server/0994-Anti-Xray.patch
+++ b/patches/server/0993-Anti-Xray.patch
diff --git a/patches/server/0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index c9e2fc6398..c9e2fc6398 100644
--- a/patches/server/0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0996-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0995-Optimize-Collision-to-not-load-chunks.patch
index 2ad06277cb..b992c3fadf 100644
--- a/patches/server/0996-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0995-Optimize-Collision-to-not-load-chunks.patch
@@ -26,7 +26,7 @@ index 461c27292af06a5150de8ec263d0c8527e8c5278..37245ff682837e7e8c9647f4afe30f0d
              // CraftBukkit end
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1f892783c16ab8fd863832255a2b03df381aa84e..720d08400915da9270ee4abf84bcb73f354ae2b4 100644
+index 703b32362cf6a23dfe9326aa4e0ee74511e0d2cb..8531304667a85436fd557d319fe36a37b3661ae5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -242,6 +242,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0997-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0996-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 8e879a28af..8e879a28af 100644
--- a/patches/server/0997-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0996-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0998-Entity-load-save-limit-per-chunk.patch b/patches/server/0997-Entity-load-save-limit-per-chunk.patch
index 69f16dddbf..69f16dddbf 100644
--- a/patches/server/0998-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0997-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0999-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0998-Fix-and-optimise-world-force-upgrading.patch
index aedbde4517..aedbde4517 100644
--- a/patches/server/0999-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0998-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/1000-Improved-Watchdog-Support.patch b/patches/server/0999-Improved-Watchdog-Support.patch
index bd43d6abe4..bd43d6abe4 100644
--- a/patches/server/1000-Improved-Watchdog-Support.patch
+++ b/patches/server/0999-Improved-Watchdog-Support.patch
diff --git a/patches/server/1001-Optimize-Voxel-Shape-Merging.patch b/patches/server/1000-Optimize-Voxel-Shape-Merging.patch
index 2c47963e34..2c47963e34 100644
--- a/patches/server/1001-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/1000-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1002-Write-SavedData-IO-async.patch b/patches/server/1001-Write-SavedData-IO-async.patch
index a61e63bdcc..a61e63bdcc 100644
--- a/patches/server/1002-Write-SavedData-IO-async.patch
+++ b/patches/server/1001-Write-SavedData-IO-async.patch
diff --git a/patches/server/1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/1002-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index ae7e0e0b35..ae7e0e0b35 100644
--- a/patches/server/1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/1002-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/1003-Use-distance-map-to-optimise-entity-tracker.patch
index be6acff7e6..986378b88f 100644
--- a/patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/1003-Use-distance-map-to-optimise-entity-tracker.patch
@@ -236,7 +236,7 @@ index ac1a4ff5f83e53fa2983ff6e834775e51fba715e..284f9548d62f9230c668bb1adb8cb808
              return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 720d08400915da9270ee4abf84bcb73f354ae2b4..28ca0aae8f8c755b558a03fc9283fa1a44697e1a 100644
+index 8531304667a85436fd557d319fe36a37b3661ae5..f220e9ba35b07b690df93b1d733e9c666c772de9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -56,6 +56,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
diff --git a/patches/server/1005-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1004-Optimize-Bit-Operations-by-inlining.patch
index 269787b9ed..269787b9ed 100644
--- a/patches/server/1005-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/1004-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1006-Remove-streams-from-hot-code.patch b/patches/server/1005-Remove-streams-from-hot-code.patch
index 75a38173c7..75a38173c7 100644
--- a/patches/server/1006-Remove-streams-from-hot-code.patch
+++ b/patches/server/1005-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1007-Eigencraft-redstone-implementation.patch b/patches/server/1006-Eigencraft-redstone-implementation.patch
index 1c66b34a01..1c66b34a01 100644
--- a/patches/server/1007-Eigencraft-redstone-implementation.patch
+++ b/patches/server/1006-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1007-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index f0c0562d70..f0c0562d70 100644
--- a/patches/server/1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/1007-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1009-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/1008-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 14c24b80b2..14c24b80b2 100644
--- a/patches/server/1009-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/1008-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/1010-Improve-boat-collision-performance.patch b/patches/server/1009-Improve-boat-collision-performance.patch
index 2754015b1c..2754015b1c 100644
--- a/patches/server/1010-Improve-boat-collision-performance.patch
+++ b/patches/server/1009-Improve-boat-collision-performance.patch
diff --git a/patches/server/1011-Optimise-general-POI-access.patch b/patches/server/1010-Optimise-general-POI-access.patch
index 9be40e9753..9be40e9753 100644
--- a/patches/server/1011-Optimise-general-POI-access.patch
+++ b/patches/server/1010-Optimise-general-POI-access.patch
diff --git a/patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1011-Custom-table-implementation-for-blockstate-state-loo.patch
index 52bdb3212c..52bdb3212c 100644
--- a/patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1011-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1013-Execute-chunk-tasks-mid-tick.patch b/patches/server/1012-Execute-chunk-tasks-mid-tick.patch
index 8ea2ca205e..8ea2ca205e 100644
--- a/patches/server/1013-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/1012-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/1014-Optimise-random-block-ticking.patch b/patches/server/1013-Optimise-random-block-ticking.patch
index 8e35b48622..8e35b48622 100644
--- a/patches/server/1014-Optimise-random-block-ticking.patch
+++ b/patches/server/1013-Optimise-random-block-ticking.patch
diff --git a/patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1014-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index b294b05766..b294b05766 100644
--- a/patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1014-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1015-Use-Velocity-compression-and-cipher-natives.patch
index 7dd88079df..7dd88079df 100644
--- a/patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/1015-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1017-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1016-Detail-more-information-in-watchdog-dumps.patch
index 710f25f69b..bf520606cb 100644
--- a/patches/server/1017-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1016-Detail-more-information-in-watchdog-dumps.patch
@@ -122,7 +122,7 @@ index 9d18da228c6709e7665ba8babb6ee6d0b36b5dc5..af9f58328c09dddb2875f79128f906b8
  
      private void tickPassenger(Entity vehicle, Entity passenger) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 28ca0aae8f8c755b558a03fc9283fa1a44697e1a..ec01a97cac653fb1a2065289fe5b0c6824732bcb 100644
+index f220e9ba35b07b690df93b1d733e9c666c772de9..c1a8de736ee39e4e177399bc51aedfd135a8100d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1063,8 +1063,43 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/1018-Collision-optimisations.patch b/patches/server/1017-Collision-optimisations.patch
index c57de0cfdf..de992f75ee 100644
--- a/patches/server/1018-Collision-optimisations.patch
+++ b/patches/server/1017-Collision-optimisations.patch
@@ -2214,7 +2214,7 @@ index 594cb6ce4bfa6c42212000a1ed983ea95ee2c4bf..97b0119ac71284b3a223c089bec26d87
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ec01a97cac653fb1a2065289fe5b0c6824732bcb..be2220457e941803b14d78c550d0db777c79a886 100644
+index c1a8de736ee39e4e177399bc51aedfd135a8100d..6de971aca46caad091271d125a079a1b7a5f163d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1250,9 +1250,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1018-Optimise-collision-checking-in-player-move-packet-ha.patch
index 76b0962ce2..76b0962ce2 100644
--- a/patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1018-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch
index efe071cf68..efe071cf68 100644
--- a/patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1020-Fix-entity-type-tags-suggestions-in-selectors.patch
index 83872a3693..83872a3693 100644
--- a/patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1020-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1022-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1021-Add-Alternate-Current-redstone-implementation.patch
index ed82f9487d..ed82f9487d 100644
--- a/patches/server/1022-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1021-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1023-optimize-dirt-and-snow-spreading.patch b/patches/server/1022-optimize-dirt-and-snow-spreading.patch
index 223dbd9a3e..223dbd9a3e 100644
--- a/patches/server/1023-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/1022-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1024-Properly-resend-entities.patch b/patches/server/1023-Properly-resend-entities.patch
index a00f094df7..f0d407671b 100644
--- a/patches/server/1024-Properly-resend-entities.patch
+++ b/patches/server/1023-Properly-resend-entities.patch
@@ -180,7 +180,7 @@ index a1bfd700cd4c39e4bb1b9c140b54b7c82cd8b32c..205b52e486123aa23a1469de896ab1ec
              }
              entity.playSound(((Bucketable) entity).getPickupSound(), 1.0F, 1.0F);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 9f657dc4075ce01c3a8f871c4a60e5ca5d8eb535..0b5a31477e3b76833fb97a455842316193663c8e 100644
+index 38c14e06bcada9678b64c6eacf351de10232ee56..7cd7912cecbbbe2c32bfd9b85181115c6d316eb8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1000,7 +1000,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/1025-Optimize-Hoppers.patch b/patches/server/1024-Optimize-Hoppers.patch
index b9cc3698c6..b9cc3698c6 100644
--- a/patches/server/1025-Optimize-Hoppers.patch
+++ b/patches/server/1024-Optimize-Hoppers.patch
diff --git a/patches/server/1026-Improve-performance-of-mass-crafts.patch b/patches/server/1025-Improve-performance-of-mass-crafts.patch
index 640d0204e2..640d0204e2 100644
--- a/patches/server/1026-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1025-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1027-Actually-optimise-explosions.patch b/patches/server/1026-Actually-optimise-explosions.patch
index bcb01ef768..bcb01ef768 100644
--- a/patches/server/1027-Actually-optimise-explosions.patch
+++ b/patches/server/1026-Actually-optimise-explosions.patch
diff --git a/patches/server/1028-Optimise-chunk-tick-iteration.patch b/patches/server/1027-Optimise-chunk-tick-iteration.patch
index 73a6088d00..73a6088d00 100644
--- a/patches/server/1028-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1027-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1029-Lag-compensation-ticks.patch b/patches/server/1028-Lag-compensation-ticks.patch
index abff0e0dc9..abff0e0dc9 100644
--- a/patches/server/1029-Lag-compensation-ticks.patch
+++ b/patches/server/1028-Lag-compensation-ticks.patch
diff --git a/patches/server/1030-Optimise-nearby-player-retrieval.patch b/patches/server/1029-Optimise-nearby-player-retrieval.patch
index c73abc51ad..c73abc51ad 100644
--- a/patches/server/1030-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1029-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1031-Distance-manager-tick-timings.patch b/patches/server/1030-Distance-manager-tick-timings.patch
index f946d92596..f946d92596 100644
--- a/patches/server/1031-Distance-manager-tick-timings.patch
+++ b/patches/server/1030-Distance-manager-tick-timings.patch
diff --git a/patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1031-Handle-Oversized-block-entities-in-chunks.patch
index 1bdb933b52..1bdb933b52 100644
--- a/patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1031-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1032-Send-full-pos-packets-for-hard-colliding-entities.patch
index 45738a19b2..45738a19b2 100644
--- a/patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/1032-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/1034-Add-ShulkerDuplicateEvent.patch b/patches/server/1033-Add-ShulkerDuplicateEvent.patch
index 91ff8b7326..91ff8b7326 100644
--- a/patches/server/1034-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/1033-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/1035-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/1034-Add-api-for-spawn-egg-texture-colors.patch
index fcb89ff9a8..fcb89ff9a8 100644
--- a/patches/server/1035-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/1034-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/1036-Disable-memory-reserve-allocating.patch b/patches/server/1035-Disable-memory-reserve-allocating.patch
index bd18c240f0..bd18c240f0 100644
--- a/patches/server/1036-Disable-memory-reserve-allocating.patch
+++ b/patches/server/1035-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/1037-Improve-tag-parser-handling.patch b/patches/server/1036-Improve-tag-parser-handling.patch
index 7be702c88c..7be702c88c 100644
--- a/patches/server/1037-Improve-tag-parser-handling.patch
+++ b/patches/server/1036-Improve-tag-parser-handling.patch
diff --git a/patches/server/1038-Add-Lifecycle-Event-system.patch b/patches/server/1037-Add-Lifecycle-Event-system.patch
index bf79acac9c..bf79acac9c 100644
--- a/patches/server/1038-Add-Lifecycle-Event-system.patch
+++ b/patches/server/1037-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/1039-Conduit-API.patch b/patches/server/1038-Conduit-API.patch
index 9df9ff716b..9df9ff716b 100644
--- a/patches/server/1039-Conduit-API.patch
+++ b/patches/server/1038-Conduit-API.patch
diff --git a/patches/server/1040-ItemStack-Tooltip-API.patch b/patches/server/1039-ItemStack-Tooltip-API.patch
index 5d03327e9d..5d03327e9d 100644
--- a/patches/server/1040-ItemStack-Tooltip-API.patch
+++ b/patches/server/1039-ItemStack-Tooltip-API.patch
diff --git a/patches/server/1041-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/1040-Fix-possible-StackOverflowError-for-some-dispenses.patch
index c9638c6967..c9638c6967 100644
--- a/patches/server/1041-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/1040-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/1042-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/1041-Properly-track-the-changed-item-from-dispense-events.patch
index f01bec2a48..f01bec2a48 100644
--- a/patches/server/1042-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/1041-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/1043-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/1042-Add-getChunkSnapshot-includeLightData-parameter.patch
index bb830096ec..bb830096ec 100644
--- a/patches/server/1043-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/1042-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/1044-Add-FluidState-API.patch b/patches/server/1043-Add-FluidState-API.patch
index 153752df1d..153752df1d 100644
--- a/patches/server/1044-Add-FluidState-API.patch
+++ b/patches/server/1043-Add-FluidState-API.patch
diff --git a/patches/server/1045-add-number-format-api.patch b/patches/server/1044-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/1045-add-number-format-api.patch
+++ b/patches/server/1044-add-number-format-api.patch
diff --git a/patches/server/1046-check-if-itemstack-is-stackable-first.patch b/patches/server/1045-check-if-itemstack-is-stackable-first.patch
index 3655bb3a13..3655bb3a13 100644
--- a/patches/server/1046-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/1045-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/1047-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/1046-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index 69eea7f52e..69eea7f52e 100644
--- a/patches/server/1047-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/1046-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/1048-improve-BanList-types.patch b/patches/server/1047-improve-BanList-types.patch
index ad92622c45..ad92622c45 100644
--- a/patches/server/1048-improve-BanList-types.patch
+++ b/patches/server/1047-improve-BanList-types.patch
diff --git a/patches/server/1049-Configurable-max-block-fluid-ticks.patch b/patches/server/1048-Configurable-max-block-fluid-ticks.patch
index c1d19d41e3..c1d19d41e3 100644
--- a/patches/server/1049-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/1048-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/1050-disable-forced-empty-world-ticks.patch b/patches/server/1049-disable-forced-empty-world-ticks.patch
index 6f3fb1c6f0..6f3fb1c6f0 100644
--- a/patches/server/1050-disable-forced-empty-world-ticks.patch
+++ b/patches/server/1049-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/1051-Suspicious-Effect-Entry-API.patch b/patches/server/1050-Suspicious-Effect-Entry-API.patch
index 31c7a46ac6..31c7a46ac6 100644
--- a/patches/server/1051-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/1050-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/1052-Per-world-ticks-per-spawn-settings.patch b/patches/server/1051-Per-world-ticks-per-spawn-settings.patch
index 7cb3e6d77c..7cb3e6d77c 100644
--- a/patches/server/1052-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/1051-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/1053-Add-onboarding-message-for-initial-server-start.patch b/patches/server/1052-Add-onboarding-message-for-initial-server-start.patch
index 744407a16a..744407a16a 100644
--- a/patches/server/1053-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/1052-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/1054-Fix-DamageSource-API.patch b/patches/server/1053-Fix-DamageSource-API.patch
index 3c80fe5209..b775177307 100644
--- a/patches/server/1054-Fix-DamageSource-API.patch
+++ b/patches/server/1053-Fix-DamageSource-API.patch
@@ -44,7 +44,7 @@ index 1561b85a45f52a8162f43553f8485bfe084b8f1f..b26e4d58ea1898a5e4b31c3d6ab33f38
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index be2220457e941803b14d78c550d0db777c79a886..f5a86c0fb1a7a313afc4c56ffc445a7fe7821428 100644
+index 6de971aca46caad091271d125a079a1b7a5f163d..b2eff51f1ad1e702525ef298807ea7d2083f6218 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3462,7 +3462,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/1055-Expanded-Hopper-API.patch b/patches/server/1054-Expanded-Hopper-API.patch
index 67efc0d7a2..67efc0d7a2 100644
--- a/patches/server/1055-Expanded-Hopper-API.patch
+++ b/patches/server/1054-Expanded-Hopper-API.patch