Compilation fixes

patches/api/0495-DataComponent-API.patch

@@ -1094,7 +1094,7 @@ index 0000000000000000000000000000000000000000..a128348247d8845321d3fecebaa09a51
 +}
 diff --git a/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java b/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..826bb860bd55ff18f91d9bc7a5dde4d638b39f98
+index 0000000000000000000000000000000000000000..135ebe0b84027073793c21c71d37eff496d23fec
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java
 @@ -0,0 +1,169 @@
@@ -1153,7 +1153,7 @@ index 0000000000000000000000000000000000000000..826bb860bd55ff18f91d9bc7a5dde4d6
 +     * @return the model key or null
 +     */
 +    @Contract(pure = true)
-+    @Nullable Key model();
++    @Nullable Key assetId();
 +
 +    /**
 +     * Gets the camera overlay key if present.
@@ -1219,7 +1219,7 @@ index 0000000000000000000000000000000000000000..826bb860bd55ff18f91d9bc7a5dde4d6
 +         * @return the builder for chaining
 +         */
 +        @Contract(value = "_ -> this", mutates = "this")
-+        Builder model(@Nullable Key model);
++        Builder assetId(@Nullable Key model);
 +
 +        /**
 +         * Sets the camera overlay key for this item.

patches/server/0256-Add-option-to-prevent-players-from-moving-into-unloa.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5f3d7ea96d690b68897d9092c624c77e49822af4..a87ea0f22b44c2fb67fd51bc8c9b0067aacac7de 100644
+index 5f3d7ea96d690b68897d9092c624c77e49822af4..31be5462945287bff7e5c1a3c1f38d6a510ddeb0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -500,9 +500,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -31,7 +31,7 @@ index 5f3d7ea96d690b68897d9092c624c77e49822af4..a87ea0f22b44c2fb67fd51bc8c9b0067
 +                    !worldserver.areChunksLoadedForMove(this.player.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(this.player.position()))) ||
 +                        !worldserver.areChunksLoadedForMove(entity.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(entity.position())))
 +                    )) {
-+                    this.connection.send(new ClientboundMoveVehiclePacket(entity));
++                    this.connection.send(ClientboundMoveVehiclePacket.fromEntity(entity));
 +                    return;
 +                }
 +                // Paper end - Prevent moving into unloaded chunks

patches/server/0263-Don-t-allow-digging-into-unloaded-chunks.patch

@@ -59,7 +59,7 @@ index 4c8189a2a7edea824545a24dccb376b8eceac001..4623c8acd125dff4919c4e2045b84831
  
                  this.level.destroyBlockProgress(this.player.getId(), pos, -1);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a87ea0f22b44c2fb67fd51bc8c9b0067aacac7de..6ea2a25789fe7f90dae7e3de7966c88f39e929a8 100644
+index 31be5462945287bff7e5c1a3c1f38d6a510ddeb0..ac41065d8b5bb9bdc4a37ec9978c12321f14c1bb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1668,6 +1668,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0267-Book-size-limits.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Book size limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6ea2a25789fe7f90dae7e3de7966c88f39e929a8..fb01e24ea6fd1d1f4beabb862c70332f92a80d78 100644
+index ac41065d8b5bb9bdc4a37ec9978c12321f14c1bb..02a36b6e276edbf6eb69e1bc213ee5bb93980bbe 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1117,6 +1117,44 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0274-Brigadier-Mojang-API.patch

@@ -119,7 +119,7 @@ index 6212d94503023f7bb5ca21785cbb69babe4421c3..642d5c6849debc5a266605b0df30d552
  
              if (commandnode2.canUse(source)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fb01e24ea6fd1d1f4beabb862c70332f92a80d78..ba10d147705d7d775999d94053cf47b5f481b905 100644
+index 02a36b6e276edbf6eb69e1bc213ee5bb93980bbe..6b1a58db2d521741eae45840d5fcb64884e5c377 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -778,19 +778,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0275-Limit-Client-Sign-length-more.patch

@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ba10d147705d7d775999d94053cf47b5f481b905..9f984834f3da2582f21172f2d52783ad3ff5c46d 100644
+index 6b1a58db2d521741eae45840d5fcb64884e5c377..859aa632d063cdd033b99c63b6f3e8837356ed45 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -310,6 +310,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0343-Fix-item-duplication-and-teleport-issues.patch

@@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e5c280df931fc712e41f4decfeb2871b870d2e4a..15d084e983e8cdfd00dda7fcc2d3c6fac9317cf2 100644
+index e5c280df931fc712e41f4decfeb2871b870d2e4a..c48f634fe80919cb1c2c4d2c1fd647dc63c87749 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2656,11 +2656,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -53,7 +53,7 @@ index e5c280df931fc712e41f4decfeb2871b870d2e4a..15d084e983e8cdfd00dda7fcc2d3c6fa
          } else {
 +            // Paper start - Fix item duplication and teleport issues
 +            if (this instanceof Leashable leashable) {
-+                leashable.dropLeash(true, true); // Paper drop lead
++                leashable.dropLeash(); // Paper drop lead
 +            }
 +            // Paper end - Fix item duplication and teleport issues
              entity.restoreFrom(this);
@@ -68,7 +68,7 @@ index e5c280df931fc712e41f4decfeb2871b870d2e4a..15d084e983e8cdfd00dda7fcc2d3c6fa
              Iterator iterator = this.getPassengers().iterator();
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 52a1581a301a3aa481b4fe4afc978b0e426e814b..9a4bcbfde22ea3c7761099152db8f793c01aedb5 100644
+index 52a1581a301a3aa481b4fe4afc978b0e426e814b..cd54ab0fed100bf1dd7261185ef0f4e5d4433aa7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1776,9 +1776,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -93,8 +93,8 @@ index 52a1581a301a3aa481b4fe4afc978b0e426e814b..9a4bcbfde22ea3c7761099152db8f793
 +        // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment
 +        org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, damageSource, this.drops, () -> {
 +            final LivingEntity entityliving = this.getKillCredit();
-+            if (this.deathScore >= 0 && entityliving != null) {
++            if (entityliving != null) {
-+                entityliving.awardKillScore(this, this.deathScore, damageSource);
++                entityliving.awardKillScore(this, damageSource);
 +            }
 +        }); // Paper end
          this.postDeathDropItems(deathEvent); // Paper

patches/server/0347-Prevent-teleporting-dead-entities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9f984834f3da2582f21172f2d52783ad3ff5c46d..e9e0a3d0958b309ca17322b11a6612be59ca41a6 100644
+index 859aa632d063cdd033b99c63b6f3e8837356ed45..517c215d47737c551125dec785de2896560f4cb0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1625,6 +1625,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0348-Implement-Mob-Goal-API.patch

@@ -18,10 +18,10 @@ index 221c7dace9950bd4e57299eeff46b2ee4cd05258..3be55cc6e95c02fb43d6e1cd13d05e4e
      testImplementation("org.hamcrest:hamcrest:2.2")
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..05e793e722bbb367ca64cd7f26156fa3dabb8474
+index 0000000000000000000000000000000000000000..36621b42f0dbca9d82a2ca284f30fd9eceab166e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-@@ -0,0 +1,380 @@
+@@ -0,0 +1,379 @@
 +package com.destroystokyo.paper.entity.ai;
 +
 +import com.destroystokyo.paper.entity.RangedEntity;
@@ -272,7 +272,6 @@ index 0000000000000000000000000000000000000000..05e793e722bbb367ca64cd7f26156fa3
 +        bukkitMap.put(net.minecraft.world.entity.animal.armadillo.Armadillo.class, org.bukkit.entity.Armadillo.class);
 +        bukkitMap.put(net.minecraft.world.entity.monster.Bogged.class, org.bukkit.entity.Bogged.class);
 +        bukkitMap.put(net.minecraft.world.entity.monster.creaking.Creaking.class, org.bukkit.entity.Creaking.class);
-+        bukkitMap.put(net.minecraft.world.entity.monster.creaking.CreakingTransient.class, org.bukkit.entity.CreakingTransient.class);
 +        bukkitMap.put(net.minecraft.world.entity.animal.AgeableWaterCreature.class, org.bukkit.entity.Squid.class); // close enough
 +    }
 +

patches/server/0362-Prevent-position-desync-causing-tp-exploit.patch

@@ -13,7 +13,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e9e0a3d0958b309ca17322b11a6612be59ca41a6..b7e3c15055681b916482503f6b2370b362863c9c 100644
+index 517c215d47737c551125dec785de2896560f4cb0..9229caf16997e8bd6da6fae1532372827ec80291 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1413,6 +1413,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0364-Add-PlayerRecipeBookClickEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b7e3c15055681b916482503f6b2370b362863c9c..71785d4b2204030dc718c10494840013d5ea72fa 100644
+index 9229caf16997e8bd6da6fae1532372827ec80291..8570b0ecd2a0db9bb02ebcd12bafa1af31bf4b45 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -201,6 +201,7 @@ import net.minecraft.world.phys.Vec3;

patches/server/0366-Add-permission-for-command-blocks.patch

@@ -18,7 +18,7 @@ index 4623c8acd125dff4919c4e2045b848310d785da5..86e4559da2344f228ef4d1c4ac3c115f
                  return false;
              } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 71785d4b2204030dc718c10494840013d5ea72fa..51e718812f2696f05824c735962aa885069d68e3 100644
+index 8570b0ecd2a0db9bb02ebcd12bafa1af31bf4b45..e3b238691a57e4d8317e84921f4c2e67ca994006 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -816,7 +816,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0367-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 <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 15d084e983e8cdfd00dda7fcc2d3c6fac9317cf2..54650ee682cc307a515e558cc2bd8041aeed01f0 100644
+index c48f634fe80919cb1c2c4d2c1fd647dc63c87749..3860265a50b62fbd36c9e1b32680c3b62d5342a6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -678,8 +678,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0368-Fix-Per-World-Difficulty-Remembering-Difficulty.patch

@@ -76,7 +76,7 @@ index fe1975675189c6d1a63c42b7959fa40b5ac95ef8..9a3e73a5c206b78dfcf6f41a47b61434
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 51e718812f2696f05824c735962aa885069d68e3..20d7b673df5e2def564c9b0daee1e943d7522deb 100644
+index e3b238691a57e4d8317e84921f4c2e67ca994006..bc0380322ea9acd055ce844f23c6e38815e31831 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3366,7 +3366,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0373-Do-not-accept-invalid-client-settings.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 20d7b673df5e2def564c9b0daee1e943d7522deb..d30febf2f37f2b9c864184f272d5949cbe2dc1e8 100644
+index bc0380322ea9acd055ce844f23c6e38815e31831..eab19d5ac362c4779e91fad0ede3e4c26f29ab01 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3352,6 +3352,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0377-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9a4bcbfde22ea3c7761099152db8f793c01aedb5..f592bee9f71580ec248e4b7485c938f3b83aeb9d 100644
+index cd54ab0fed100bf1dd7261185ef0f4e5d4433aa7..b742a42b2c86db79fb88399f40e8682afd600507 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3808,7 +3808,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0401-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch

@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d30febf2f37f2b9c864184f272d5949cbe2dc1e8..748458bf569e7b96fd7cea6bd8a29d1735eb7d25 100644
+index eab19d5ac362c4779e91fad0ede3e4c26f29ab01..0d7dae5fa79cd302d73d1be51d8bf908a816c4ca 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -680,7 +680,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -22,7 +22,7 @@ index d30febf2f37f2b9c864184f272d5949cbe2dc1e8..748458bf569e7b96fd7cea6bd8a29d17
              this.lastGoodY = this.awaitingPositionFromClient.y;
              this.lastGoodZ = this.awaitingPositionFromClient.z;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 54650ee682cc307a515e558cc2bd8041aeed01f0..65a7d4f564cd608af3829d09c1739eb933024691 100644
+index 3860265a50b62fbd36c9e1b32680c3b62d5342a6..e93f8a9eefc082d66d0e1804c98d0df7db914cd8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -180,6 +180,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0405-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 65a7d4f564cd608af3829d09c1739eb933024691..1bf13cf7aff50f8e67bba579228e5b63ba234421 100644
+index e93f8a9eefc082d66d0e1804c98d0df7db914cd8..56e4a5316e873c0a6fc3495bbfba6dc503cc9c9c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4760,4 +4760,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0407-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 1bf13cf7aff50f8e67bba579228e5b63ba234421..6970e85853954c240bc89407e2aaafdd888bc334 100644
+index 56e4a5316e873c0a6fc3495bbfba6dc503cc9c9c..7609a58979388cb62be7ae94a51cc14774464214 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4765,5 +4765,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0411-Fix-for-large-move-vectors-crashing-server.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 748458bf569e7b96fd7cea6bd8a29d1735eb7d25..8be41f7ea383a27331109813e04d807f38bf6736 100644
+index 0d7dae5fa79cd302d73d1be51d8bf908a816c4ca..1e6c8a23e892fc1c49da9538b435aa3eb0a28934 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -499,9 +499,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0432-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 6970e85853954c240bc89407e2aaafdd888bc334..b30bc225fe971aed01c7552f66e0c231cfc35d8c 100644
+index 7609a58979388cb62be7ae94a51cc14774464214..fc40880fadb20f7c274c94b1e6a2fa6d0118e672 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2219,6 +2219,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -44,7 +44,7 @@ index b8d57e25851dd7da905100dfd4022e4b99fd7f02..721321a19ce056f82de2bef44a8791dc
              } else if (entity1 instanceof Player && entity instanceof Player && !io.papermc.paper.configuration.GlobalConfiguration.get().collisions.enablePlayerCollisions) { // Paper - Configurable player collision
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f592bee9f71580ec248e4b7485c938f3b83aeb9d..d7e5c2d5935a86bab9987c36df8e1b957fe90ba0 100644
+index b742a42b2c86db79fb88399f40e8682afd600507..f025d36c8ae8606172e8166721f09c851784c3cc 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3722,7 +3722,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0435-Limit-recipe-packets.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8be41f7ea383a27331109813e04d807f38bf6736..bf4b64f07f21d816eb866d23b290c2f5e5471c70 100644
+index 1e6c8a23e892fc1c49da9538b435aa3eb0a28934..04de96af5415c3115703f5ab42e9fa3aa2ccee60 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -279,6 +279,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0443-MC-4-Fix-item-position-desync.patch

@@ -28,7 +28,7 @@ index 488ebd443903af812913437f1ade3002093f2470..a043ac10834562d357ef0b5aded2e916
  
      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 b30bc225fe971aed01c7552f66e0c231cfc35d8c..341cfedfb06ac0a18b8cca1df5aa4f72b1455737 100644
+index fc40880fadb20f7c274c94b1e6a2fa6d0118e672..64ea966438b0ec9d029b628543177b0faa2c259d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4505,6 +4505,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0449-Fix-interact-event-not-being-called-sometimes.patch

@@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes
 Co-authored-by: Moulberry <james.jenour@protonmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bf4b64f07f21d816eb866d23b290c2f5e5471c70..b0c32f22960ab7f809768037b5014536ef894af9 100644
+index 04de96af5415c3115703f5ab42e9fa3aa2ccee60..76b6c3fca13590f057dc4767d27fef4192974147 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1842,7 +1842,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0466-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 341cfedfb06ac0a18b8cca1df5aa4f72b1455737..e556788a7c5e38c6ed293d566f75ef6501b7464c 100644
+index 64ea966438b0ec9d029b628543177b0faa2c259d..fe7c8a3748627232508c6c9a366977345dda9ad7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2048,6 +2048,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0474-Expand-EntityUnleashEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expand EntityUnleashEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e556788a7c5e38c6ed293d566f75ef6501b7464c..a18e716a8c1c6f1fe23dcd3f4da033da95417e22 100644
+index fe7c8a3748627232508c6c9a366977345dda9ad7..627946dba408cea922614497c0c1b2b48a429f06 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2715,12 +2715,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0477-Add-EntityMoveEvent.patch

@@ -29,7 +29,7 @@ index e56f9e823f9460854c6f0f2f05422136c12aabba..de948bb8903c48e0431c1a46f5aac4fc
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d7e5c2d5935a86bab9987c36df8e1b957fe90ba0..2d3f418b5a7a5414ca5be8525146e480add51635 100644
+index f025d36c8ae8606172e8166721f09c851784c3cc..728004ca0c0e0ce40f2357ed8dc5f2a86b9cc50a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3638,6 +3638,20 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0492-Allow-using-signs-inside-spawn-protection.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b0c32f22960ab7f809768037b5014536ef894af9..01771669a8f6aa70d0dbf00fc7a65c7af6233129 100644
+index 76b6c3fca13590f057dc4767d27fef4192974147..26900978386bc97be6f224e9428fae051be6fc22 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1827,7 +1827,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0497-Don-t-ignore-result-of-PlayerEditBookEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 01771669a8f6aa70d0dbf00fc7a65c7af6233129..b24b6b93a3615c7aa95f64c13df983d7afc9b974 100644
+index 26900978386bc97be6f224e9428fae051be6fc22..7a38ddcfb2ee373e9464f486bf968210ef10dd1a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1219,7 +1219,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0500-Fix-PlayerItemConsumeEvent-cancelling-properly.patch

@@ -9,7 +9,7 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2d3f418b5a7a5414ca5be8525146e480add51635..509139ab9a3070c8c96d14fdc4d07bc229b41bd6 100644
+index 728004ca0c0e0ce40f2357ed8dc5f2a86b9cc50a..fc51c7ed9b60a307562c81475ef1cedcb1605798 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -4149,6 +4149,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0507-fix-PlayerItemHeldEvent-firing-twice.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b24b6b93a3615c7aa95f64c13df983d7afc9b974..3f5cd2a2c86daef6659ee9614a9efb26c6f1ce28 100644
+index 7a38ddcfb2ee373e9464f486bf968210ef10dd1a..7864d30a18c76f1170708192e7690cc7b50b15ef 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2014,6 +2014,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0524-Expand-PlayerGameModeChangeEvent.patch

@@ -134,7 +134,7 @@ index 546be40a8e4470fb5a6686072cdd342cdaa6fe15..e000a918230187f6841b03b7b0dd7368
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3f5cd2a2c86daef6659ee9614a9efb26c6f1ce28..774d087787067faee75d566e796d5b8c88a24f24 100644
+index 7864d30a18c76f1170708192e7690cc7b50b15ef..bfd38864cbb205f56a7c5da76990aca06f04a979 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2818,7 +2818,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0527-Move-range-check-for-block-placing-up.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 774d087787067faee75d566e796d5b8c88a24f24..1691d0c4d1e58bfd996a534076398bfdf7680dc1 100644
+index bfd38864cbb205f56a7c5da76990aca06f04a979..b0739538a19e6401111750f833f1b88846c06b49 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1814,6 +1814,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0530-Add-Unix-domain-socket-support.patch

@@ -87,7 +87,7 @@ index d6d7f1c446ba5507f67038ff27775ba75156f4a7..c63c194c44646e6bc1a5942655278701
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1691d0c4d1e58bfd996a534076398bfdf7680dc1..7557842ce2d6ca19277a99ab9de5356b11b526b2 100644
+index b0739538a19e6401111750f833f1b88846c06b49..5e809ac566834307ced0c56727c42fc712f026df 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2631,6 +2631,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0536-Add-PlayerKickEvent-causes.patch

@@ -229,7 +229,7 @@ index f8ae8c8eff73e4e87eb34d0f2635517f1688a6f1..59d20fd62e850a38380d877cef95ed69
          if (this.cserver.getServer().isRunning()) {
              this.cserver.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7557842ce2d6ca19277a99ab9de5356b11b526b2..022ccaf364da665f62c5ff428f0b419174558e3b 100644
+index 5e809ac566834307ced0c56727c42fc712f026df..8f1188bd5e9e1ae7e5318674038c2d7f87d743b7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -361,7 +361,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0545-Line-Of-Sight-Changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 509139ab9a3070c8c96d14fdc4d07bc229b41bd6..b7c854614643cc6fcb78ce7ac378f5dbbb8eb305 100644
+index fc51c7ed9b60a307562c81475ef1cedcb1605798..7ee81d5891d9d18566012cd72a516870f529628e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3913,7 +3913,8 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0550-Missing-Entity-API.patch

@@ -45,7 +45,7 @@ Co-authored-by: maxcom1 <46265094+maxcom1@users.noreply.github.com>
 Co-authored-by: TotalledZebra <Holappa57@gmail.com>
 
 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 05e793e722bbb367ca64cd7f26156fa3dabb8474..3470720466fc81f977c18e3a97bb918926025a22 100644
+index 36621b42f0dbca9d82a2ca284f30fd9eceab166e..d5d617d72c1d160564e3e53d3c6bdffe3d868145 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 @@ -164,7 +164,7 @@ public class MobGoalHelper {

patches/server/0554-Add-PlayerArmSwingEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 022ccaf364da665f62c5ff428f0b419174558e3b..dc9cbd4636bff0db6c7308482413a844c04d8526 100644
+index 8f1188bd5e9e1ae7e5318674038c2d7f87d743b7..176bf8692e19abe0a24df3be28431b438f465613 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2488,7 +2488,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0555-Fix-kick-event-leave-message-not-being-sent.patch

@@ -55,7 +55,7 @@ index 59d20fd62e850a38380d877cef95ed69cb46ecbd..fc242acade3ff06c9213428cde103cf0
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index dc9cbd4636bff0db6c7308482413a844c04d8526..94ecc56fb633ecc4ecbfb2f436fadaf2afbc7491 100644
+index 176bf8692e19abe0a24df3be28431b438f465613..fee3bcc109f77b2caaffe95c6bc181457018017d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1975,6 +1975,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0561-Prevent-AFK-kick-while-watching-end-credits.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 94ecc56fb633ecc4ecbfb2f436fadaf2afbc7491..7dfb5d176f88044f8416a2bff38b290d011de066 100644
+index fee3bcc109f77b2caaffe95c6bc181457018017d..b9eb462cf7603fb4afe365f6f094c784a5ee1137 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -398,7 +398,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0568-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 a18e716a8c1c6f1fe23dcd3f4da033da95417e22..ddb3d68f064d2dd82b42d0013c65f3685ef1065d 100644
+index 627946dba408cea922614497c0c1b2b48a429f06..20f613427d7521456e1a3609a7be2db50da56cd1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4118,20 +4118,34 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0575-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 ddb3d68f064d2dd82b42d0013c65f3685ef1065d..f9e52b8794d62cc79c420008a1a95707efa14321 100644
+index 20f613427d7521456e1a3609a7be2db50da56cd1..dbea0da4b2c0dda744a1995c779049d3d63351cb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3522,6 +3522,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0586-Add-Raw-Byte-Entity-Serialization.patch

@@ -7,7 +7,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f9e52b8794d62cc79c420008a1a95707efa14321..ee2625301ebb1dd601618ae43915891f3b57b7c3 100644
+index dbea0da4b2c0dda744a1995c779049d3d63351cb..ca0353307f6a1d937ec9663a19489135b9844963 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2284,6 +2284,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0590-Improve-and-expand-AsyncCatcher.patch

@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7dfb5d176f88044f8416a2bff38b290d011de066..7961fbf5c72dae1031ae583baee62a20587b177f 100644
+index b9eb462cf7603fb4afe365f6f094c784a5ee1137..740363cfeb7808994c7e3824163af7af7862fb15 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1651,6 +1651,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -29,7 +29,7 @@ index 7dfb5d176f88044f8416a2bff38b290d011de066..7961fbf5c72dae1031ae583baee62a20
          if (player.isRemoved()) {
              LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b7c854614643cc6fcb78ce7ac378f5dbbb8eb305..fb3cec13dd9e426904ce28a8755e6cc57296a42e 100644
+index 7ee81d5891d9d18566012cd72a516870f529628e..a5d3e5b402ca0a2e806a783304d43eac9dc142ad 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1143,7 +1143,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0603-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7961fbf5c72dae1031ae583baee62a20587b177f..7e46af4a325303df780a088ba8a0d8d4c719fa6b 100644
+index 740363cfeb7808994c7e3824163af7af7862fb15..88ba98aee07764e418edb9052075acea557ceec9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -758,6 +758,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0612-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 ee2625301ebb1dd601618ae43915891f3b57b7c3..9d95be758a905209eb1de9ee9d3b0f5af5b14074 100644
+index ca0353307f6a1d937ec9663a19489135b9844963..6457b529ce3dead642f4435c76c3e8a1e31023ba 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1938,6 +1938,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0618-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 9d95be758a905209eb1de9ee9d3b0f5af5b14074..6e0b22b81d25db7a8f98bbf0fc6b4b69f4a678fd 100644
+index 6457b529ce3dead642f4435c76c3e8a1e31023ba..7de1cd151d4ccea4b4f069cc50fc399038ce5de9 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 SyncedDataHolder, Nameable, EntityAccess

patches/server/0619-Prevent-excessive-velocity-through-repeated-crits.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fb3cec13dd9e426904ce28a8755e6cc57296a42e..dfa1e3548f9b48c20f28712ecb06310fe9c856f5 100644
+index a5d3e5b402ca0a2e806a783304d43eac9dc142ad..d46886a658c5058ba2c622daff96f5daf15ef3f3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2875,17 +2875,29 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0627-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 6e0b22b81d25db7a8f98bbf0fc6b4b69f4a678fd..17c8a369e5a09276a3918dfb2bb004441e35a8e0 100644
+index 7de1cd151d4ccea4b4f069cc50fc399038ce5de9..68b072415d312e22ef00da3689efcd4631934163 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3511,6 +3511,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0646-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 17c8a369e5a09276a3918dfb2bb004441e35a8e0..4784bfb23a7e0004287f89213d50bcfaaaed9e38 100644
+index 68b072415d312e22ef00da3689efcd4631934163..05a105cfc59bad7ca8fdf2355c6338cdff446d6a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -415,6 +415,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -46,7 +46,7 @@ index 17c8a369e5a09276a3918dfb2bb004441e35a8e0..4784bfb23a7e0004287f89213d50bcfa
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index dfa1e3548f9b48c20f28712ecb06310fe9c856f5..bb96b962439aa62954352f193b44f97d2e826373 100644
+index d46886a658c5058ba2c622daff96f5daf15ef3f3..77fc3086d5848fddf62f301bb4a2dfdaed8b3c3c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3621,7 +3621,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0665-More-Projectile-API.patch

@@ -521,7 +521,7 @@ index 6e2f91423371ead9890095cf4b1e2299c4dcba28..9d8f4b7176e60180565e3134a14ecf19
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 10a95c1a40597867ffd2974037bfed86dd6deda4..2028f9874e96a3b274528858d4149b04a075f256 100644
+index 10a95c1a40597867ffd2974037bfed86dd6deda4..9399df20ba14ad92379d5d2048e249883eaa8050 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -579,8 +579,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -546,7 +546,7 @@ index 10a95c1a40597867ffd2974037bfed86dd6deda4..2028f9874e96a3b274528858d4149b04
                  launch = new net.minecraft.world.entity.projectile.Arrow(world, this.getHandle(), new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.ARROW), null);
              }
 -            ((net.minecraft.world.entity.projectile.AbstractArrow) launch).shootFromRotation(this.getHandle(), this.getHandle().getXRot(), this.getHandle().getYRot(), 0.0F, 3.0F, 1.0F); // ItemBow
-+            ((net.minecraft.world.entity.projectile.AbstractArrow) launch).shootFromRotation(this.getHandle(), this.getHandle().getXRot(), this.getHandle().getYRot(), 0.0F, Trident.class.isAssignableFrom(projectile) ? net.minecraft.world.item.TridentItem.SHOOT_POWER : 3.0F, 1.0F); // ItemBow // Paper - see TridentItem
++            ((net.minecraft.world.entity.projectile.AbstractArrow) launch).shootFromRotation(this.getHandle(), this.getHandle().getXRot(), this.getHandle().getYRot(), 0.0F, Trident.class.isAssignableFrom(projectile) ? net.minecraft.world.item.TridentItem.PROJECTILE_SHOOT_POWER : 3.0F, 1.0F); // ItemBow // Paper - see TridentItem
          } else if (ThrownPotion.class.isAssignableFrom(projectile)) {
              if (LingeringPotion.class.isAssignableFrom(projectile)) {
                  launch = new net.minecraft.world.entity.projectile.ThrownPotion(world, this.getHandle(), new net.minecraft.world.item.ItemStack(Items.LINGERING_POTION));

patches/server/0667-Don-t-allow-vehicle-movement-from-players-while-tele.patch

@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7e46af4a325303df780a088ba8a0d8d4c719fa6b..1d2db5c0b1fbd98308659e878832cf7923b9eab0 100644
+index 88ba98aee07764e418edb9052075acea557ceec9..864ab4d3de50ee9ce9ff2b0538aa46df43985a84 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -491,6 +491,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0676-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 4784bfb23a7e0004287f89213d50bcfaaaed9e38..f2572fec8989911803cbcf1110e670b005ae29b0 100644
+index 05a105cfc59bad7ca8fdf2355c6338cdff446d6a..8cf1a2a4dbf1d26d17dc5b4f67a52f7df54dae81 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2833,7 +2833,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0688-Add-PlayerStopUsingItemEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bb96b962439aa62954352f193b44f97d2e826373..a35ee5cca91512a6b534140fe59df0f8355a097d 100644
+index 77fc3086d5848fddf62f301bb4a2dfdaed8b3c3c..91fc54b060d8ab5d8e60a09677afbe1b46798064 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -4210,6 +4210,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0696-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 f2572fec8989911803cbcf1110e670b005ae29b0..0ab366df0cdd6ccba64e355322ff134cce3b5f42 100644
+index 8cf1a2a4dbf1d26d17dc5b4f67a52f7df54dae81..36f82ba16f30fe4054b19e62a8157cf3d4d07671 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -729,6 +729,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0708-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 0ab366df0cdd6ccba64e355322ff134cce3b5f42..f030194e160123df6004c2d22f320e33fed00ed3 100644
+index 36f82ba16f30fe4054b19e62a8157cf3d4d07671..ad548e41740221fa5bb1aee6ba484e213bd1e779 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2698,6 +2698,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0710-More-Teleport-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] More Teleport API
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1d2db5c0b1fbd98308659e878832cf7923b9eab0..8bf268094c6034d8b90b0e4d1a5269cce9216cdc 100644
+index 864ab4d3de50ee9ce9ff2b0538aa46df43985a84..90eedcb1013226cd4dbbbaf4ff9332a89e6d7c96 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1639,11 +1639,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -30,7 +30,7 @@ index 1d2db5c0b1fbd98308659e878832cf7923b9eab0..8bf268094c6034d8b90b0e4d1a5269cc
              positionmoverotation = new PositionMoveRotation(CraftLocation.toVec3D(to), Vec3.ZERO, to.getYaw(), to.getPitch());
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 10fb64df10820974d11f142c102a11a5bd0f317c..8d2f6bb43fb69a4a1e2085960eb24f4397072499 100644
+index 10fb64df10820974d11f142c102a11a5bd0f317c..2335a3501399ea37d2fab2e5267712d7d174041b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -222,15 +222,36 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -72,7 +72,7 @@ index 10fb64df10820974d11f142c102a11a5bd0f317c..8d2f6bb43fb69a4a1e2085960eb24f43
  
          // Let the server handle cross world teleports
          if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) {
-@@ -971,6 +992,39 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -971,6 +992,35 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return CraftEntity.perm;
      }
  
@@ -88,10 +88,6 @@ index 10fb64df10820974d11f142c102a11a5bd0f317c..8d2f6bb43fb69a4a1e2085960eb24f43
 +
 +        world.loadChunksForMoveAsync(getHandle().getBoundingBoxAt(locationClone.getX(), locationClone.getY(), locationClone.getZ()),
 +            this instanceof CraftPlayer ? ca.spottedleaf.concurrentutil.util.Priority.HIGHER : ca.spottedleaf.concurrentutil.util.Priority.NORMAL, (list) -> {
-+                net.minecraft.server.level.ServerChunkCache chunkProviderServer = world.getChunkSource();
-+                for (net.minecraft.world.level.chunk.ChunkAccess chunk : list) {
-+                    chunkProviderServer.addTicketAtLevel(net.minecraft.server.level.TicketType.POST_TELEPORT, chunk.getPos(), 33, CraftEntity.this.getEntityId());
-+                }
 +                net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(() -> {
 +                    try {
 +                        ret.complete(CraftEntity.this.teleport(locationClone, cause, teleportFlags) ? Boolean.TRUE : Boolean.FALSE);

patches/server/0713-Send-block-entities-after-destroy-prediction.patch

@@ -57,7 +57,7 @@ index 5c3e5c348e6fececccd8097355f423b9e7ad982b..064a7a3e1c4d192010e072a5e985a541
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8bf268094c6034d8b90b0e4d1a5269cce9216cdc..196026e7f0689270d9c7320109c9f4fbe697f3d0 100644
+index 90eedcb1013226cd4dbbbaf4ff9332a89e6d7c96..aeaf2d4f7a0ad0621c210cd479c610104ec7a83b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1779,8 +1779,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0717-Collision-API.patch

@@ -22,10 +22,10 @@ index a7748f4b7c5a1630937c702b3fd5fded93793d64..a93a879117ee1eb06842242aa03f757a
      // 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 8d2f6bb43fb69a4a1e2085960eb24f4397072499..fc48a1de886d48da4cb384472f48cdba974034dd 100644
+index 2335a3501399ea37d2fab2e5267712d7d174041b..87edb57f843bd726e87403efa10e4287aa52e660 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1189,4 +1189,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1185,4 +1185,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.getHandle().noPhysics;
      }
      // Paper end - missing entity api

patches/server/0723-Stop-large-look-changes-from-crashing-the-server.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server
 Co-authored-by: Jaren Knodel <Jaren@Knodel.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a35ee5cca91512a6b534140fe59df0f8355a097d..2d914f94c7c667ecb934254649d32190c3e1633a 100644
+index 91fc54b060d8ab5d8e60a09677afbe1b46798064..28eb50111e524bce5aadb1dd2eea14a7df0105f2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3282,37 +3282,15 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0734-Fix-a-bunch-of-vanilla-bugs.patch

@@ -115,7 +115,7 @@ index 064a7a3e1c4d192010e072a5e985a54135748d87..a706f0855fdf88cc9aece3ba00ef574b
              this.player.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit
              this.level.updateSleepingPlayerList();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 196026e7f0689270d9c7320109c9f4fbe697f3d0..2fd7f959d3ad7e7f034ac883aacd638aed701e2b 100644
+index aeaf2d4f7a0ad0621c210cd479c610104ec7a83b..c078b3bc75e52456f458c7febc51ea6f8b29f737 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1889,7 +1889,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -319,6 +319,19 @@ index 8aab6f68f576fb022eb59798585e264f5aafbc69..edd6017937a7f20a1b43fa15204ec130
          super.setRemoved();
      }
  
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java
+index 476caf7fb4f0124daa35822f2161e11620f18621..b6f9aca593a66fd1e18ab2c4d1989c08824fa6b4 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java
+@@ -391,7 +391,7 @@ public final class TrialSpawner {
+     }
+ 
+     public void overrideEntityToSpawn(EntityType<?> entityType, Level world) {
+-        this.data.reset();
++        this.data.reset(this); // Paper
+         this.normalConfig = Holder.direct(((TrialSpawnerConfig) this.normalConfig.value()).withSpawning(entityType));
+         this.ominousConfig = Holder.direct(((TrialSpawnerConfig) this.ominousConfig.value()).withSpawning(entityType));
+         this.setState(world, TrialSpawnerState.INACTIVE);
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java
 index 2f808e5f3a5fb2b63f273f6da47292cfd9719bcc..f4ba1afe2f4dc528fc154258d8bc9e144794980f 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java

patches/server/0741-Add-entity-knockback-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2028f9874e96a3b274528858d4149b04a075f256..ed67bf4f30afa9dba604cc406b0a4fbe99dbb2b2 100644
+index 9399df20ba14ad92379d5d2048e249883eaa8050..5efa27ab1e03eed4b2b05c4ea667b536ebc110bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1146,4 +1146,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

patches/server/0749-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 f030194e160123df6004c2d22f320e33fed00ed3..107bb275b422cde0ff648176aa15573739a2c80b 100644
+index ad548e41740221fa5bb1aee6ba484e213bd1e779..0b55f92576a4257d210a53e9e77fcd573d558fc7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3351,6 +3351,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0755-check-global-player-list-where-appropriate.patch

@@ -24,7 +24,7 @@ index ee1b0bb6c6681c32b32ebf50e15e261a123beb1a..334b21a37196f4bf1046d9506c9a491d
 +    // Paper end - check global player list where appropriate
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2d914f94c7c667ecb934254649d32190c3e1633a..a69fbbbb38d1222d4e067550fa71a98beb4afb18 100644
+index 28eb50111e524bce5aadb1dd2eea14a7df0105f2..26c25f9ccd59922ced968abef41683c2b6b45e7d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3877,7 +3877,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0757-ItemStack-damage-API.patch

@@ -67,7 +67,7 @@ index 679112d1622744680b7d3c7d296acafac019d00a..63872104e7302dbbc9c482a4ed8a9a34
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index ed67bf4f30afa9dba604cc406b0a4fbe99dbb2b2..ad7f1adab37376814d01398b0fd469cbcc91ab3a 100644
+index 5efa27ab1e03eed4b2b05c4ea667b536ebc110bd..20b84c87ef0987f76a4932f45a7d1534a74a8c00 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1154,4 +1154,48 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

patches/server/0758-Friction-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Friction API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a69fbbbb38d1222d4e067550fa71a98beb4afb18..b2c94edf9e1161aa97aa56f4124d96bd6a9b42ce 100644
+index 26c25f9ccd59922ced968abef41683c2b6b45e7d..cdd94eb9b82bb22505461ae135d12914d7446b00 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -294,6 +294,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -199,7 +199,7 @@ index 1a291dd8a287db30e71dcb315599fc4b038764c4..30d62ee4d5cd2ddacb8783b5bbbf475d
      public int getHealth() {
          return this.getHandle().health;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index ad7f1adab37376814d01398b0fd469cbcc91ab3a..8bda60a24c25d7a529f8ef1c70ea2442f76e1bfe 100644
+index 20b84c87ef0987f76a4932f45a7d1534a74a8c00..812194dac108e446cd987c474ec6e582eaaed32b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1198,4 +1198,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

patches/server/0762-Player-Entity-Tracking-Events.patch

@@ -21,7 +21,7 @@ index 2d325c998e40a65af10d6adbb0dc304bea50e3d8..c1c2eeba0f5b8e499cc51cc1df7bf9ac
                  } 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 107bb275b422cde0ff648176aa15573739a2c80b..d484edbf30090d7b2167f2adafd5528bc3d76ccb 100644
+index 0b55f92576a4257d210a53e9e77fcd573d558fc7..827f141834ac903adca919f3514a468b7b6de089 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4106,7 +4106,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0767-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 fc48a1de886d48da4cb384472f48cdba974034dd..ca9cda9059a5c1dae1ca9ec09248768274d4e207 100644
+index 87edb57f843bd726e87403efa10e4287aa52e660..087bf6f78457308488d52db04cac32d3a9dec4a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -870,6 +870,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

patches/server/0768-Improve-logging-and-errors.patch

@@ -52,7 +52,7 @@ index 4e47611f85f3db6a638d0fc6a0dd712b245cf229..ebe6a002d883721d80cbfcc004064e8a
          }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2fd7f959d3ad7e7f034ac883aacd638aed701e2b..658796ce6d6398148ffee12f115e69a6e949e0e2 100644
+index c078b3bc75e52456f458c7febc51ea6f8b29f737..ce818321177df69ee81a9a237f2f44216ecea640 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3502,7 +3502,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0769-Improve-PortalEvents.patch

@@ -18,7 +18,7 @@ index a62e16b88a400c0715ddbdc33d25663303cc9103..a5eaac3fb6d949098a9fca20d9dbff59
              // Paper start - gateway-specific teleport event
              if (this.portalProcess != null && this.portalProcess.isSamePortal(((net.minecraft.world.level.block.EndGatewayBlock) net.minecraft.world.level.block.Blocks.END_GATEWAY)) && this.serverLevel().getBlockEntity(this.portalProcess.getEntryPosition()) instanceof net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity theEndGatewayBlockEntity) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d484edbf30090d7b2167f2adafd5528bc3d76ccb..b3036c121064af76f0d7cd538245a47801a3a738 100644
+index 827f141834ac903adca919f3514a468b7b6de089..1f9379ac11b15b564e70fcab655bc5e50b584e65 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3777,7 +3777,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0771-Add-missing-SpigotConfig-logCommands-check.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 Co-authored-by: david <mrminecraft00@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 658796ce6d6398148ffee12f115e69a6e949e0e2..3f4f3236522672552de106a5326b12e396355dc6 100644
+index ce818321177df69ee81a9a237f2f44216ecea640..0c7fa826ee3f7a0851b49487484eb2ca39d9fcd7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2139,7 +2139,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0774-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 b3036c121064af76f0d7cd538245a47801a3a738..bea167afbdd3a2f54b00c3abdb840014313fd239 100644
+index 1f9379ac11b15b564e70fcab655bc5e50b584e65..5b2341e07d66feb4a3975eb2eb6208306c3ebaa9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -977,6 +977,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0776-Use-single-player-info-update-packet-on-join.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3f4f3236522672552de106a5326b12e396355dc6..16cb1ed6b47972a6bf6e3324f50912792d76bdda 100644
+index 0c7fa826ee3f7a0851b49487484eb2ca39d9fcd7..2cd5ddcd99e77b6e28469a84d6b171b0c099819e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3540,7 +3540,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0777-Correctly-shrink-items-during-EntityResurrectEvent.patch

@@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem
 of undying was found and the event was called uncancelled.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b2c94edf9e1161aa97aa56f4124d96bd6a9b42ce..ff583a2c502f700b60cfe4a7fc341744d86f1c32 100644
+index cdd94eb9b82bb22505461ae135d12914d7446b00..1c67dafa4a54513d2f8febd13124ea5c976b313e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1683,7 +1683,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0781-Add-Entity-Body-Yaw-API.patch

@@ -5,10 +5,10 @@ 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 ca9cda9059a5c1dae1ca9ec09248768274d4e207..e65d1ca701d835db0ed45e627c92c1c5ed384887 100644
+index 087bf6f78457308488d52db04cac32d3a9dec4a8..38f8831306a0f9e623de27d1ff9ef26698859636 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1179,6 +1179,33 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1175,6 +1175,33 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      }
      // Paper end - entity powdered snow API
  
@@ -43,7 +43,7 @@ index ca9cda9059a5c1dae1ca9ec09248768274d4e207..e65d1ca701d835db0ed45e627c92c1c5
      @Override
      public boolean isInvisible() {  // Paper - moved up from LivingEntity
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 8bda60a24c25d7a529f8ef1c70ea2442f76e1bfe..c0055944fc769053141e6bb3d7db80cdd20651fd 100644
+index 812194dac108e446cd987c474ec6e582eaaed32b..cf388e227cd5893619ab5d05fee4a43c00ba0d9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1211,4 +1211,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

patches/server/0787-Fix-advancement-triggers-for-entity-damage.patch

@@ -23,7 +23,7 @@ index 2fb95271a161a30ce6f8ce40cc75470db3d03c4a..c838dc018fad67ae0a9b602a3b477aae
  
              return !this.getResponse();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ff583a2c502f700b60cfe4a7fc341744d86f1c32..94ade049fa74f1e9e417c891453f50b203fe9b6c 100644
+index 1c67dafa4a54513d2f8febd13124ea5c976b313e..4e0eb1f0103823a764c184142744a290c0ebed53 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2475,7 +2475,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0793-Treat-sequence-violations-like-they-should-be.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 16cb1ed6b47972a6bf6e3324f50912792d76bdda..b16e08834bc63260a56b33fbfb89a46c9971a042 100644
+index 2cd5ddcd99e77b6e28469a84d6b171b0c099819e..0545414171c65531a39d6c4f4f3ea669bd8214ee 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2058,6 +2058,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0794-Prevent-causing-expired-keys-from-impacting-new-join.patch

@@ -26,7 +26,7 @@ index ef33705588abf550e2b3d0bf795788516141b3df..6bfb83434a184e6fdba932f692281f03
          UPDATE_GAME_MODE((serialized, buf) -> serialized.gameMode = GameType.byId(buf.readVarInt()), (buf, entry) -> buf.writeVarInt(entry.gameMode().getId())),
          UPDATE_LISTED((serialized, buf) -> serialized.listed = buf.readBoolean(), (buf, entry) -> buf.writeBoolean(entry.listed())),
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b16e08834bc63260a56b33fbfb89a46c9971a042..888d41499c3a2186e4bd17d97372399f31d62ceb 100644
+index 0545414171c65531a39d6c4f4f3ea669bd8214ee..13b71e5572f68f5992bc95638c11a4f6a8e18099 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -307,6 +307,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0804-Refresh-ProjectileSource-for-projectiles.patch

@@ -14,7 +14,7 @@ clearing the owner.
 Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bea167afbdd3a2f54b00c3abdb840014313fd239..7fb2bfa378169fac65c4d889c8174fb5ed945c55 100644
+index 5b2341e07d66feb4a3975eb2eb6208306c3ebaa9..29804084c93af884aea92d25b05e9bf20b92b620 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -394,6 +394,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0812-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 c0055944fc769053141e6bb3d7db80cdd20651fd..c8422ceecc7ba3cb2e28616949790bf44cef7213 100644
+index cf388e227cd5893619ab5d05fee4a43c00ba0d9a..cbcd3563d1fda1038f9113da6ff88db9507a0f02 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -573,6 +573,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

patches/server/0818-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 7fb2bfa378169fac65c4d889c8174fb5ed945c55..e11893db9dbe2731e6e15860d51a485b0422094d 100644
+index 29804084c93af884aea92d25b05e9bf20b92b620..d3457d9576dcacb0adbcc1884a407d5b24680563 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1242,7 +1242,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0829-Implement-PlayerFailMoveEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 888d41499c3a2186e4bd17d97372399f31d62ceb..b0184fffd9703c6f9a89f6614d6c176a484a471a 100644
+index 13b71e5572f68f5992bc95638c11a4f6a8e18099..ed68a02dc3f3265b3a2c911767186a1268ea7212 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1325,8 +1325,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0830-Folia-scheduler-and-owned-region-API.patch

@@ -1185,7 +1185,7 @@ index 7da3e315de67f3273997ce9160995183a3a1ce71..3a6e918e9db6397b6f1cff5310416552
          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 e11893db9dbe2731e6e15860d51a485b0422094d..293994cb737af5f55ff9bab9fb6b09aca2d75c44 100644
+index d3457d9576dcacb0adbcc1884a407d5b24680563..c7292ddae2a2cb11434a6962706bc2a8dd5d2cdc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -263,10 +263,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1342,7 +1342,7 @@ index 5c907eca23d936ba3095f2d81256775edaa737da..4c4fa7bbafb075beb0d9c1ef21e3ba2d
          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 e65d1ca701d835db0ed45e627c92c1c5ed384887..211726898275788e593002a279bf007c916de4de 100644
+index 38f8831306a0f9e623de27d1ff9ef26698859636..f3788ae79abfb1dd82a5c638d9b7850c7006b658 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -71,6 +71,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

patches/server/0843-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 211726898275788e593002a279bf007c916de4de..547a485559b40411c2e91fecd3e83075dfc80241 100644
+index f3788ae79abfb1dd82a5c638d9b7850c7006b658..56a3c69bb37b90b7af6590027a80d20f4812bef4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1259,4 +1259,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1255,4 +1255,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return !this.getHandle().level().noCollision(this.getHandle(), aabb);
      }
      // Paper end - Collision API

patches/server/0845-Don-t-tab-complete-namespaced-commands-if-send-names.patch

@@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player
 requests tab-complete only commands.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b0184fffd9703c6f9a89f6614d6c176a484a471a..5674852a8be42c4a411858ad3b55dbfa0e5254c6 100644
+index ed68a02dc3f3265b3a2c911767186a1268ea7212..a2c404e4cd808a3a676ae3808852e4105bdc9af4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -830,6 +830,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0849-Add-Listing-API-for-Player.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add Listing API for Player
 
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java
-index 6bfb83434a184e6fdba932f692281f0303ada65f..8074d7e84a2f3f868920392896828b31bb90bd5d 100644
+index 6bfb83434a184e6fdba932f692281f0303ada65f..e2541a3886504b143f858a4e75ac4746d4d39e28 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java
 @@ -38,6 +38,17 @@ public class ClientboundPlayerInfoUpdatePacket implements Packet<ClientGamePacke
@@ -78,7 +78,7 @@ index 6bfb83434a184e6fdba932f692281f0303ada65f..8074d7e84a2f3f868920392896828b31
          }
 +        // Paper start - Add Listing API for Player
 +        Entry(UUID profileId, boolean listed) {
-+            this(profileId, null, listed, 0, GameType.DEFAULT_MODE, null, 0, null);
++            this(profileId, null, listed, 0, GameType.DEFAULT_MODE, null, true, 0, null);
 +        }
 +        // Paper end - Add Listing API for Player
      }

patches/server/0853-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 293994cb737af5f55ff9bab9fb6b09aca2d75c44..e47440d9b166b1d3512ab84e1427828cf0fb81f8 100644
+index c7292ddae2a2cb11434a6962706bc2a8dd5d2cdc..aa317a143e2c38a0385a83651a78403401a75d9e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -428,6 +428,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -25,7 +25,7 @@ index 293994cb737af5f55ff9bab9fb6b09aca2d75c44..e47440d9b166b1d3512ab84e1427828c
          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 547a485559b40411c2e91fecd3e83075dfc80241..7cd929d4b9ab60a585c2316b949fce2a0e97e467 100644
+index 56a3c69bb37b90b7af6590027a80d20f4812bef4..27c8850f874040ba00fa4c226ca0662261451826 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -895,6 +895,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

patches/server/0855-Add-PlayerPickItemEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5674852a8be42c4a411858ad3b55dbfa0e5254c6..9230afb0c75133a51e99545b160333ace6036075 100644
+index a2c404e4cd808a3a676ae3808852e4105bdc9af4..755b43f5b247361f234430e1fd40a662415540c3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -994,15 +994,24 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0860-Fix-slot-desync.patch

@@ -22,7 +22,7 @@ index a5eaac3fb6d949098a9fca20d9dbff59c56773ed..bfaf2cc79afebb0b51f6eb7081de2230
          this.containerMenu.findSlot(this.getInventory(), this.getInventory().selected).ifPresent(s -> {
              this.containerSynchronizer.sendSlotChange(this.containerMenu, s, this.getMainHandItem());
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9230afb0c75133a51e99545b160333ace6036075..4db3e4f87487428e598046b953d083f3323cf9f1 100644
+index 755b43f5b247361f234430e1fd40a662415540c3..c892e12ea0d6408bde20402f18868d4d3f3e4f65 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2812,10 +2812,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -40,7 +40,7 @@ index 9230afb0c75133a51e99545b160333ace6036075..4db3e4f87487428e598046b953d083f3
  
                                  if (event.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e47440d9b166b1d3512ab84e1427828cf0fb81f8..efe093a1215386d5ff69c15170a841ea4f3a52b4 100644
+index aa317a143e2c38a0385a83651a78403401a75d9e..1c070437ef763b56791d61b8c36e623c3dc80649 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2783,8 +2783,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0865-Add-slot-sanity-checks-in-container-clicks.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add slot sanity checks in container clicks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4db3e4f87487428e598046b953d083f3323cf9f1..50c4ecabdea7dafbb7ecdf226cac7d55a50b9e64 100644
+index c892e12ea0d6408bde20402f18868d4d3f3e4f65..76fdf92b933b5fbb21eb511932fdf8e299a44377 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3075,6 +3075,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0886-Broadcast-take-item-packets-with-collector-as-source.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Broadcast take item packets with collector as source
 This fixes players (which can't view the collector) seeing item pickups with themselves as the target.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 94ade049fa74f1e9e417c891453f50b203fe9b6c..66c9df4085d004b8a83ce0da954b380c7e5085a6 100644
+index 4e0eb1f0103823a764c184142744a290c0ebed53..70574115423d95c9efabf77e4113e65e81f8c0d1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3903,7 +3903,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0892-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 7cd929d4b9ab60a585c2316b949fce2a0e97e467..2b1f3e27ce5cecc94297c27debe5e3bd64c08967 100644
+index 27c8850f874040ba00fa4c226ca0662261451826..71dfa030136492bfb03bfedc4f0d36eef5d67856 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -259,6 +259,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

patches/server/0894-Don-t-fire-sync-events-during-worldgen.patch

@@ -31,7 +31,7 @@ index 1197788c4e0cc8740e69cfcc36d731bf6bc9fcb1..97f1722ed5566dcb8c7e0ccdefea1f89
          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 efe093a1215386d5ff69c15170a841ea4f3a52b4..a84e80f53418a759de5e4e364be6530e0996fd1b 100644
+index 1c070437ef763b56791d61b8c36e623c3dc80649..ea4a31e08452a311798ace8554cfa16e41acf15c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -632,7 +632,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -68,7 +68,7 @@ index 979c99851ccb363d889069bafa5b5f7eb6b1a436..2cd74db8e3c51c97a2abcb801bb5c15c
          }, () -> {
              EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 66c9df4085d004b8a83ce0da954b380c7e5085a6..e723098bbba695e6919c5d0cc185dfb710f52606 100644
+index 70574115423d95c9efabf77e4113e65e81f8c0d1..1618c415f5f9b356206f0e2f1474545f31dfbb01 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1159,6 +1159,11 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0897-Restore-vanilla-entity-drops-behavior.patch

@@ -37,7 +37,7 @@ index 4c49a7a5dc702e1ab2d1b12f41af7c9ce1368e06..d82a22d9ef5a7f649d424c01e88a1209
          loot.addAll(this.drops);
          this.drops.clear(); // SPIGOT-5188: make sure to clear
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a84e80f53418a759de5e4e364be6530e0996fd1b..7c102523d44fd07d3d31b09203e36ab3b9ef472f 100644
+index ea4a31e08452a311798ace8554cfa16e41acf15c..c5724826fade3ade6fea3d4f6173b46fdeaf9679 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2704,19 +2704,45 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -89,7 +89,7 @@ index a84e80f53418a759de5e4e364be6530e0996fd1b..7c102523d44fd07d3d31b09203e36ab3
              return this.spawnAtLocation(world, entityitem);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e723098bbba695e6919c5d0cc185dfb710f52606..5d879efbb460ecca9a8ffc570d384a96898dada1 100644
+index 1618c415f5f9b356206f0e2f1474545f31dfbb01..d32e5b1aa7549751e192b79c238c1832d6e9e605 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -287,7 +287,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0901-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch

@@ -26,7 +26,7 @@ index c6dcc37ac5fcf50bcb246f533b99983dfc5c19c2..c13b6f14c3061710c2b27034db240cc9
                  d3 = to.getX();
                  d4 = to.getY();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5d879efbb460ecca9a8ffc570d384a96898dada1..23c9ef6dd0bb73bcf6af0e9b581bad72abe8bf22 100644
+index d32e5b1aa7549751e192b79c238c1832d6e9e605..2715ba6325ecf82dee237bb53372e3aac3972112 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -4371,7 +4371,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0905-Validate-ResourceLocation-in-NBT-reading.patch

@@ -85,7 +85,7 @@ index 68b869c5d76aeb390a05b053eef70486bd4126fd..48f89ec0f02b85092d03fddeec961f1e
              if (nbt.contains("leash", 11)) {
                  Either<UUID, BlockPos> either = (Either) NbtUtils.readBlockPos(nbt, "leash").map(Either::right).orElse(null); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 23c9ef6dd0bb73bcf6af0e9b581bad72abe8bf22..b5b156b9f7a4a0d43715fe82957864bebf1cceb2 100644
+index 2715ba6325ecf82dee237bb53372e3aac3972112..95c2e2d73aefcf7c436fad3066e1fedc7299faa1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -909,11 +909,13 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0912-Add-api-for-spawn-egg-texture-colors.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add api for spawn egg texture colors
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 066d8f0592fa4fc9886eab7ca1ba1151b3748b95..663d3a2e4f2eb4d30a0fbde2a05445cf3ed88810 100644
+index 066d8f0592fa4fc9886eab7ca1ba1151b3748b95..44abd5742f2682b6224d6de90d52312000d20429 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -637,6 +637,15 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -637,6 +637,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
      }
      // Paper end
  
@@ -17,7 +17,10 @@ index 066d8f0592fa4fc9886eab7ca1ba1151b3748b95..663d3a2e4f2eb4d30a0fbde2a05445cf
 +    public org.bukkit.Color getSpawnEggLayerColor(final EntityType entityType, final int layer) {
 +        final net.minecraft.world.entity.EntityType<?> nmsType = org.bukkit.craftbukkit.entity.CraftEntityType.bukkitToMinecraft(entityType);
 +        final net.minecraft.world.item.SpawnEggItem eggItem = net.minecraft.world.item.SpawnEggItem.byId(nmsType);
-+        return eggItem == null ? null : org.bukkit.Color.fromRGB(eggItem.getColor(layer));
++        if (eggItem != null) {
++            throw new UnsupportedOperationException("Not yet implemented");
++        }
++        return eggItem == null ? null : org.bukkit.Color.fromRGB(1); // TODO
 +    }
 +    // Paper end - spawn egg color visibility
 +

patches/server/0913-Add-Lifecycle-Event-system.patch

@@ -743,10 +743,10 @@ index eaea08530ca864158a2fa15dca38ca0c25a49bde..b4a823a62d7088262b7f799c977aec71
          this.reloadCount++;
          this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 663d3a2e4f2eb4d30a0fbde2a05445cf3ed88810..4bec6593dbda01199c8d13515c4c2ae7f489438d 100644
+index 44abd5742f2682b6224d6de90d52312000d20429..0debfd0f95c063566280556dbd755c717e3aa266 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -646,6 +646,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -649,6 +649,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
      }
      // Paper end - spawn egg color visibility
  

patches/server/0914-ItemStack-Tooltip-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack Tooltip API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 4bec6593dbda01199c8d13515c4c2ae7f489438d..565b2474a7f511d1635aa80b7f1eaa6452b0f2a2 100644
+index 0debfd0f95c063566280556dbd755c717e3aa266..0e2d9de778e9747d0c2ab897d36c623d2ffbeb95 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -635,6 +635,19 @@ public final class CraftMagicNumbers implements UnsafeValues {

patches/server/0922-Add-CartographyItemEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add CartographyItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 50c4ecabdea7dafbb7ecdf226cac7d55a50b9e64..478911bb39e276e7734b4a82f1c0fa38d43e30df 100644
+index 76fdf92b933b5fbb21eb511932fdf8e299a44377..e9478fed28995a3ce5527e80232203eed503104c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3197,6 +3197,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl