diff --git a/patches/api/0004-Add-FastUtil-to-Bukkit.patch b/patches/api/0004-Add-FastUtil-to-Bukkit.patch
index 0ecd7ee45..8c267a95b 100644
--- a/patches/api/0004-Add-FastUtil-to-Bukkit.patch
+++ b/patches/api/0004-Add-FastUtil-to-Bukkit.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8472feb05de7955999bdfbbe721f2cfb847a9019..79bf95d5a19046b142d0162dd6b739b7f0f52e59 100644
+index 044b7c49b569e1170108c912e9307f7fec278762..f0423df165bf7d0f3fad21d26b64f31ba3e6aeee 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -18,6 +18,7 @@ dependencies {
diff --git a/patches/api/0026-Use-ASM-for-event-executors.patch b/patches/api/0026-Use-ASM-for-event-executors.patch
index 3ae98fbb6..331aaf5a9 100644
--- a/patches/api/0026-Use-ASM-for-event-executors.patch
+++ b/patches/api/0026-Use-ASM-for-event-executors.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 84432bf9dd99332098f952ea777ee97d987f9eb2..47e08784c71b0e25c21bc6b15da0385e4a1806d4 100644
+index 7b8196db1fd1e283dc9ef71e3fe5137cc5920ba9..f0f8047cb3a43b447dc50b730dab3d0bc471b25a 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -39,6 +39,9 @@ dependencies {
diff --git a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
index 1733e48f9..1baed8390 100644
--- a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 47e08784c71b0e25c21bc6b15da0385e4a1806d4..e950bce5047552bdd3f5664eb24ce290b0a06225 100644
+index f0f8047cb3a43b447dc50b730dab3d0bc471b25a..435db1ffe47476bcb7067802faad7aee7e4c3f54 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -39,6 +39,8 @@ dependencies {
diff --git a/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
index 500dd3e20..34c3a7348 100644
--- a/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index cf4beb02cce7b87facd5465291286f1b5e97db59..7f29fd1891b0b0c2037dc6fb7620e6de29083feb 100644
+index 9d23a4019814f4662f4ab9a47b3fceff656c5245..f9f708bda24751353dd61951418731a2eea5abb0 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -39,7 +39,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 0e894e676..56ad8fa03 100644
--- a/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -226,7 +226,7 @@ index c65f0d6569c130b4920a9e71ad24af6427f1f030..01bcb3a1bdb5accdf844d0178cec3d25
          return key;
      }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 64114b1a9e201df369fc794fbee984d496385420..35009498aafd1bd36c493085127135fc8a5c36ec 100644
+index a19635c38705e6221ae25d58e976e483e7ed17e4..71c7780424a986a95852b1ca15116096896500df 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -444,4 +444,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
diff --git a/patches/api/0157-Add-Material-Tags.patch b/patches/api/0157-Add-Material-Tags.patch
index 8bfbe70e6..20ac53dcf 100644
--- a/patches/api/0157-Add-Material-Tags.patch
+++ b/patches/api/0157-Add-Material-Tags.patch
@@ -1189,7 +1189,7 @@ index 0000000000000000000000000000000000000000..06bb9d1180361d3d00c699796bbacbce
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java
-index 622cf46ae12540dc168631a4884a9a69e9d2f6c7..2f907c18c8f3228df107bfc05c5454354e89b943 100644
+index 701a17c10f31cd345238a3c568264178ce372faa..bfb39f48bea14ad616c53e2a8a6901e93f728768 100644
 --- a/src/test/java/org/bukkit/TestServer.java
 +++ b/src/test/java/org/bukkit/TestServer.java
 @@ -32,6 +32,16 @@ public final class TestServer implements InvocationHandler {
diff --git a/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index ad97b59cd..99524ae7c 100644
--- a/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 93f86bb30725dff5dbfcccf15012ffd1cee237bf..a7d1f1e701f23e851f735584a30bedadb0d8b9bd 100644
+index 9d774a10b9543e9293cb10ee9d7c9adebbfef34c..23e853bae0e051cd43deb9eb24c54e74a56d8ab0 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -160,7 +160,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
diff --git a/patches/api/0210-Support-components-in-ItemMeta.patch b/patches/api/0210-Support-components-in-ItemMeta.patch
index a4e6b27bd..d9bc5b4ad 100644
--- a/patches/api/0210-Support-components-in-ItemMeta.patch
+++ b/patches/api/0210-Support-components-in-ItemMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta
 
 
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 1beedb446a9dd554d05d1d94dba8598e4b69eba6..c6b0fd783675cd019048e445d8e959637d90be7a 100644
+index 5428aeb018c415f8e9bb46c84a627adf70829259..f1e9a7626c4efb99be78f1056dc04b06bbe13c87 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -5,6 +5,7 @@ import java.util.Collection;
diff --git a/patches/api/0392-Also-load-resources-from-LibraryLoader.patch b/patches/api/0393-Also-load-resources-from-LibraryLoader.patch
similarity index 100%
rename from patches/api/0392-Also-load-resources-from-LibraryLoader.patch
rename to patches/api/0393-Also-load-resources-from-LibraryLoader.patch
diff --git a/patches/api/0393-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0394-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/api/0393-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/api/0394-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/api/0394-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0395-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/api/0394-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/api/0395-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0011-Paper-Metrics.patch b/patches/server/0011-Paper-Metrics.patch
index d15b30644..37974e62f 100644
--- a/patches/server/0011-Paper-Metrics.patch
+++ b/patches/server/0011-Paper-Metrics.patch
@@ -690,7 +690,7 @@ index 0000000000000000000000000000000000000000..5a19e30a9b7e65a70f68a429b8ca741f
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 8f29bb843fc456384f7b4e216afca5018fb7f794..f4a6a6addbba65b3415320977048aeba0eadba63 100644
+index 393e465b0bac55d407f2ec66d7b11ed0537c9641..408eff59b081ace53bf435947df17e2fe75bfd5e 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -192,6 +192,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0020-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0020-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index b66f6bfe0..ec8ccf7a1 100644
--- a/patches/server/0020-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/patches/server/0020-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
@@ -1211,7 +1211,7 @@ index 5833cc3d5014dad82607afc4d643b6bed885be64..8e0f73dcef189442450b4518437fb3a1
          GameProfileCache usercache = this.server.getProfileCache();
          Optional<GameProfile> optional = usercache.get(gameprofile.getId());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 47a05aa42739f4cfce828c0de42b4f1da467093e..70c338f5bf605d2f51a21670634c716177cd6f97 100644
+index 1a44c98b69398ba5dcb4115f0e8fdcf3f62fd920..9878aded49d0049b066fa608c7eaf25a55fcf12e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -212,7 +212,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0037-Configurable-top-of-nether-void-damage.patch b/patches/server/0037-Configurable-top-of-nether-void-damage.patch
index d5007abff..c7d17a7bc 100644
--- a/patches/server/0037-Configurable-top-of-nether-void-damage.patch
+++ b/patches/server/0037-Configurable-top-of-nether-void-damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable top of nether void damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ef7320d69d058ea260e48dd1e0d4fc2d69aec1c2..a761c5b3551c7a87b8d04b03f5640805007fbcd3 100644
+index 385c81c9e0faf7a51d24b3542713e0d57e5398dd..f9f0cb28811e3a14bf4b5005050920b4992f868b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -653,7 +653,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0043-Disable-explosion-knockback.patch b/patches/server/0043-Disable-explosion-knockback.patch
index 61079fbbb..72708a7e5 100644
--- a/patches/server/0043-Disable-explosion-knockback.patch
+++ b/patches/server/0043-Disable-explosion-knockback.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable explosion knockback
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e2d93d7a9c421f896e98e6dd6b318f9a30cab3b4..0d61cb2b7af48bbc60b04be6a4767ccba2b29ffb 100644
+index bffaa7397e931b7b15a1780989e69aae8b29345f..87b8a9bb1493d4ff048f0283151cfc5c8ea7d7ef 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1399,6 +1399,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0051-Use-UserCache-for-player-heads.patch b/patches/server/0051-Use-UserCache-for-player-heads.patch
index 238132411..21457dbd7 100644
--- a/patches/server/0051-Use-UserCache-for-player-heads.patch
+++ b/patches/server/0051-Use-UserCache-for-player-heads.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use UserCache for player heads
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 0281a825f5a00f1416405dfe8b1edd9c61fccd93..545074f5f7b109daf17af05fa36a9dc5816f22d4 100644
+index af284ff9b38341b9fdeec93febc7aea36ba2c9a7..07a6bac294273c94f2f7353aa0514ced24c4a93e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -167,7 +167,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
diff --git a/patches/server/0056-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/server/0056-All-chunks-are-slime-spawn-chunks-toggle.patch
index c510a8443..e0111a4cd 100644
--- a/patches/server/0056-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/patches/server/0056-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -18,7 +18,7 @@ index a62f88048d8243f5b98834988c049471114c4199..7b95d18fb5edbd1575f6be92bfcbb3e0
              if (random.nextInt(10) == 0 && flag && pos.getY() < 40) {
                  return checkMobSpawnRules(type, world, spawnReason, pos, random);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index d748eb01ecb2b15b081ab3d98b3b3d5804a2215a..0d905269ab3bce4cfe68647b9b0cda8fff4aa17e 100644
+index 6d44634ae6dcbc392011f248f6ab429b9845af55..bda9c6720fe0a91a4c6763795e4d6e01e6dd2747 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -220,7 +220,7 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0078-Use-a-Shared-Random-for-Entities.patch b/patches/server/0078-Use-a-Shared-Random-for-Entities.patch
index fa08041db..5064ca7f5 100644
--- a/patches/server/0078-Use-a-Shared-Random-for-Entities.patch
+++ b/patches/server/0078-Use-a-Shared-Random-for-Entities.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4218d5aa5b4ba77d304b91c6c6cd9fa9cdaaa532..72915f876d456a28ea3609e46861412052065f37 100644
+index 6e8811a6a4b41d38c99ac40a2d4f0bef4713b762..a9fb70e4d37162332b4b5c428ee6907a7d8c21db 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -159,6 +159,79 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0095-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0095-EntityRegainHealthEvent-isFastRegen-API.patch
index 06e6c5137..dbd8280ca 100644
--- a/patches/server/0095-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/server/0095-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 54e7fa7a483e15c440f562559601292c2a064208..d33495915e63e4cae16b3c1ed536bae916a944d9 100644
+index 8dc6fbbdfaecf0eb38a876d87d77f111541f766d..707a7fc783973d4806e10f59eb6202e408991223 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1250,10 +1250,16 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0099-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/server/0099-LootTable-API-Replenishable-Lootables-Feature.patch
index 3893dcb7f..69d603745 100644
--- a/patches/server/0099-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/patches/server/0099-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -485,7 +485,7 @@ index 0000000000000000000000000000000000000000..3377b86c337d0234bbb9b0349e4034a7
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 72915f876d456a28ea3609e46861412052065f37..32d230dc6968306dd6e322ffd6a820380e3c88b1 100644
+index a9fb70e4d37162332b4b5c428ee6907a7d8c21db..ac2b7e86afc21607564ddea62e39ec484e91bbf2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -232,6 +232,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0112-Configurable-packet-in-spam-threshold.patch b/patches/server/0112-Configurable-packet-in-spam-threshold.patch
index ff3985289..7059a874f 100644
--- a/patches/server/0112-Configurable-packet-in-spam-threshold.patch
+++ b/patches/server/0112-Configurable-packet-in-spam-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1161ed7ba2a32a42fb092f3f76af0bba958c44ae..b62171dc10d0c3a1dfefbb7f083a333899a1f1bb 100644
+index b86f742c4a7500f0bb241d5c07a077aa1be1c7e5..c94a736dbf02c2ba34e74e73b6cc3780238f0ede 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1611,13 +1611,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0113-Configurable-flying-kick-messages.patch b/patches/server/0113-Configurable-flying-kick-messages.patch
index 2f466ef78..b4c5d977e 100644
--- a/patches/server/0113-Configurable-flying-kick-messages.patch
+++ b/patches/server/0113-Configurable-flying-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b62171dc10d0c3a1dfefbb7f083a333899a1f1bb..c8f9223f750ec0825c45288d52df149f94748d5d 100644
+index c94a736dbf02c2ba34e74e73b6cc3780238f0ede..75bc0d9e8ec46d1fcfd6d5886d5ab03537e575d2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -358,7 +358,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0133-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0133-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index a88248a9a..2a6c64ec6 100644
--- a/patches/server/0133-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0133-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -131,7 +131,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..16a1a005f2dda30cf804bf51638383ef
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d33495915e63e4cae16b3c1ed536bae916a944d9..9f6629189a126c12a2d45098e12f41d8e45147a4 100644
+index 707a7fc783973d4806e10f59eb6202e408991223..45b76070d6a178ffb5cd378cbeb12342eab4f360 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1723,7 +1723,8 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0151-Block-player-logins-during-server-shutdown.patch b/patches/server/0151-Block-player-logins-during-server-shutdown.patch
index dfd3414f6..8777198e4 100644
--- a/patches/server/0151-Block-player-logins-during-server-shutdown.patch
+++ b/patches/server/0151-Block-player-logins-during-server-shutdown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Block player logins during server shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 6e315a2e87bbc4b03e4e0f38ba0b0f6b592a433e..a00636626e2ef2975a3506fd6cfb7e4444d41e3f 100644
+index 71581c619d369d443908ed475d9a4d2d6ef07e5c..0de44db53089216f864da372238017f3ee310af9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -77,6 +77,12 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0161-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0161-Allow-specifying-a-custom-authentication-servers-dow.patch
index 3316790e6..5396b4371 100644
--- a/patches/server/0161-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/server/0161-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 0b6cca9dae24aaa18e64c9238f7eb2042402db84..20b8c415834018ff7e6151b5345f91a0190d294c 100644
+index 0de44db53089216f864da372238017f3ee310af9..c37a1b25638dba2b4964f73e821d989302ad415a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -334,7 +334,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0164-Add-PlayerJumpEvent.patch b/patches/server/0164-Add-PlayerJumpEvent.patch
index c6cc30079..c861a5386 100644
--- a/patches/server/0164-Add-PlayerJumpEvent.patch
+++ b/patches/server/0164-Add-PlayerJumpEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f3360ebf43d973606682fe85bc3240a84a0f0123..b44fd3e73d2d15736ac2bbcc7d99ae44c7459d4b 100644
+index f8955429ec4cfe778de77a7db5fef624c20e4318..32c4383cfb4cab6329d7046c48daf3050fa027c6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1293,7 +1293,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0167-revert-serverside-behavior-of-keepalives.patch b/patches/server/0167-revert-serverside-behavior-of-keepalives.patch
index 8657cdbcb..8736164bf 100644
--- a/patches/server/0167-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/0167-revert-serverside-behavior-of-keepalives.patch
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c6330fa43f205c28f3a494269933482c14f75afb..322ecd7671c9b1a6c359455d47ec617b7da00bdc 100644
+index c4f1ded84ec1ed152faeb835a3f50b7e31356655..e40eeb5e04d96fb55283ded82cea0a5539a2fad5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -256,7 +256,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0170-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0170-Prevent-logins-from-being-processed-when-the-player-.patch
index a7bab6af8..797b24287 100644
--- a/patches/server/0170-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/server/0170-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 552b7d612d0f833f3280a2a60839e2ef93b59271..158862d2ea50a34dea10e074f3776bc5ed5a327f 100644
+index c37a1b25638dba2b4964f73e821d989302ad415a..f97552c5e62124cab00301daee2fd41069fb802c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -84,7 +84,11 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0174-AsyncTabCompleteEvent.patch b/patches/server/0174-AsyncTabCompleteEvent.patch
index 0172c62c7..82028759c 100644
--- a/patches/server/0174-AsyncTabCompleteEvent.patch
+++ b/patches/server/0174-AsyncTabCompleteEvent.patch
@@ -16,7 +16,7 @@ Also adds isCommand and getLocation to the sync TabCompleteEvent
 Co-authored-by: Aikar <aikar@aikar.co>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 322ecd7671c9b1a6c359455d47ec617b7da00bdc..9d66ce602f2c71107659774d5a8a1e19071de214 100644
+index e40eeb5e04d96fb55283ded82cea0a5539a2fad5..90bd5c1a010a3a9d24328e5c719053603e206626 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -784,12 +784,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0178-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0178-Add-setPlayerProfile-API-for-Skulls.patch
index a87a829f5..dfcc8c375 100644
--- a/patches/server/0178-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/server/0178-Add-setPlayerProfile-API-for-Skulls.patch
@@ -48,7 +48,7 @@ index 6ac03706a584e4cb07300cf6e34969a8c4595c58..0be71d9d06f34e9ac58da3bbef954b27
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 545074f5f7b109daf17af05fa36a9dc5816f22d4..292ae4a68093b7d939a755e1062cee57da186ab1 100644
+index 07a6bac294273c94f2f7353aa0514ced24c4a93e..92b56f16b4d8107ccf206be6b81a98dc58986c10 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -143,6 +143,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
diff --git a/patches/server/0188-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0188-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 3058adfc3..33928fcf0 100644
--- a/patches/server/0188-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/server/0188-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 8245a9ce591f4613fc165e9c0d413b0bc7fa09fe..9246eb35d42bafcef32da8619e5b1ce5557a3aab 100644
+index f97552c5e62124cab00301daee2fd41069fb802c..9a7fe61d7de80eaf044c202e1ed13d9e4b59622a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -369,8 +369,16 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0189-Player.setPlayerProfile-API.patch b/patches/server/0189-Player.setPlayerProfile-API.patch
index 367da64aa..eff52cffc 100644
--- a/patches/server/0189-Player.setPlayerProfile-API.patch
+++ b/patches/server/0189-Player.setPlayerProfile-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 9246eb35d42bafcef32da8619e5b1ce5557a3aab..b72dc9c19f512c3f07390e440f2f0f0aab20d6c2 100644
+index 9a7fe61d7de80eaf044c202e1ed13d9e4b59622a..ef09f5f42a89f767060f015af27269ad496d08c7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -370,11 +370,11 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0242-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0242-Break-up-and-make-tab-spam-limits-configurable.patch
index f41462388..c21146252 100644
--- a/patches/server/0242-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0242-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 38d9abe5f34c17b66c8eaf40fac87fc16786f095..d991354d65305ab7d02666f7c3362e4136c3f6af 100644
+index a517eb45cd06c130cbfe6ff6565825c492079287..3b8fd0b7f9a5d215119c6507e1af3068c7f543a2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -262,6 +262,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0245-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0245-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 6bd58ca83..07ef9835a 100644
--- a/patches/server/0245-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0245-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -72,7 +72,7 @@ index e13fa5d2ed02b5fe8f9f9d124d15dd5374a7f472..377ebed70c5008d69701bd919f22ad45
              return false;
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index dd00721df47c84629cc5399dd558c531f6cea1cc..29c71c951ce7114dfb24f0c99c3bf8c2a6f6144f 100644
+index 64261427c5f4abf1a4144eb88a6409560667f70b..0282b575d4ff68a306053f86b47908dd44dc54ed 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -235,6 +235,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 9917cfd41..be3987951 100644
--- a/patches/server/0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/server/0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 0d905269ab3bce4cfe68647b9b0cda8fff4aa17e..cf48c93d89da53e0ec771e5c2c8582e30b35e3f5 100644
+index bda9c6720fe0a91a4c6763795e4d6e01e6dd2747..dfdcc01c7cb2864d9b5f572c0cafedf16063edd8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -4,8 +4,10 @@ import com.google.common.base.Preconditions;
diff --git a/patches/server/0264-Mob-Pathfinding-API.patch b/patches/server/0264-Mob-Pathfinding-API.patch
index 099c7b8b0..517909c69 100644
--- a/patches/server/0264-Mob-Pathfinding-API.patch
+++ b/patches/server/0264-Mob-Pathfinding-API.patch
@@ -7,10 +7,10 @@ Implements Pathfinding API for mobs
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..8c9f0c6c38627beded373ca29f1989ae3ba6f873
+index 0000000000000000000000000000000000000000..2d799fec40afe7dade649a294761d272c83157f0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
-@@ -0,0 +1,139 @@
+@@ -0,0 +1,143 @@
 +package com.destroystokyo.paper.entity;
 +
 +import org.apache.commons.lang.Validate;
@@ -27,7 +27,7 @@ index 0000000000000000000000000000000000000000..8c9f0c6c38627beded373ca29f1989ae
 +
 +public class PaperPathfinder implements com.destroystokyo.paper.entity.Pathfinder {
 +
-+    private final net.minecraft.world.entity.Mob entity;
++    private net.minecraft.world.entity.Mob entity;
 +
 +    public PaperPathfinder(net.minecraft.world.entity.Mob entity) {
 +        this.entity = entity;
@@ -38,6 +38,10 @@ index 0000000000000000000000000000000000000000..8c9f0c6c38627beded373ca29f1989ae
 +        return entity.getBukkitMob();
 +    }
 +
++    public void setHandle(net.minecraft.world.entity.Mob entity) {
++        this.entity = entity;
++    }
++
 +    @Override
 +    public void stopPathfinding() {
 +        entity.getNavigation().stop();
@@ -163,7 +167,7 @@ index 4ad2ac8d1e9111933fa58c47442fa1f5e8173fd3..2a335f277bd0e4b8ad0f60d8226eb8aa
      public Path(List<Node> nodes, BlockPos target, boolean reachesTarget) {
          this.nodes = nodes;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 659ccb6532506b2a8c9feb55dc5aee962f6da795..f3e277dc79124d28e244d59e2a453748610e5ff9 100644
+index 659ccb6532506b2a8c9feb55dc5aee962f6da795..f36713771598ac5afdae5d94db10a5790949611d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -15,8 +15,11 @@ import org.bukkit.loot.LootTable;
@@ -178,3 +182,18 @@ index 659ccb6532506b2a8c9feb55dc5aee962f6da795..f3e277dc79124d28e244d59e2a453748
      @Override
      public void setTarget(LivingEntity target) {
          Preconditions.checkState(!this.getHandle().generation, "Cannot set target during world generation");
+@@ -57,6 +60,14 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
+         return (net.minecraft.world.entity.Mob) entity;
+     }
+ 
++    // Paper start
++    @Override
++    public void setHandle(net.minecraft.world.entity.Entity entity) {
++        super.setHandle(entity);
++        paperPathfinder.setHandle(getHandle());
++    }
++    // Paper end
++
+     @Override
+     public String toString() {
+         return "CraftMob";
diff --git a/patches/server/0276-Add-sun-related-API.patch b/patches/server/0276-Add-sun-related-API.patch
index 483f2ac21..8c8e84ecc 100644
--- a/patches/server/0276-Add-sun-related-API.patch
+++ b/patches/server/0276-Add-sun-related-API.patch
@@ -23,10 +23,10 @@ index ef0bff86d3f5f0c404f66b3e2e0a4976006909ee..3aa2e80e7d30d8824fd7f009282adfd8
      public long getGameTime() {
          return world.levelData.getGameTime();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index f3e277dc79124d28e244d59e2a453748610e5ff9..206b4d187a486e2c8a3a36eacb2d33f9d2555fe8 100644
+index f36713771598ac5afdae5d94db10a5790949611d..c92f7f31c3bf96f22fb1d2e783b14b80512448a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-@@ -85,4 +85,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
+@@ -93,4 +93,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
      public long getSeed() {
          return this.getHandle().lootTableSeed;
      }
diff --git a/patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch
index bcbabba35..bbb684115 100644
--- a/patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0282-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 d991354d65305ab7d02666f7c3362e4136c3f6af..5beba7d1ba44bde3d9cefccc80b6b8795a47b945 100644
+index 3b8fd0b7f9a5d215119c6507e1af3068c7f543a2..17e5ec6bba89c2769a6c20358b0f01824877497c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -571,9 +571,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch
index 333ff2365..c43ce4836 100644
--- a/patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -59,7 +59,7 @@ index 53717a4a2bfd841346c00b5f854899e23661122c..3fadf6b46cc722ad81cf810c0761cf71
  
                  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 5beba7d1ba44bde3d9cefccc80b6b8795a47b945..e107aa00f51430a38e190be6d8b1ccba70a3c055 100644
+index 17e5ec6bba89c2769a6c20358b0f01824877497c..c53fdcba6308e0c0283459f950388d981ccdfe2d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1675,6 +1675,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0296-Book-Size-Limits.patch b/patches/server/0296-Book-Size-Limits.patch
index 4a91022d7..406e5f0f4 100644
--- a/patches/server/0296-Book-Size-Limits.patch
+++ b/patches/server/0296-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 e107aa00f51430a38e190be6d8b1ccba70a3c055..c1270536fc3566454c98419f4bddc0b3b684d63b 100644
+index c53fdcba6308e0c0283459f950388d981ccdfe2d..61a0cee760d058e382c2756096a5acce050d9f9d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1124,6 +1124,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0304-Implement-Brigadier-Mojang-API.patch b/patches/server/0304-Implement-Brigadier-Mojang-API.patch
index df0d54f64..9fb421afe 100644
--- a/patches/server/0304-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0304-Implement-Brigadier-Mojang-API.patch
@@ -106,7 +106,7 @@ index c4315531f93f4ed68b4621157b02572886e1ed30..b141d251eedd31bd115342b878afd68d
  
              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 c1270536fc3566454c98419f4bddc0b3b684d63b..1454d5c070bb004d75523d69eaa3d0d382944198 100644
+index 61a0cee760d058e382c2756096a5acce050d9f9d..ac5f70ee86cc5a01b046e8e610434742448e3919 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -836,8 +836,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0322-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0322-Fix-CB-call-to-changed-postToMainThread-method.patch
index 97729ec72..1b53a2693 100644
--- a/patches/server/0322-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0322-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 75cd936e28c3c933c53513093634a9d071a7f94b..0b31a2e2d3bde184c9e1ef9d4ff08e94da0a6960 100644
+index 9f60c0786b4676726036ca56906663698d26aaea..4ebae3246e3866bbdfa17e43bd0252d637885052 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -519,7 +519,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0399-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0399-Load-Chunks-for-Login-Asynchronously.patch
index 9df642bdd..a26ec1459 100644
--- a/patches/server/0399-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/server/0399-Load-Chunks-for-Login-Asynchronously.patch
@@ -81,7 +81,7 @@ index 3af9f2d86cf2a9566e22865689101245647d05a5..fe722106e20e199eb914a09f8dbc1409
          this.server.getProfiler().push("keepAlive");
          // Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index b72dc9c19f512c3f07390e440f2f0f0aab20d6c2..0aa5dc11567cc388d2fcd843faf0aff792892966 100644
+index ef09f5f42a89f767060f015af27269ad496d08c7..984324767cf8afc31fccc0b7add10645aa0925cf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -90,7 +90,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0410-misc-debugging-dumps.patch b/patches/server/0410-misc-debugging-dumps.patch
index 3eca6fade..466556c63 100644
--- a/patches/server/0410-misc-debugging-dumps.patch
+++ b/patches/server/0410-misc-debugging-dumps.patch
@@ -58,7 +58,7 @@ index 3a4222f78a02e10ecccc03df3c580895fbb8059d..ff94b07246b5e17be53f4e7294557c67
          this.running = false;
          if (flag) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 0aa5dc11567cc388d2fcd843faf0aff792892966..5d661c5d9d2f8133445a603db91b729ca36bf44b 100644
+index 984324767cf8afc31fccc0b7add10645aa0925cf..e62bfb9d0803c16e8b34c56c8a61fcafde05dcc8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -203,6 +203,11 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0488-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0488-Fix-hex-colors-not-working-in-some-kick-messages.patch
index c4f76a0ad..3c5a150c0 100644
--- a/patches/server/0488-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0488-Fix-hex-colors-not-working-in-some-kick-messages.patch
@@ -25,7 +25,7 @@ index 43759cdf3da0796d7969c6504ac9a6986c0f0518..750fef0f5b908b776a7306e54653eba4
  
                      this.connection.send(new ClientboundLoginDisconnectPacket(ichatmutablecomponent));
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index d477e9fbe6ffb600d08f8ba49741067d14348968..2f0a70bc9cc8cda9e9beef00421078c036d6287c 100644
+index e62bfb9d0803c16e8b34c56c8a61fcafde05dcc8..1f311f84f8f291228a3b52471835d33c220db849 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -108,7 +108,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index f24ac0cb3..e0d7dfa85 100644
--- a/patches/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 92781fc6d0ebce082cb43353b1dcaf0c70dc4cec..cb8b1375e1c26c8b7e53f18db8d526874089a0b2 100644
+index 1f311f84f8f291228a3b52471835d33c220db849..76d6572429548d90b5efa3029f33923a81f54c3f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -371,12 +371,13 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0649-Add-Mob-lookAt-API.patch b/patches/server/0649-Add-Mob-lookAt-API.patch
index 34a4f0308..2179be519 100644
--- a/patches/server/0649-Add-Mob-lookAt-API.patch
+++ b/patches/server/0649-Add-Mob-lookAt-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Mob#lookAt API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 206b4d187a486e2c8a3a36eacb2d33f9d2555fe8..e19014a6e0d293973574c40c90c556aca17e0b0d 100644
+index c92f7f31c3bf96f22fb1d2e783b14b80512448a0..4d0c6e3aaf984e295061d878dd4a8ef4d19511cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-@@ -91,5 +91,53 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
+@@ -99,5 +99,53 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
      public boolean isInDaylight() {
          return getHandle().isSunBurnTick();
      }
diff --git a/patches/server/0710-Left-handed-API.patch b/patches/server/0710-Left-handed-API.patch
index 51c41178e..3b4077b54 100644
--- a/patches/server/0710-Left-handed-API.patch
+++ b/patches/server/0710-Left-handed-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Left handed API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index e19014a6e0d293973574c40c90c556aca17e0b0d..9187f92f1708478dfffcd9de65898fd409a1b0c1 100644
+index 4d0c6e3aaf984e295061d878dd4a8ef4d19511cb..620d918e302a00d5a6640648e3096988d15535a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-@@ -139,5 +139,15 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
+@@ -147,5 +147,15 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
      public int getMaxHeadPitch() {
          return getHandle().getMaxHeadXRot();
      }
diff --git a/patches/server/0723-Fix-GameProfileCache-concurrency.patch b/patches/server/0723-Fix-GameProfileCache-concurrency.patch
index 68ce86c24..1c8bd06db 100644
--- a/patches/server/0723-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0723-Fix-GameProfileCache-concurrency.patch
@@ -7,7 +7,7 @@ Separate lookup and state access locks prevent lookups
 from stalling simple state access/write calls
 
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 5e3bc0590e59770490b1c6c818d99be054214a8a..84bdf4a849b09a90da6c22f4080386e85a53f6b3 100644
+index 2a4f8aa6697ed6144440970c9abaf9f6e1a2c2ce..8d86645ef264287d01203afd7bba516e78be5743 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -62,6 +62,11 @@ public class GameProfileCache {
diff --git a/patches/server/0732-Optimise-general-POI-access.patch b/patches/server/0732-Optimise-general-POI-access.patch
index b7014db09..621895ffc 100644
--- a/patches/server/0732-Optimise-general-POI-access.patch
+++ b/patches/server/0732-Optimise-general-POI-access.patch
@@ -984,7 +984,7 @@ index bb2be6eea7a0cff4cc70bd43738b1ce213e43558..b71a4027a0eed467a3707c59315092dd
      private boolean isValid;
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
-index 678bd36581ead3a225e3a6e24b78e5db4e42657b..9b2cec7528936a5d53a926c91063cb6e9ed7da1b 100644
+index 4dcfffe2e1c5263c3d1bd096d57d090c1e4b0523..bb59cff9ba570923a40c1612d5812a64390454ee 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 @@ -71,11 +71,11 @@ public class SectionStorage<R> extends RegionFileStorage implements AutoCloseabl
diff --git a/patches/server/0760-Rewrite-dataconverter-system.patch b/patches/server/0760-Rewrite-dataconverter-system.patch
index e892c4fc2..12653fcbc 100644
--- a/patches/server/0760-Rewrite-dataconverter-system.patch
+++ b/patches/server/0760-Rewrite-dataconverter-system.patch
@@ -22700,7 +22700,7 @@ index de7afc737b1ab099edc29a4ef94baa76329c2947..2bc0384728f89b7c64a8beec78a1b77d
  
      public static int getVersion(CompoundTag chunkNbt) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
-index 9b2cec7528936a5d53a926c91063cb6e9ed7da1b..47cda78efcce597d3d7ba8fc93a2865e10cdc237 100644
+index bb59cff9ba570923a40c1612d5812a64390454ee..10e8d1e36639cca21aa451e81cdab90ba9e9a496 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 @@ -148,7 +148,14 @@ public class SectionStorage<R> extends RegionFileStorage implements AutoCloseabl
diff --git a/patches/server/0761-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0761-Use-Velocity-compression-and-cipher-natives.patch
index 4036aee39..686898947 100644
--- a/patches/server/0761-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0761-Use-Velocity-compression-and-cipher-natives.patch
@@ -341,7 +341,7 @@ index b80aedd2002959b4026c27ce76b3ed17f0acfb5b..2985271132c9ae822dcb0d7a7e6f0c26
                  protected void initChannel(Channel channel) {
                      try {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index cb8b1375e1c26c8b7e53f18db8d526874089a0b2..c8d34d4d9173d2c7c44cc922abe6b5f6c6bea879 100644
+index 76d6572429548d90b5efa3029f33923a81f54c3f..26781be1a01b0683f4d0f3cf565c3a623c987606 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -305,12 +305,14 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0780-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0780-Add-config-option-for-logging-player-ip-addresses.patch
index 549e7d846..e2e775311 100644
--- a/patches/server/0780-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0780-Add-config-option-for-logging-player-ip-addresses.patch
@@ -49,7 +49,7 @@ index 2985271132c9ae822dcb0d7a7e6f0c268d1736cc..cfdbcd024de6ad0f9d4e83b2f912b36e
  
                              networkmanager.send(new ClientboundDisconnectPacket(ichatmutablecomponent), PacketSendListener.thenRun(() -> {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index c8d34d4d9173d2c7c44cc922abe6b5f6c6bea879..4ac2a2584fcfce36cbaeccae45ce082c1c37fa12 100644
+index 26781be1a01b0683f4d0f3cf565c3a623c987606..c8e373bccb8c8edd8b7a3a812e04fcf6c836df2d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -226,7 +226,10 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0801-Actually-unload-POI-data.patch b/patches/server/0801-Actually-unload-POI-data.patch
index 009a86355..bf5d29c06 100644
--- a/patches/server/0801-Actually-unload-POI-data.patch
+++ b/patches/server/0801-Actually-unload-POI-data.patch
@@ -267,7 +267,7 @@ index 497a81e49d54380713c18523ae8f09f94c453721..210b0cdd4831421c8f43c3d823ac8e96
  
          @Override
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
-index 47cda78efcce597d3d7ba8fc93a2865e10cdc237..38287fad39d553a86370bbdc755c0a006615e0cf 100644
+index 10e8d1e36639cca21aa451e81cdab90ba9e9a496..954819db8ada38ef2c832151be8a96492e76390a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 @@ -58,6 +58,40 @@ public class SectionStorage<R> extends RegionFileStorage implements AutoCloseabl
diff --git a/patches/server/0820-Validate-usernames.patch b/patches/server/0820-Validate-usernames.patch
index b52fd3e1d..34dcaf0ab 100644
--- a/patches/server/0820-Validate-usernames.patch
+++ b/patches/server/0820-Validate-usernames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 4ac2a2584fcfce36cbaeccae45ce082c1c37fa12..b62208300433bef59789243e484a34650a9edeab 100644
+index c8e373bccb8c8edd8b7a3a812e04fcf6c836df2d..ef6a55a9f0055e23e8887eb3efd17cc21a7dc004 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -66,6 +66,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0829-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0829-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index c7825e4b3..4963f056c 100644
--- a/patches/server/0829-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0829-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added getHostname to AsyncPlayerPreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index b62208300433bef59789243e484a34650a9edeab..7ce626369535219e1918a2e652a501e6835dce41 100644
+index ef6a55a9f0055e23e8887eb3efd17cc21a7dc004..5fe9442810a354cde4516304cdee1ea80dc1e9e4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -411,7 +411,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0928-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0928-Remove-invalid-signature-login-stacktrace.patch
index d282006db..44d9c41c0 100644
--- a/patches/server/0928-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/server/0928-Remove-invalid-signature-login-stacktrace.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove invalid signature login stacktrace
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 7ce626369535219e1918a2e652a501e6835dce41..4c37a225aad960d50cec3f998bcc935b5c7dfe7a 100644
+index 5fe9442810a354cde4516304cdee1ea80dc1e9e4..90ad59b8f387be37311dd3874c96568e2fb812e6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -167,7 +167,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0931-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0931-Add-Velocity-IP-Forwarding-Support.patch
index f45280c84..0ef73f32b 100644
--- a/patches/server/0931-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0931-Add-Velocity-IP-Forwarding-Support.patch
@@ -94,7 +94,7 @@ index 0000000000000000000000000000000000000000..5de2dabbc076a9482b1d6c299f1cff74
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 4c37a225aad960d50cec3f998bcc935b5c7dfe7a..94211a2927352ae468a19939958eb41c8a1d7429 100644
+index 90ad59b8f387be37311dd3874c96568e2fb812e6..79d2bb3170c51e4c83a054eb8d47f894829a94d9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -67,6 +67,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0932-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0932-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index 81d6721a6..73c43682a 100644
--- a/patches/server/0932-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0932-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use thread safe random in ServerLoginPacketListenerImpl
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index bf488013e45b9ab97568e587f4dad899498b2f73..88a849a21d6e39fd70f6e7b554528da1a5a7dd57 100644
+index 79d2bb3170c51e4c83a054eb8d47f894829a94d9..855eac5e6f3a99a2fc31ad0e02c496d4b5c60622 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -52,7 +52,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se