Expose power on fireballs (#10302)

112 files changed, 76 insertions, 42 deletions

diff --git a/patches/api/0072-Add-PlayerJumpEvent.patch b/patches/api/0072-Add-PlayerJumpEvent.patch
index a65192d7a1..fef1ccd347 100644
--- a/patches/api/0072-Add-PlayerJumpEvent.patch
+++ b/patches/api/0072-Add-PlayerJumpEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d3c319298d360967b853cf0168c0a1833f094779
+index 0000000000000000000000000000000000000000..8c2fd2c1120d634052f9bc345365272ad3a67b6f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
 @@ -0,0 +1,106 @@
@@ -102,7 +102,7 @@ index 0000000000000000000000000000000000000000..d3c319298d360967b853cf0168c0a183
 +     */
 +    @NotNull
 +    public Location getTo() {
-+        return this.to;
++        return this.to.clone();
 +    }
 +
 +    @NotNull
diff --git a/patches/api/0298-Missing-Entity-API.patch b/patches/api/0298-Missing-Entity-API.patch
index 2e2d58e8f3..33d18a3ebe 100644
--- a/patches/api/0298-Missing-Entity-API.patch
+++ b/patches/api/0298-Missing-Entity-API.patch
@@ -9,6 +9,7 @@ Co-authored-by: William Blake Galbreath <[email protected]>
 Co-authored-by: SoSeDiK <[email protected]>
 Co-authored-by: booky10 <[email protected]>
 Co-authored-by: Amin <[email protected]>
+Co-authored-by: TrollyLoki <[email protected]>
 
 diff --git a/src/main/java/io/papermc/paper/entity/SchoolableFish.java b/src/main/java/io/papermc/paper/entity/SchoolableFish.java
 new file mode 100644
@@ -413,6 +414,43 @@ index 9e7f42caab1204036f4203354c115fd40c6def92..138d2530de2410f4a9424dabd3e5ce0c
 +    int getLifetimeTicks();
 +    // Paper end
  }
+diff --git a/src/main/java/org/bukkit/entity/Fireball.java b/src/main/java/org/bukkit/entity/Fireball.java
+index 7a44707f2307dc4dbfea4de3f4baf3cc0490dc93..d0e82102425e54274be9c4769634d754319d6196 100644
+--- a/src/main/java/org/bukkit/entity/Fireball.java
++++ b/src/main/java/org/bukkit/entity/Fireball.java
+@@ -23,4 +23,32 @@ public interface Fireball extends Projectile, Explosive {
+     @NotNull
+     public Vector getDirection();
+ 
++    // Paper start - Expose power on fireball projectiles
++    /**
++     * {@inheritDoc}
++     * <p>
++     * Note: For fireball entities, their movement is also controlled by their power.
++     *
++     * @param velocity New velocity to travel with
++     * @see #setPower(Vector)
++     */
++    @Override
++    public void setVelocity(@NotNull Vector velocity);
++
++    /**
++     * Sets the power of a fireball. The power determines the direction and magnitude of its acceleration.
++     *
++     * @param power the power
++     */
++    public void setPower(@NotNull Vector power);
++
++    /**
++     * Gets the power of a fireball. The power determines the direction and magnitude of its acceleration.
++     *
++     * @return the power
++     */
++    @NotNull
++    public Vector getPower();
++    // Paper end - Expose power on fireball projectiles
++
+ }
 diff --git a/src/main/java/org/bukkit/entity/Fox.java b/src/main/java/org/bukkit/entity/Fox.java
 index c61a473453f33f9d10c330fc46cfa9d52251fe49..473a7e36ad64f866d1d2e09e2ecb2e9881668faf 100644
 --- a/src/main/java/org/bukkit/entity/Fox.java
diff --git a/patches/server/0586-Missing-Entity-API.patch b/patches/server/0586-Missing-Entity-API.patch
index 1d25ac6396..501d3329dd 100644
--- a/patches/server/0586-Missing-Entity-API.patch
+++ b/patches/server/0586-Missing-Entity-API.patch
@@ -36,6 +36,7 @@ Co-authored-by: William Blake Galbreath <[email protected]>
 Co-authored-by: SoSeDiK <[email protected]>
 Co-authored-by: booky10 <[email protected]>
 Co-authored-by: Amin <[email protected]>
