Initial 1.19.1 release

gradle.properties

@@ -1,13 +1,8 @@
-group=wtf.etil.mirai
-version=1.19-R0.1-SNAPSHOT
-mcVersion=1.19
-packageVersion=1_19_R1
-pufferfishRef=37f936f0b89395c6b59b08f4695525096c9a888b
-
 org.gradle.caching=true
-org.gradle.caching.debug=false
-org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=false
-org.gradle.daemon=false
+
-org.gradle.jvmargs=-Dfile.encoding=UTF-8
+group=wtf.etil.mirai
+version=1.19.1-R0.1-SNAPSHOT
+mcVersion=1.19.1
+pufferfishRef=b21931ddf3aa85ced77837172a1740511b2c2ec5

patches/server/0001-Mirai-Branding-Changes.patch

@@ -217,10 +217,10 @@ index b0390eedb507d27426d1e1d73bd4ab63aec89ebe..509a9a5326d94200ca3d7a83ae47c6bb
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 67c4cd2fb3c64432b0390c9d497ef7067577c64a..cd704d013024088ba4fbf7a04daeb0135e794651 100644
+index d66c60918313b0ede41ed96aa82e11fb2230f95b..d92c69e902d7631634c2762f0a8339c966ad9f7d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -911,7 +911,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -913,7 +913,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          shutdownThread = Thread.currentThread();
          org.spigotmc.WatchdogThread.doStop(); // Paper
          if (!isSameThread()) {
@@ -252,7 +252,7 @@ index 9a8a7eff47d40d6de558f0946c450531b3984f44..920b905c91cc37acb09e26add02acdf5
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 2d9c98931df5d1c54adcfba78a9136841764f853..ae2965796f5c0a5c8629159714a245557c17f423 100644
+index a912b96a4e099c7e90cbba37218972f830188d24..738bde117ab28a197018e7f2a47462d6d9b60e5f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -430,7 +430,7 @@ public final class CraftMagicNumbers implements UnsafeValues {

patches/server/0004-Reduce-constants-allocations.patch

@@ -161,10 +161,10 @@ index a14b01cee7a8d7022c4fa7264d349a76be143ba5..44f441d6c102fa5bd50071cae991a8a6
  
      @Override
 diff --git a/src/main/java/net/minecraft/nbt/ListTag.java b/src/main/java/net/minecraft/nbt/ListTag.java
-index f346306d61854bdc6b395f5d8f799909537a1b50..3dd6526c3550a08f7da75ce0b80be4ba090ed272 100644
+index 6a5e33d9821221be73f9c16afc17c9130248a231..29b7bde3ef3c5817910ccd5248e791f9e2948af7 100644
 --- a/src/main/java/net/minecraft/nbt/ListTag.java
 +++ b/src/main/java/net/minecraft/nbt/ListTag.java
-@@ -217,7 +217,7 @@ public class ListTag extends CollectionTag<Tag> {
+@@ -218,7 +218,7 @@ public class ListTag extends CollectionTag<Tag> {
              }
          }
  
@@ -173,7 +173,7 @@ index f346306d61854bdc6b395f5d8f799909537a1b50..3dd6526c3550a08f7da75ce0b80be4ba
      }
  
      public long[] getLongArray(int index) {
-@@ -228,7 +228,7 @@ public class ListTag extends CollectionTag<Tag> {
+@@ -229,7 +229,7 @@ public class ListTag extends CollectionTag<Tag> {
              }
          }
  
@@ -183,10 +183,10 @@ index f346306d61854bdc6b395f5d8f799909537a1b50..3dd6526c3550a08f7da75ce0b80be4ba
  
      public double getDouble(int index) {
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index b65a3626d2e0817cd1e223ec3b10e82fa0339663..e3d2d71c31e2257810ee1da00958d43887062200 100644
+index 868d4913f63b3f4752f7f1cdcd81e118e482c474..813b77047cd2b158f0254a18f94983e37fce4b72 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -315,7 +315,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -311,7 +311,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      }
  
      public void setListener(PacketListener listener) {
@@ -209,10 +209,10 @@ index 0a843e0afbcb1af8e2641515eb244b791b819b8c..c420ce5c1bebdb0abe273d73a61a15e5
          OptionSpec<Integer> optionspec11 = optionparser.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(-1, new Integer[0]);
          OptionSpec<String> optionspec12 = optionparser.accepts("serverId").withRequiredArg();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e995aa81665bdf582f753acec3f0584f0060c851..f895903aaf0a69c65947c91f7f486f04991434d8 100644
+index d92c69e902d7631634c2762f0a8339c966ad9f7d..da2cab1d6df536baa9274fb2aa949003d803e332 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1371,8 +1371,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1372,8 +1372,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              try {
                  BufferedImage bufferedimage = ImageIO.read(file);
  
@@ -224,7 +224,7 @@ index e995aa81665bdf582f753acec3f0584f0060c851..f895903aaf0a69c65947c91f7f486f04
  
                  ImageIO.write(bufferedimage, "PNG", bytearrayoutputstream);
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 871bce7f5acc1b9a058496f41d962ec2e724f620..f4569f8e53fc22a8a580fcaebbe773b497c11304 100644
+index 88152988425b7b02ec5ce229ba4c24b40e030329..a0317be1eea29e4e911976e0106563cf49db1e6b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -307,7 +307,7 @@ public class ServerEntity {
@@ -237,10 +237,10 @@ index 871bce7f5acc1b9a058496f41d962ec2e724f620..f4569f8e53fc22a8a580fcaebbe773b4
  
              for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 32a39a150a3d2bbae95a726901f3f46363e34ecf..7b80dfb72b191bd86e5e4443efc87713814b6c4c 100644
+index f58873ef4362bfcc618ead099be94ba2dd4d86ed..3b7eecdf4f54de06e79335f42ef09d2d0a12d450 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -871,7 +871,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -872,7 +872,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      BlockPos blockposition2 = blockposition.set(j + randomX, randomY, k + randomZ);
                      BlockState iblockdata = com.destroystokyo.paper.util.maplist.IBlockDataList.getBlockDataFromRaw(raw);
  
@@ -249,7 +249,7 @@ index 32a39a150a3d2bbae95a726901f3f46363e34ecf..7b80dfb72b191bd86e5e4443efc87713
                      // We drop the fluid tick since LAVA is ALREADY TICKED by the above method (See LiquidBlock).
                      // TODO CHECK ON UPDATE
                  }
-@@ -1126,7 +1126,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1127,7 +1127,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      public static List<Entity> getCurrentlyTickingEntities() {
          Entity ticking = currentlyTickingEntity.get();
@@ -259,10 +259,10 @@ index 32a39a150a3d2bbae95a726901f3f46363e34ecf..7b80dfb72b191bd86e5e4443efc87713
          return ret;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0960025c64fe2e8c055fcbf6e695ff90c1f41cd9..f4e12d6a122dc66505289651de105cfac5dd7b86 100644
+index 5b543a3f115fc80778db662d8557d12d3bd36942..23038001b5165a0092c23707b779293c8811c868 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -385,7 +385,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -413,7 +413,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          if (this.keepAlivePending) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
@@ -271,7 +271,7 @@ index 0960025c64fe2e8c055fcbf6e695ff90c1f41cd9..f4e12d6a122dc66505289651de105cfa
              }
          } else {
              if (elapsedTime >= 15000L) { // 15 seconds
-@@ -831,13 +831,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -875,13 +875,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); // Paper - run this async
          // CraftBukkit start
          if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable
@@ -287,7 +287,7 @@ index 0960025c64fe2e8c055fcbf6e695ff90c1f41cd9..f4e12d6a122dc66505289651de105cfa
              return;
          }
          // Paper end
-@@ -3138,7 +3138,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3346,7 +3346,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
@@ -297,10 +297,10 @@ index 0960025c64fe2e8c055fcbf6e695ff90c1f41cd9..f4e12d6a122dc66505289651de105cfa
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 039b47e19d672ec9066c41fcc6342523992bf7b6..9903316fe3164a987a7745104c2f1875ca0c0a47 100644
+index c36babd85b7d5ba57c08708d0bbf01e16a70a4b2..9a4d3d75f12716a69aec78034079fcad6c8cca04 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -285,8 +285,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -295,8 +295,8 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
  
      @Override
      public void handleHello(ServerboundHelloPacket packet) {
@@ -311,7 +311,7 @@ index 039b47e19d672ec9066c41fcc6342523992bf7b6..9903316fe3164a987a7745104c2f1875
          // Paper start - validate usernames
          if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.performUsernameValidation) {
              if (!this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation && !validateUsername(packet.name())) {
-@@ -356,7 +356,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -356,7 +356,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
  
      @Override
      public void handleKey(ServerboundKeyPacket packet) {
@@ -321,10 +321,10 @@ index 039b47e19d672ec9066c41fcc6342523992bf7b6..9903316fe3164a987a7745104c2f1875
          final String s;
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 20cdfdb3b9351f74e89bc45b3ab972384165659a..4030818ff51eca95e1c2ec38c7eca5bff79a0a4a 100644
+index 37d8a797bb590c30bf42ab04128489a9390684d3..affcdfcc60a3c68a719115c7e3fc06b81e94eda6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -734,7 +734,7 @@ public abstract class PlayerList {
+@@ -735,7 +735,7 @@ public abstract class PlayerList {
          while (iterator.hasNext()) {
              entityplayer = (ServerPlayer) iterator.next();
              this.save(entityplayer); // CraftBukkit - Force the player's inventory to be saved
@@ -372,10 +372,10 @@ index c82bb38b5b1c9204daef21455723d21509ad1c44..4aa044ab8748c01b0022096733e5bacf
      private EquipmentSlot(EquipmentSlot.Type type, int entityId, int armorStandId, String name) {
          this.type = type;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8a9b6cacfb87d4ba825f3386894c25631ecbb1f7..d8f7361960eff24022a15505dec00613310db3b0 100644
+index 8a0e566aa0124480481b17b5b31691849c3ee7cd..2cb4cbbfd6c043d489ac8122a26e711a850b8c23 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3064,7 +3064,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3067,7 +3067,7 @@ public abstract class LivingEntity extends Entity {
      @Nullable
      private Map<EquipmentSlot, ItemStack> collectEquipmentChanges() {
          Map<EquipmentSlot, ItemStack> map = null;
@@ -425,7 +425,7 @@ index e8e60ea8b9e97ed87be78752f398ab25ba8e9a1b..9980df9128dfc51f2afbca8f4aa2031e
  
                  for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index cff0ed9ae6e79f84870343e43574f384dd73ea88..79f5390cbbe014687010b110bcf572bdcff3339d 100644
+index fb0a77b4cf1ba47c73c00993bd9b7454240fe5d6..df1dfaea8b49794d9e3ecb792a129113829b60c9 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -233,7 +233,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -438,7 +438,7 @@ index cff0ed9ae6e79f84870343e43574f384dd73ea88..79f5390cbbe014687010b110bcf572bd
  
          for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 6b3cfc19c4fd1382ddf534265a1114995a4f6b55..24cf8fba9515dfbeb1422e69968c085f1d4f8f6e 100644
+index c18a0bc94d0210396046f4475e49a739088593f3..4fea1c9873b4dd9c9f21722adbb02200487caf3c 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -969,7 +969,7 @@ public final class ItemStack {

patches/server/0007-lithium-CompactSineLUT.patch

@@ -104,10 +104,10 @@ index 0000000000000000000000000000000000000000..d2b00d9a91b60716d5f458048df3d944
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/util/Mth.java b/src/main/java/net/minecraft/util/Mth.java
-index 81c5cf66e15ca814be2d0a5a4798ac71732601c4..a4a6885bea59210192e8a2ce8834372275e7ceb3 100644
+index 9b22034aa655ceb0da151d9d8ca3147f6487889a..ec587cf6592a1dc0d90d6f54af1bdfab97aec7c6 100644
 --- a/src/main/java/net/minecraft/util/Mth.java
 +++ b/src/main/java/net/minecraft/util/Mth.java
-@@ -31,6 +31,7 @@ public class Mth {
+@@ -32,6 +32,7 @@ public class Mth {
  
      });
      private static final RandomSource RANDOM = RandomSource.createThreadSafe();
@@ -115,7 +115,7 @@ index 81c5cf66e15ca814be2d0a5a4798ac71732601c4..a4a6885bea59210192e8a2ce88343722
      private static final int[] MULTIPLY_DE_BRUIJN_BIT_POSITION = new int[]{0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, 31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9};
      private static final double ONE_SIXTH = 0.16666666666666666D;
      private static final int FRAC_EXP = 8;
-@@ -40,11 +41,11 @@ public class Mth {
+@@ -41,11 +42,11 @@ public class Mth {
      private static final double[] COS_TAB = new double[257];
  
      public static float sin(float value) {

patches/server/0009-Add-last-tick-time-API.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/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f895903aaf0a69c65947c91f7f486f04991434d8..d8099a9bac8a6dc48e1096a4d0a56abfad969cd1 100644
+index da2cab1d6df536baa9274fb2aa949003d803e332..f5110261542aa0546b10d0da7e3c4e95d2d59639 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1117,6 +1117,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1120,6 +1120,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // Paper End
      // Spigot End
  
@@ -19,7 +19,7 @@ index f895903aaf0a69c65947c91f7f486f04991434d8..d8099a9bac8a6dc48e1096a4d0a56abf
      protected void runServer() {
          try {
              long serverStartTime = Util.getNanos(); // Paper
-@@ -1186,7 +1188,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1190,7 +1192,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  this.nextTickTime += 50L;
                  this.startMetricsRecordingTick();
                  this.profiler.push("tick");
@@ -30,7 +30,7 @@ index f895903aaf0a69c65947c91f7f486f04991434d8..d8099a9bac8a6dc48e1096a4d0a56abf
                  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 2aece16c65245337e59f7b08d6fcd76916055fc2..6275c857948dbda98fbfefbeec0843f3c42f9f40 100644
+index 920b905c91cc37acb09e26add02acdf5e026bd91..8529f79361b1881d42c0d4871a82a6e9844e2a1d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2902,6 +2902,12 @@ public final class CraftServer implements Server {

patches/server/0010-Add-config-for-logging-login-location.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 4030818ff51eca95e1c2ec38c7eca5bff79a0a4a..348fadecea776f2aea24664d340ce0955455d8af 100644
+index affcdfcc60a3c68a719115c7e3fc06b81e94eda6..70b680e15e6ec34c82b9d4467979b9133b042af1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -497,7 +497,13 @@ public abstract class PlayerList {
+@@ -498,7 +498,13 @@ public abstract class PlayerList {
          }
          // Paper end
          // CraftBukkit - Moved from above, added world

patches/server/0012-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 348fadecea776f2aea24664d340ce0955455d8af..db4b6d7fe91c1a071a833db842f664ec6ba51932 100644
+index 70b680e15e6ec34c82b9d4467979b9133b042af1..35717f36244df395b89416e6caecbd9e7726fa95 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -757,13 +757,19 @@ public abstract class PlayerList {
+@@ -758,13 +758,19 @@ public abstract class PlayerList {
          if (getBans().isBanned(gameprofile) && (gameprofilebanentry = getBans().get(gameprofile)) != null) {
              // Paper end
  

patches/server/0014-Remove-TickTask.patch

@@ -7,10 +7,10 @@ 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 a9bb700ae1496e3c23a19b62fcc4233c18a0209d..513b333a7bf8f68a2528e31d9a5e658b107b6469 100644
+index f5110261542aa0546b10d0da7e3c4e95d2d59639..e790ef23bdad13cb40666e408af97e4b6d4c411f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -180,7 +180,7 @@ import org.bukkit.event.server.ServerLoadEvent;
+@@ -182,7 +182,7 @@ import org.bukkit.event.server.ServerLoadEvent;
  
  import co.aikar.timings.MinecraftTimings; // Paper
  
@@ -19,7 +19,7 @@ index a9bb700ae1496e3c23a19b62fcc4233c18a0209d..513b333a7bf8f68a2528e31d9a5e658b
  
      private static MinecraftServer SERVER; // Paper
      public static final Logger LOGGER = LogUtils.getLogger();
-@@ -1315,19 +1315,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1316,19 +1316,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      @Override
@@ -43,7 +43,7 @@ index a9bb700ae1496e3c23a19b62fcc4233c18a0209d..513b333a7bf8f68a2528e31d9a5e658b
  
      @Override
      public boolean pollTask() {
-@@ -1359,10 +1361,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1360,10 +1362,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
  

patches/server/0015-Make-a-field-final.patch

@@ -7,13 +7,13 @@ 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/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index 0148cadbeb41a882a05d982f0b34770b2829a04a..e11d9677558727a11208ea6580459c00bdb0af57 100644
+index e0dd0fc1638377f4d4226d4b2976b901d635dff0..e75a428ff261a52b8d5f72d5c46437feef5b8ac4 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-@@ -55,7 +55,7 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
+@@ -59,7 +59,7 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
-     private final EntityAnchorArgument.Anchor anchor;
      private final Vec2 rotation;
      private final CommandSigningContext signingContext;
+     private final TaskChainer chatMessageChainer;
 -    public java.util.Map<Thread, CommandNode> currentCommand = new java.util.concurrent.ConcurrentHashMap<>(); // CraftBukkit // Paper
 +    public final java.util.Map<Thread, CommandNode> currentCommand = new java.util.concurrent.ConcurrentHashMap<>(); // CraftBukkit // Paper // Patina - make a field final
  

patches/server/0016-Don-t-create-new-random-instance.patch

@@ -7,10 +7,10 @@ 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/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 353463084d90eb684717e65c56da52cd25a1e375..226a3a698e3863296481753434a716a793cb5d51 100644
+index 94944ba458178f9e5b772224da329bb5d85f4394..56e5679a3910a6e5b25aeb0d3eb7420444296932 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -374,7 +374,7 @@ public class ServerPlayer extends Player {
+@@ -376,7 +376,7 @@ public class ServerPlayer extends Player {
              long l = k * k;
              int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
              int j1 = this.getCoprime(i1);
@@ -19,7 +19,7 @@ index 353463084d90eb684717e65c56da52cd25a1e375..226a3a698e3863296481753434a716a7
  
              for (int l1 = 0; l1 < i1; ++l1) {
                  int i2 = (k1 + j1 * l1) % i1;
-@@ -411,7 +411,7 @@ public class ServerPlayer extends Player {
+@@ -413,7 +413,7 @@ public class ServerPlayer extends Player {
              long l = k * k;
              int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
              int j1 = this.getCoprime(i1);
@@ -29,15 +29,15 @@ index 353463084d90eb684717e65c56da52cd25a1e375..226a3a698e3863296481753434a716a7
              for (int l1 = 0; l1 < i1; ++l1) {
                  int i2 = (k1 + j1 * l1) % i1;
 diff --git a/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java b/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
-index 29e2bc3fa3091df3c2fa908a2632c3b592c4a872..55a2f7af4b5a78f616fe9af00783d7452f8ee203 100644
+index 1ef089dbf83de35d875c00efdf468c397be56978..c345f10cbf7f3451edc604f97cdf959d70639e17 100644
 --- a/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
 +++ b/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
-@@ -348,7 +348,7 @@ public class QueryThreadGs4 extends GenericThread {
+@@ -349,7 +349,7 @@ public class QueryThreadGs4 extends GenericThread {
              this.identBytes[2] = bs[5];
              this.identBytes[3] = bs[6];
              this.ident = new String(this.identBytes, StandardCharsets.UTF_8);
 -            this.challenge = RandomSource.create().nextInt(16777216);
 +            this.challenge = java.util.concurrent.ThreadLocalRandom.current().nextInt(16777216); // Patina - don't create new random instance
-             this.challengeBytes = String.format("\t%s%d\u0000", this.ident, this.challenge).getBytes(StandardCharsets.UTF_8);
+             this.challengeBytes = String.format(Locale.ROOT, "\t%s%d\u0000", this.ident, this.challenge).getBytes(StandardCharsets.UTF_8);
          }
  

patches/server/0017-Completely-remove-bootstrapExecutor.patch

@@ -7,10 +7,10 @@ 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/Util.java b/src/main/java/net/minecraft/Util.java
-index c540b695282e2cca97cc4e3320d641befa19c1c6..eee3347a5fd1b1f4eb0bbee29483f0a81868cf16 100644
+index cdb7aea969b56f59d88f60bc3744e4932228c50a..59ecf5ff33617a6b9d2a3ae317315484235da804 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
-@@ -77,7 +77,7 @@ public class Util {
+@@ -79,7 +79,7 @@ public class Util {
      private static final int DEFAULT_MAX_THREADS = 255;
      private static final String MAX_THREADS_SYSTEM_PROPERTY = "max.bg.threads";
      private static final AtomicInteger WORKER_COUNT = new AtomicInteger(1);
@@ -19,7 +19,7 @@ index c540b695282e2cca97cc4e3320d641befa19c1c6..eee3347a5fd1b1f4eb0bbee29483f0a8
      private static final ExecutorService BACKGROUND_EXECUTOR = makeExecutor("Main", -1); // Paper - add -1 priority
      // Paper start - don't submit BLOCKING PROFILE LOOKUPS to the world gen thread
      public static final ExecutorService PROFILE_EXECUTOR = Executors.newFixedThreadPool(2, new java.util.concurrent.ThreadFactory() {
-@@ -200,7 +200,7 @@ public class Util {
+@@ -207,7 +207,7 @@ public class Util {
      }
  
      public static ExecutorService bootstrapExecutor() {

patches/server/0019-Better-handling-of-async-tasks.patch

@@ -59,10 +59,10 @@ index c0fdc5a79107f8694a514a12d5526bd431fc45e9..eeb20c5b9365a04db45e738793f6c10a
      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 e8aeaa1d629d3fe870bbe1c0bacbebd4fb81275e..9f6520d57840b40d506df141bdf755d593b64c27 100644
+index e790ef23bdad13cb40666e408af97e4b6d4c411f..4ace20e9e87c53f2d737c46bde6b9e28282a26a3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1017,6 +1017,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
+@@ -1020,6 +1020,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
          LOGGER.info("Flushing Chunk IO");
          com.destroystokyo.paper.io.PaperFileIOThread.Holder.INSTANCE.close(true, true); // Paper
          LOGGER.info("Closing Thread Pool");
@@ -70,7 +70,7 @@ index e8aeaa1d629d3fe870bbe1c0bacbebd4fb81275e..9f6520d57840b40d506df141bdf755d5
          Util.shutdownExecutors(); // Paper
          LOGGER.info("Closing Server");
          try {
-@@ -1469,6 +1470,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
+@@ -1470,6 +1471,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
          io.papermc.paper.util.CachedLists.reset(); // Paper
          // Paper start - move executeAll() into full server tick timing
          try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
@@ -78,7 +78,7 @@ index e8aeaa1d629d3fe870bbe1c0bacbebd4fb81275e..9f6520d57840b40d506df141bdf755d5
              this.runAllTasks();
          }
          // Paper end
-@@ -2716,6 +2718,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
+@@ -2756,6 +2758,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
              return;
          }
  
@@ -87,10 +87,10 @@ index e8aeaa1d629d3fe870bbe1c0bacbebd4fb81275e..9f6520d57840b40d506df141bdf755d5
          try {
              for (;;) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 9903316fe3164a987a7745104c2f1875ca0c0a47..62c4f737022fa226be1e1140cc4bafa009023d2f 100644
+index 9a4d3d75f12716a69aec78034079fcad6c8cca04..3dc5109f144b371b60d6a4943f853474cfa748de 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -133,6 +133,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -135,6 +135,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
      }
  
      // Paper start - Cache authenticator threads
@@ -98,7 +98,7 @@ index 9903316fe3164a987a7745104c2f1875ca0c0a47..62c4f737022fa226be1e1140cc4bafa0
      private static final AtomicInteger threadId = new AtomicInteger(0);
      private static final java.util.concurrent.ExecutorService authenticatorPool = java.util.concurrent.Executors.newCachedThreadPool(
              r -> {
-@@ -142,7 +143,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -144,7 +145,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
  
                  return ret;
              }
@@ -107,7 +107,7 @@ index 9903316fe3164a987a7745104c2f1875ca0c0a47..62c4f737022fa226be1e1140cc4bafa0
      // Paper end
      // Spigot start
      public void initUUID()
-@@ -329,7 +330,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -329,7 +330,8 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
                  // Paper end
                  // Spigot start
              // Paper start - Cache authenticator threads
@@ -117,7 +117,7 @@ index 9903316fe3164a987a7745104c2f1875ca0c0a47..62c4f737022fa226be1e1140cc4bafa0
                      @Override
                      public void run() {
                          try {
-@@ -385,7 +387,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -387,7 +389,8 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
          }
  
          // Paper start - Cache authenticator threads
@@ -127,7 +127,7 @@ index 9903316fe3164a987a7745104c2f1875ca0c0a47..62c4f737022fa226be1e1140cc4bafa0
              public void run() {
                  GameProfile gameprofile = ServerLoginPacketListenerImpl.this.gameProfile;
  
-@@ -533,7 +536,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -536,7 +539,8 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
              }
  
              // Proceed with login
@@ -182,7 +182,7 @@ index 9c1aff17aabd062640e3f451a2ef8c50a7c62f10..29eda0db104fe13fb268ebe0750e5e3e
          }
          return false;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index d568fc92d03c313a782796cc720a1ebb1a5ad8be..adfd28b4b34ff0b161076b4b03f7d93fecb09573 100644
+index 413bcdb0389718a73047a114e6f5d05d96bdcf43..4e9ae34c690fed7f5d6c52e39a33a00e7943cedd 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -140,6 +140,7 @@ public class WatchdogThread extends Thread

patches/server/0020-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR-in.patch

@@ -39,12 +39,12 @@ index 0000000000000000000000000000000000000000..7bd88761137b2a68c04fbaa920a9ea9c
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index eee3347a5fd1b1f4eb0bbee29483f0a81868cf16..e7acf1466bd7640d172f84a7a0e5a7e2eb0a0a37 100644
+index 59ecf5ff33617a6b9d2a3ae317315484235da804..4b4f3533f6f8624551794e63baae87138a495835 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
-@@ -71,6 +71,12 @@ import net.minecraft.util.datafix.DataFixers;
+@@ -73,6 +73,12 @@ import net.minecraft.util.TimeSource;
+ import net.minecraft.util.datafix.DataFixers;
  import net.minecraft.world.level.block.state.properties.Property;
- import org.apache.commons.io.IOUtils;
  import org.slf4j.Logger;
 +// JettPack start
 +import java.util.concurrent.AbstractExecutorService;
@@ -55,7 +55,7 @@ index eee3347a5fd1b1f4eb0bbee29483f0a81868cf16..e7acf1466bd7640d172f84a7a0e5a7e2
  
  public class Util {
      static final Logger LOGGER = LogUtils.getLogger();
-@@ -158,7 +164,46 @@ public class Util {
+@@ -165,7 +171,46 @@ public class Util {
          if (i <= 0) {
              executorService = MoreExecutors.newDirectExecutorService();
          } else {

patches/server/0021-Remove-sync-chunk-writes-in-server.properties.patch

@@ -7,20 +7,20 @@ 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/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index ea461ff0b13a3ccba2f0ed02b9268712eaf728c1..6d98648934c23cd99694718ff52474fcba76bab4 100644
+index 2ef1d4feff67f9e618dc96bd1a3a086ddff25673..aec14ff5235686a3e02b66eb3ad05fed2c4756b4 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -394,7 +394,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          BufferedWriter bufferedwriter = Files.newBufferedWriter(file);
  
          try {
--            bufferedwriter.write(String.format("sync-chunk-writes=%s%n", dedicatedserverproperties.syncChunkWrites));
+-            bufferedwriter.write(String.format(Locale.ROOT, "sync-chunk-writes=%s%n", dedicatedserverproperties.syncChunkWrites));
-+            //bufferedwriter.write(String.format("sync-chunk-writes=%s%n", dedicatedserverproperties.syncChunkWrites)); // JettPack - remove 'sync-chunk-writes' in server.properties
++            //bufferedwriter.write(String.format(Locale.ROOT, "sync-chunk-writes=%s%n", dedicatedserverproperties.syncChunkWrites)); // JettPack - remove 'sync-chunk-writes' in server.properties
-             bufferedwriter.write(String.format("gamemode=%s%n", dedicatedserverproperties.gamemode));
+             bufferedwriter.write(String.format(Locale.ROOT, "gamemode=%s%n", dedicatedserverproperties.gamemode));
-             bufferedwriter.write(String.format("spawn-monsters=%s%n", dedicatedserverproperties.spawnMonsters));
+             bufferedwriter.write(String.format(Locale.ROOT, "spawn-monsters=%s%n", dedicatedserverproperties.spawnMonsters));
-             bufferedwriter.write(String.format("entity-broadcast-range-percentage=%d%n", dedicatedserverproperties.entityBroadcastRangePercentage));
+             bufferedwriter.write(String.format(Locale.ROOT, "entity-broadcast-range-percentage=%d%n", dedicatedserverproperties.entityBroadcastRangePercentage));
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index 26345494ce190b5cd2ab58dd7d4b046796767b20..80c73f43987a66b941b456951f60c7a27082c36f 100644
+index a32cfa75a9bea896f558bab646d0868391b069a9..3e4a3915cdf29fc964e0314ce01d156dd2f4f873 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 @@ -136,7 +136,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie

patches/server/0023-Configurable-flight-checks.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/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f4e12d6a122dc66505289651de105cfac5dd7b86..8058c98db187aa4525d30ac4bd1e70c6babdaa87 100644
+index 23038001b5165a0092c23707b779293c8811c868..c5a4eafdced5dbd8f8aa2607a3c8b77e2535a4a3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -342,7 +342,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -370,7 +370,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          ++this.tickCount;
          this.knownMovePacketCount = this.receivedMovePacketCount;
          if (this.clientIsFloating && !this.player.isSleeping() && !this.player.isPassenger()) {
@@ -19,7 +19,7 @@ index f4e12d6a122dc66505289651de105cfac5dd7b86..8058c98db187aa4525d30ac4bd1e70c6
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked for floating too long!", this.player.getName().getString());
                  this.disconnect(io.papermc.paper.configuration.GlobalConfiguration.get().messages.kick.flyingPlayer, org.bukkit.event.player.PlayerKickEvent.Cause.FLYING_PLAYER); // Paper - use configurable kick message & kick event cause
                  return;
-@@ -361,7 +361,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -389,7 +389,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              this.vehicleLastGoodY = this.lastVehicle.getY();
              this.vehicleLastGoodZ = this.lastVehicle.getZ();
              if (this.clientVehicleIsFloating && this.player.getRootVehicle().getControllingPassenger() == this.player) {

patches/server/0026-Do-not-process-chat-commands-before-player-has-joine.patch

@@ -7,14 +7,14 @@ Original code by Starlis, licensed under GNU General Public License v3.0
 You can find the original code on https://github.com/starlis/empirecraft
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1329314774a15be493703dac0031e8849865295f..a3b5b52f7e597dc128281eb8ff9c60e0836bab98 100644
+index c5a4eafdced5dbd8f8aa2607a3c8b77e2535a4a3..2c9c803880621da22e58afe5de992b4f22f833f9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2210,6 +2210,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2311,6 +2311,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
- 
+         } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
-             this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), i));
+             this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
              return false;
 +        } else if (!player.didPlayerJoinEvent) { return false; // EMC - do not handle chat messages before they joined
          } else {
-             this.player.resetLastActionTime();
+             LastSeenMessagesValidator lastseenmessagesvalidator = this.lastSeenMessagesValidator;
-             return true;
+             Set set;

patches/server/0030-Spread-out-and-optimise-player-list-ticksSpread-out-.patch

@@ -8,10 +8,10 @@ Original code by PurpurMC, licensed under MIT
 You can find the original code on https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index db4b6d7fe91c1a071a833db842f664ec6ba51932..7502f715849fdefc96ad9808cd2070d366bb85da 100644
+index 35717f36244df395b89416e6caecbd9e7726fa95..d8050543f6112c095e459500cc8c38cb1c485284 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1031,22 +1031,22 @@ public abstract class PlayerList {
+@@ -1032,22 +1032,22 @@ public abstract class PlayerList {
      }
  
      public void tick() {
@@ -22,7 +22,7 @@ index db4b6d7fe91c1a071a833db842f664ec6ba51932..7502f715849fdefc96ad9808cd2070d3
 -
 -                target.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_LATENCY, this.players.stream().filter(new Predicate<ServerPlayer>() {
 -                    @Override
--                    public boolean apply(ServerPlayer input) {
+-                    public boolean test(ServerPlayer input) {
 -                        return target.getBukkitEntity().canSee(input.getBukkitEntity());
 -                    }
 -                }).collect(Collectors.toList())));
@@ -48,10 +48,10 @@ index db4b6d7fe91c1a071a833db842f664ec6ba51932..7502f715849fdefc96ad9808cd2070d3
  
      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 287520f91e22309e1268be1940e0fafb628980a9..384d00b9e5767752ecee946c9c596ff0927b8364 100644
+index 9f34358dfcb95104c5bb9e63fbe295e6e049a55d..2f1fdb19c6e5ac4cadd5586970dbbd5a8f6fabf8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1736,7 +1736,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1827,7 +1827,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(org.bukkit.entity.Entity entity) {

patches/server/0036-Skip-events-if-there-s-no-listeners.patch

@@ -7,10 +7,10 @@ Original code by PurpurMC, licensed under MIT
 You can find the original code on https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index ea5f0600d47b0f7c08b96eed91e5de255114637b..02add91d477dfef1bafa39c28b23dfc09418c939 100644
+index a0f5aa8c3cfce63af9cb286278a7fdebd7aa3642..91bb48f66aad86c76b2e7d2e70e84ca0e1a50212 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -393,6 +393,7 @@ public class Commands {
+@@ -404,6 +404,7 @@ public class Commands {
      }
  
      private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
@@ -18,7 +18,7 @@ index ea5f0600d47b0f7c08b96eed91e5de255114637b..02add91d477dfef1bafa39c28b23dfc0
          // Paper end - Async command map building
          new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper
          PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
-@@ -405,6 +406,7 @@ public class Commands {
+@@ -416,6 +417,7 @@ public class Commands {
              }
          }
          // CraftBukkit end

patches/server/0037-Alternative-Keepalive-Handling.patch

@@ -7,10 +7,10 @@ Original code by PurpurMC, licensed under MIT
 You can find the original code on https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fc37001445d50f88bc274eb501914d9db49dce40..785e9e9b4408c1193cb3680a3b55f90a8f0d5b0a 100644
+index 2c9c803880621da22e58afe5de992b4f22f833f9..7846ce8a78a560855d7e2263db656143ea12e3f8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -245,6 +245,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -258,6 +258,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      private long keepAliveTime = Util.getMillis();
      private boolean keepAlivePending;
      private long keepAliveChallenge;
@@ -18,7 +18,7 @@ index fc37001445d50f88bc274eb501914d9db49dce40..785e9e9b4408c1193cb3680a3b55f90a
      // CraftBukkit start - multithreaded fields
      private final AtomicInteger chatSpamTickCount = new AtomicInteger();
      private final java.util.concurrent.atomic.AtomicInteger tabSpamLimiter = new java.util.concurrent.atomic.AtomicInteger(); // Paper - configurable tab spam limits
-@@ -382,6 +383,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -410,6 +411,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          long currentTime = Util.getMillis();
          long elapsedTime = currentTime - this.keepAliveTime;
  
@@ -40,7 +40,7 @@ index fc37001445d50f88bc274eb501914d9db49dce40..785e9e9b4408c1193cb3680a3b55f90a
          if (this.keepAlivePending) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
-@@ -3326,6 +3342,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3546,6 +3562,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {

patches/server/0037-Fix-the-dead-lagging-the-server.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 6 Mar 2020 13:37:26 -0600
-Subject: [PATCH] Fix the dead lagging the server
-
-Original code by PurpurMC, licensed under MIT
-You can find the original code on https://github.com/PurpurMC/Purpur
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index beab9f74ba3c3ef294485ee74daf165475d29566..f85573a6ea0b670bb42252b17bcf88969f5521b4 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1871,6 +1871,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-         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 d8f7361960eff24022a15505dec00613310db3b0..b7a9f16fb75d7664b6788d20d9b4a07459866dac 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2967,7 +2967,7 @@ public abstract class LivingEntity extends Entity {
-             }
-         }
- 
--        this.aiStep();
-+        if (!this.isRemoved()) this.aiStep(); // Purpur
-         double d0 = this.getX() - this.xo;
-         double d1 = this.getZ() - this.zo;
-         float f = (float) (d0 * d0 + d1 * d1);

patches/server/0038-Logger-settings-suppressing-pointless-logs.patch

@@ -7,10 +7,10 @@ Original code by PurpurMC, licensed under MIT
 You can find the original code on https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index de0513b38e5fa0138f1cee6bb633561be12449fc..ef0625c0f860eeedcdc1e3b8801e15631c76cb7a 100644
+index a0c19503aabab5378d672a30163d35a5ba05b6c1..f70be47882fb05e34e672e2c0c4b64f9d3f901a1 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -185,6 +185,7 @@ public class PlayerAdvancements {
+@@ -183,6 +183,7 @@ public class PlayerAdvancements {
                          if (advancement == null) {
                              // CraftBukkit start
                              if (entry.getKey().getNamespace().equals("minecraft")) {
@@ -19,10 +19,10 @@ index de0513b38e5fa0138f1cee6bb633561be12449fc..ef0625c0f860eeedcdc1e3b8801e1563
                              }
                              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index f000c822ed4563b5b840936852bc7d8e030763e3..292791bb91f65f9236e52886ceecf699c099143e 100644
+index 80c1e0e47818486a68e0114b063395290365346b..365ede275df6b3b4da7075f29699ca7411b81f6d 100644
 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-@@ -294,6 +294,7 @@ public class WorldGenRegion implements WorldGenLevel {
+@@ -295,6 +295,7 @@ public class WorldGenRegion implements WorldGenLevel {
              return true;
          } else {
              // Paper start
@@ -31,15 +31,15 @@ index f000c822ed4563b5b840936852bc7d8e030763e3..292791bb91f65f9236e52886ceecf699
              Util.logAndPauseIfInIde("Detected setBlock in a far chunk [" + i + ", " + j + "], pos: " + pos + ", status: " + this.generatingStatus + (this.currentlyGenerating == null ? "" : ", currently generating: " + (String) this.currentlyGenerating.get()));
              hasSetFarWarned = true;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 785e9e9b4408c1193cb3680a3b55f90a8f0d5b0a..bbb2c75e0d963159f8c01478da89e46d498ce5b2 100644
+index 7846ce8a78a560855d7e2263db656143ea12e3f8..7bf8ade4c9907c0dc060b318c34cb43f7f9078c5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2183,6 +2183,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2577,6 +2577,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              return false;
          } else {
-             if (this.isChatExpired(instant)) {
+             if (message.hasExpiredServer(Instant.now())) {
 +                if (!wtf.etil.mirai.MiraiConfig.loggerSuppressSentExpiredChat) // Purpur
-                 ServerGamePacketListenerImpl.LOGGER.warn("{} sent expired chat: '{}'. Is the client/server system time unsynchronized? c: {} s: {}", this.player.getName().getString(), s, instant.getEpochSecond(), Instant.now().getEpochSecond()); // Paper
+                 ServerGamePacketListenerImpl.LOGGER.warn("{} sent expired chat: '{}'. Is the client/server system time unsynchronized? c: {} s: {}", this.player.getName().getString(), message.signedContent().plain(), message.timeStamp().getEpochSecond(), Instant.now().getEpochSecond()); // Paper
              }
  
 diff --git a/src/main/java/net/minecraft/stats/ServerRecipeBook.java b/src/main/java/net/minecraft/stats/ServerRecipeBook.java

patches/server/0039-Add-5-second-tps-average-in-tps.patch

@@ -29,10 +29,10 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
          setListData(vector);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9f6520d57840b40d506df141bdf755d593b64c27..11b0d23783fed5d96bd96c24adfc9a7f353a18b3 100644
+index 4ace20e9e87c53f2d737c46bde6b9e28282a26a3..55f6e8a47d4a50a65cfd08f15499546ef2a3327b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -287,7 +287,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
+@@ -290,7 +290,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
      public static final int TPS = 20;
      public static final int TICK_TIME = 1000000000 / MinecraftServer.TPS;
      private static final int SAMPLE_INTERVAL = 20; // Paper
@@ -41,7 +41,7 @@ index 9f6520d57840b40d506df141bdf755d593b64c27..11b0d23783fed5d96bd96c24adfc9a7f
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
      public static long currentTickLong = 0L; // Paper
-@@ -1071,6 +1071,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
+@@ -1074,6 +1074,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
      private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
      private long lastTick = 0;
      private long catchupTime = 0;
@@ -49,7 +49,7 @@ index 9f6520d57840b40d506df141bdf755d593b64c27..11b0d23783fed5d96bd96c24adfc9a7f
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -1167,13 +1168,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
+@@ -1171,13 +1172,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
                  {
                      final long diff = curTime - tickSection;
                      java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
@@ -71,7 +71,7 @@ index 9f6520d57840b40d506df141bdf755d593b64c27..11b0d23783fed5d96bd96c24adfc9a7f
                      tickSection = curTime;
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6275c857948dbda98fbfefbeec0843f3c42f9f40..9c1ad2fc51e7cf15aa4e6591cb2b7f4a455a6df3 100644
+index 8529f79361b1881d42c0d4871a82a6e9844e2a1d..d1767ef9913d30cbdfd1a8a3a073ec85248c8597 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2683,6 +2683,7 @@ public final class CraftServer implements Server {

patches/server/0040-Fix-stuck-in-portals.patch

@@ -7,10 +7,10 @@ Original code by PurpurMC, licensed under MIT
 You can find the original code on https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 226a3a698e3863296481753434a716a793cb5d51..f5aca2054dcad52301b9b99e44fbd3723aabdad7 100644
+index 56e5679a3910a6e5b25aeb0d3eb7420444296932..666189dae2400decc3d5bf97e073301e2de40472 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1154,6 +1154,7 @@ public class ServerPlayer extends Player {
+@@ -1153,6 +1153,7 @@ public class ServerPlayer extends Player {
                  playerlist.sendPlayerPermissionLevel(this);
                  worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
                  this.unsetRemoved();
@@ -19,10 +19,10 @@ index 226a3a698e3863296481753434a716a793cb5d51..f5aca2054dcad52301b9b99e44fbd372
                  // CraftBukkit end
                  this.setLevel(worldserver);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f85573a6ea0b670bb42252b17bcf88969f5521b4..884ff7229c9f2ecc9f204c488617b37543a0b033 100644
+index 9630d95ad2d47bb4a043dcb143bb58cd183c00c1..69976b3fd9b50e66ca48122cdb05360a94a7f2fb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2865,12 +2865,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2861,12 +2861,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return Vec3.directionFromRotation(this.getRotationVector());
      }
  
@@ -39,7 +39,7 @@ index f85573a6ea0b670bb42252b17bcf88969f5521b4..884ff7229c9f2ecc9f204c488617b375
  
              this.isInsidePortal = true;
 diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java
-index 65a77864c368545c14d1bb28fb0a91323e286158..3bb4fa37604543df1f3bf036fdd824ac7f87fa24 100644
+index 375a56a4fe9d1a2d32f3db32c09341d249557342..c6439c941de76384fe72cae4459461f5740026e8 100644
 --- a/src/main/java/wtf/etil/mirai/MiraiConfig.java
 +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java
 @@ -189,4 +189,11 @@ public class MiraiConfig {

patches/server/0041-Entities-can-use-portals-configuration.patch

@@ -7,10 +7,10 @@ Original code by PurpurMC, licensed under MIT
 You can find the original code on https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 884ff7229c9f2ecc9f204c488617b37543a0b033..324c8f33355626712e2b7e0c0ca1ed3235727dc1 100644
+index 69976b3fd9b50e66ca48122cdb05360a94a7f2fb..0bbc4d362e1ad118197b5bbc4ece2103b36f6f47 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2870,7 +2870,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2866,7 +2866,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          if (this.isOnPortalCooldown()) {
              if (!(wtf.etil.mirai.MiraiConfig.playerFixStuckPortal && this instanceof Player && !pos.equals(portalPos))) // Purpur
              this.setPortalCooldown();
@@ -19,7 +19,7 @@ index 884ff7229c9f2ecc9f204c488617b37543a0b033..324c8f33355626712e2b7e0c0ca1ed32
              if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
                  this.portalEntrancePos = pos.immutable();
                  portalPos = BlockPos.ZERO; // Purpur
-@@ -3535,7 +3535,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3539,7 +3539,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean canChangeDimensions() {
@@ -29,7 +29,7 @@ index 884ff7229c9f2ecc9f204c488617b37543a0b033..324c8f33355626712e2b7e0c0ca1ed32
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java
-index 3bb4fa37604543df1f3bf036fdd824ac7f87fa24..3b9108f0cb4c6ee9fbdae34168445d78a8b4f651 100644
+index c6439c941de76384fe72cae4459461f5740026e8..12fc0a1524d99d8509a826b09d59ce5b9b82c6bd 100644
 --- a/src/main/java/wtf/etil/mirai/MiraiConfig.java
 +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java
 @@ -196,4 +196,10 @@ public class MiraiConfig {

patches/server/0042-PaperPR-Use-DataConverter-for-itemstack-entity-deser.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] PaperPR Use DataConverter for itemstack/entity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index ae2965796f5c0a5c8629159714a245557c17f423..aa9a533f3301395bb15bb74605df2d4b9cd5ac92 100644
+index 738bde117ab28a197018e7f2a47462d6d9b60e5f..64f99429bbabb9023afbc269b54f177764ee555e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -453,8 +453,8 @@ public final class CraftMagicNumbers implements UnsafeValues {

patches/server/0044-vmp-skip-entity-move-if-movement-is-zero.patch

@@ -9,7 +9,7 @@ Original code by RelativityMC, licensed under MIT
 You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 324c8f33355626712e2b7e0c0ca1ed3235727dc1..ecc62a9e5379f7f9f0973f5d7d6e91bc93fb8d4c 100644
+index 0bbc4d362e1ad118197b5bbc4ece2103b36f6f47..2319b407e9e331584925948a060ae4263c5a5dd8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -300,6 +300,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -33,7 +33,7 @@ index 324c8f33355626712e2b7e0c0ca1ed3235727dc1..ecc62a9e5379f7f9f0973f5d7d6e91bc
          // Paper start - detailed watchdog information
          io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
          synchronized (this.posLock) {
-@@ -3740,6 +3747,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3744,6 +3751,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public final void setBoundingBox(AABB boundingBox) {

patches/server/0045-Don-t-send-equipment-updates-if-only-durability-chan.patch

@@ -7,10 +7,10 @@ Original code by Cryptite, licensed under MIT
 You can find the original code on https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b7a9f16fb75d7664b6788d20d9b4a07459866dac..f6af6dc1c686d477212cd68031d4983f85234a7f 100644
+index 2cb4cbbfd6c043d489ac8122a26e711a850b8c23..8bd01874edb9654887ec2f7570a9b962b5d82ae1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3084,7 +3084,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3087,7 +3087,7 @@ public abstract class LivingEntity extends Entity {
  
              ItemStack itemstack1 = this.getItemBySlot(enumitemslot);
  

patches/server/0046-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch

@@ -7,7 +7,7 @@ Original code by Cryptite, licensed under MIT
 You can find the original code on https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ecc62a9e5379f7f9f0973f5d7d6e91bc93fb8d4c..d17c483b229df2a08b804521426472f1e7651bc8 100644
+index 2319b407e9e331584925948a060ae4263c5a5dd8..a189fdcafda1e52ee8bf52361b1aae5cfff7614b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -878,7 +878,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0047-lithium-cached-hashcode.patch

@@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 224ce424b9a22548212ac157ec273c6dd80d6cfb..8986eb0cfb151a05a0450d2d46aca1837d3c1152 100644
+index 2e65b44f10aeb44fd524a58e7eb815a566c1ad61..dfe1e522a747b894d43124b97eaceb0ab196ac44 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -612,11 +612,18 @@ public class Block extends BlockBehaviour implements ItemLike {

patches/server/0051-Configurable-enchantment-table-book-animation-tick.patch

@@ -17,7 +17,7 @@ index 2341a5a249d455628165fc6ba508fc6d70c3dbfb..5a144c724eb6045909febf1fe3236717
          blockEntity.oRot = blockEntity.rot;
          Player player = world.getNearestPlayer((double)pos.getX() + 0.5D, (double)pos.getY() + 0.5D, (double)pos.getZ() + 0.5D, 3.0D, false);
 diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java
-index 3b9108f0cb4c6ee9fbdae34168445d78a8b4f651..e34fa6934a59fbead5ba4f4329a20507378e727a 100644
+index 12fc0a1524d99d8509a826b09d59ce5b9b82c6bd..9bc1e365e0c96907f6fb2b5cd67a12c87d0cf7ed 100644
 --- a/src/main/java/wtf/etil/mirai/MiraiConfig.java
 +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java
 @@ -202,4 +202,11 @@ public class MiraiConfig {

patches/server/0058-lithium-entity.fast_elytra_check.patch

@@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f6af6dc1c686d477212cd68031d4983f85234a7f..de9b209597bad45ac1ea918b43745dc92b085082 100644
+index 8bd01874edb9654887ec2f7570a9b962b5d82ae1..c120c557097e90a6ad2d0ecbb2cb40cf0b6ddac5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3422,6 +3422,8 @@ public abstract class LivingEntity extends Entity {
+@@ -3425,6 +3425,8 @@ public abstract class LivingEntity extends Entity {
      }
  
      private void updateFallFlying() {

patches/server/0059-lithium-profiler.patch

@@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7b80dfb72b191bd86e5e4443efc87713814b6c4c..05b895c79accf2f10f54a9868e6b9c10e1e5e687 100644
+index 3b7eecdf4f54de06e79335f42ef09d2d0a12d450..447fa39cf935072178503c3079c74ffe984d01c4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -222,6 +222,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -223,6 +223,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
  

patches/server/0060-lithium-entity.fast_hand_swing.patch

@@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index de9b209597bad45ac1ea918b43745dc92b085082..9e71182c927dec5ede91d7e7c6a842e69b10db6a 100644
+index c120c557097e90a6ad2d0ecbb2cb40cf0b6ddac5..fe15418c055e095500b1ea052723ab0911aa1d83 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2463,6 +2463,8 @@ public abstract class LivingEntity extends Entity {

patches/server/0061-c2me-opts-math.patch

@@ -189,10 +189,10 @@ index fb84d703b4461343d50510d7c9be32fc1f09ed22..3da6b30febc98e5392e42d39c5bd69a8
      private double sampleWithDerivative(int sectionX, int sectionY, int sectionZ, double localX, double localY, double localZ, double[] ds) {
          int i = this.p(sectionX);
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/synth/PerlinNoise.java b/src/main/java/net/minecraft/world/level/levelgen/synth/PerlinNoise.java
-index 02d176dd374b806cb004056964c1c4ee9e73072b..d9db7842a3dfe9432f436047417b0ff18a25b627 100644
+index 03c752e4abfe9e1f27c79024af48b31f7e90e555..125ae55681212e902e6e1ed3f82990180d1a56c4 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/synth/PerlinNoise.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/synth/PerlinNoise.java
-@@ -25,6 +25,10 @@ public class PerlinNoise {
+@@ -26,6 +26,10 @@ public class PerlinNoise {
      private final double lowestFreqValueFactor;
      private final double lowestFreqInputFactor;
      private final double maxValue;
@@ -203,7 +203,7 @@ index 02d176dd374b806cb004056964c1c4ee9e73072b..d9db7842a3dfe9432f436047417b0ff1
  
      /** @deprecated */
      @Deprecated
-@@ -130,6 +134,10 @@ public class PerlinNoise {
+@@ -131,6 +135,10 @@ public class PerlinNoise {
          this.lowestFreqInputFactor = Math.pow(2.0D, (double)(-j));
          this.lowestFreqValueFactor = Math.pow(2.0D, (double)(i - 1)) / (Math.pow(2.0D, (double)i) - 1.0D);
          this.maxValue = this.edgeValue(2.0D);
@@ -214,7 +214,7 @@ index 02d176dd374b806cb004056964c1c4ee9e73072b..d9db7842a3dfe9432f436047417b0ff1
      }
  
      protected double maxValue() {
-@@ -140,9 +148,33 @@ public class PerlinNoise {
+@@ -141,9 +149,33 @@ public class PerlinNoise {
          random.consumeCount(262);
      }
  
@@ -249,7 +249,7 @@ index 02d176dd374b806cb004056964c1c4ee9e73072b..d9db7842a3dfe9432f436047417b0ff1
  
      /** @deprecated */
      @Deprecated
-@@ -190,9 +222,15 @@ public class PerlinNoise {
+@@ -191,9 +223,15 @@ public class PerlinNoise {
          return this.noiseLevels[this.noiseLevels.length - 1 - octave];
      }
  

patches/server/0062-lithium-entity.fast_powder_snow_check.patch

@@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9e71182c927dec5ede91d7e7c6a842e69b10db6a..858ccbfd456777a61e9579beb997abb568d5b75e 100644
+index fe15418c055e095500b1ea052723ab0911aa1d83..58fd02c12894e57312dca70fd4871b8a0590bb76 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -569,11 +569,11 @@ public abstract class LivingEntity extends Entity {

patches/server/0066-lithium-chunk.serialization.patch

@@ -309,7 +309,7 @@ index acae3eb30e0689048937f479dc3070f0688abdad..9c2b79655f2c63a208c7087d5d897db0
      int onResize(int newBits, T object);
  }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index 18c4f815888fee0c85ebbb485d21063ce0d143fb..59bb7c4ca7202cf80493dcc8da1233c89c5cde40 100644
+index 7908360dd47937b2cb702e381802b7b278a5198e..f31fd07ce34f798f54d4fae1ccfa22636d4ec2aa 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 @@ -22,8 +22,23 @@ import net.minecraft.util.Mth;
@@ -337,7 +337,7 @@ index 18c4f815888fee0c85ebbb485d21063ce0d143fb..59bb7c4ca7202cf80493dcc8da1233c8
      private final PaletteResize<T> dummyPaletteResize = (newSize, added) -> {
          return 0;
 @@ -299,30 +314,54 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
-     public synchronized PalettedContainerRO.PackedData<T> pack(IdMap<T> idMap, PalettedContainer.Strategy strategy) { // Paper - synchronize
+     public synchronized PalettedContainerRO.PackedData<T> pack(IdMap<T> idList, PalettedContainer.Strategy paletteProvider) { // Paper - synchronize
          this.acquire();
  
 -        PalettedContainerRO.PackedData var12;
@@ -345,14 +345,14 @@ index 18c4f815888fee0c85ebbb485d21063ce0d143fb..59bb7c4ca7202cf80493dcc8da1233c8
 +        Optional<LongStream> data = Optional.empty();
 +        List<T> elements = null;
          try {
--            HashMapPalette<T> hashMapPalette = new HashMapPalette<>(idMap, this.data.storage.getBits(), this.dummyPaletteResize);
+-            HashMapPalette<T> hashMapPalette = new HashMapPalette<>(idList, this.data.storage.getBits(), this.dummyPaletteResize);
--            int i = strategy.size();
+-            int i = paletteProvider.size();
 -            int[] is = new int[i];
 -            this.data.storage.unpack(is);
--            swapPalette(is, (ix) -> {
+-            swapPalette(is, (id) -> {
--                return hashMapPalette.idFor(this.data.palette.valueFor(ix));
+-                return hashMapPalette.idFor(this.data.palette.valueFor(id));
 -            });
--            int j = strategy.calculateBitsForSerialization(idMap, hashMapPalette.getSize());
+-            int j = paletteProvider.calculateBitsForSerialization(idList, hashMapPalette.getSize());
 -            Optional<LongStream> optional;
 -            if (j != 0) {
 -                SimpleBitStorage simpleBitStorage = new SimpleBitStorage(j, i, is);
@@ -373,17 +373,17 @@ index 18c4f815888fee0c85ebbb485d21063ce0d143fb..59bb7c4ca7202cf80493dcc8da1233c8
  
 -            var12 = new PalettedContainerRO.PackedData<>(hashMapPalette.getEntries(), optional);
 +            if (elements == null) {
-+                LithiumHashPalette<T> compactedPalette = new LithiumHashPalette<>(idMap, storage.getBits(), this.dummyPaletteResize);
++                LithiumHashPalette<T> compactedPalette = new LithiumHashPalette<>(idList, storage.getBits(), this.dummyPaletteResize);
-+                short[] array = this.getOrCreate(strategy.size());
++                short[] array = this.getOrCreate(paletteProvider.size());
 +
 +                storage.compact(this.data.palette(), compactedPalette, array);
 +
 +                // If the palette didn't change during compaction, do a simple copy of the data array
-+                if (hashPalette != null && hashPalette.getSize() == compactedPalette.getSize() && storage.getBits() == strategy.calculateBitsForSerialization(idMap, hashPalette.getSize())) { // paletteSize can de-sync from palette - see https://github.com/CaffeineMC/lithium-fabric/issues/279
++                if (hashPalette != null && hashPalette.getSize() == compactedPalette.getSize() && storage.getBits() == paletteProvider.calculateBitsForSerialization(idMap, hashPalette.getSize())) { // paletteSize can de-sync from palette - see https://github.com/CaffeineMC/lithium-fabric/issues/279
 +                    data = this.asOptional(storage.getRaw().clone());
 +                    elements = hashPalette.getElements();
 +                } else {
-+                    int bits = strategy.calculateBitsForSerialization(idMap, compactedPalette.getSize());
++                    int bits = paletteProvider.calculateBitsForSerialization(idList, compactedPalette.getSize());
 +                    if (bits != 0) {
 +                        // Re-pack the integer array as the palette has changed size
 +                        SimpleBitStorage copy = new SimpleBitStorage(bits, array.length);
@@ -407,7 +407,7 @@ index 18c4f815888fee0c85ebbb485d21063ce0d143fb..59bb7c4ca7202cf80493dcc8da1233c8
 +        // JettPack end
      }
  
-     private static <T> void swapPalette(int[] is, IntUnaryOperator intUnaryOperator) {
+     private static <T> void swapPalette(int[] is, IntUnaryOperator applier) {
 @@ -362,17 +401,37 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
  
      @Override

patches/server/0067-Configurable-criterion-triggers.patch

@@ -9,10 +9,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/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f5aca2054dcad52301b9b99e44fbd3723aabdad7..f120e10679d38f3db22315f16a00622ab7601c2a 100644
+index 666189dae2400decc3d5bf97e073301e2de40472..2392913f2c221882bfdf324b671486a05a87ea76 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -613,7 +613,7 @@ public class ServerPlayer extends Player {
+@@ -615,7 +615,7 @@ public class ServerPlayer extends Player {
  
      @Override
      protected void onInsideBlock(BlockState state) {
@@ -21,7 +21,7 @@ index f5aca2054dcad52301b9b99e44fbd3723aabdad7..f120e10679d38f3db22315f16a00622a
      }
  
      @Override
-@@ -659,7 +659,7 @@ public class ServerPlayer extends Player {
+@@ -661,7 +661,7 @@ public class ServerPlayer extends Player {
              }
          }
  
@@ -30,7 +30,7 @@ index f5aca2054dcad52301b9b99e44fbd3723aabdad7..f120e10679d38f3db22315f16a00622a
          if (this.levitationStartPos != null) {
              CriteriaTriggers.LEVITATION.trigger(this, this.levitationStartPos, this.tickCount - this.levitationStartTime);
          }
-@@ -735,9 +735,7 @@ public class ServerPlayer extends Player {
+@@ -737,9 +737,7 @@ public class ServerPlayer extends Player {
                  this.connection.send(new ClientboundSetExperiencePacket(this.experienceProgress, this.totalExperience, this.experienceLevel));
              }
  
@@ -42,7 +42,7 @@ index f5aca2054dcad52301b9b99e44fbd3723aabdad7..f120e10679d38f3db22315f16a00622a
              // CraftBukkit start - initialize oldLevel, fire PlayerLevelChangeEvent, and tick client-sided world border
              if (this.oldLevel == -1) {
 diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java
-index e34fa6934a59fbead5ba4f4329a20507378e727a..6fb5f2f9bb1dc881eff5bc4a6edfcb1d3c7dc161 100644
+index 9bc1e365e0c96907f6fb2b5cd67a12c87d0cf7ed..aa6e4eae07182d74632b7b4ee0844a979a630686 100644
 --- a/src/main/java/wtf/etil/mirai/MiraiConfig.java
 +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java
 @@ -209,4 +209,16 @@ public class MiraiConfig {

patches/server/0068-Set-item-stuck-sleep-to-15-ticks.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/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 64c8eefa0302b04b416cd4912c01c50feddf1301..b9abfa591bf535de3805f7bb2b3f3401c8a4c1f6 100644
+index 16a55f94bda9f959548772c8916b4dc3eb045d47..3fbcd5e5d83b4451d2bf169971aa23ae5402184b 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -138,7 +138,7 @@ public class ItemEntity extends Entity {
+@@ -141,7 +141,7 @@ public class ItemEntity extends Entity {
  
              if (this.level.isClientSide) {
                  this.noPhysics = false;

patches/server/0069-Smarter-statistics-ticking.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/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index b22e4068407f3012b62683abd060509829e61c62..da94849a59825b6b2ca886df3080d026e1720418 100644
+index 9b131f0a827413e9f5d6d0f7491c5481576cb8b1..b5ffd28b2d17014d25bc4d099b1cc5da186f3146 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -283,19 +283,21 @@ public abstract class Player extends LivingEntity {
+@@ -284,19 +284,21 @@ public abstract class Player extends LivingEntity {
          if (!this.level.isClientSide) {
              this.foodData.tick(this);
              this.wardenSpawnTracker.tick();

patches/server/0070-lithium-ai.nearby_entity_tracking-and-ai.nearby_enti.patch

@@ -600,7 +600,7 @@ index 0000000000000000000000000000000000000000..178fc249777c9997e9586ffe099e54c9
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fb8fb1332b88427b7340fdeeff2024455f73f502..9d453f71b85be15b5889636569f93cc66efd6a52 100644
+index a189fdcafda1e52ee8bf52361b1aae5cfff7614b..95ad50a86077d42e9c9429635d1eaf3b1ba8c098 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -154,9 +154,29 @@ import org.bukkit.event.entity.EntityPoseChangeEvent;

patches/server/0071-some-entity-micro-opts.patch

@@ -7,10 +7,10 @@ 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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9d453f71b85be15b5889636569f93cc66efd6a52..ecc7085ecb33f4a2bc08b49ca0889ca41a015c8c 100644
+index 95ad50a86077d42e9c9429635d1eaf3b1ba8c098..9806c35f4ebb1c7541852d3c995a30d6372bdf6f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1891,12 +1891,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1886,12 +1886,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
      }
  
@@ -30,7 +30,7 @@ index 9d453f71b85be15b5889636569f93cc66efd6a52..ecc7085ecb33f4a2bc08b49ca0889ca4
      public void absMoveTo(double x, double y, double z, float yaw, float pitch) {
          this.absMoveTo(x, y, z);
          this.setYRot(yaw % 360.0F);
-@@ -4325,6 +4331,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4329,6 +4335,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
      // Paper end - block invalid positions
  

patches/server/0072-Dont-eat-blocks-in-non-ticking-chunks.patch

@@ -7,10 +7,10 @@ Original code by PurpurMC, licensed under MIT
 You can find the original code on https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b7f56d1909272bb02591b6e08aed78943ab96ba1..c67c7ba95537ff39bf4a4f4c490698b49dcb0849 100644
+index 87518f6ff223ca211727c3002d107bc9bcaa36f9..b9d4878dd629886c4ef3e29ff1b729571d81d785 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1826,7 +1826,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1823,7 +1823,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          return this.anyPlayerCloseEnoughForSpawning(this.getUpdatingChunkIfPresent(chunkcoordintpair.toLong()), chunkcoordintpair, reducedRange);
      }
  

patches/server/0073-Fast-speed-check.patch

@@ -12,7 +12,7 @@ doing questionable/buggy ones, and claiming breathtaking performance improvement
 any of those Spigot forks!
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ecc7085ecb33f4a2bc08b49ca0889ca41a015c8c..c7c4f4489f9226d87b6d9f0f77d25806e8d80b75 100644
+index 9806c35f4ebb1c7541852d3c995a30d6372bdf6f..91db9f3a066ef9a7a9c9c0eddc5ecb41f9024bd9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1225,7 +1225,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -36,7 +36,7 @@ index ecc7085ecb33f4a2bc08b49ca0889ca41a015c8c..c7c4f4489f9226d87b6d9f0f77d25806
                  this.setDeltaMovement(this.getDeltaMovement().multiply((double) f2, 1.0D, (double) f2));
                  // Paper start - remove expensive streams from here
 diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java
-index 6fb5f2f9bb1dc881eff5bc4a6edfcb1d3c7dc161..04d08c44f56a4af207b8240ca1d9d34790ead16d 100644
+index aa6e4eae07182d74632b7b4ee0844a979a630686..dc8f27232aaece57fa5924e4d47b14a5066eb453 100644
 --- a/src/main/java/wtf/etil/mirai/MiraiConfig.java
 +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java
 @@ -221,4 +221,11 @@ public class MiraiConfig {

patches/server/0077-lithium-shapes.blockstate_cache.patch

@@ -73,7 +73,7 @@ index 0000000000000000000000000000000000000000..a833ec84b2053c805dd33821cc08939c
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 8986eb0cfb151a05a0450d2d46aca1837d3c1152..50bf78a307bf9830fc3bcd5ab8ed5578f9d84095 100644
+index dfe1e522a747b894d43124b97eaceb0ab196ac44..1834470b549d8352317cf081173ff542c9faac1e 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -64,17 +64,19 @@ import net.minecraft.world.phys.shapes.BooleanOp;

patches/server/0078-lithium-gen.patch

@@ -106,10 +106,10 @@ index 0000000000000000000000000000000000000000..c99eff34c1be07508c88fe9525c3ae1a
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index 4538e459f35d2e08fbacee71cec142a2db4b1371..d9444afba8c65c9e1591726e0e1c7ba7b6749ff0 100644
+index 365ede275df6b3b4da7075f29699ca7411b81f6d..c7aa41023c32862c577f89fcf23aa7e04130f54e 100644
 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-@@ -53,6 +53,7 @@ import net.minecraft.world.phys.Vec3;
+@@ -54,6 +54,7 @@ import net.minecraft.world.phys.Vec3;
  import net.minecraft.world.ticks.LevelTickAccess;
  import net.minecraft.world.ticks.WorldGenTickAccess;
  import org.slf4j.Logger;
@@ -117,7 +117,7 @@ index 4538e459f35d2e08fbacee71cec142a2db4b1371..d9444afba8c65c9e1591726e0e1c7ba7
  
  public class WorldGenRegion implements WorldGenLevel {
  
-@@ -81,6 +82,8 @@ public class WorldGenRegion implements WorldGenLevel {
+@@ -82,6 +83,8 @@ public class WorldGenRegion implements WorldGenLevel {
      private Supplier<String> currentlyGenerating;
      private final AtomicLong subTickCount = new AtomicLong();
      private static final ResourceLocation WORLDGEN_REGION_RANDOM = new ResourceLocation("worldgen_region_random");
@@ -126,7 +126,7 @@ index 4538e459f35d2e08fbacee71cec142a2db4b1371..d9444afba8c65c9e1591726e0e1c7ba7
  
      public WorldGenRegion(ServerLevel world, List<ChunkAccess> chunks, ChunkStatus status, int placementRadius) {
          this.generatingStatus = status;
-@@ -103,6 +106,12 @@ public class WorldGenRegion implements WorldGenLevel {
+@@ -104,6 +107,12 @@ public class WorldGenRegion implements WorldGenLevel {
              this.lastPos = ((ChunkAccess) chunks.get(chunks.size() - 1)).getPos();
              this.structureManager = world.structureManager().forWorldGenRegion(this);
          }
@@ -139,7 +139,7 @@ index 4538e459f35d2e08fbacee71cec142a2db4b1371..d9444afba8c65c9e1591726e0e1c7ba7
      }
  
      public boolean isOldChunkAround(ChunkPos chunkPos, int checkRadius) {
-@@ -118,11 +127,33 @@ public class WorldGenRegion implements WorldGenLevel {
+@@ -119,11 +128,33 @@ public class WorldGenRegion implements WorldGenLevel {
          this.currentlyGenerating = structureName;
      }
  
@@ -174,7 +174,7 @@ index 4538e459f35d2e08fbacee71cec142a2db4b1371..d9444afba8c65c9e1591726e0e1c7ba7
      @Nullable
      @Override
      public ChunkAccess getChunk(int chunkX, int chunkZ, ChunkStatus leastStatus, boolean create) {
-@@ -178,10 +209,24 @@ public class WorldGenRegion implements WorldGenLevel {
+@@ -179,10 +210,24 @@ public class WorldGenRegion implements WorldGenLevel {
      }
      // Paper end
  
@@ -201,7 +201,7 @@ index 4538e459f35d2e08fbacee71cec142a2db4b1371..d9444afba8c65c9e1591726e0e1c7ba7
      @Override
      public FluidState getFluidState(BlockPos pos) {
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
-index df1db87d2dd5076fccea6a1ac9271a9d786729bb..a9be97c61714597dd68fbe196c90b214a4cd9647 100644
+index 575efe82a7219e256afd8362984eb26795445119..6292dead8c2d682e524edee6af9f04b31a79489c 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
 @@ -67,6 +67,7 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
@@ -210,7 +210,7 @@ index df1db87d2dd5076fccea6a1ac9271a9d786729bb..a9be97c61714597dd68fbe196c90b214
      private final Aquifer.FluidPicker globalFluidPicker;
 +    private int cachedSeaLevel; // Mirai - lithium: gen
  
-     public NoiseBasedChunkGenerator(Registry<StructureSet> structureSetRegistry, Registry<NormalNoise.NoiseParameters> noiseRegistry, BiomeSource populationSource, Holder<NoiseGeneratorSettings> holder) {
+     public NoiseBasedChunkGenerator(Registry<StructureSet> structureSetRegistry, Registry<NormalNoise.NoiseParameters> noiseRegistry, BiomeSource populationSource, Holder<NoiseGeneratorSettings> settings) {
          super(structureSetRegistry, Optional.empty(), populationSource);
 @@ -83,6 +84,7 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
          this.globalFluidPicker = (j, k, l) -> {

patches/server/0079-PaperPR-Stop-large-look-changes-from-crashing-the-se.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] PaperPR Stop large look changes from crashing the server
 Taken from https://github.com/PaperMC/Paper/pull/7459
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 858ccbfd456777a61e9579beb997abb568d5b75e..4a0ef94baec5b16ca0eee8d971851a08038b1825 100644
+index 58fd02c12894e57312dca70fd4871b8a0590bb76..3174fb7fb678a8a669e28ae10c830ede3855a3ad 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3006,37 +3006,12 @@ public abstract class LivingEntity extends Entity {
+@@ -3009,37 +3009,12 @@ public abstract class LivingEntity extends Entity {
          this.level.getProfiler().pop();
          this.level.getProfiler().push("rangeChecks");
  

patches/server/0080-PaperPR-Add-more-collision-code-skipping-logic.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] PaperPR Add more collision code skipping logic
 Taken from https://github.com/PaperMC/Paper/pull/7581
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4a0ef94baec5b16ca0eee8d971851a08038b1825..10fe0a33e7d2663e27413b3affe035e91de37255 100644
+index 3174fb7fb678a8a669e28ae10c830ede3855a3ad..a2c348697b0a9a6646647e7946f6720c5897fb3d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3439,6 +3439,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3442,6 +3442,10 @@ public abstract class LivingEntity extends Entity {
  
      protected void pushEntities() {
          // Paper start - don't run getEntities if we're not going to use its result

patches/server/0081-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch

@@ -9,10 +9,10 @@ Original code by RelativityMC, licensed under MIT
 You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c67c7ba95537ff39bf4a4f4c490698b49dcb0849..a596cbae5981953aa0813ddfedb4cd3677e3d8f6 100644
+index b9d4878dd629886c4ef3e29ff1b729571d81d785..629ee5ece4819608fe12db64b817edeeb777d1fc 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -114,6 +114,7 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator;
+@@ -111,6 +111,7 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator;
  import org.bukkit.entity.Player;
  // CraftBukkit end
  import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; // Paper
@@ -20,7 +20,7 @@ index c67c7ba95537ff39bf4a4f4c490698b49dcb0849..a596cbae5981953aa0813ddfedb4cd36
  
  public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider {
  
-@@ -419,7 +420,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -416,7 +417,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          this.toDrop = new LongOpenHashSet();
          this.tickingGenerated = new AtomicInteger();
          this.playerMap = new PlayerMap();

patches/server/0085-lithium-suffocation.patch

@@ -9,10 +9,10 @@ Original license: GNU Lesser General Public License v3.0
 Original project: https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c7c4f4489f9226d87b6d9f0f77d25806e8d80b75..5dc113137840ffe943f4f9c9f50a78b57d990af1 100644
+index 91db9f3a066ef9a7a9c9c0eddc5ecb41f9024bd9..ed4d8ad6c7b6c08045710e6e8135d7b633d950fc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2617,39 +2617,64 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2613,39 +2613,64 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return !this.isRemoved();
      }
  

patches/server/0086-Optimize-default-values-for-configs.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize default values for configs
 
 
 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-index 09827eaa9f6adf49385a33aa60b3a6bf4005a982..49fa028efe1a34d9f37b95866c0824fcf210f338 100644
+index 38cb29c646ff496ffaa6553f98a565b71155c464..755b165279b596807b8fa8def417671abbc4c4bf 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 @@ -216,7 +216,7 @@ public class PufferfishConfig {

patches/server/0087-Configurable-map-update-interval.patch

@@ -27,7 +27,7 @@ index 67b88da702b780f79c0496cb17f1e6f1f8dd6c2b..712707da510977bfa1ce4b991fd8a8f5
                  // CraftBukkit start
                  java.util.Collection<MapDecoration> icons = new java.util.ArrayList<MapDecoration>();
 diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java
-index 04d08c44f56a4af207b8240ca1d9d34790ead16d..0e1ff578af49eaa44508119b16fae67744041150 100644
+index dc8f27232aaece57fa5924e4d47b14a5066eb453..f9ba32332a64768dc30e7d95deae441ae23b7365 100644
 --- a/src/main/java/wtf/etil/mirai/MiraiConfig.java
 +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java
 @@ -228,4 +228,11 @@ public class MiraiConfig {

patches/server/0088-Fix-hunger-saturation-depleting-on-peaceful.patch

@@ -8,10 +8,10 @@ the displayed hunger bar never goes down. Hunger (or any related value, includin
 should not go down on peaceful. See https://bugs.mojang.com/browse/MC-31819.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index da94849a59825b6b2ca886df3080d026e1720418..8d465c3ca7af2a804a4c178f054063d6a1a5ddad 100644
+index b5ffd28b2d17014d25bc4d099b1cc5da186f3146..54e241534f0a3c00044c1ce33e7dc3a8fd020ab7 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1911,6 +1911,7 @@ public abstract class Player extends LivingEntity {
+@@ -1921,6 +1921,7 @@ public abstract class Player extends LivingEntity {
      }
  
      public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) {

patches/server/0093-Swaps-the-predicate-order-of-collision.patch

@@ -8,10 +8,10 @@ Original license: GPLv3
 Original project: 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 5dc113137840ffe943f4f9c9f50a78b57d990af1..a02b8f64502326efa758bfa3bb861dc0a77dec65 100644
+index ed4d8ad6c7b6c08045710e6e8135d7b633d950fc..32bb217e3b1a5ee3be8ba576e192ee93b4123d30 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2009,8 +2009,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2003,8 +2003,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public void playerTouch(Player player) {}
  
      public void push(Entity entity) {

patches/server/0094-Fix-head-rotation-packet-spam.patch

@@ -7,7 +7,7 @@ Original license: GPLv3
 Original project: https://github.com/Electroid/SportPaper
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 0423dff716fdd4f60b792e24a4a5a33d150e734d..bcaa1033f570b1934a770bc51b3a49ef634abcf1 100644
+index 4197961b2f03a5151b396d0d09bf5cb9ab6481e7..09be313aefd5dda15bd4db6ee0324b2aec879744 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -346,8 +346,10 @@ public class ServerEntity {

patches/server/0095-Cache-block-break-animation-packet.patch

@@ -7,10 +7,10 @@ Original license: GPLv3
 Original project: https://github.com/Electroid/SportPaper
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 05b895c79accf2f10f54a9868e6b9c10e1e5e687..50daf0762ae2eded8e5e42db12bcdb06ed183225 100644
+index 447fa39cf935072178503c3079c74ffe984d01c4..ef932eaedf1dbf4d2a90cab270516b71923d5678 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1539,6 +1539,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1540,6 +1540,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (entity instanceof Player) entityhuman = (Player) entity;
          // CraftBukkit end
  
@@ -18,7 +18,7 @@ index 05b895c79accf2f10f54a9868e6b9c10e1e5e687..50daf0762ae2eded8e5e42db12bcdb06
          while (iterator.hasNext()) {
              ServerPlayer entityplayer = (ServerPlayer) iterator.next();
  
-@@ -1554,7 +1555,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1555,7 +1556,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  // CraftBukkit end
  
                  if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {

patches/server/0097-Optimize-Math.round-and-Math.hypot-functions.patch

@@ -164,10 +164,10 @@ index ae60bd96b5284d54676d8e7e4dd5d170b526ec1e..2344ea858eda8e54c2eb3ccbdad464ed
          return true;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 11b0d23783fed5d96bd96c24adfc9a7f353a18b3..834ad81056c5a22921495c22d410bdf11666b87e 100644
+index 55f6e8a47d4a50a65cfd08f15499546ef2a3327b..acd9ca84f4f208c8264ac6560bea85d1e568404f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2744,7 +2744,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
+@@ -2784,7 +2784,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
                      }
  
                      double overuseCount = (double)overuse/(double)MAX_CHUNK_EXEC_TIME;
@@ -190,10 +190,10 @@ index 88f10d729aa1e0a01790521821d691a0ecd373a2..df2c8dffd626eab0e03b1b62940a52fa
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/util/Mth.java b/src/main/java/net/minecraft/util/Mth.java
-index a4a6885bea59210192e8a2ce8834372275e7ceb3..6fb805ba6afa000e215e4b7c8da29bf5d8ba7399 100644
+index ec587cf6592a1dc0d90d6f54af1bdfab97aec7c6..41fe8bbdf9235ce79bffe6b2fe1339f79f34822f 100644
 --- a/src/main/java/net/minecraft/util/Mth.java
 +++ b/src/main/java/net/minecraft/util/Mth.java
-@@ -791,6 +791,7 @@ public class Mth {
+@@ -792,6 +792,7 @@ public class Mth {
      }
  
      public static double length(double a, double b) {
@@ -202,7 +202,7 @@ index a4a6885bea59210192e8a2ce8834372275e7ceb3..6fb805ba6afa000e215e4b7c8da29bf5
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 10fe0a33e7d2663e27413b3affe035e91de37255..af8012ad3acb294806a18b6aa4fadb1d3fec6b33 100644
+index a2c348697b0a9a6646647e7946f6720c5897fb3d..f53e5cd78431e84bf257229cd70fd8dd4599e306 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1496,7 +1496,7 @@ public abstract class LivingEntity extends Entity {
@@ -269,7 +269,7 @@ index 10fe0a33e7d2663e27413b3affe035e91de37255..af8012ad3acb294806a18b6aa4fadb1d
                          }
                      }
  
-@@ -3007,10 +3007,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3010,10 +3010,10 @@ public abstract class LivingEntity extends Entity {
          this.level.getProfiler().push("rangeChecks");
  
          // Paper start - Stop large pitch and yaw changes from crashing the server
@@ -285,10 +285,10 @@ index 10fe0a33e7d2663e27413b3affe035e91de37255..af8012ad3acb294806a18b6aa4fadb1d
  
          this.level.getProfiler().pop();
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 8d465c3ca7af2a804a4c178f054063d6a1a5ddad..4e520a7c5bdf0eb3830905859ea106396fa79653 100644
+index 54e241534f0a3c00044c1ce33e7dc3a8fd020ab7..b76f7acd5b44ecc2d73a716b6860b0b58b6510a0 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1086,7 +1086,7 @@ public abstract class Player extends LivingEntity {
+@@ -1087,7 +1087,7 @@ public abstract class Player extends LivingEntity {
              float f2 = f1 - f;
  
              if (f2 > 0.0F && f2 < 3.4028235E37F) {
@@ -297,7 +297,7 @@ index 8d465c3ca7af2a804a4c178f054063d6a1a5ddad..4e520a7c5bdf0eb3830905859ea10639
              }
  
              if (f != 0.0F) {
-@@ -1096,7 +1096,7 @@ public abstract class Player extends LivingEntity {
+@@ -1097,7 +1097,7 @@ public abstract class Player extends LivingEntity {
                  this.setHealth(this.getHealth() - f);
                  this.getCombatTracker().recordDamage(damagesource, f3, f);
                  if (f < 3.4028235E37F) {
@@ -306,7 +306,7 @@ index 8d465c3ca7af2a804a4c178f054063d6a1a5ddad..4e520a7c5bdf0eb3830905859ea10639
                  }
  
              }
-@@ -1422,7 +1422,7 @@ public abstract class Player extends LivingEntity {
+@@ -1423,7 +1423,7 @@ public abstract class Player extends LivingEntity {
                          if (target instanceof LivingEntity) {
                              float f5 = f3 - ((LivingEntity) target).getHealth();
  
@@ -315,7 +315,7 @@ index 8d465c3ca7af2a804a4c178f054063d6a1a5ddad..4e520a7c5bdf0eb3830905859ea10639
                              if (j > 0) {
                                  // CraftBukkit start - Call a combust event when somebody hits with a fire enchanted item
                                  EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), target.getBukkitEntity(), j * 4);
-@@ -1691,29 +1691,29 @@ public abstract class Player extends LivingEntity {
+@@ -1696,29 +1696,29 @@ public abstract class Player extends LivingEntity {
              int i;
  
              if (this.isSwimming()) {
@@ -350,7 +350,7 @@ index 8d465c3ca7af2a804a4c178f054063d6a1a5ddad..4e520a7c5bdf0eb3830905859ea10639
                  if (i > 0) {
                      if (this.isSprinting()) {
                          this.awardStat(Stats.SPRINT_ONE_CM, i);
-@@ -1727,10 +1727,10 @@ public abstract class Player extends LivingEntity {
+@@ -1732,10 +1732,10 @@ public abstract class Player extends LivingEntity {
                      }
                  }
              } else if (this.isFallFlying()) {
@@ -363,7 +363,7 @@ index 8d465c3ca7af2a804a4c178f054063d6a1a5ddad..4e520a7c5bdf0eb3830905859ea10639
                  if (i > 25) {
                      this.awardStat(Stats.FLY_ONE_CM, i);
                  }
-@@ -1741,7 +1741,7 @@ public abstract class Player extends LivingEntity {
+@@ -1746,7 +1746,7 @@ public abstract class Player extends LivingEntity {
  
      public void checkRidingStatistics(double dx, double dy, double dz) {
          if (this.isPassenger()) {
@@ -372,7 +372,7 @@ index 8d465c3ca7af2a804a4c178f054063d6a1a5ddad..4e520a7c5bdf0eb3830905859ea10639
  
              if (i > 0) {
                  Entity entity = this.getVehicle();
-@@ -1768,7 +1768,7 @@ public abstract class Player extends LivingEntity {
+@@ -1773,7 +1773,7 @@ public abstract class Player extends LivingEntity {
              return false;
          } else {
              if (fallDistance >= 2.0F) {
@@ -395,7 +395,7 @@ index 16504b8be08064e61b013fa943f692816612cbd0..c5b39234822626b4ff948464409ca415
  
          i = Mth.clamp(i, (int) 0, (int) 15);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 264ca51c2f2a5ff69688372b71ad7355366bac1a..01fcbe8445de6d024b17c205d9363faa6b2dfa39 100644
+index 19ffd93b7bc745d9a6822f1e5642d2f640f61df7..0790467860bd793a7e69b2a4080161756d28906d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -249,8 +249,8 @@ public abstract class ChunkGenerator {
@@ -451,7 +451,7 @@ index 0ecac76577eb440a0c3104ef4603acec826c474d..4813bd6de894d0566e8631d8c71915c3
  
      // Yatopia start - Last tick time API
 diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java
-index 0e1ff578af49eaa44508119b16fae67744041150..58464d609824c52bd297e9c242c2957e1545c172 100644
+index f9ba32332a64768dc30e7d95deae441ae23b7365..42da3cbd8bf1f1960fad09f6563087cab1e3fbee 100644
 --- a/src/main/java/wtf/etil/mirai/MiraiConfig.java
 +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java
 @@ -235,4 +235,13 @@ public class MiraiConfig {

patches/server/0100-reduce-work-done-by-game-event-system.patch

@@ -11,10 +11,10 @@ Original project: https://github.com/Bloom-host/Petal
 2. euclideangameeventdispatcher is not used concurrently so we ban that usage for improved performance with allays
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 50daf0762ae2eded8e5e42db12bcdb06ed183225..fa51185762cf68b9f086d278db2f1d1441315344 100644
+index ef932eaedf1dbf4d2a90cab270516b71923d5678..a9bb78d68adac54729a954f766ad993989bfee77 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1617,6 +1617,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1618,6 +1618,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  if (chunk != null) {
                      for (int j2 = k; j2 <= j1; ++j2) {
                          flag |= chunk.getEventDispatcher(j2).walkListeners(event, emitterPos, emitter, (gameeventlistener, vec3d1) -> {

patches/server/0101-reduce-sensor-work.patch

@@ -10,7 +10,7 @@ this patch is focused around the sensors used for ai
 delete the line of sight cache less often and use a faster nearby comparison
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index af8012ad3acb294806a18b6aa4fadb1d3fec6b33..c4c32d3f2ee242e3fdd9d57270b8a9d938014351 100644
+index f53e5cd78431e84bf257229cd70fd8dd4599e306..7fe46ecd8221545d56f5c8e509f72cb90ad6425a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -998,12 +998,14 @@ public abstract class LivingEntity extends Entity {