Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@2a4aef3 Mark ChatRender#render as ApiStatus.Override PaperMC/Paper@f5b9e07 Add GameEvent tags (#6439) PaperMC/Paper@b173c3e Use access transformers for player profile API (#7468) PaperMC/Paper@286bd1b 1.18 misc performance dev branch (#7368) PaperMC/Paper@5bb4549 Fix entity armor not showing on death animation (#7355)
2026-02-17 08:27:43 +01:00 · 2022-02-18 20:06:35 -06:00
parent d0ea018612
commit 5ad7f4bd90
36 changed files with 101 additions and 99 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -67,7 +67,6 @@ paperweight {
    decompileRepo.set("https://files.minecraftforge.net/maven/")

    usePaperUpstream(providers.gradleProperty("paperCommit")) {
-        url.set(github("PurpurMC", "Paper"))
        withPaperPatcher {
            apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
            apiOutputDir.set(layout.projectDirectory.dir("Purpur-API"))
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.18.1-R0.1-SNAPSHOT
 mcVersion = 1.18.1
 packageVersion = 1_18_R1

-paperCommit = b19e67928792d92035b17b1a62dba95fbe8c6c9e
+paperCommit = 5bb4549f48bf823487f1cb697d8973afad2aa584

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/api/0005-Purpur-client-support.patch
+++ b/patches/api/0005-Purpur-client-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 131daee2b29f7016463a00ce7927dff7b0a1b1b4..6a3c22efa63133b8144b8a20e591c30ae00ab7d2 100644
+index 5c1b8f35f22ae10a17d78ece95c49de44f58976d..468938dc2589cca72266b33e49284ce8e9ba8854 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2652,4 +2652,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2668,4 +2668,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
     @Override
     Spigot spigot();
     // Spigot end
--- a/patches/api/0010-AFK-API.patch
+++ b/patches/api/0010-AFK-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6a3c22efa63133b8144b8a20e591c30ae00ab7d2..75680d1b3bd7640ae9f72ec7b0b794689e7c2cb6 100644
+index 468938dc2589cca72266b33e49284ce8e9ba8854..ae1b74a9ecfb028761439476141069c9e2fa6f26 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2660,5 +2660,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2676,5 +2676,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      * @return True if Player uses Purpur Client
      */
     public boolean usesPurpurClient();
--- a/patches/api/0017-Player-invulnerabilities.patch
+++ b/patches/api/0017-Player-invulnerabilities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 75680d1b3bd7640ae9f72ec7b0b794689e7c2cb6..b07e6709531595b7241ef54754f2450d4561c463 100644
+index ae1b74a9ecfb028761439476141069c9e2fa6f26..fa81050f3c16c5bf0ab4a7e1271e98a6f7a3ebfc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2679,5 +2679,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2695,5 +2695,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      * Reset the idle timer back to 0
      */
     void resetIdleTimer();
--- a/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch
+++ b/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch
@@ -924,10 +924,10 @@ index 1dcc2c8f4899da029af8b1c1b2ff1b5e368e82c1..c5f49f3f82fd259a1c795b59e83c3d9f
 
         NORMAL(false),
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b07e6709531595b7241ef54754f2450d4561c463..68fb6c2a92e27b42703c00139df7f88eafa74652 100644
+index fa81050f3c16c5bf0ab4a7e1271e98a6f7a3ebfc..621b8c31f0a326341ab1ad53afd79e7926ca7282 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2482,6 +2482,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2498,6 +2498,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
     void resetCooldown();
 
     /**
@@ -936,7 +936,7 @@ index b07e6709531595b7241ef54754f2450d4561c463..68fb6c2a92e27b42703c00139df7f88e
      * @return the client option value of the player
      */
     @NotNull
-@@ -2513,6 +2515,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2529,6 +2531,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
     // Paper end
 
     // Spigot start
--- a/patches/api/0037-Flying-Fall-Damage-API.patch
+++ b/patches/api/0037-Flying-Fall-Damage-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 3383aab3f98f089425c9db10057533dff28cc8d4..6e95dbe19df37b67dfb497e0ac37bfeccdcbd38c 100644
+index c98a47dd5109a021b7a7a7d069285a80d302fccc..c0a2c64c6e15a5aa6e70a449b76a9fd0f2796555 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2705,5 +2705,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2721,5 +2721,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      * @param invulnerableTicks Invulnerable ticks remaining
      */
     void setSpawnInvulnerableTicks(int invulnerableTicks);
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -111,7 +111,7 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..f2fe6ea3719ff8b2913b7a3a939d7a5b
                 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                     Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 4a14eb59541347aa8e9504ac156e9b63d1bdfd69..499d5d5a35323571571911969cc9bac3b90cec99 100644
+index 153f07bac06093b43a1f5b0f8e1a46ffbe6407e5..638cffa552d804d5901e1d099691fdfa4c65a7a7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -232,6 +232,15 @@ public class PaperConfig {
@@ -2173,7 +2173,7 @@ index 7bddc7517356cc74104dcc5c7c55522a53f2596f..d6a57cdad2c92521a800cb18d060d9d6
 
     public static long getCoordinateKey(final ChunkPos pair) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 887243394fc2578fbcfd3dd150921e221f2d8475..3ec35d19f63832ee465a54518219184a14bb08e2 100644
+index 1674deebbeab0995ed7acacf8052e1daf4d2a7bc..a31f8bf3f4183a7a02f58f2321dbeaf427017b1c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -310,6 +310,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2185,7 +2185,7 @@ index 887243394fc2578fbcfd3dd150921e221f2d8475..3ec35d19f63832ee465a54518219184a
 
     public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
         AtomicReference<S> atomicreference = new AtomicReference();
-@@ -1713,7 +1715,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1710,7 +1712,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
     @DontObfuscate
     public String getServerModName() {
@@ -2194,7 +2194,7 @@ index 887243394fc2578fbcfd3dd150921e221f2d8475..3ec35d19f63832ee465a54518219184a
     }
 
     public SystemReport fillSystemReport(SystemReport details) {
-@@ -2247,6 +2249,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2244,6 +2246,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     }
 
     public ProfilerFiller getProfiler() {
@@ -2765,7 +2765,7 @@ index 419a7e9614af2328ed401fc954196056243a984c..9bc568a2b0df13f55ee8670839b9e6a6
     public final String id;
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 25338fe4cfdc683ca4c01487e166a1649c6f640b..3236a1dc51c394b784d3f42b78e76bf7c2f69c37 100644
+index 9822d163a9e4d6ac8240c18a7082e911788d0948..6f98681ac54f575be047867a8c0b58e1dbd2a37d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -139,7 +139,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -2802,7 +2802,7 @@ index 25338fe4cfdc683ca4c01487e166a1649c6f640b..3236a1dc51c394b784d3f42b78e76bf7
     @Override
     public boolean hurt(DamageSource source, float amount) {
         if (this.isInvulnerableTo(source)) {
-@@ -1839,6 +1846,20 @@ public abstract class LivingEntity extends Entity {
+@@ -1848,6 +1855,20 @@ public abstract class LivingEntity extends Entity {
         return this.lastClimbablePos;
     }
 
@@ -2823,7 +2823,7 @@ index 25338fe4cfdc683ca4c01487e166a1649c6f640b..3236a1dc51c394b784d3f42b78e76bf7
     public boolean onClimbable() {
         if (this.isSpectator()) {
             return false;
-@@ -3536,7 +3557,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3545,7 +3566,10 @@ public abstract class LivingEntity extends Entity {
             Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
 
             // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
@@ -2836,7 +2836,7 @@ index 25338fe4cfdc683ca4c01487e166a1649c6f640b..3236a1dc51c394b784d3f42b78e76bf7
     }
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 031660f7d0ea270f87e5174a4fe65ccad1f7a561..35ff7abd8251b0af6c23fbb63804db632ec5b85d 100644
+index 850a4f8a9bd1dc30b13205e158fcbfaa872d6157..73af374f4aa9e3e8f188434c21a5f1433cffc637 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -206,14 +206,16 @@ public abstract class Mob extends LivingEntity {
@@ -4136,7 +4136,7 @@ index e387de8adc480eac27b58b6f3f0d331ffc4382f1..6dba9d6bb7b81fe176cc0fabbb60b554
 
     @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f0629cac377b29246e990a01d60601270cbd77bd..b187f42dc41838b8119b29204368a8b5a7e18de5 100644
+index dbbae437123163c60c3f60a48043967a8adbd124..e62a643990929dccf1c022a3c9eca12d08d5ca7d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper
--- a/patches/server/0002-Rebrand.patch
+++ b/patches/server/0002-Rebrand.patch
@@ -167,7 +167,7 @@ index cc0576e8e5e1dc77c22856f0f9c4376b6bf36677..6654c5a547cb49bce98d6b0feed9a245
         stringbuilder.append(CrashReport.getErrorComment());
         stringbuilder.append("\n\n");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3ec35d19f63832ee465a54518219184a14bb08e2..596a130a94865806b0b2340d303b25fae71986b7 100644
+index a31f8bf3f4183a7a02f58f2321dbeaf427017b1c..365a3a60e41a28106e7373d23743ed72e91c187b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1021,7 +1021,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -179,7 +179,7 @@ index 3ec35d19f63832ee465a54518219184a14bb08e2..596a130a94865806b0b2340d303b25fa
             while (this.getRunningThread().isAlive()) {
                 this.getRunningThread().stop();
                 try {
-@@ -1715,7 +1715,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1712,7 +1712,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
     @DontObfuscate
     public String getServerModName() {
@@ -221,7 +221,7 @@ index 4502362ff3c43eac489125deee59c66d76204e98..c6267659e8ff73e59d2a4992aa67f86c
 
     private static final int DEFAULT_SIZE_THRESHOLD = 1024 * 8;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b187f42dc41838b8119b29204368a8b5a7e18de5..c47bbbdaf75b9691ce2f8436afe3eda431e76ae5 100644
+index e62a643990929dccf1c022a3c9eca12d08d5ca7d..5690198dabdcc92bb9f8bd20bea830179e10cea8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper
--- a/patches/server/0003-Purpur-config-files.patch
+++ b/patches/server/0003-Purpur-config-files.patch
@@ -105,7 +105,7 @@ index 4f8b2617adc0013035cc0ca72bf1b83eb5c18c6c..7d2cc5bbeda115bae0b2cdfa89893a75
         this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c47bbbdaf75b9691ce2f8436afe3eda431e76ae5..8015ed84e3e37ef0c8377bad66c5658a0279853a 100644
+index 5690198dabdcc92bb9f8bd20bea830179e10cea8..15227fd4bdd53630dab390e94001734d04c2143a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -957,6 +957,7 @@ public final class CraftServer implements Server {
@@ -132,7 +132,7 @@ index c47bbbdaf75b9691ce2f8436afe3eda431e76ae5..8015ed84e3e37ef0c8377bad66c5658a
         this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
         this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
 
-@@ -2688,6 +2691,18 @@ public final class CraftServer implements Server {
+@@ -2701,6 +2704,18 @@ public final class CraftServer implements Server {
             return com.destroystokyo.paper.PaperConfig.config;
         }
 
--- a/patches/server/0004-Purpur-client-support.patch
+++ b/patches/server/0004-Purpur-client-support.patch
@@ -43,10 +43,10 @@ index b9f2f6713bd9e3431ddbf2a41f16cbda5739ef57..f579bcfd222025ca9bc5b0f0f8b168d3
             try {
                 byte[] data = new byte[packet.data.readableBytes()];
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2088b708d7ed7af8de0df31493084d8fcfed8a70..b1540e8bb9332506dbd5762024202414a173c621 100644
+index ef841a5ea1f634e87e5437faf83dc00efd590106..b35a09b635315cce408a86f7fb6dbad7911116ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2693,4 +2693,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2714,4 +2714,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         return this.spigot;
     }
     // Spigot end
--- a/patches/server/0006-Ridables.patch
+++ b/patches/server/0006-Ridables.patch
@@ -22,10 +22,10 @@ index 14610e6144ec144ebbec6fb0945c67bb0ea86795..6833eb5dc7aa64bef1b3b38de5e282bd
         super(x, y, z);
     }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 596a130a94865806b0b2340d303b25fae71986b7..f7e76dc842ac226b94ba552ad412cf0dba149394 100644
+index 365a3a60e41a28106e7373d23743ed72e91c187b..d9623b26440274f0f84c59c74315ae698d809893 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1593,6 +1593,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1590,6 +1590,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
             ServerLevel worldserver = (ServerLevel) iterator.next();
             worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
             worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -34,7 +34,7 @@ index 596a130a94865806b0b2340d303b25fae71986b7..f7e76dc842ac226b94ba552ad412cf0d
 
             this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 59d57108f38f38e03cd8b69a53c3e9d40179599a..2d2c1ac2c40605e9a6228c81e5e50a31a3e2c4af 100644
+index 740e1d7b299e78668bff5b176bbe54f478c73fd3..c0c180174a90bb007ea21f86b6713ce1df1fd8e1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -211,6 +211,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -201,7 +201,7 @@ index 645c1dc9bd09b135a641759c76ce8d957b9bd488..912767ed261e44c0192c5a07e2c20261
     protected ParticleOptions getInkParticle() {
         return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3236a1dc51c394b784d3f42b78e76bf7c2f69c37..d1b85bbb53912bacc42ffb8962e2c3fed1b33d26 100644
+index 6f98681ac54f575be047867a8c0b58e1dbd2a37d..eb9830104fb1c46ccce7b0f5e7c6ab66ecb6c809 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -216,9 +216,9 @@ public abstract class LivingEntity extends Entity {
@@ -234,7 +234,7 @@ index 3236a1dc51c394b784d3f42b78e76bf7c2f69c37..d1b85bbb53912bacc42ffb8962e2c3fe
 
     @Override
     protected void checkFallDamage(double heightDifference, boolean onGround, BlockState landedState, BlockPos landedPosition) {
-@@ -2604,7 +2605,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2613,7 +2614,7 @@ public abstract class LivingEntity extends Entity {
     }
 
     protected long lastJumpTime = 0L; // Paper
@@ -243,7 +243,7 @@ index 3236a1dc51c394b784d3f42b78e76bf7c2f69c37..d1b85bbb53912bacc42ffb8962e2c3fe
         double d0 = (double) this.getJumpPower() + this.getJumpBoostPower();
         Vec3 vec3d = this.getDeltaMovement();
         // Paper start
-@@ -3346,8 +3347,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3355,8 +3356,10 @@ public abstract class LivingEntity extends Entity {
         this.pushEntities();
         this.level.getProfiler().pop();
         // Paper start
@@ -256,7 +256,7 @@ index 3236a1dc51c394b784d3f42b78e76bf7c2f69c37..d1b85bbb53912bacc42ffb8962e2c3fe
                 Location from = new Location(this.level.getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
                 Location to = new Location (this.level.getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
                 io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
-@@ -3357,6 +3360,21 @@ public abstract class LivingEntity extends Entity {
+@@ -3366,6 +3369,21 @@ public abstract class LivingEntity extends Entity {
                     absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
                 }
             }
@@ -279,7 +279,7 @@ index 3236a1dc51c394b784d3f42b78e76bf7c2f69c37..d1b85bbb53912bacc42ffb8962e2c3fe
         // Paper end
         if (!this.level.isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 35ff7abd8251b0af6c23fbb63804db632ec5b85d..dcf788de63b819abc668cc6deba974af26a41f2e 100644
+index 73af374f4aa9e3e8f188434c21a5f1433cffc637..9956c5c69ee967c3cfab76d1dc31c9454ec61036 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -141,8 +141,8 @@ public abstract class Mob extends LivingEntity {
@@ -293,7 +293,7 @@ index 35ff7abd8251b0af6c23fbb63804db632ec5b85d..dcf788de63b819abc668cc6deba974af
         this.jumpControl = new JumpControl(this);
         this.bodyRotationControl = this.createBodyControl();
         this.navigation = this.createNavigation(world);
-@@ -1306,7 +1306,7 @@ public abstract class Mob extends LivingEntity {
+@@ -1310,7 +1310,7 @@ public abstract class Mob extends LivingEntity {
     protected void onOffspringSpawnedFromEgg(Player player, Mob child) {}
 
     protected InteractionResult mobInteract(Player player, InteractionHand hand) {
@@ -302,7 +302,7 @@ index 35ff7abd8251b0af6c23fbb63804db632ec5b85d..dcf788de63b819abc668cc6deba974af
     }
 
     public boolean isWithinRestriction() {
-@@ -1667,4 +1667,52 @@ public abstract class Mob extends LivingEntity {
+@@ -1671,4 +1671,52 @@ public abstract class Mob extends LivingEntity {
 
         return itemmonsteregg == null ? null : new ItemStack(itemmonsteregg);
     }
--- a/patches/server/0011-AFK-API.patch
+++ b/patches/server/0011-AFK-API.patch
@@ -213,7 +213,7 @@ index 1f4b72a0aca200b2e0860449c718e6e607d2fc47..e1dd8932594780b07db13f68efa117eb
                 if (range < 0.0D || d < range * range) {
                     return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b1540e8bb9332506dbd5762024202414a173c621..db25979960774c59c4bd1d864cc8203f54305d3c 100644
+index b35a09b635315cce408a86f7fb6dbad7911116ae..5fc7354df359c77eecac4873f00abf9b14d73f40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -435,10 +435,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -233,7 +233,7 @@ index b1540e8bb9332506dbd5762024202414a173c621..db25979960774c59c4bd1d864cc8203f
         for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
             if (player.getBukkitEntity().canSee(this)) {
                 player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
-@@ -2699,5 +2704,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2720,5 +2725,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     public boolean usesPurpurClient() {
         return getHandle().purpurClient;
     }
--- a/patches/server/0012-Bring-back-server-name.patch
+++ b/patches/server/0012-Bring-back-server-name.patch
@@ -17,10 +17,10 @@ index f944e6beafc7876ed9c6923a22f58d82967b77cb..e1c7b7a659e56fa5b3a1f52cb2ccc99b
     public final boolean spawnNpcs = this.get("spawn-npcs", true);
     public final boolean pvp = this.get("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8015ed84e3e37ef0c8377bad66c5658a0279853a..a5c64896d5d87a04773ec578034c5df4febd4914 100644
+index 15227fd4bdd53630dab390e94001734d04c2143a..e8ff8dea26eb464804b950a4e9af74451e33ed17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2857,4 +2857,11 @@ public final class CraftServer implements Server {
+@@ -2870,4 +2870,11 @@ public final class CraftServer implements Server {
     }
 
     // Paper end
--- a/patches/server/0013-Configurable-server-mod-name.patch
+++ b/patches/server/0013-Configurable-server-mod-name.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name


 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f7e76dc842ac226b94ba552ad412cf0dba149394..0eed0dc8aa52a8ea16e47f7183ba7b4235ce362a 100644
+index d9623b26440274f0f84c59c74315ae698d809893..c386c146362138dbf8f397101ad91b3da6b72883 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1716,7 +1716,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1713,7 +1713,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
     @DontObfuscate
     public String getServerModName() {
--- a/patches/server/0014-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0014-LivingEntity-safeFallDistance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e25bf8d2b00fab28aefc0587af5e05cb45c4e352..ea51a01e8c8da9c8275c74e3f1e7cf8ab458c687 100644
+index 8f8fc60f33176362c26aa0730e24e850929df618..456341b5ed16e72927a9fb8cb452de6369ed112e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -250,6 +250,7 @@ public abstract class LivingEntity extends Entity {
@@ -27,7 +27,7 @@ index e25bf8d2b00fab28aefc0587af5e05cb45c4e352..ea51a01e8c8da9c8275c74e3f1e7cf8a
 
             if (!landedState.isAir()) {
                 double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
-@@ -1924,7 +1925,7 @@ public abstract class LivingEntity extends Entity {
+@@ -1933,7 +1934,7 @@ public abstract class LivingEntity extends Entity {
         MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
         float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
 
--- a/patches/server/0015-Lagging-threshold.patch
+++ b/patches/server/0015-Lagging-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold


 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0eed0dc8aa52a8ea16e47f7183ba7b4235ce362a..0c7355902448b444c360259a84a7e8a10ad96f46 100644
+index c386c146362138dbf8f397101ad91b3da6b72883..04439c7a4dcc45ae57aca2e090064a74e4230e95 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -304,6 +304,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -25,10 +25,10 @@ index 0eed0dc8aa52a8ea16e47f7183ba7b4235ce362a..0c7355902448b444c360259a84a7e8a1
                     }
                     // Spigot end
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a5c64896d5d87a04773ec578034c5df4febd4914..805250ab22b07918ad553869ab4391e7fa953e7e 100644
+index e8ff8dea26eb464804b950a4e9af74451e33ed17..136f93f18414a7968ca85d134218ebaa3cb5e03b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2863,5 +2863,10 @@ public final class CraftServer implements Server {
+@@ -2876,5 +2876,10 @@ public final class CraftServer implements Server {
     public String getServerName() {
         return this.getProperties().serverName;
     }
--- a/patches/server/0018-Player-invulnerabilities.patch
+++ b/patches/server/0018-Player-invulnerabilities.patch
@@ -121,10 +121,10 @@ index 0c7afc7787bf9303a8f8a7b4125a3bc45b70ccff..cb4af460cae665016e0a6ec7ff664830
         return entityplayer1;
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index db25979960774c59c4bd1d864cc8203f54305d3c..2bdc1caa5748cf947f3941b4388e9f81e4c42ce2 100644
+index 5fc7354df359c77eecac4873f00abf9b14d73f40..b0459c6b416ad4aec90b4fa44c894f7c592690ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2719,5 +2719,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2740,5 +2740,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     public void resetIdleTimer() {
         getHandle().resetLastActionTime();
     }
--- a/patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch
@@ -5,18 +5,21 @@ Subject: [PATCH] Disable loot drops on death by cramming


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ea51a01e8c8da9c8275c74e3f1e7cf8ab458c687..726909f539a72bebacde7547d8dfabff0a2469e1 100644
+index 456341b5ed16e72927a9fb8cb452de6369ed112e..d3d3b37c50ce36e411d2ca3e1c35c5b77f8fb8a6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1717,10 +1717,12 @@ public abstract class LivingEntity extends Entity {
+@@ -1722,6 +1722,7 @@ public abstract class LivingEntity extends Entity {
 
         this.dropEquipment(); // CraftBukkit - from below
         if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
 +            if (!(source == DamageSource.CRAMMING && level.purpurConfig.disableDropsOnCrammingDeath)) { // Purpur
             this.dropFromLootTable(source, flag);
-             this.clearEquipmentSlots = false; // Paper
+             // Paper start
+             final boolean prev = this.clearEquipmentSlots;
+@@ -1730,6 +1731,7 @@ public abstract class LivingEntity extends Entity {
+             // Paper end
             this.dropCustomDeathLoot(source, i, flag);
-             this.clearEquipmentSlots = true; // Paper
+             this.clearEquipmentSlots = prev; // Paper
 +            } // Purpur
         }
         // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment
--- a/patches/server/0049-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0049-Fix-the-dead-lagging-the-server.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server


 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ab53a0d7f9a63d85e0c8d213b76a948ebb111b24..cfa1e7eb6d1a4af2acb035dbe0852cdf62d87564 100644
+index c08506f7376d0b1ad1378d52febd667d761a977e..300ff27544957612d71267cef940c0d3d5e40e03 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1770,6 +1770,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -17,10 +17,10 @@ index ab53a0d7f9a63d85e0c8d213b76a948ebb111b24..cfa1e7eb6d1a4af2acb035dbe0852cdf
 
     public void absMoveTo(double x, double y, double z) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5d4c6f66d881525894ed8a3eac1aaadbc0d261c7..a7c7f3ac0e69f717ee37f9b840b04146661fcf67 100644
+index d3d3b37c50ce36e411d2ca3e1c35c5b77f8fb8a6..8df4992a2efe9a2c54a583825f75c63e1df04283 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2930,7 +2930,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2939,7 +2939,7 @@ public abstract class LivingEntity extends Entity {
             }
         }
 
--- a/patches/server/0056-Allow-leashing-villagers.patch
+++ b/patches/server/0056-Allow-leashing-villagers.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow leashing villagers


 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index dcf788de63b819abc668cc6deba974af26a41f2e..0b7e937b821b4e357cd2e726f5c5e542335cdee0 100644
+index 9956c5c69ee967c3cfab76d1dc31c9454ec61036..461a0149c3b3cb7b6e23790284b7dbf27c860436 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1240,6 +1240,7 @@ public abstract class Mob extends LivingEntity {
+@@ -1244,6 +1244,7 @@ public abstract class Mob extends LivingEntity {
         if (!this.isAlive()) {
             return InteractionResult.PASS;
         } else if (this.getLeashHolder() == player) {
--- a/patches/server/0061-Configurable-void-damage-height-and-damage.patch
+++ b/patches/server/0061-Configurable-void-damage-height-and-damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage


 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cfa1e7eb6d1a4af2acb035dbe0852cdf62d87564..c1d6e5db593142188e3e7f4174bcaf5bd9b44527 100644
+index 300ff27544957612d71267cef940c0d3d5e40e03..f9ccf9d2d426ff895a7586a1aaf213c415f87b37 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -816,7 +816,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -18,10 +18,10 @@ index cfa1e7eb6d1a4af2acb035dbe0852cdf62d87564..c1d6e5db593142188e3e7f4174bcaf5b
             && this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) {
             // Paper end
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a7c7f3ac0e69f717ee37f9b840b04146661fcf67..bc97a1f4f7c81693ea2e9cc9b5d82a172033d230 100644
+index 8df4992a2efe9a2c54a583825f75c63e1df04283..c791d60081a89e00d4bcc95453b9e2c65c47d8f7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2422,7 +2422,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2431,7 +2431,7 @@ public abstract class LivingEntity extends Entity {
 
     @Override
     protected void outOfWorld() {
--- a/patches/server/0063-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server/0063-Dispenser-curse-of-binding-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dispenser curse of binding protection


 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 0b7e937b821b4e357cd2e726f5c5e542335cdee0..68858cb7376c8c030a1e4039e76c296894168ce3 100644
+index 461a0149c3b3cb7b6e23790284b7dbf27c860436..867abf68593b5ede92adf80be8c5169e7c3b2665 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -63,6 +63,7 @@ import net.minecraft.world.item.ProjectileWeaponItem;
@@ -16,7 +16,7 @@ index 0b7e937b821b4e357cd2e726f5c5e542335cdee0..68858cb7376c8c030a1e4039e76c2968
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.Level;
-@@ -1096,6 +1097,12 @@ public abstract class Mob extends LivingEntity {
+@@ -1100,6 +1101,12 @@ public abstract class Mob extends LivingEntity {
 
     }
 
--- a/patches/server/0066-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0066-Add-5-second-tps-average-in-tps.patch
@@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
         setListData(vector);
     }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5e2d1e31722791f879f09705ebd491dedc6ac1da..20fd8a043ea8e8221aab94479ffb73c4fba290e5 100644
+index 479c30b7062c59478d96ea6d23fc82767c238bbe..160681181705c4cbb34409b5ff2ec3667b308306 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -303,7 +303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -69,10 +69,10 @@ index 5e2d1e31722791f879f09705ebd491dedc6ac1da..20fd8a043ea8e8221aab94479ffb73c4
                         lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
                         tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 805250ab22b07918ad553869ab4391e7fa953e7e..3952c4340f84902741371e170f4be6ccc375ee22 100644
+index 136f93f18414a7968ca85d134218ebaa3cb5e03b..f1be9dfcda1801bc89e01d43e701198828687fec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2645,6 +2645,7 @@ public final class CraftServer implements Server {
+@@ -2658,6 +2658,7 @@ public final class CraftServer implements Server {
     @Override
     public double[] getTPS() {
         return new double[] {
--- a/patches/server/0067-Implement-elytra-settings.patch
+++ b/patches/server/0067-Implement-elytra-settings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 08a7a0fcb64643969c334c26fa58f9ff74943640..0344e6f50fab35512a5c49ea66d017078e2353b4 100644
+index c791d60081a89e00d4bcc95453b9e2c65c47d8f7..4d438cde187f32d4e721c4d3bd46dc0b4fea97af 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3407,7 +3407,16 @@ public abstract class LivingEntity extends Entity {
+@@ -3416,7 +3416,16 @@ public abstract class LivingEntity extends Entity {
                     int j = i / 10;
 
                     if (j % 2 == 0) {
@@ -54,7 +54,7 @@ index 543a08f920319a2547258640bafebb1e70af65c4..dd211aa7c4ef1e158933a89898b9e5bc
                     itemStack.shrink(1);
                     } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 2238fb40af8c95494b0aec84a5a24cdbf4165da6..31ac7e1e5cc37cd9abf0ffd0bab1402f51bffed9 100644
+index 455de7226be37b9a0da8824f44bf8fefba2816dd..ac8a90253f45a43486c1677c576231313d2d3e09 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -542,7 +542,7 @@ public final class ItemStack {
--- a/patches/server/0079-Entity-lifespan.patch
+++ b/patches/server/0079-Entity-lifespan.patch
@@ -17,7 +17,7 @@ index 651178b4ea058d8a424961ff160d161bfc3a1187..ffc7b49f4b3a783e37670efa93550129
                     private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
                         ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand).copy();
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 68858cb7376c8c030a1e4039e76c296894168ce3..f3c01f5a6a23b65acc6239ea1df9ec8aed5d28f3 100644
+index 867abf68593b5ede92adf80be8c5169e7c3b2665..0330ccccff19a44cc56d58fa05891b9f183225cf 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -129,6 +129,7 @@ public abstract class Mob extends LivingEntity {
@@ -86,7 +86,7 @@ index 68858cb7376c8c030a1e4039e76c296894168ce3..f3c01f5a6a23b65acc6239ea1df9ec8a
     }
 
     @Override
-@@ -1611,6 +1639,7 @@ public abstract class Mob extends LivingEntity {
+@@ -1615,6 +1643,7 @@ public abstract class Mob extends LivingEntity {
             this.setLastHurtMob(target);
         }
 
--- a/patches/server/0105-Configurable-daylight-cycle.patch
+++ b/patches/server/0105-Configurable-daylight-cycle.patch
@@ -18,10 +18,10 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe
     public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
         this.gameTime = time % 192000; // Paper - fix guardian beam
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 20fd8a043ea8e8221aab94479ffb73c4fba290e5..47fbe4f3877756d88d5b914bb43c06d3a136a288 100644
+index 160681181705c4cbb34409b5ff2ec3667b308306..c05a16e19b4fff6cbb6ba1c37c61c81da906da3e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1589,7 +1589,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1586,7 +1586,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
             long worldTime = world.getGameTime();
             final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
             for (Player entityhuman : world.players()) {
@@ -31,7 +31,7 @@ index 20fd8a043ea8e8221aab94479ffb73c4fba290e5..47fbe4f3877756d88d5b914bb43c06d3
                 }
                 ServerPlayer entityplayer = (ServerPlayer) entityhuman;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3aa635ae50fc94cab800c4d5cf940b05a648a0a5..df1a075dbfedc22823a3aeb0fc903eed92a371bd 100644
+index 9ff1f59202fa359c01aa7f976866a8dfe5a41133..12a188b6eb6804bc6957e3d31c11e95beb49f21f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -206,6 +206,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
--- a/patches/server/0116-Changeable-Mob-Left-Handed-Chance.patch
+++ b/patches/server/0116-Changeable-Mob-Left-Handed-Chance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Changeable Mob Left Handed Chance


 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index f3c01f5a6a23b65acc6239ea1df9ec8aed5d28f3..6a0ddb0f337bafa0146e77758759ee5c1c85d5ec 100644
+index 0330ccccff19a44cc56d58fa05891b9f183225cf..f7d588198876082c456adfe8aba8e3150620e2d2 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1223,7 +1223,7 @@ public abstract class Mob extends LivingEntity {
+@@ -1227,7 +1227,7 @@ public abstract class Mob extends LivingEntity {
     @Nullable
     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
         this.getAttribute(Attributes.FOLLOW_RANGE).addPermanentModifier(new AttributeModifier("Random spawn bonus", this.random.nextGaussian() * 0.05D, AttributeModifier.Operation.MULTIPLY_BASE));
--- a/patches/server/0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
+++ b/patches/server/0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
@@ -46,10 +46,10 @@ index b69c05a7cddacfb791a4f46920677eae805ec42a..1d3692d8d533bb4c3ac18f8837aa44f8
 
     public void broadcastAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2bdc1caa5748cf947f3941b4388e9f81e4c42ce2..755316f873762f7bb988756a1103127253eec8cc 100644
+index b0459c6b416ad4aec90b4fa44c894f7c592690ca..e9ace0dd9aef27e28766baf6847d82eeafb04bbe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1633,7 +1633,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1654,7 +1654,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
     @Override
     public boolean canSee(org.bukkit.entity.Entity entity) {
--- a/patches/server/0132-Add-mobGriefing-bypass-to-everything-affected.patch
+++ b/patches/server/0132-Add-mobGriefing-bypass-to-everything-affected.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8f77d232a2ce67f8687946959e28b987f40b4523..f46f532dd5c8eadb6250e0aa6161929c7aaa03e3 100644
+index 959e404537c9f6c05b36fc811d3aff3ceb0e6478..f7c6633733460bdfe0a02255f9be5ac385ec915a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1689,7 +1689,7 @@ public abstract class LivingEntity extends Entity {
+@@ -1691,7 +1691,7 @@ public abstract class LivingEntity extends Entity {
             boolean flag = false;
 
             if (this.dead && adversary instanceof WitherBoss) { // Paper
@@ -18,7 +18,7 @@ index 8f77d232a2ce67f8687946959e28b987f40b4523..f46f532dd5c8eadb6250e0aa6161929c
                     BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 6a0ddb0f337bafa0146e77758759ee5c1c85d5ec..7fa3cd8a7f1005386f68f61cf17e65fb5c9a4958 100644
+index f7d588198876082c456adfe8aba8e3150620e2d2..e569ca15ded9dc4f85dd9d6431470be6844ed593 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -658,7 +658,7 @@ public abstract class Mob extends LivingEntity {
--- a/patches/server/0134-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0134-Add-EntityTeleportHinderedEvent.patch
@@ -93,10 +93,10 @@ index 728eba385fe5c658bc61114029192295ec7ebf05..e875bc08aaecc41db09ca0ffa00ff0f1
         }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 755316f873762f7bb988756a1103127253eec8cc..703eef24baa26475e8ec5f843fbc92420599c20a 100644
+index e9ace0dd9aef27e28766baf6847d82eeafb04bbe..9ff46a5aaecbf66edb8dc76924d4b3427d9bfb8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1039,6 +1039,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1060,6 +1060,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         }
 
         if (entity.isVehicle()) {
--- a/patches/server/0143-One-Punch-Man.patch
+++ b/patches/server/0143-One-Punch-Man.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] One Punch Man!


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c34ba47e889f348442d37820e9ba575cb6492ef6..b4cc6b9c94eda63caa4c176a96d7c8babe1284bd 100644
+index f7c6633733460bdfe0a02255f9be5ac385ec915a..693fe29b9b086d8c8c333406479e2baab4d4de4b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2157,6 +2157,20 @@ public abstract class LivingEntity extends Entity {
+@@ -2166,6 +2166,20 @@ public abstract class LivingEntity extends Entity {
                 ((ServerPlayer) damagesource.getEntity()).awardStat(Stats.DAMAGE_DEALT_ABSORBED, Math.round(f2 * 10.0F));
             }
 
--- a/patches/server/0187-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0187-API-for-any-mob-to-burn-daylight.patch
@@ -29,7 +29,7 @@ index e414f44168a03874910c5ebdb865fe39d91e27b7..7e85785b902a2ef72c09d53f0e24cb2a
     // Purpur end
 }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6710358370ade90410a836242862cd72703dba95..3f2af5dfa530b0a9e86b707aaec3218d63271c6d 100644
+index 951e583826598a19e92d3e2a02ebd0c7536460d1..17eb40a73e3d73e2fd24ec411c0d76ebf9ae6490 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -260,6 +260,7 @@ public abstract class LivingEntity extends Entity {
@@ -60,7 +60,7 @@ index 6710358370ade90410a836242862cd72703dba95..3f2af5dfa530b0a9e86b707aaec3218d
     }
 
     // CraftBukkit start
-@@ -3427,6 +3434,27 @@ public abstract class LivingEntity extends Entity {
+@@ -3436,6 +3443,27 @@ public abstract class LivingEntity extends Entity {
             this.hurt(DamageSource.DROWN, 1.0F);
         }
 
@@ -89,10 +89,10 @@ index 6710358370ade90410a836242862cd72703dba95..3f2af5dfa530b0a9e86b707aaec3218d
 
     public boolean isSensitiveToWater() {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 7fa3cd8a7f1005386f68f61cf17e65fb5c9a4958..f760e6f20e65154417e694e94018a3f6760d6ed6 100644
+index e569ca15ded9dc4f85dd9d6431470be6844ed593..1441619edfe075c176ef8e2606eb6f5251558e6c 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1656,17 +1656,7 @@ public abstract class Mob extends LivingEntity {
+@@ -1660,17 +1660,7 @@ public abstract class Mob extends LivingEntity {
     }
 
     public boolean isSunBurnTick() {
--- a/patches/server/0192-Flying-Fall-Damage-API.patch
+++ b/patches/server/0192-Flying-Fall-Damage-API.patch
@@ -26,10 +26,10 @@ index 3b25bbb0cc86c8fba1fb770556c0f8c9ef6ac46e..15a8c193d7f5a0dda7e3d2d1aa967a91
         } else {
             if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 703eef24baa26475e8ec5f843fbc92420599c20a..91d3c8110a3a185780b77c7377640b244af961a2 100644
+index 9ff46a5aaecbf66edb8dc76924d4b3427d9bfb8f..6c6b60119aa89637c822746b77e440f97a186b95 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2744,5 +2744,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2765,5 +2765,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
         getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
     }
--- a/patches/server/0216-Toggle-for-kinetic-damage.patch
+++ b/patches/server/0216-Toggle-for-kinetic-damage.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for kinetic damage


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ef2efc00ebd610cf0e393b6b604c48cdac2d4bbc..0f36cf3ab761d4f920b461054dba8e1dcf55ffc1 100644
+index 17eb40a73e3d73e2fd24ec411c0d76ebf9ae6490..aecebe3b368c4159e64da305b3b921ae33b1e1a4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2816,7 +2816,11 @@ public abstract class LivingEntity extends Entity {
+@@ -2825,7 +2825,11 @@ public abstract class LivingEntity extends Entity {
 
                     if (f4 > 0.0F) {
                         this.playSound(this.getFallDamageSound((int) f4), 1.0F, 1.0F);
@@ -22,7 +22,7 @@ index ef2efc00ebd610cf0e393b6b604c48cdac2d4bbc..0f36cf3ab761d4f920b461054dba8e1d
                 }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7a3794a71c0a5bef69884e9452001472ce7b1be9..92cb1039d2d27c197d2e040e90d9de3572889174 100644
+index b481c3bf0311058307b1fc38d68047e48c4df44d..b03142997900921e6cf4c105262ff08678e87097 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -176,12 +176,14 @@ public class PurpurWorldConfig {
--- a/patches/server/0227-Extended-OfflinePlayer-API.patch
+++ b/patches/server/0227-Extended-OfflinePlayer-API.patch
@@ -223,10 +223,10 @@ index 1f2bc88d4570c6ef00e67a772b745e0b0c98e051..f505e871a9836503377f168c31c1f09f
 +    // Purpur end - OfflinePlayer API
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 91d3c8110a3a185780b77c7377640b244af961a2..d7008f2a1f647ae042eb7e25068b942e39e4b728 100644
+index 6c6b60119aa89637c822746b77e440f97a186b95..85daead2568eb2bc09843f7841652b7ea8dc161d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2007,6 +2007,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2028,6 +2028,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         return this.getHandle().getAbilities().walkingSpeed * 2f;
     }