[ci skip] pain

2021-10-11 22:08:41 +02:00
parent a3ae7e7273
commit 7fbbb359d7
68 changed files with 85 additions and 156 deletions
--- a/patches/server/0001-Mirai-Branding-Changes.patch
+++ b/patches/server/0001-Mirai-Branding-Changes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Mirai Branding Changes


 diff --git a/build.gradle.kts b/build.gradle.kts
-index e4fdc5d362b8dbef2c8b209678200f147e871db0..2cc2b916a2667d0e04bb7efd13bdb35c112fdc08 100644
+index fdc3f2390d8d0124102cbff386e8a981c6f92c22..9e9fd28a76ad6af45b9b45288a5060c6c2a1bcc4 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -32,7 +32,7 @@ repositories {
+@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
@@ -17,7 +17,7 @@ index e4fdc5d362b8dbef2c8b209678200f147e871db0..2cc2b916a2667d0e04bb7efd13bdb35c
     implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Airplane
     // Paper start
     implementation("org.jline:jline-terminal-jansi:3.12.1")
-@@ -93,7 +93,7 @@ tasks.jar {
+@@ -92,7 +92,7 @@ tasks.jar {
             "Main-Class" to "org.bukkit.craftbukkit.Main",
             "Implementation-Title" to "CraftBukkit",
             "Implementation-Version" to "git-Paper-$implementationVersion",
@@ -27,7 +27,7 @@ index e4fdc5d362b8dbef2c8b209678200f147e871db0..2cc2b916a2667d0e04bb7efd13bdb35c
             "Specification-Title" to "Bukkit",
             "Specification-Version" to project.version,
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f6d335b377dbf6f744e5f6ced56cf437e6e6bab3..018845c1a96fa4d0411ad12d2260a7d0d6bb5165 100644
+index c80a600b72972c2e8b7d472e2e11c312adaa06e1..34515d988d3a2db1e1e58fa4330eb731c92be305 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -40,10 +40,10 @@ index f6d335b377dbf6f744e5f6ced56cf437e6e6bab3..018845c1a96fa4d0411ad12d2260a7d0
 
     public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 28fa8e5c0d1e78d57d9cfb5ea2998740b8d700dc..0c0029fbbf593dea77e98ff309266203d3a221d1 100644
+index c987e7c46afe6c41339e8e08bf2bfabe8c1ba098..03ec1bbc0fc4354549108868e2514dd42e85ff1d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
+@@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper
 import javax.annotation.Nonnull; // Paper
 
 public final class CraftServer implements Server {
--- a/patches/server/0002-Mirai-Configuration.patch
+++ b/patches/server/0002-Mirai-Configuration.patch
@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Etil <81570777+etil2jz@users.noreply.github.com>
-Date: Fri, 17 Sep 2021 22:03:40 +0200
+Date: Mon, 11 Oct 2021 21:46:23 +0200
 Subject: [PATCH] Mirai Configuration


 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 2a569d05edf0f5337afbcd6803c0513d338ca55e..6081d9063bb1f10a601020d58a1ccb2f16b3c212 100644
+index e2901132b78126c0a4eb04363dfe6a0dccd1313f..2b246dd34ca0ff3da6d49a0eab2ee0af75b13642 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -6,10 +6,7 @@ import com.mojang.authlib.GameProfile;
@@ -20,7 +20,7 @@ index 2a569d05edf0f5337afbcd6803c0513d338ca55e..6081d9063bb1f10a601020d58a1ccb2f
 import java.net.InetAddress;
 import java.net.Proxy;
 import java.nio.charset.StandardCharsets;
-@@ -225,6 +222,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -236,6 +233,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         // Paper end
         gg.airplane.AirplaneConfig.load(); // Airplane - config
         gg.airplane.commands.AirplaneCommands.init(); // Airplane - command
@@ -38,17 +38,17 @@ index 2a569d05edf0f5337afbcd6803c0513d338ca55e..6081d9063bb1f10a601020d58a1ccb2f
         this.setPvpAllowed(dedicatedserverproperties.pvp);
         this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 55ec38f83f97494585aab451e59a8f67841b077b..edb0bcfed9d83c4d7624a28f343dd614e5ab3b3b 100644
+index 03ec1bbc0fc4354549108868e2514dd42e85ff1d..4e3ca2d239ef3585eb0a3dd92e78b638597b3539 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -892,6 +892,7 @@ public final class CraftServer implements Server {
+@@ -907,6 +907,7 @@ public final class CraftServer implements Server {
 
         org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
         com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
 +		xyz.arthurb.mirai.MiraiConfig.init((File) console.options.valueOf("mirai-settings")); // Mirai
         for (ServerLevel world : this.console.getAllLevels()) {
-             world.serverLevelData.setDifficulty(config.difficulty);
-             world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
+             // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
+             world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
 index 22e9dd17f62103c5061435099ce96a3d70d54808..5d0801fc73f5888398efd65cb5e9eabbdf7748e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
--- a/patches/server/0003-Akarin-Swaps-the-predicate-order-of-collision.patch
+++ b/patches/server/0003-Akarin-Swaps-the-predicate-order-of-collision.patch
@@ -8,10 +8,10 @@ Original code by Akarin-project, licensed under GNU General Public License v3.0
 You can find the original code on https://github.com/Akarin-project/Akarin

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7e65ed2a6a4dfa4f22bef5a01a079b8b7cb9e212..7ca7d9ee1772be76a1d0ff2d92c2cb07d7242482 100644
+index d35cdcf2ee7568ad5caf52588db54e9c6f607d4b..d0db4d6683fb5cc114754114c0a0da0d090c8be4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1857,8 +1857,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1859,8 +1859,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
     public void playerTouch(Player player) {}
 
     public void push(Entity entity) {
@@ -21,7 +21,7 @@ index 7e65ed2a6a4dfa4f22bef5a01a079b8b7cb9e212..7ca7d9ee1772be76a1d0ff2d92c2cb07
                 if (this.level.paperConfig.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper
                 double d0 = entity.getX() - this.getX();
                 double d1 = entity.getZ() - this.getZ();
-@@ -1887,7 +1886,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1889,7 +1888,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                     }
                 }
 
--- a/patches/server/0004-Yatopia-Utilities.patch
+++ b/patches/server/0004-Yatopia-Utilities.patch
@@ -10,10 +10,10 @@ Original code by YatopiaMC, licensed under MIT
 You can find the original code on https://github.com/YatopiaMC/Yatopia

 diff --git a/build.gradle.kts b/build.gradle.kts
-index 79983b971264e8de36bfc547439f8889e2e2a5fe..b5871f179baa86668390ff0c4e4b6ef2a55c72ea 100644
+index 9e9fd28a76ad6af45b9b45288a5060c6c2a1bcc4..74f8760264aa93af9d4d2895a96ed416a8ef411e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -50,6 +50,7 @@ dependencies {
+@@ -49,6 +49,7 @@ dependencies {
     implementation("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
     implementation("org.ow2.asm:asm:9.2")
     implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation
--- a/patches/server/0010-Hide-player-IPs.patch
+++ b/patches/server/0010-Hide-player-IPs.patch
@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Etil <81570777+etil2jz@users.noreply.github.com>
-Date: Sat, 18 Sep 2021 16:43:11 +0200
-Subject: [PATCH] Hide player IPs
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 01fee879c946b6640da34d5890d686f0152437dc..76c2f4b24e16c7d641ae1945b0ef94a6e854b342 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -10,12 +10,14 @@ import java.net.InetSocketAddress;
- import java.net.SocketAddress;
- import java.security.PrivateKey;
- import java.util.Arrays;
-+import java.util.Objects;
- import java.util.Random;
- import java.util.UUID;
- import java.util.concurrent.atomic.AtomicInteger;
- import javax.annotation.Nullable;
- import javax.crypto.Cipher;
- import javax.crypto.SecretKey;
-+import xyz.arthurb.mirai.MiraiConfig;
- import net.minecraft.DefaultUncaughtExceptionHandler;
- import net.minecraft.network.Connection;
- import net.minecraft.network.FriendlyByteBuf;
-@@ -223,6 +225,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
-     }
- 
-     public String getUserName() {
-+		// Mirai start
-+		if (MiraiConfig.hidePlayerIps) {
-+			return Objects.toString(this.gameProfile);
-+		}
-         return this.gameProfile != null ? this.gameProfile + " (" + this.connection.getRemoteAddress() + ")" : String.valueOf(this.connection.getRemoteAddress());
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c560b0cf408467a913b0965bc97eed9d6d63897c..9dea6afb7fd90ff58970a5fe130fb14d2cdc991d 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -7,6 +7,7 @@ import com.google.common.collect.Sets;
- import com.mojang.authlib.GameProfile;
- import com.mojang.serialization.DataResult;
- import com.mojang.serialization.Dynamic;
-+import xyz.arthurb.mirai.MiraiConfig;
- import io.netty.buffer.Unpooled;
- import io.papermc.paper.adventure.PaperAdventure;
- import java.io.File;
-@@ -486,11 +487,17 @@ public abstract class PlayerList {
-         // CraftBukkit - Moved from above, added world
-         
- 		// Yatopia start - log player login location
-		if (xyz.arthurb.mirai.MiraiConfig.logPlayerLoginLoc) {
-			PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
-		} else {
-			PlayerList.LOGGER.info("{}[{}] logged in with entity id {}", player.getName().getString(), s1, player.getId());
-		}
-+		// Mirai start - hide player ips
-+		if (xyz.arthurb.mirai.MiraiConfig.logPlayerLoginLoc && MiraiConfig.hidePlayerIps) {
-+			PlayerList.LOGGER.info("{} logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
-+		} else if (xyz.arthurb.mirai.MiraiConfig.logPlayerLoginLoc) {
-+ 			PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
-+		} else if (MiraiConfig.hidePlayerIps) {
-+			PlayerList.LOGGER.info("{} logged in with entity id {}", player.getName().getString(), player.getId());
-+ 		} else {
-+ 			PlayerList.LOGGER.info("{}[{}] logged in with entity id {}", player.getName().getString(), s1, player.getId());
-+ 		}
-+		// Mirai end - hide player ips
- 		// Yatopia end - log player login location
-     }
- 
--- a/patches/server/0010-Lithium-HashedList.patch
+++ b/patches/server/0010-Lithium-HashedList.patch
--- a/patches/server/0011-Yatopia-Optimize-TileEntity-load-unload.patch
+++ b/patches/server/0011-Yatopia-Optimize-TileEntity-load-unload.patch
@@ -7,7 +7,7 @@ Original code by YatopiaMC, licensed under MIT
 You can find the original code on https://github.com/YatopiaMC/Yatopia

 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6f4e6105aa1d6546daa2424f57972fd29db25fa3..96085df2d6a10a4592455434c52e7919803bd8f4 100644
+index 24d772c18d5a448154909e4a51964ba29485a5c2..243e3c9b36a2606ea03dd8effebc925bcabac0c0 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -115,8 +115,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
--- a/patches/server/0012-Lithium-entity.fast_retrieval.patch
+++ b/patches/server/0012-Lithium-entity.fast_retrieval.patch
--- a/patches/server/0013-Patina-Completely-remove-snooper.patch
+++ b/patches/server/0013-Patina-Completely-remove-snooper.patch
@@ -7,7 +7,7 @@ Original code by PatinaMC, licensed under GNU General Public License v3.0
 You can find the original code on https://github.com/PatinaMC/Patina

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cc4b83b8d8f532fd1015a9259b67de6e34f242d7..38dd502cd8b0e366933e5d886d367cb7458255ef 100644
+index c8e5c4faba4ff144659032ca3f80e4022d765522..48ed4ba0c4eef10e32206a066e4a22e8998449c7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -189,14 +189,14 @@ import org.bukkit.event.server.ServerLoadEvent;
@@ -118,10 +118,10 @@ index cc4b83b8d8f532fd1015a9259b67de6e34f242d7..38dd502cd8b0e366933e5d886d367cb7
     public int getSpawnProtectionRadius() {
         return 16;
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 6081d9063bb1f10a601020d58a1ccb2f16b3c212..d88878bc094fa0fb2f7e9bfe288c250d14e228c7 100644
+index 2b246dd34ca0ff3da6d49a0eab2ee0af75b13642..02973f4ac85217364a41596748dc17581ecf6bd0 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -494,17 +494,21 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -505,17 +505,21 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         return this.getProperties().allowNether;
     }
 
--- a/patches/server/0014-Patina-Remove-TickTask.patch
+++ b/patches/server/0014-Patina-Remove-TickTask.patch
@@ -7,7 +7,7 @@ Original code by PatinaMC, licensed under GNU General Public License v3.0
 You can find the original code on https://github.com/PatinaMC/Patina

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 38dd502cd8b0e366933e5d886d367cb7458255ef..0cbbf7ee0ae6a5d4533287c56ed1e711f4ff9c56 100644
+index 48ed4ba0c4eef10e32206a066e4a22e8998449c7..c2ef14a223b9e4414c0e1a34b507a99378ddca21 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -189,7 +189,7 @@ import org.bukkit.event.server.ServerLoadEvent;
--- a/patches/server/0015-Patina-Completely-remove-metrics.patch
+++ b/patches/server/0015-Patina-Completely-remove-metrics.patch
@@ -688,7 +688,7 @@ index f5d01bce4d5547b4aeca96b7962b2090f47ea541..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3cb9e223c90f97aa106ee1e9512d33897a6bac1a..a94be051d8c7aec6fe6bc00e14994c3b493cd28d 100644
+index 361b05c3211704edbbe921a042d4daae8dbd5d45..f404f163626959478756451d9e97a98f8f109da6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -51,7 +51,7 @@ public class PaperConfig {
@@ -1362,7 +1362,7 @@ index 8f15af52d2ed734732134bf011ccdd4b7856a284..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index ba0e8902e7205bc6da88efd28be70ece04cc1974..740752da2942911d68f323c889725749d1a73bfe 100644
+index ec7938202e3890bccb809a8092362458d0f4ca75..6f67770af753c26a7584f3d6cb85a2a3a00abca2 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -48,7 +48,7 @@ public class SpigotConfig
--- a/patches/server/0016-Patina-Remove-unnecessary-LogManager.getLogger.patch
+++ b/patches/server/0016-Patina-Remove-unnecessary-LogManager.getLogger.patch
@@ -7,7 +7,7 @@ Original code by PatinaMC, licensed under GNU General Public License v3.0
 You can find the original code on https://github.com/PatinaMC/Patina

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7ca7d9ee1772be76a1d0ff2d92c2cb07d7242482..c07a945d0215297a47f5928e4476615c1f0b8011 100644
+index d0db4d6683fb5cc114754114c0a0da0d090c8be4..02952b2896cdccb4802c5c113bc6f0b647e11908 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -164,7 +164,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -19,7 +19,7 @@ index 7ca7d9ee1772be76a1d0ff2d92c2cb07d7242482..c07a945d0215297a47f5928e4476615c
             } else {
                 super.setSeed(seed);
                 locked = true;
-@@ -2320,7 +2320,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2322,7 +2322,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                 try {
                     spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.valueOf(spawnReasonName);
                 } catch (Exception ignored) {
--- a/patches/server/0017-Patina-Make-a-field-final.patch
+++ b/patches/server/0017-Patina-Make-a-field-final.patch
--- a/patches/server/0018-Patina-Don-t-create-new-random-instance.patch
+++ b/patches/server/0018-Patina-Don-t-create-new-random-instance.patch
@@ -7,7 +7,7 @@ Original code by PatinaMC, licensed under GNU General Public License v3.0
 You can find the original code on https://github.com/PatinaMC/Patina

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f0250f97d194f1ad98f8f119c80e1b24ee26a2ac..b660c853128e79334f3da8f7334125d240cf0fc6 100644
+index c2ef14a223b9e4414c0e1a34b507a99378ddca21..b5d91bdedad3c0f892e07928d35e2e1427245efa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -647,7 +647,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
@@ -20,7 +20,7 @@ index f0250f97d194f1ad98f8f119c80e1b24ee26a2ac..b660c853128e79334f3da8f7334125d2
                 dimensionmanager = worlddimension.type();
                 chunkgenerator = worlddimension.generator();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9e6342ac61bdccfde371674249a5d43c692358eb..fe38270c83555fd2008f9ce873ba2964a283e6a8 100644
+index 11f46c1b8f4c8414e0667d1873542c17d6e01f2a..2bc5bb4fbfb8b354c08e00059727d96426bcdaac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -372,7 +372,7 @@ public class ServerPlayer extends Player {
@@ -55,7 +55,7 @@ index 25ae440839f1d286550a77d0a4c61e1dc02b369d..711d5dc2a8b3a5f2a2a35cab59b5ecfd
         }
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ae6b32865857cc6e32c468237c25b9baa117842b..66e48492c2cbb4833ffda027332a81b80538d214 100644
+index 243e3c9b36a2606ea03dd8effebc925bcabac0c0..6236ab216f4d4c65e057ee3460451271ed88f446 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -123,13 +123,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -97,10 +97,10 @@ index 57b12ba5a24e68b0a0420d692946fe5e83974db4..75b00ee813da7447f33ba2a334e96892
         if (!s1.isEmpty()) {
             try {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0bfced8a446fbd689680f071599a47c9527eee63..2ff372ebd8b74926c00ae470ddf79ab918036eb1 100644
+index 4e3ca2d239ef3585eb0a3dd92e78b638597b3539..8c6722cff36adf963003972cdd85e63bb21e1f9c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1173,7 +1173,7 @@ public final class CraftServer implements Server {
+@@ -1194,7 +1194,7 @@ public final class CraftServer implements Server {
 
         if (worlddimension == null) {
             dimensionmanager = (DimensionType) console.registryHolder.registryOrThrow(Registry.DIMENSION_TYPE_REGISTRY).getOrThrow(DimensionType.OVERWORLD_LOCATION);
--- a/patches/server/0019-Patina-Completely-remove-bootstrapExecutor.patch
+++ b/patches/server/0019-Patina-Completely-remove-bootstrapExecutor.patch
--- a/patches/server/0020-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch
+++ b/patches/server/0020-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch
--- a/patches/server/0021-Logo.patch
+++ b/patches/server/0021-Logo.patch
--- a/patches/server/0022-Sugarcane-New-NBT-cache.patch
+++ b/patches/server/0022-Sugarcane-New-NBT-cache.patch
@@ -9,7 +9,7 @@ Original code by YatopiaMC, licensed under MIT
 You can find the original code on https://github.com/YatopiaMC/Yatopia

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b660c853128e79334f3da8f7334125d240cf0fc6..31de069f4a5cee86eb5fa3316a031b85c8f6eb1b 100644
+index b5d91bdedad3c0f892e07928d35e2e1427245efa..e0bcfe69b021ee4b676cc698d52648f7bd178ee3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1097,7 +1097,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
--- a/patches/server/0023-Sugarcane-Add-last-tick-time-API.patch
+++ b/patches/server/0023-Sugarcane-Add-last-tick-time-API.patch
@@ -9,7 +9,7 @@ Original code by YatopiaMC, licensed under MIT
 You can find the original code on https://github.com/YatopiaMC/Yatopia

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 31de069f4a5cee86eb5fa3316a031b85c8f6eb1b..a1a1aa0f4f30391cf4afb57a743c16aa8f5a4e17 100644
+index e0bcfe69b021ee4b676cc698d52648f7bd178ee3..0dcffa54fd10f2dc905a95cbff41e9c207c700a2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1210,6 +1210,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
@@ -32,10 +32,10 @@ index 31de069f4a5cee86eb5fa3316a031b85c8f6eb1b..a1a1aa0f4f30391cf4afb57a743c16aa
                     this.mayHaveDelayedTasks = true;
                     this.delayedTasksMaxNextTickTime = Math.max(Util.getMillis() + 50L, this.nextTickTime);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2ff372ebd8b74926c00ae470ddf79ab918036eb1..fb9a857dd119333b49867bb48846679ffa8193e1 100644
+index 8c6722cff36adf963003972cdd85e63bb21e1f9c..692c4066584c3f468b16ca63f56d124d9b9b741a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2669,4 +2669,6 @@ public final class CraftServer implements Server {
+@@ -2709,4 +2709,6 @@ public final class CraftServer implements Server {
     }
 
     // Paper end
--- a/patches/server/0024-Sugarcane-Add-GameProfileLookupEvent.patch
+++ b/patches/server/0024-Sugarcane-Add-GameProfileLookupEvent.patch
--- a/patches/server/0025-Sugarcane-Stop-wasting-resources-on-JsonList-get.patch
+++ b/patches/server/0025-Sugarcane-Stop-wasting-resources-on-JsonList-get.patch
@@ -7,10 +7,10 @@ Original code by YatopiaMC, licensed under MIT
 You can find the original code on https://github.com/YatopiaMC/Yatopia

 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9dea6afb7fd90ff58970a5fe130fb14d2cdc991d..e61c9b789583382612b4b0fd56084ebe2e9adbda 100644
+index c5b3c824ac8868cf696c02a877dd5b3a89e022a5..eca17945296ddacceb0eeda97ee57e465bd6638a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -753,14 +753,20 @@ public abstract class PlayerList {
+@@ -746,14 +746,20 @@ public abstract class PlayerList {
         if (getBans().isBanned(gameprofile) && (gameprofilebanentry = getBans().get(gameprofile)) != null) {
             // Paper end
 
--- a/patches/server/0026-Yatopia-Global-Eula-file.patch
+++ b/patches/server/0026-Yatopia-Global-Eula-file.patch
--- a/patches/server/0027-EMC-Don-t-save-Fireworks.patch
+++ b/patches/server/0027-EMC-Don-t-save-Fireworks.patch
--- a/patches/server/0028-EMC-Fix-Give-command.patch
+++ b/patches/server/0028-EMC-Fix-Give-command.patch
--- a/patches/server/0029-EMC-Don-t-use-force-unload-for-keep-spawn-setting-ch.patch
+++ b/patches/server/0029-EMC-Don-t-use-force-unload-for-keep-spawn-setting-ch.patch
@@ -7,10 +7,10 @@ Original code by Starlis LLC, licensed under MIT
 You can find the original code on https://github.com/starlis/empirecraft

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 883b2070fcf99cf10d44aef6dece0f7f84bfeeed..63f6dd93aa00b8c30478f50bd388fae805b9e3b4 100644
+index 00d8b61c04ac91770b0ff3b846d3ff70bef2e8e7..1d0c2e7b1c9c1b8e5b00c7b17ab70658172c2f0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -369,7 +369,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -370,7 +370,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
 
     @Override
     public boolean unloadChunk(int x, int z) {
--- a/patches/server/0030-EMC-Don-t-trigger-Lootable-Refresh-for-non-player-in.patch
+++ b/patches/server/0030-EMC-Don-t-trigger-Lootable-Refresh-for-non-player-in.patch
--- a/patches/server/0031-EMC-Don-t-load-chunks-for-physics.patch
+++ b/patches/server/0031-EMC-Don-t-load-chunks-for-physics.patch
@@ -7,10 +7,10 @@ Original code by Starlis LLC, licensed under MIT
 You can find the original code on https://github.com/starlis/empirecraft

 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 66e48492c2cbb4833ffda027332a81b80538d214..35cf04c0710f831eb6663a66f7de1d05d615adc1 100644
+index 6236ab216f4d4c65e057ee3460451271ed88f446..5f48f2d6a05a74e5e6b1308f7e054972c7928c15 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -914,7 +914,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -916,7 +916,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
 
     public void neighborChanged(BlockPos pos, Block sourceBlock, BlockPos neighborPos) {
         if (!this.isClientSide) {
--- a/patches/server/0032-EMC-Do-not-process-chat-commands-before-player-has-j.patch
+++ b/patches/server/0032-EMC-Do-not-process-chat-commands-before-player-has-j.patch
--- a/patches/server/0033-Jettpack-Use-LinkedBlockingDeque-in-IAsyncTaskHandle.patch
+++ b/patches/server/0033-Jettpack-Use-LinkedBlockingDeque-in-IAsyncTaskHandle.patch
--- a/patches/server/0034-Jettpack-Better-handling-of-async-tasks.patch
+++ b/patches/server/0034-Jettpack-Better-handling-of-async-tasks.patch
@@ -7,7 +7,7 @@ Original code by Titaniumtown, licensed under GNU General Public License v3.0
 You can find the original code on https://gitlab.com/Titaniumtown/JettPack

 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 6fec6a47538da4c0c5a4505e9bedf492bb3376dd..fcef1eec26a4b7d76b2e7a8676a7bf84c1cc84a3 100644
+index b7c24a7ff4dc50d03f74b21a0b353d0ce559b4d4..0c473488a94a34f48d73e3bf52391bacddd6496e 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -350,9 +350,13 @@ public class Commands {
@@ -80,7 +80,7 @@ index f9701ef4162868894a81f0d1ac9b58d00d9a2d65..184b23d4a895d8feb57f707b635490d0
     public static Runnable once(Runnable run) {
         AtomicBoolean ran = new AtomicBoolean(false);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a1a1aa0f4f30391cf4afb57a743c16aa8f5a4e17..a1d0389f7c6126d0088734f4f7997eb202486b6e 100644
+index 0dcffa54fd10f2dc905a95cbff41e9c207c700a2..38b6595ac5d709795b8e846e6113d55481ddd79d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -368,7 +368,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
@@ -110,10 +110,10 @@ index a1a1aa0f4f30391cf4afb57a743c16aa8f5a4e17..a1d0389f7c6126d0088734f4f7997eb2
         }
         // Paper end
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 76c2f4b24e16c7d641ae1945b0ef94a6e854b342..3cf32793d7de14cd7b070037896916c542008984 100644
+index 494ca8fa8c742d4eac9fb11878d3b3170d850265..e49603998d5af9568f37e86899f8f9c70bbf2b9c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -48,6 +48,7 @@ import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
+@@ -46,6 +46,7 @@ import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 import org.bukkit.event.player.PlayerPreLoginEvent;
 // CraftBukkit end
 import io.netty.buffer.Unpooled; // Paper
@@ -121,7 +121,7 @@ index 76c2f4b24e16c7d641ae1945b0ef94a6e854b342..3cf32793d7de14cd7b070037896916c5
 
 public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener {
 
-@@ -128,7 +129,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -126,7 +127,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
 
     }
 
@@ -131,7 +131,7 @@ index 76c2f4b24e16c7d641ae1945b0ef94a6e854b342..3cf32793d7de14cd7b070037896916c5
     private static final AtomicInteger threadId = new AtomicInteger(0);
     private static final java.util.concurrent.ExecutorService authenticatorPool = java.util.concurrent.Executors.newCachedThreadPool(
             r -> {
-@@ -140,6 +142,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -138,6 +140,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
             }
     );
     // Paper end
@@ -139,7 +139,7 @@ index 76c2f4b24e16c7d641ae1945b0ef94a6e854b342..3cf32793d7de14cd7b070037896916c5
     // Spigot start
     public void initUUID()
     {
-@@ -250,7 +253,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -247,7 +250,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
             // Paper end
             // Spigot start
             // Paper start - Cache authenticator threads
@@ -148,7 +148,7 @@ index 76c2f4b24e16c7d641ae1945b0ef94a6e854b342..3cf32793d7de14cd7b070037896916c5
                 @Override
                 public void run() {
                     try {
-@@ -294,7 +297,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -291,7 +294,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
         }
 
         // Paper start - Cache authenticator threads
@@ -157,7 +157,7 @@ index 76c2f4b24e16c7d641ae1945b0ef94a6e854b342..3cf32793d7de14cd7b070037896916c5
             public void run() {
                 GameProfile gameprofile = ServerLoginPacketListenerImpl.this.gameProfile;
 
-@@ -428,7 +431,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -425,7 +428,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
             this.gameProfile = com.destroystokyo.paper.proxy.VelocityProxy.createProfile(buf);
 
             // Proceed with login
--- a/patches/server/0035-Jettpack-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EX.patch
+++ b/patches/server/0035-Jettpack-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EX.patch
--- a/patches/server/0036-Lithium-ai.task.goat_jump.patch
+++ b/patches/server/0036-Lithium-ai.task.goat_jump.patch
--- a/patches/server/0037-Lithium-Reduce-allocations.patch
+++ b/patches/server/0037-Lithium-Reduce-allocations.patch
--- a/patches/server/0038-Some-modifications-to-the-Snooper-patch.patch
+++ b/patches/server/0038-Some-modifications-to-the-Snooper-patch.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Some modifications to the Snooper patch


 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a1d0389f7c6126d0088734f4f7997eb202486b6e..c2e170e1fd84796298888e237bc8eb4f98ab1ceb 100644
+index 38b6595ac5d709795b8e846e6113d55481ddd79d..7aeeb858e0b44008b48e26ec4c61f04a203ed288 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -120,8 +120,8 @@ import net.minecraft.util.profiling.metrics.profiling.ServerMetricsSamplersProvi
@@ -46,10 +46,10 @@ index a1d0389f7c6126d0088734f4f7997eb202486b6e..c2e170e1fd84796298888e237bc8eb4f
 	*/
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index d88878bc094fa0fb2f7e9bfe288c250d14e228c7..303dff5ba819897f8c011f57d8f1e7ba7624e020 100644
+index 02973f4ac85217364a41596748dc17581ecf6bd0..d0ca92837e95483e94faf4115f5de7a4e6adbfc9 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -501,9 +501,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -512,9 +512,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         snooper.setDynamicData("whitelist_count", (Object) this.getPlayerList().getWhiteListNames().length);
         super.populateSnooper(snooper);
     }
--- a/patches/server/0039-Purpur-Fix-cow-rotation-when-shearing-mooshroom.patch
+++ b/patches/server/0039-Purpur-Fix-cow-rotation-when-shearing-mooshroom.patch
--- a/patches/server/0040-Purpur-End-gateway-should-check-if-entity-can-use-po.patch
+++ b/patches/server/0040-Purpur-End-gateway-should-check-if-entity-can-use-po.patch
@@ -7,7 +7,7 @@ Original code by pl3xgaming, licensed under MIT
 You can find the original code on https://github.com/pl3xgaming/Purpur

 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 782becb96b6300f14deee360b653dc99c57fdc12..eee9b13817c3c0c9fe418b337e82a1ad0d69f919 100644
+index 0b238666a506816b8948d1db7397c26ca50b89d3..cfb82920e3ecd50134a6c4c641d4b098f614c763 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
@@ -178,6 +178,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
--- a/patches/server/0041-Purpur-Arrows-should-not-reset-despawn-counter.patch
+++ b/patches/server/0041-Purpur-Arrows-should-not-reset-despawn-counter.patch
--- a/patches/server/0042-Purpur-Spread-out-and-optimise-player-list-ticksSpre.patch
+++ b/patches/server/0042-Purpur-Spread-out-and-optimise-player-list-ticksSpre.patch
@@ -8,10 +8,10 @@ Original code by pl3xgaming, licensed under MIT
 You can find the original code on https://github.com/pl3xgaming/Purpur

 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e61c9b789583382612b4b0fd56084ebe2e9adbda..694006404be284042991cddd19caab909ada3cf2 100644
+index eca17945296ddacceb0eeda97ee57e465bd6638a..71a742704038fa7a1174ce1d118735d917095f60 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1029,22 +1029,22 @@ public abstract class PlayerList {
+@@ -1022,22 +1022,22 @@ public abstract class PlayerList {
     }
 
     public void tick() {
@@ -48,7 +48,7 @@ index e61c9b789583382612b4b0fd56084ebe2e9adbda..694006404be284042991cddd19caab90
 
     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 2b8e31ae00e786dfbfbf5bb5228b846752cd2543..6c7cb224229fa3aa64d6cf3b25a2213e31165931 100644
+index c64911651f3d736c83cc83996de04920b091cc57..f7b05cb6c145adadf0836ea9f7903675b002569a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1565,7 +1565,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/patches/server/0043-Purpur-Fix-SPIGOT-6278.patch
+++ b/patches/server/0043-Purpur-Fix-SPIGOT-6278.patch
@@ -7,7 +7,7 @@ Original code by pl3xgaming, licensed under MIT
 You can find the original code on https://github.com/pl3xgaming/Purpur

 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index 06c6ed64488bb3685b9de3e05d8a1e74ebc62e37..4b671e0663693002632b8f00262961ec5e8b1d09 100644
+index 758558c1e312edc730d1f5d7ffdbc5a41356a6e5..61db9173c37cbb0f3c249658aa3487f2a08c9692 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
@@ -200,7 +200,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
--- a/patches/server/0044-EMC-Always-convert-Lore-Name-of-an-item-to-ensure-co.patch
+++ b/patches/server/0044-EMC-Always-convert-Lore-Name-of-an-item-to-ensure-co.patch
--- a/patches/server/0045-EMC-Bound-villager-trade-maxUses-by-16.patch
+++ b/patches/server/0045-EMC-Bound-villager-trade-maxUses-by-16.patch
--- a/patches/server/0046-EMC-Tweak-explosions.patch
+++ b/patches/server/0046-EMC-Tweak-explosions.patch
--- a/patches/server/0047-Purpur-Fix-vanilla-command-permission-handler.patch
+++ b/patches/server/0047-Purpur-Fix-vanilla-command-permission-handler.patch
@@ -19,10 +19,10 @@ index f64aa22ed6fcb4af67317b99f459ee5296392548..63af2216c383aef0809dd381b69493ec
     public void removeCommand(String name) {
         this.children.remove(name);
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index e9d1fb479855194da5a05e86861848158736cbb4..c5f0c4022ef1ffadc49f0224fe491d1eb1b4e48f 100644
+index 4aa1dc543950b5de64345b3403a6d0bc41c521df..23adb3b18a0fbe6b6c7cbc40d9f256495d6661f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-@@ -87,6 +87,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {
+@@ -89,6 +89,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {
     }
 
     public static String getPermission(CommandNode<CommandSourceStack> vanillaCommand) {
--- a/patches/server/0048-Improve-EntityTransformEvent-cancellation-handling.patch
+++ b/patches/server/0048-Improve-EntityTransformEvent-cancellation-handling.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve EntityTransformEvent cancellation handling


 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 0f7f7aef78a1f34fe113eeb00a88fd2610351344..e9e1929750e10e9170b0051edfd43a615b8e241b 100644
+index 4904971710acbb2855ed9ed96fead4aed189c494..cd332a416bc56227d1d197ab1bc892ac90181b3a 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -858,7 +858,6 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
--- a/patches/server/0049-Yatopia-Use-faster-random-implementation.patch
+++ b/patches/server/0049-Yatopia-Use-faster-random-implementation.patch
@@ -20,7 +20,7 @@ index 20cfe7b9b7127ddeb97aa91d759fc17b4a548eaf..8d4f8de8aa9a9f8194e37b9261ee0819
     private long lastFill = -1;
     private long nextRefill = -1;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c2e170e1fd84796298888e237bc8eb4f98ab1ceb..1e3185f84c3017a4f756bdf14e397604b74edf4e 100644
+index 7aeeb858e0b44008b48e26ec4c61f04a203ed288..74c6c9b6ea7f0f3564f76db4cdac1c89789434ed 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -412,7 +412,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
@@ -64,10 +64,10 @@ index a7ea776f5f8dad3dd9475de41209d8704c0886d3..277acda841ed4d7a13b4ffd64dee46a4
         double d1 = (double) (center.y - maxRange);
         double d2 = (double) (center.x + maxRange);
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 3cf32793d7de14cd7b070037896916c542008984..60409c1ece97e1f7b51a7394f048d3e676469fde 100644
+index e49603998d5af9568f37e86899f8f9c70bbf2b9c..e9fec04cc3ff23e2254172ed01849a0a837338f7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -55,7 +55,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -53,7 +53,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
     private static final AtomicInteger UNIQUE_THREAD_ID = new AtomicInteger(0);
     static final Logger LOGGER = LogManager.getLogger();
     private static final int MAX_TICKS_BEFORE_LOGIN = 600;
@@ -77,7 +77,7 @@ index 3cf32793d7de14cd7b070037896916c542008984..60409c1ece97e1f7b51a7394f048d3e6
     final MinecraftServer server;
     public final Connection connection;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c07a945d0215297a47f5928e4476615c1f0b8011..551d5ea47ff8bbffce1affefab3c990fb5c1ac8f 100644
+index 02952b2896cdccb4802c5c113bc6f0b647e11908..fbbf36e5c71e216b357123497cbed23354635d34 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -159,7 +159,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -116,7 +116,7 @@ index f8ede3588bfda9a7d4d5807311a3e9c2651fd0a3..5b2b7ff744a94493ee7598b89439553a
     private int tickDelay;
     private int spawnDelay;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-index 852a4edde291bf368b2396e3c94ab402e3c66622..eb165d4c64cfd5c18cc522e4a798392e3402d743 100644
+index 5c16566f59535ce61fb3f747a745255cfaa439e8..1269e34b4d5248aba57f422604747a528c283566 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
@@ -77,7 +77,7 @@ public class FishingHook extends Projectile {
@@ -181,7 +181,7 @@ index cfec89db4300bdb96a220540ee87892d22215e9d..56b54a0f784397663f951d2838b341e9
     private NonNullList<ItemStack> items;
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 53001f490f374c75e0d44ec75387f4bee6ab8952..6bbd6ee76be340759eafffde2414fbad711de5e3 100644
+index 44551fc6fc5888206c1a2da3ece5baa486faa1d5..c5d490717a6fdbe7eb93d02ac672f6451800c570 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
@@ -120,7 +120,7 @@ public class EndDragonFight {
@@ -212,10 +212,10 @@ index 53001f490f374c75e0d44ec75387f4bee6ab8952..6bbd6ee76be340759eafffde2414fbad
 
     private EnderDragon createNewDragon() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 63f6dd93aa00b8c30478f50bd388fae805b9e3b4..36cc407c27a089dd7149899f8c3abef955dd013c 100644
+index 1d0c2e7b1c9c1b8e5b00c7b17ab70658172c2f0d..8ccc0bbcaf30b1cdb8450aea6bfc9740651f59ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -201,7 +201,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -202,7 +202,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
     }
     // Paper end
 
--- a/patches/server/0050-Origami-Optimize-inventory-API-item-handling.patch
+++ b/patches/server/0050-Origami-Optimize-inventory-API-item-handling.patch
--- a/patches/server/0051-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0051-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal


 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 416f579560115caddadf6a400b80a4d1d6ebe04c..c61072657205a76a0515dfd02312a71cd4e7e4e6 100644
+index 86b6d4b4984c7dc41026bffb695fe9e573c48891..47a086bf030ed21d731dde689bd7e1b005b5df47 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2430,6 +2430,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2436,6 +2436,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
             // Spigot end
             // Spigot Start
             if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder) {
--- a/patches/server/0052-Purpur-Disable-outdated-build-check.patch
+++ b/patches/server/0052-Purpur-Disable-outdated-build-check.patch
--- a/patches/server/0053-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch
+++ b/patches/server/0053-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch
--- a/patches/server/0054-Purpur-Don-t-send-useless-entity-packets.patch
+++ b/patches/server/0054-Purpur-Don-t-send-useless-entity-packets.patch
@@ -42,7 +42,7 @@ index c71bc00973899feec0ec5530bf3d237928810cf4..d175a41fd8c24813904019e25432c4a7
     public void removePairing(ServerPlayer player) {
         this.entity.stopSeenByPlayer(player);
 diff --git a/src/main/java/xyz/arthurb/mirai/MiraiConfig.java b/src/main/java/xyz/arthurb/mirai/MiraiConfig.java
-index 50392b3056d1cc10d9c59353bfa8edda3bab85f4..72dad6f85c1307aa99b0506d2dfd6e376b2dd11d 100644
+index ca2aeb64b1ff8a52800fdf7279b7e2bc697472ea..696d94ebe10c16d482c8c9b072ad22f1b46db67f 100644
 --- a/src/main/java/xyz/arthurb/mirai/MiraiConfig.java
 +++ b/src/main/java/xyz/arthurb/mirai/MiraiConfig.java
@@ -204,5 +204,11 @@ public class MiraiConfig {
--- a/patches/server/0055-Purpur-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/server/0055-Purpur-Skip-events-if-there-s-no-listeners.patch
@@ -7,7 +7,7 @@ Original code by pl3xgaming, licensed under MIT
 You can find the original code on https://github.com/pl3xgaming/Purpur

 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index fcef1eec26a4b7d76b2e7a8676a7bf84c1cc84a3..91a2a51c767f68f9d20a6e6827109e0111c62268 100644
+index 0c473488a94a34f48d73e3bf52391bacddd6496e..f4ff6b94b95d9794b1c4c49f6fb8ea3255343dc7 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -386,6 +386,7 @@ public class Commands {
--- a/patches/server/0056-Purpur-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0056-Purpur-Fix-the-dead-lagging-the-server.patch
@@ -7,22 +7,22 @@ Original code by pl3xgaming, licensed under MIT
 You can find the original code on https://github.com/pl3xgaming/Purpur

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 551d5ea47ff8bbffce1affefab3c990fb5c1ac8f..b6d3e77b5ea67f9c2a35e37ac35d5f77e8436995 100644
+index fbbf36e5c71e216b357123497cbed23354635d34..0e5b670ecbde0a917af961aa7099b0a073d1d8f6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1771,6 +1771,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-         this.setXRot(Mth.clamp(pitch, -90.0F, 90.0F) % 360.0F);
+@@ -1772,6 +1772,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
         this.yRotO = this.getYRot();
         this.xRotO = this.getXRot();
+         this.setYHeadRot(yaw); // Paper - Update head rotation
 +		if (valid && !this.isRemoved()) level.getChunk((int) Math.floor(this.getX()) >> 4, (int) Math.floor(this.getZ()) >> 4); // CraftBukkit // Paper // Purpur
     }
 
     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 db7ecf2bdbc684f1199e5a3179a876f212af5ec5..0b6331f333e7cbdb76f83cbc2acb027e5716bc07 100644
+index cec7b16066ed0b41209b983c4dfc3835f94ad2c3..8f6903aaac8da81c70e1fc98d5be708ca3586848 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2894,7 +2894,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2893,7 +2893,7 @@ public abstract class LivingEntity extends Entity {
             }
         }
 
--- a/patches/server/0058-Purpur-Logger-settings-suppressing-pointless-logs.patch
+++ b/patches/server/0058-Purpur-Logger-settings-suppressing-pointless-logs.patch
--- a/patches/server/0059-Purpur-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0059-Purpur-Add-5-second-tps-average-in-tps.patch
--- a/patches/server/0060-Patina-Remove-VersionFetcher.patch
+++ b/patches/server/0060-Patina-Remove-VersionFetcher.patch
--- a/patches/server/0061-Purpur-Fix-stuck-in-portals.patch
+++ b/patches/server/0061-Purpur-Fix-stuck-in-portals.patch
--- a/patches/server/0062-Change-defaults-in-YAML-config-files.patch
+++ b/patches/server/0062-Change-defaults-in-YAML-config-files.patch
--- a/patches/server/0063-Purpur-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0063-Purpur-Stop-squids-floating-on-top-of-water.patch
--- a/patches/server/0064-Purpur-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0064-Purpur-Entities-can-use-portals-configuration.patch
--- a/patches/server/0065-Lithium-CompactSineLUT.patch
+++ b/patches/server/0065-Lithium-CompactSineLUT.patch
--- a/patches/server/0066-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0066-Fix-bees-aging-inside-hives.patch
--- a/patches/server/0067-Fix-entity.fast_retrieval.patch
+++ b/patches/server/0067-Fix-entity.fast_retrieval.patch
--- a/patches/server/0068-Paper-PR-Workaround-for-Client-Lag-Spikes-MC-162253.patch
+++ b/patches/server/0068-Paper-PR-Workaround-for-Client-Lag-Spikes-MC-162253.patch
--- a/patches/server/0069-Don-t-send-equipment-updates-if-only-durability-chan.patch
+++ b/patches/server/0069-Don-t-send-equipment-updates-if-only-durability-chan.patch
--- a/patches/server/0070-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch
+++ b/patches/server/0070-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch
--- a/patches/server/0071-Packet-obfuscation-and-reduction.patch
+++ b/patches/server/0071-Packet-obfuscation-and-reduction.patch