+Co-authored-by: TrollyLoki <[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
@@ -666,6 +667,31 @@ index fc0f0e841dc974d080e1abb9bbafb5165801131f..d657fd2c507a5b215aeab0a5f3e9c2ee
 +    }
 +    // Paper end
  }
+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
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
+@@ -59,6 +59,20 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
+         this.update(); // SPIGOT-6579
+     }
+ 
++    // Paper start - Expose power on fireball projectiles
++    @Override
++    public void setPower(final Vector power) {
++        this.getHandle().xPower = power.getX();
++        this.getHandle().yPower = power.getY();
++        this.getHandle().zPower = power.getZ();
++    }
++
++    @Override
++    public Vector getPower() {
++        return new Vector(this.getHandle().xPower, this.getHandle().yPower, this.getHandle().zPower);
++    }
++    // Paper end - Expose power on fireball projectiles
++
+     @Override
+     public AbstractHurtingProjectile getHandle() {
+         return (AbstractHurtingProjectile) this.entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
 index 17164811bbcf983bef62c47bc99330074762267b..c455deb4fd2a7684bcc01a8212c362a2375c190b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
diff --git a/patches/server/0949-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0948-Fix-UnsafeValues-loadAdvancement.patch
index 0de7a22d6d..0de7a22d6d 100644
--- a/patches/server/0949-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0948-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0948-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/0948-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
deleted file mode 100644
index 3af04ed113..0000000000
--- a/patches/server/0948-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: TrollyLoki <[email protected]>
-Date: Tue, 10 Oct 2023 00:45:01 -0400
-Subject: [PATCH] Make setVelocity method of Fireballs change the travel
- direction to an arbitrary vector
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
-index 2783e218d5e5c24787429237974e196761f4d02b..1d8aab2fda18c6e2bb30f6ba4a6325263267b628 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
-@@ -46,6 +46,18 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
-         this.update(); // SPIGOT-6579
-     }
- 
-+    // Paper start - set direction without normalizing
-+    @Override
-+    public void setVelocity(Vector velocity) {
-+        Preconditions.checkArgument(velocity != null, "Vector velocity cannot be null");
-+        velocity.checkFinite();
-+        this.getHandle().xPower = velocity.getX();
-+        this.getHandle().yPower = velocity.getY();
-+        this.getHandle().zPower = velocity.getZ();
-+        update();
-+    }
-+    // Paper end - set direction without normalizing
-+
-     @Override
-     public AbstractHurtingProjectile getHandle() {
-         return (AbstractHurtingProjectile) this.entity;
diff --git a/patches/server/0950-Add-player-idle-duration-API.patch b/patches/server/0949-Add-player-idle-duration-API.patch
index 717b1d7291..717b1d7291 100644
--- a/patches/server/0950-Add-player-idle-duration-API.patch
+++ b/patches/server/0949-Add-player-idle-duration-API.patch
diff --git a/patches/server/0951-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0950-Don-t-check-if-we-can-see-non-visible-entities.patch
index 1c1aa40a97..1c1aa40a97 100644
--- a/patches/server/0951-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0950-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0952-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0951-Fix-NPE-in-SculkBloomEvent-world-access.patch
index b66e61a522..b66e61a522 100644
--- a/patches/server/0952-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0951-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0953-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0952-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 72c810300c..72c810300c 100644
--- a/patches/server/0953-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0952-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0954-Optimize-VarInts.patch b/patches/server/0953-Optimize-VarInts.patch
index 19e7fc574a..19e7fc574a 100644
--- a/patches/server/0954-Optimize-VarInts.patch
+++ b/patches/server/0953-Optimize-VarInts.patch
diff --git a/patches/server/0955-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0954-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 9794102b95..9794102b95 100644
--- a/patches/server/0955-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0954-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0956-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0955-Add-predicate-for-blocks-when-raytracing.patch
index 2a30c191f6..2a30c191f6 100644
--- a/patches/server/0956-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0955-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0957-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0956-Broadcast-take-item-packets-with-collector-as-source.patch
index ad908f281c..ad908f281c 100644
--- a/patches/server/0957-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0956-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0958-Expand-LingeringPotion-API.patch b/patches/server/0957-Expand-LingeringPotion-API.patch
index abc4c72435..abc4c72435 100644
--- a/patches/server/0958-Expand-LingeringPotion-API.patch
+++ b/patches/server/0957-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0959-Add-MaterialTagsTest.patch b/patches/server/0958-Add-MaterialTagsTest.patch
index 34233ba1ca..34233ba1ca 100644
--- a/patches/server/0959-Add-MaterialTagsTest.patch
+++ b/patches/server/0958-Add-MaterialTagsTest.patch
diff --git a/patches/server/0960-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0959-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index 69084fab3f..69084fab3f 100644
--- a/patches/server/0960-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0959-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0961-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0960-Add-hand-to-fish-event-for-all-player-interactions.patch
index 39764d836e..39764d836e 100644
--- a/patches/server/0961-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0960-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0961-Fix-several-issues-with-EntityBreedEvent.patch
index e7f91ee16c..e7f91ee16c 100644
--- a/patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0961-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0963-Add-UUID-attribute-modifier-API.patch b/patches/server/0962-Add-UUID-attribute-modifier-API.patch
index 37efcab4b6..37efcab4b6 100644
--- a/patches/server/0963-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0962-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0964-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0963-Fix-missing-event-call-for-entity-teleport-API.patch
index 1d122c2f15..1d122c2f15 100644
--- a/patches/server/0964-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0963-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0965-Lazily-create-LootContext-for-criterions.patch b/patches/server/0964-Lazily-create-LootContext-for-criterions.patch
index 293dfbd694..293dfbd694 100644
--- a/patches/server/0965-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0964-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0966-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0965-Don-t-fire-sync-events-during-worldgen.patch
index 0200563077..2654c1f60d 100644
--- a/patches/server/0966-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0965-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 bbc3f09105b19eabd3ebb8b9589412b8871739a1..67dfb7b6a8825a87ff69b8c33efd1c040db12bf0 100644
+index 919c9ff3dd97d4bd2d41631176f9671f1987ad91..1de77621f159608f572ab4935ceb78863bb82c59 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/0967-Add-Structure-check-API.patch b/patches/server/0966-Add-Structure-check-API.patch
index b291fdf604..b291fdf604 100644
--- a/patches/server/0967-Add-Structure-check-API.patch
+++ b/patches/server/0966-Add-Structure-check-API.patch
diff --git a/patches/server/0968-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index bbc3e41f85..bbc3e41f85 100644
--- a/patches/server/0968-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0969-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0968-Restore-vanilla-entity-drops-behavior.patch
index c2f0a406f7..e6db1df680 100644
--- a/patches/server/0969-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0968-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 67dfb7b6a8825a87ff69b8c33efd1c040db12bf0..198aeb71e958a3fa6f8eaa8f607120af483e597f 100644
+index 1de77621f159608f572ab4935ceb78863bb82c59..5ab9ca815cb324c47c3e25a4d84a1b432bb393be 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/0970-Dont-resend-blocks-on-interactions.patch b/patches/server/0969-Dont-resend-blocks-on-interactions.patch
index 8a8a5bb4ed..8a8a5bb4ed 100644
--- a/patches/server/0970-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0969-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0971-add-more-scoreboard-API.patch b/patches/server/0970-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0971-add-more-scoreboard-API.patch
+++ b/patches/server/0970-add-more-scoreboard-API.patch
diff --git a/patches/server/0972-Improve-Registry.patch b/patches/server/0971-Improve-Registry.patch
index b3e7a17ff6..b3e7a17ff6 100644
--- a/patches/server/0972-Improve-Registry.patch
+++ b/patches/server/0971-Improve-Registry.patch
diff --git a/patches/server/0973-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0972-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 5ef39afe5c..5ef39afe5c 100644
--- a/patches/server/0973-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0972-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0974-Add-experience-points-API.patch b/patches/server/0973-Add-experience-points-API.patch
index 5256a6ae70..5256a6ae70 100644
--- a/patches/server/0974-Add-experience-points-API.patch
+++ b/patches/server/0973-Add-experience-points-API.patch
diff --git a/patches/server/0975-Add-drops-to-shear-events.patch b/patches/server/0974-Add-drops-to-shear-events.patch
index 57405a32c2..57405a32c2 100644
--- a/patches/server/0975-Add-drops-to-shear-events.patch
+++ b/patches/server/0974-Add-drops-to-shear-events.patch
diff --git a/patches/server/0976-Add-PlayerShieldDisableEvent.patch b/patches/server/0975-Add-PlayerShieldDisableEvent.patch
index a02011827d..a02011827d 100644
--- a/patches/server/0976-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0975-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0977-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0976-Validate-ResourceLocation-in-NBT-reading.patch
index 74748ab8d8..74748ab8d8 100644
--- a/patches/server/0977-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0976-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0978-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0977-Properly-handle-experience-dropping-on-block-break.patch
index f7d4494ec0..f7d4494ec0 100644
--- a/patches/server/0978-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0977-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0979-Fixup-NamespacedKey-handling.patch b/patches/server/0978-Fixup-NamespacedKey-handling.patch
index 14ddcf111d..14ddcf111d 100644
--- a/patches/server/0979-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0978-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0980-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0979-Expose-LootTable-of-DecoratedPot.patch
index 6d5e2738de..6d5e2738de 100644
--- a/patches/server/0980-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0979-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0981-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0980-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index d6756e53cf..d6756e53cf 100644
--- a/patches/server/0981-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0980-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0982-Rewrite-dataconverter-system.patch b/patches/server/0981-Rewrite-dataconverter-system.patch
index 0d62473208..0d62473208 100644
--- a/patches/server/0982-Rewrite-dataconverter-system.patch
+++ b/patches/server/0981-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0983-Starlight.patch b/patches/server/0982-Starlight.patch
index b4e6c66968..b4e6c66968 100644
--- a/patches/server/0983-Starlight.patch
+++ b/patches/server/0982-Starlight.patch
diff --git a/patches/server/0984-Rewrite-chunk-system.patch b/patches/server/0983-Rewrite-chunk-system.patch
index 0d4fc72669..2a35933def 100644
--- a/patches/server/0984-Rewrite-chunk-system.patch
+++ b/patches/server/0983-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 198aeb71e958a3fa6f8eaa8f607120af483e597f..89db78c05118a64d1b73ac05381e24c825d3cf76 100644
+index 5ab9ca815cb324c47c3e25a4d84a1b432bb393be..42d01cec6eba11183409c9a93d068e61f5010153 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/0985-incremental-chunk-and-player-saving.patch b/patches/server/0984-incremental-chunk-and-player-saving.patch
index c140932b29..c140932b29 100644
--- a/patches/server/0985-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0984-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 622feb95fb..622feb95fb 100644
--- a/patches/server/0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 811439226f..811439226f 100644
--- a/patches/server/0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 9aded39822..9aded39822 100644
--- a/patches/server/0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 6ab7cbf215..6ab7cbf215 100644
--- a/patches/server/0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0990-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch
index f6a81ca166..f6a81ca166 100644
--- a/patches/server/0990-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0991-Fix-World-isChunkGenerated-calls.patch b/patches/server/0990-Fix-World-isChunkGenerated-calls.patch
index 0b3eebad3f..0b3eebad3f 100644
--- a/patches/server/0991-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0990-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0992-Flat-bedrock-generator-settings.patch b/patches/server/0991-Flat-bedrock-generator-settings.patch
index 7e54f34f22..7e54f34f22 100644
--- a/patches/server/0992-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0991-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0993-Entity-Activation-Range-2.0.patch b/patches/server/0992-Entity-Activation-Range-2.0.patch
index c709e5d6cf..4bec5ca13e 100644
--- a/patches/server/0993-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0992-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 89db78c05118a64d1b73ac05381e24c825d3cf76..dd785d11461541e8a93544142f7a3b4e43b2173d 100644
+index 42d01cec6eba11183409c9a93d068e61f5010153..1f892783c16ab8fd863832255a2b03df381aa84e 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/0994-Optional-per-player-mob-spawns.patch b/patches/server/0993-Optional-per-player-mob-spawns.patch
index b80d633556..b80d633556 100644
--- a/patches/server/0994-Optional-per-player-mob-spawns.patch
+++ b/patches/server/0993-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/0995-Anti-Xray.patch b/patches/server/0994-Anti-Xray.patch
index 65f22d8479..65f22d8479 100644
--- a/patches/server/0995-Anti-Xray.patch
+++ b/patches/server/0994-Anti-Xray.patch
diff --git a/patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index c9e2fc6398..c9e2fc6398 100644
--- a/patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0997-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0996-Optimize-Collision-to-not-load-chunks.patch
index 106d5bd3fb..2ad06277cb 100644
--- a/patches/server/0997-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0996-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 dd785d11461541e8a93544142f7a3b4e43b2173d..f8ce3c92597b9fb2b8743a08088f33a7bf237c5d 100644
+index 1f892783c16ab8fd863832255a2b03df381aa84e..720d08400915da9270ee4abf84bcb73f354ae2b4 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/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0997-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 8e879a28af..8e879a28af 100644
--- a/patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0997-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0999-Entity-load-save-limit-per-chunk.patch b/patches/server/0998-Entity-load-save-limit-per-chunk.patch
index 69f16dddbf..69f16dddbf 100644
--- a/patches/server/0999-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0998-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1000-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0999-Fix-and-optimise-world-force-upgrading.patch
index aedbde4517..aedbde4517 100644
--- a/patches/server/1000-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0999-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/1001-Improved-Watchdog-Support.patch b/patches/server/1000-Improved-Watchdog-Support.patch
index 3614cf6564..bd43d6abe4 100644
--- a/patches/server/1001-Improved-Watchdog-Support.patch
+++ b/patches/server/1000-Improved-Watchdog-Support.patch
@@ -315,7 +315,7 @@ index 2eeb0c78f2b717b59542b6b668371558ae2fcc25..6ec3fc801453fd54c25b642e6fa71c19
                          final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
                          net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index d931a4c6e633bf9c1b3e5e18e880e2ddbfe4aa2a..ce341f42b3a5e17fb6d1f7de8057e73137ae2a6e 100644
+index b131a84865d9160d1b5d411515b69e967dbda66c..8d626fadcd4743b6472a2954d2b1b2ec89669814 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -186,6 +186,36 @@ public class Main {
diff --git a/patches/server/1002-Optimize-Voxel-Shape-Merging.patch b/patches/server/1001-Optimize-Voxel-Shape-Merging.patch
index 2c47963e34..2c47963e34 100644
--- a/patches/server/1002-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/1001-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1003-Write-SavedData-IO-async.patch b/patches/server/1002-Write-SavedData-IO-async.patch
index a61e63bdcc..a61e63bdcc 100644
--- a/patches/server/1003-Write-SavedData-IO-async.patch
+++ b/patches/server/1002-Write-SavedData-IO-async.patch
diff --git a/patches/server/1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index ae7e0e0b35..ae7e0e0b35 100644
--- a/patches/server/1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/1005-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch
index 395ef636c5..be6acff7e6 100644
--- a/patches/server/1005-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch
@@ -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 f8ce3c92597b9fb2b8743a08088f33a7bf237c5d..3282327f1a85155d671dd63f3e5bf9b636a3e893 100644
+index 720d08400915da9270ee4abf84bcb73f354ae2b4..28ca0aae8f8c755b558a03fc9283fa1a44697e1a 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/1006-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1005-Optimize-Bit-Operations-by-inlining.patch
index 269787b9ed..269787b9ed 100644
--- a/patches/server/1006-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/1005-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1007-Remove-streams-from-hot-code.patch b/patches/server/1006-Remove-streams-from-hot-code.patch
index 75a38173c7..75a38173c7 100644
--- a/patches/server/1007-Remove-streams-from-hot-code.patch
+++ b/patches/server/1006-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1008-Eigencraft-redstone-implementation.patch b/patches/server/1007-Eigencraft-redstone-implementation.patch
index 1c66b34a01..1c66b34a01 100644
--- a/patches/server/1008-Eigencraft-redstone-implementation.patch
+++ b/patches/server/1007-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index f0c0562d70..f0c0562d70 100644
--- a/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1010-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/1009-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 14c24b80b2..14c24b80b2 100644
--- a/patches/server/1010-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/1009-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/1011-Improve-boat-collision-performance.patch b/patches/server/1010-Improve-boat-collision-performance.patch
index 2754015b1c..2754015b1c 100644
--- a/patches/server/1011-Improve-boat-collision-performance.patch
+++ b/patches/server/1010-Improve-boat-collision-performance.patch
diff --git a/patches/server/1012-Optimise-general-POI-access.patch b/patches/server/1011-Optimise-general-POI-access.patch
index 9be40e9753..9be40e9753 100644
--- a/patches/server/1012-Optimise-general-POI-access.patch
+++ b/patches/server/1011-Optimise-general-POI-access.patch
diff --git a/patches/server/1013-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch
index 52bdb3212c..52bdb3212c 100644
--- a/patches/server/1013-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1014-Execute-chunk-tasks-mid-tick.patch b/patches/server/1013-Execute-chunk-tasks-mid-tick.patch
index 8ea2ca205e..8ea2ca205e 100644
--- a/patches/server/1014-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/1013-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/1015-Optimise-random-block-ticking.patch b/patches/server/1014-Optimise-random-block-ticking.patch
index 8e35b48622..8e35b48622 100644
--- a/patches/server/1015-Optimise-random-block-ticking.patch
+++ b/patches/server/1014-Optimise-random-block-ticking.patch
diff --git a/patches/server/1016-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index b294b05766..b294b05766 100644
--- a/patches/server/1016-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1017-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch
index 7dd88079df..7dd88079df 100644
--- a/patches/server/1017-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1018-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1017-Detail-more-information-in-watchdog-dumps.patch
index 4f06eee45b..710f25f69b 100644
--- a/patches/server/1018-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1017-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 3282327f1a85155d671dd63f3e5bf9b636a3e893..2f3f1418b8ec765cfab5ece88972825d7d68cae5 100644
+index 28ca0aae8f8c755b558a03fc9283fa1a44697e1a..ec01a97cac653fb1a2065289fe5b0c6824732bcb 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/1019-Collision-optimisations.patch b/patches/server/1018-Collision-optimisations.patch
index 371f2b708c..c57de0cfdf 100644
--- a/patches/server/1019-Collision-optimisations.patch
+++ b/patches/server/1018-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 2f3f1418b8ec765cfab5ece88972825d7d68cae5..51097f1d04d981db2823e8647b546658b8fd27c1 100644
+index ec01a97cac653fb1a2065289fe5b0c6824732bcb..be2220457e941803b14d78c550d0db777c79a886 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/1020-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch
index 76b0962ce2..76b0962ce2 100644
--- a/patches/server/1020-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1021-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch
index efe071cf68..efe071cf68 100644
--- a/patches/server/1021-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/1022-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch
index 83872a3693..83872a3693 100644
--- a/patches/server/1022-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1023-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1022-Add-Alternate-Current-redstone-implementation.patch
index ed82f9487d..ed82f9487d 100644
--- a/patches/server/1023-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1022-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1024-optimize-dirt-and-snow-spreading.patch b/patches/server/1023-optimize-dirt-and-snow-spreading.patch
index 223dbd9a3e..223dbd9a3e 100644
--- a/patches/server/1024-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/1023-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1025-Properly-resend-entities.patch b/patches/server/1024-Properly-resend-entities.patch
index a00f094df7..a00f094df7 100644
--- a/patches/server/1025-Properly-resend-entities.patch
+++ b/patches/server/1024-Properly-resend-entities.patch
diff --git a/patches/server/1026-Optimize-Hoppers.patch b/patches/server/1025-Optimize-Hoppers.patch
index 14afff5a29..b9cc3698c6 100644
--- a/patches/server/1026-Optimize-Hoppers.patch
+++ b/patches/server/1025-Optimize-Hoppers.patch
@@ -105,7 +105,7 @@ index 20201430ee8f28245aa845acb172d0f5d80458ff..9ea74d37cd951e0dc76d20ed8234b587
          }
  
 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 4dda44608320c2a872b23053a1c3de63b79741c2..757edf74751dc7183454656fda9cecc4eb601e4c 100644
+index e3b6f2bf93710ea695b0c25c0b6968a8f24f0829..cdb739df2a285032d25d84f4464f202a7a3fa578 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
 @@ -152,6 +152,43 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
diff --git a/patches/server/1027-Improve-performance-of-mass-crafts.patch b/patches/server/1026-Improve-performance-of-mass-crafts.patch
index 640d0204e2..640d0204e2 100644
--- a/patches/server/1027-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1026-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1028-Actually-optimise-explosions.patch b/patches/server/1027-Actually-optimise-explosions.patch
index bcb01ef768..bcb01ef768 100644
--- a/patches/server/1028-Actually-optimise-explosions.patch
+++ b/patches/server/1027-Actually-optimise-explosions.patch
diff --git a/patches/server/1029-Optimise-chunk-tick-iteration.patch b/patches/server/1028-Optimise-chunk-tick-iteration.patch
index 73a6088d00..73a6088d00 100644
--- a/patches/server/1029-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/1028-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1030-Lag-compensation-ticks.patch b/patches/server/1029-Lag-compensation-ticks.patch
index abff0e0dc9..abff0e0dc9 100644
--- a/patches/server/1030-Lag-compensation-ticks.patch
+++ b/patches/server/1029-Lag-compensation-ticks.patch
diff --git a/patches/server/1031-Optimise-nearby-player-retrieval.patch b/patches/server/1030-Optimise-nearby-player-retrieval.patch
index c73abc51ad..c73abc51ad 100644
--- a/patches/server/1031-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1030-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1032-Distance-manager-tick-timings.patch b/patches/server/1031-Distance-manager-tick-timings.patch
index f946d92596..f946d92596 100644
--- a/patches/server/1032-Distance-manager-tick-timings.patch
+++ b/patches/server/1031-Distance-manager-tick-timings.patch
diff --git a/patches/server/1033-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch
index 1bdb933b52..1bdb933b52 100644
--- a/patches/server/1033-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1034-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch
index 45738a19b2..45738a19b2 100644
--- a/patches/server/1034-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/1035-Add-ShulkerDuplicateEvent.patch b/patches/server/1034-Add-ShulkerDuplicateEvent.patch
index 91ff8b7326..91ff8b7326 100644
--- a/patches/server/1035-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/1034-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/1036-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/1035-Add-api-for-spawn-egg-texture-colors.patch
index fcb89ff9a8..fcb89ff9a8 100644
--- a/patches/server/1036-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/1035-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/1037-Disable-memory-reserve-allocating.patch b/patches/server/1036-Disable-memory-reserve-allocating.patch
index bd18c240f0..bd18c240f0 100644
--- a/patches/server/1037-Disable-memory-reserve-allocating.patch
+++ b/patches/server/1036-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/1038-Improve-tag-parser-handling.patch b/patches/server/1037-Improve-tag-parser-handling.patch
index 7be702c88c..7be702c88c 100644
--- a/patches/server/1038-Improve-tag-parser-handling.patch
+++ b/patches/server/1037-Improve-tag-parser-handling.patch
diff --git a/patches/server/1039-Add-Lifecycle-Event-system.patch b/patches/server/1038-Add-Lifecycle-Event-system.patch
index bf79acac9c..bf79acac9c 100644
--- a/patches/server/1039-Add-Lifecycle-Event-system.patch
+++ b/patches/server/1038-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/1040-Conduit-API.patch b/patches/server/1039-Conduit-API.patch
index 9df9ff716b..9df9ff716b 100644
--- a/patches/server/1040-Conduit-API.patch
+++ b/patches/server/1039-Conduit-API.patch
diff --git a/patches/server/1041-ItemStack-Tooltip-API.patch b/patches/server/1040-ItemStack-Tooltip-API.patch
index 5d03327e9d..5d03327e9d 100644
--- a/patches/server/1041-ItemStack-Tooltip-API.patch
+++ b/patches/server/1040-ItemStack-Tooltip-API.patch
diff --git a/patches/server/1042-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/1041-Fix-possible-StackOverflowError-for-some-dispenses.patch
index c9638c6967..c9638c6967 100644
--- a/patches/server/1042-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/1041-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/1043-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/1042-Properly-track-the-changed-item-from-dispense-events.patch
index f01bec2a48..f01bec2a48 100644
--- a/patches/server/1043-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/1042-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/1044-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/1043-Add-getChunkSnapshot-includeLightData-parameter.patch
index bb830096ec..bb830096ec 100644
--- a/patches/server/1044-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/1043-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/1045-Add-FluidState-API.patch b/patches/server/1044-Add-FluidState-API.patch
index 153752df1d..153752df1d 100644
--- a/patches/server/1045-Add-FluidState-API.patch
+++ b/patches/server/1044-Add-FluidState-API.patch
diff --git a/patches/server/1046-add-number-format-api.patch b/patches/server/1045-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/1046-add-number-format-api.patch
+++ b/patches/server/1045-add-number-format-api.patch
diff --git a/patches/server/1047-check-if-itemstack-is-stackable-first.patch b/patches/server/1046-check-if-itemstack-is-stackable-first.patch
index 3655bb3a13..3655bb3a13 100644
--- a/patches/server/1047-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/1046-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/1048-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/1047-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index 69eea7f52e..69eea7f52e 100644
--- a/patches/server/1048-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/1047-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/1049-improve-BanList-types.patch b/patches/server/1048-improve-BanList-types.patch
index ad92622c45..ad92622c45 100644
--- a/patches/server/1049-improve-BanList-types.patch
+++ b/patches/server/1048-improve-BanList-types.patch
diff --git a/patches/server/1050-Configurable-max-block-fluid-ticks.patch b/patches/server/1049-Configurable-max-block-fluid-ticks.patch
index c1d19d41e3..c1d19d41e3 100644
--- a/patches/server/1050-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/1049-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/1051-disable-forced-empty-world-ticks.patch b/patches/server/1050-disable-forced-empty-world-ticks.patch
index 6f3fb1c6f0..6f3fb1c6f0 100644
--- a/patches/server/1051-disable-forced-empty-world-ticks.patch
+++ b/patches/server/1050-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/1052-Suspicious-Effect-Entry-API.patch b/patches/server/1051-Suspicious-Effect-Entry-API.patch
index 31c7a46ac6..31c7a46ac6 100644
--- a/patches/server/1052-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/1051-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/1053-Per-world-ticks-per-spawn-settings.patch b/patches/server/1052-Per-world-ticks-per-spawn-settings.patch
index 7cb3e6d77c..7cb3e6d77c 100644
--- a/patches/server/1053-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/1052-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/1054-Add-onboarding-message-for-initial-server-start.patch b/patches/server/1053-Add-onboarding-message-for-initial-server-start.patch
index 744407a16a..744407a16a 100644
--- a/patches/server/1054-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/1053-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/1055-Fix-DamageSource-API.patch b/patches/server/1054-Fix-DamageSource-API.patch
index 3c80fe5209..3c80fe5209 100644
--- a/patches/server/1055-Fix-DamageSource-API.patch
+++ b/patches/server/1054-Fix-DamageSource-API.patch
diff --git a/patches/server/1056-Expanded-Hopper-API.patch b/patches/server/1055-Expanded-Hopper-API.patch
index 67efc0d7a2..67efc0d7a2 100644
--- a/patches/server/1056-Expanded-Hopper-API.patch
+++ b/patches/server/1055-Expanded-Hopper-API.patch