diff --git a/build.gradle.kts b/build.gradle.kts
index 382838c..4692f53 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     java
     `maven-publish`
-    id("io.papermc.paperweight.patcher") version "1.7.1"
+    id("io.papermc.paperweight.patcher") version "1.7.3"
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
diff --git a/gradle.properties b/gradle.properties
index a33db68..bb90414 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = me.earthme.luminol
 version = 1.21.1-R0.1-SNAPSHOT
 
-foliaCommit = 88e0907cadf2358e1d3e06222c0a97722ca4ce12
+foliaCommit = 06d719d57d7ca9df0bda9f881d330b05aca99ebd
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0001-Rebrand-to-Luminol.patch b/patches/api/0001-Rebrand-to-Luminol.patch
index 6e1844c..4c43eef 100644
--- a/patches/api/0001-Rebrand-to-Luminol.patch
+++ b/patches/api/0001-Rebrand-to-Luminol.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand to Luminol
 
 
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-index 9df9d09aa477d4cd3c496ba0933c816df1ef0964..b8a5e4f02499e3a3c370d43f6bbb84ffba58e1f3 100644
+index 652ff54e7c50412503725d628bfe72ed03059790..ee163b9fa8f441aa4b3e2309f33e8f932dfc02d7 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-@@ -18,6 +18,13 @@ public interface ServerBuildInfo {
+@@ -19,6 +19,13 @@ public interface ServerBuildInfo {
       */
      Key BRAND_PAPER_ID = Key.key("papermc", "paper");
  
diff --git a/patches/api/0003-KioCG-Chunk-API.patch b/patches/api/0003-KioCG-Chunk-API.patch
index 9d192a9..d91c69c 100644
--- a/patches/api/0003-KioCG-Chunk-API.patch
+++ b/patches/api/0003-KioCG-Chunk-API.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <novau233@163.com>
-Date: Sat, 27 Apr 2024 13:22:59 +0000
+From: MrHua269 <wangxyper@163.com>
+Date: Fri, 25 Oct 2024 00:07:15 +0800
 Subject: [PATCH] KioCG Chunk API
 
 
@@ -16,13 +16,13 @@ index bc8b5bc17706250b8535b1b309134843d2ce2bb1..1cfe84ad1094e3c4fab96487f328be53
 +    long getChunkHotAvg(); // KioCG
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7c56182acaf827f4b1a986a61cea8e9960604c98..2d40d7dff833a7e259a82cca758b89c2ef3d5375 100644
+index 8086acceacbceb2c5a7228fff005e41a86d37008..16ab3c58adcd801d052d93cbf27279d01404cdfd 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3859,4 +3859,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     @Override
-     Spigot spigot();
-     // Spigot end
+@@ -3871,4 +3871,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      */
+     void sendEntityEffect(org.bukkit.@NotNull EntityEffect effect, @NotNull Entity target);
+     // Paper end - entity effect API
 +
 +    long getNearbyChunkHot(); // KioCG
  }
diff --git a/patches/api/0005-Pufferfish-SIMD-Utilities.patch b/patches/api/0005-Pufferfish-SIMD-Utilities.patch
index 2e92fb3..cb3eb5c 100644
--- a/patches/api/0005-Pufferfish-SIMD-Utilities.patch
+++ b/patches/api/0005-Pufferfish-SIMD-Utilities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Pufferfish SIMD Utilities
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 540fe7e2c110e79c3742f229b3ed8c54b101d260..3dff16a345086778a451067db90e0820943ca2a7 100644
+index e7c96be769fde8375b9a1b128cc7ce474144d16d..73e0b4a9af5803198e42fa74af5b05654d9a934a 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -130,6 +130,13 @@ val generateApiVersioningFile by tasks.registering {
+@@ -131,6 +131,13 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
  
@@ -22,7 +22,7 @@ index 540fe7e2c110e79c3742f229b3ed8c54b101d260..3dff16a345086778a451067db90e0820
  tasks.jar {
      from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
          into("META-INF/maven/${project.group}/${project.name}")
-@@ -188,6 +195,7 @@ tasks.withType<Javadoc> {
+@@ -190,6 +197,7 @@ tasks.withType<Javadoc> {
              into("build/docs/javadoc")
          }
      }
diff --git a/patches/server/0002-Rebrand-to-Luminol.patch b/patches/server/0002-Rebrand-to-Luminol.patch
index df368a5..c9e46fb 100644
--- a/patches/server/0002-Rebrand-to-Luminol.patch
+++ b/patches/server/0002-Rebrand-to-Luminol.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand to Luminol
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ee6ae99ba31ec4c91d81be845a594481ce85beab..de5a43db5f0c7c507c492db8789ad2d4a4cff3c8 100644
+index 28726c59088d98923b9ecb3221ca254385d142fd..f07a002ab51a4aadfea65c3258406edc19b5078e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -84,14 +84,14 @@ tasks.jar {
+@@ -85,14 +85,14 @@ tasks.jar {
          val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
diff --git a/patches/server/0004-Add-config-for-server-mod-name.patch b/patches/server/0004-Add-config-for-server-mod-name.patch
index 93f299a..e42cb09 100644
--- a/patches/server/0004-Add-config-for-server-mod-name.patch
+++ b/patches/server/0004-Add-config-for-server-mod-name.patch
@@ -47,10 +47,10 @@ index 0000000000000000000000000000000000000000..94e7c8910e3623163528a844fd7a08b3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ac56b02498eb38883ae462be6ef3d15cb2a855aa..05b8f509b119b8166012567f865b99a23ad84ae2 100644
+index 511992c31d70e806bba68737048ca760bef1def0..5bd02c4f65327b9b848b08e61820c262e0a71731 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2034,7 +2034,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2032,7 +2032,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
diff --git a/patches/server/0006-Add-config-for-void-trading.patch b/patches/server/0005-Add-config-for-void-trading.patch
similarity index 93%
rename from patches/server/0006-Add-config-for-void-trading.patch
rename to patches/server/0005-Add-config-for-void-trading.patch
index 89ae19f..000241b 100644
--- a/patches/server/0006-Add-config-for-void-trading.patch
+++ b/patches/server/0005-Add-config-for-void-trading.patch
@@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..22f3c6c70e4287f1bdd0b18f87f57efe
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0166d6bd686d68ffdcc42e908b0d1aa41a3bffdf..b5cb700e2cd1de2f78ad582245208c056fa6fa79 100644
+index 90d78ddf8518c0df307cdaa8b7cfb5549491c6e5..94d855f14c91ca164f1728be1df4e83dfed8b005 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2814,7 +2814,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -2816,7 +2816,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
                  // Paper start - Fix merchant inventory not closing on entity removal
diff --git a/patches/server/0005-Add-config-for-unsafe-teleportation.patch b/patches/server/0006-Add-config-for-unsafe-teleportation.patch
similarity index 89%
rename from patches/server/0005-Add-config-for-unsafe-teleportation.patch
rename to patches/server/0006-Add-config-for-unsafe-teleportation.patch
index d6c7f41..93d8d5c 100644
--- a/patches/server/0005-Add-config-for-unsafe-teleportation.patch
+++ b/patches/server/0006-Add-config-for-unsafe-teleportation.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MrHua269 <wangxyper@163.com>
-Date: Wed, 31 Jul 2024 11:59:44 +0800
+Date: Fri, 25 Oct 2024 00:05:33 +0800
 Subject: [PATCH] Add config for unsafe teleportation
 
 
@@ -53,18 +53,19 @@ index 5d6b1a63a2a213f8a4e81c5e574847007a82007b..77ff2a526a1d2b9307dfc696f9862bfd
      }
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-index 58e15d7a5f7997a7aec9edaa5d211807b2b1ef6b..8a71276715c380b5b8510503399f3fde0084c145 100644
+index e1c071e0b25c4678bf08313b6c60cf895a54aa02..13c3527cd4852356ce8f39c739d1c5015ef69b16 100644
 --- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-@@ -70,6 +70,11 @@ public class EndPortalBlock extends BaseEntityBlock implements Portal {
-             world.getCraftServer().getPluginManager().callEvent(event);
+@@ -71,7 +71,11 @@ public class EndPortalBlock extends BaseEntityBlock implements Portal {
              if (event.isCancelled()) return; // Paper - make cancellable
              // CraftBukkit end
+             // Folia - region threading - do not show credits
+-
 +            // Luminol start - unsafe teleportation
 +            if (me.earthme.luminol.config.modules.fixes.UnsafeTeleportationConfig.enabled && !(entity instanceof net.minecraft.world.entity.player.Player)) {
 +                entity.endPortalLogicAsync(pos);
 +            }
 +            // Luminol end
-             if (!world.isClientSide && world.dimension() == Level.END && entity instanceof ServerPlayer) {
-                 ServerPlayer entityplayer = (ServerPlayer) entity;
+             entity.setAsInsidePortal(this, pos);
+         }
  
diff --git a/patches/server/0009-Add-a-simple-tpsbar.patch b/patches/server/0009-Add-a-simple-tpsbar.patch
index 9c641a7..e68aaf0 100644
--- a/patches/server/0009-Add-a-simple-tpsbar.patch
+++ b/patches/server/0009-Add-a-simple-tpsbar.patch
@@ -358,7 +358,7 @@ index 0755e8f460f59e2dbc00cac73026bb441c04e9ea..690d0f59daf8c4630c3d70b6fb690c2e
          //Util.shutdownExecutors(); // Paper - moved into super
          SkullBlockEntity.clear();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d681ec617590a3718f926cd5a9749952d5ac52bd..d9907ab4161f65328b989cd41564ec34f6ffcb14 100644
+index e4a68f43c1a48fe8193623c646eb40bc5f664c76..59a4937363a2404fe0b852b0ac851ef0c9c528ce 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -303,7 +303,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -371,10 +371,10 @@ index d681ec617590a3718f926cd5a9749952d5ac52bd..d9907ab4161f65328b989cd41564ec34
      private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
      private final ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder viewDistanceHolder = new ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 28c6923c90ca106256ca75769828cd62d5542ca7..dcee0b573f952f2b5c80e9c164724964d42577d8 100644
+index 12a2da086f249b3dbd61e5749b9856a2fce9ac7b..b954a5a3d8c589a0261202f21f1430c8790e874a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2389,6 +2389,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2393,6 +2393,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  handle.expToDrop = data.getInt("expToDrop");
                  handle.keepLevel = data.getBoolean("keepLevel");
              }
@@ -384,7 +384,7 @@ index 28c6923c90ca106256ca75769828cd62d5542ca7..dcee0b573f952f2b5c80e9c164724964
          }
      }
  
-@@ -2410,6 +2413,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2414,6 +2417,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          data.putLong("lastPlayed", System.currentTimeMillis());
          data.putString("lastKnownName", handle.getScoreboardName());
  
diff --git a/patches/server/0010-Add-a-simple-membar.patch b/patches/server/0010-Add-a-simple-membar.patch
index a887c6c..c138ab1 100644
--- a/patches/server/0010-Add-a-simple-membar.patch
+++ b/patches/server/0010-Add-a-simple-membar.patch
@@ -318,7 +318,7 @@ index 690d0f59daf8c4630c3d70b6fb690c2e1cedd402..8bd9baba560051e681277b8cea9d1374
          //Util.shutdownExecutors(); // Paper - moved into super
          SkullBlockEntity.clear();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d9907ab4161f65328b989cd41564ec34f6ffcb14..a737fb8dac485303d2ee7399d4dae8dbbff2f7fe 100644
+index 59a4937363a2404fe0b852b0ac851ef0c9c528ce..023ffc81f9363eb2fc7c3b3382c843b064c889e3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -304,6 +304,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -330,10 +330,10 @@ index d9907ab4161f65328b989cd41564ec34f6ffcb14..a737fb8dac485303d2ee7399d4dae8db
      private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
      private final ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder viewDistanceHolder = new ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dcee0b573f952f2b5c80e9c164724964d42577d8..f13128a9e5462ae1047987ad29d35c72f74c5412 100644
+index b954a5a3d8c589a0261202f21f1430c8790e874a..77576c06ffc0a677b1bfb63d48d39fba2aa2050d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2392,6 +2392,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2396,6 +2396,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              //Luminol start - Tpsbar
              getHandle().isTpsBarVisible = data.getBoolean("tpsbarVisible");
              //Luminol end
@@ -343,7 +343,7 @@ index dcee0b573f952f2b5c80e9c164724964d42577d8..f13128a9e5462ae1047987ad29d35c72
          }
      }
  
-@@ -2416,6 +2419,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2420,6 +2423,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          //Luminol start - Tpsbar
          data.putBoolean("tpsbarVisible",handle.isTpsBarVisible);
          //Luminol end
diff --git a/patches/server/0011-Add-config-for-username-check.patch b/patches/server/0011-Add-config-for-username-check.patch
index 2595dfd..9a76c17 100644
--- a/patches/server/0011-Add-config-for-username-check.patch
+++ b/patches/server/0011-Add-config-for-username-check.patch
@@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..c7e4724cc4ab8d911bcaf0106c098b26
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index d0f8a81ed0363764d185682c3de667703d30e8eb..c785b7fdc7cdba1598e841703df1bd5edded4757 100644
+index 8098b1a447a7c054e15edc09d2fa50e48f73e926..b6a65bdddc8eaf64931d9aa3f4801dc8e128801b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -173,7 +173,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -178,7 +178,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
      public void handleHello(ServerboundHelloPacket packet) {
          Validate.validState(this.state == ServerLoginPacketListenerImpl.State.HELLO, "Unexpected hello packet", new Object[0]);
          // Paper start - Validate usernames
diff --git a/patches/server/0020-Teleport-async-if-entity-was-moving-to-another-regio.patch b/patches/server/0020-Teleport-async-if-entity-was-moving-to-another-regio.patch
index 608d021..67088c3 100644
--- a/patches/server/0020-Teleport-async-if-entity-was-moving-to-another-regio.patch
+++ b/patches/server/0020-Teleport-async-if-entity-was-moving-to-another-regio.patch
@@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..0e51d465db3554ac80d00c6b85cc1f01
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4b85556eea3fb64f5bb7f44fa63681c65c2f3ff5..622de6624132abd9aecf4d4ab5c9630446549e5c 100644
+index 537fc5c169ab2e519277b95d456aab51b5b7fbb5..25a5f36ff19ff3f9cea051a1a6bf671b6288b799 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1123,6 +1123,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1125,6 +1125,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
      // Paper end - detailed watchdog information
  
@@ -53,7 +53,7 @@ index 4b85556eea3fb64f5bb7f44fa63681c65c2f3ff5..622de6624132abd9aecf4d4ab5c96304
      public void move(MoverType movementType, Vec3 movement) {
          final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
          // Paper start - detailed watchdog information
-@@ -1133,6 +1137,32 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1135,6 +1139,32 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              this.moveStartZ = this.getZ();
              this.moveVector = movement;
          }
diff --git a/patches/server/0022-Prevent-teleportAsync-calling-during-moving-event-be.patch b/patches/server/0022-Prevent-teleportAsync-calling-during-moving-event-be.patch
index 6f6ac15..514fcbe 100644
--- a/patches/server/0022-Prevent-teleportAsync-calling-during-moving-event-be.patch
+++ b/patches/server/0022-Prevent-teleportAsync-calling-during-moving-event-be.patch
@@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..8f1449545d6d217b46a9ffae705123da
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a810ffe411897a3155ae175418b8bbb0504cf923..84588c32ada812015fa970a38b36843492af779f 100644
+index d57fd6e4aacb611526a741fbd98165f124b7b8ef..8cfaa94da67bcdd5c3d30479379d384c20b4a1ac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -335,6 +335,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -50,7 +50,7 @@ index a810ffe411897a3155ae175418b8bbb0504cf923..84588c32ada812015fa970a38b368434
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
          this.chatVisibility = ChatVisiblity.FULL;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 804166bf2da81927ab449811be9fcf67e74eed00..fda2075b848612eae057ffc644a1ecf4ea841956 100644
+index 18d9e92f2fdc2cb25229005ffc08bffe555e0583..f0e063afa941aae051e950808fa7435e52d39456 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -695,7 +695,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -63,7 +63,7 @@ index 804166bf2da81927ab449811be9fcf67e74eed00..fda2075b848612eae057ffc644a1ecf4
  
                      // If the event is cancelled we move the player back to their old location.
                      if (event.isCancelled()) {
-@@ -1606,7 +1608,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1609,7 +1611,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                                      Location oldTo = to.clone();
                                      PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
@@ -74,10 +74,10 @@ index 804166bf2da81927ab449811be9fcf67e74eed00..fda2075b848612eae057ffc644a1ecf4
                                      // If the event is cancelled we move the player back to their old location.
                                      if (event.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 622de6624132abd9aecf4d4ab5c9630446549e5c..91b57934e8acf8fc6f23ba01db04bd7a315b06dd 100644
+index 25a5f36ff19ff3f9cea051a1a6bf671b6288b799..bacc88b735619998927c59ce7b828bfff7574fa8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4073,6 +4073,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4075,6 +4075,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                                         java.util.function.Consumer<Entity> teleportComplete) {
          ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this, "Cannot teleport entity async");
  
@@ -97,7 +97,7 @@ index 622de6624132abd9aecf4d4ab5c9630446549e5c..91b57934e8acf8fc6f23ba01db04bd7a
              return false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-index f403fc311a974558233028663dbe14c27b27d3f9..fbc936a218bc972866486f384baaa44949b29580 100644
+index a38ce400550893f63640e3bb5bb801ab40f06266..236e87790fe9357d948af40d411af56d958132c9 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 @@ -375,7 +375,21 @@ public abstract class AbstractMinecart extends VehicleEntity {
diff --git a/patches/server/0024-Force-disable-builtin-spark-plugin.patch b/patches/server/0024-Force-disable-builtin-spark-plugin.patch
index 6eb7b92..3b5eded 100644
--- a/patches/server/0024-Force-disable-builtin-spark-plugin.patch
+++ b/patches/server/0024-Force-disable-builtin-spark-plugin.patch
@@ -18,10 +18,10 @@ index 48604e7f96adc9e226e034054c5e2bad0b024eb5..99f0c1e4d3437154a1062b0a8f94b7a0
              return;
          }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 05b8f509b119b8166012567f865b99a23ad84ae2..2874c9c9901aeb0f356dbeb07153abd5f6cd0179 100644
+index 5bd02c4f65327b9b848b08e61820c262e0a71731..05871b8addafaf11ce10f16a0fc8d0ad9619e3d0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -778,8 +778,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -777,8 +777,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end - Configurable player collision
  
          this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
@@ -32,7 +32,7 @@ index 05b8f509b119b8166012567f865b99a23ad84ae2..2874c9c9901aeb0f356dbeb07153abd5
          if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
          io.papermc.paper.command.brigadier.PaperCommands.INSTANCE.setValid(); // Paper - reset invalid state for event fire below
          io.papermc.paper.plugin.lifecycle.event.LifecycleEventRunner.INSTANCE.callReloadableRegistrarEvent(io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents.COMMANDS, io.papermc.paper.command.brigadier.PaperCommands.INSTANCE, org.bukkit.plugin.Plugin.class, io.papermc.paper.plugin.lifecycle.event.registrar.ReloadableRegistrarEvent.Cause.INITIAL); // Paper - call commands event for regular plugins
-@@ -1093,7 +1093,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1092,7 +1092,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
          MinecraftTimings.stopServer(); // Paper
@@ -41,7 +41,7 @@ index 05b8f509b119b8166012567f865b99a23ad84ae2..2874c9c9901aeb0f356dbeb07153abd5
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
-@@ -1309,7 +1309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1308,7 +1308,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              // tasks are default scheduled at -1 + delay, and first tick will tick at 1
              final long actualDoneTimeMs = System.currentTimeMillis() - org.bukkit.craftbukkit.Main.BOOT_TIME.toEpochMilli(); // Paper - Add total time
              LOGGER.info("Done ({})! For help, type \"help\"", String.format(java.util.Locale.ROOT, "%.3fs", actualDoneTimeMs / 1000.00D)); // Paper - Add total time
@@ -50,7 +50,7 @@ index 05b8f509b119b8166012567f865b99a23ad84ae2..2874c9c9901aeb0f356dbeb07153abd5
              org.spigotmc.WatchdogThread.tick();
              // Paper end - Improved Watchdog Support
              org.spigotmc.WatchdogThread.hasStarted = true; // Paper
-@@ -1673,7 +1673,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1671,7 +1671,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          BooleanSupplier shouldKeepTicking = () -> {
              return scheduledEnd - System.nanoTime() > targetBuffer;
          };
@@ -59,7 +59,7 @@ index 05b8f509b119b8166012567f865b99a23ad84ae2..2874c9c9901aeb0f356dbeb07153abd5
          new com.destroystokyo.paper.event.server.ServerTickStartEvent((int)region.getCurrentTick()).callEvent(); // Paper
          // Folia end - region threading
          co.aikar.timings.TimingsManager.FULL_SERVER_TICK.startTiming(); // Paper
-@@ -1759,7 +1759,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1757,7 +1757,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          long endTime = System.nanoTime();
          long remaining = scheduledEnd - endTime; // Folia - region ticking
          new com.destroystokyo.paper.event.server.ServerTickEndEvent((int)io.papermc.paper.threadedregions.RegionizedServer.getCurrentTick(), ((double)(endTime - startTime) / 1000000D), remaining).callEvent(); // Folia - region ticking
@@ -91,7 +91,7 @@ index 79b79a5d41dc3568ae6a3d7701e6ac6b91045e36..cd28f741343c443ff4728fc0aa5526b6
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 39e4493ef5c7d4bfd903da18b76e14235a535ab5..be126a3139b1519e7a0ad3d521d72bf0817ccb1c 100644
+index dee23b4b96b7f2c6af54a6affe385b183479f8cc..07c6f858596e4926397b467ef5e22cab7e7f999b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -309,7 +309,7 @@ public final class CraftServer implements Server {
@@ -103,7 +103,7 @@ index 39e4493ef5c7d4bfd903da18b76e14235a535ab5..be126a3139b1519e7a0ad3d521d72bf0
  
      // Paper start - Folia region threading API
      private final io.papermc.paper.threadedregions.scheduler.FoliaRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaRegionScheduler(); // Folia - region threading
-@@ -481,7 +481,7 @@ public final class CraftServer implements Server {
+@@ -482,7 +482,7 @@ public final class CraftServer implements Server {
          }
          this.potionBrewer = new io.papermc.paper.potion.PaperPotionBrewer(console); // Paper - custom potion mixes
          datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
@@ -112,7 +112,7 @@ index 39e4493ef5c7d4bfd903da18b76e14235a535ab5..be126a3139b1519e7a0ad3d521d72bf0
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -1144,7 +1144,7 @@ public final class CraftServer implements Server {
+@@ -1146,7 +1146,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -121,7 +121,7 @@ index 39e4493ef5c7d4bfd903da18b76e14235a535ab5..be126a3139b1519e7a0ad3d521d72bf0
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -1173,7 +1173,7 @@ public final class CraftServer implements Server {
+@@ -1175,7 +1175,7 @@ public final class CraftServer implements Server {
          this.loadPlugins();
          this.enablePlugins(PluginLoadOrder.STARTUP);
          this.enablePlugins(PluginLoadOrder.POSTWORLD);
diff --git a/patches/server/0026-LinearPurpur-Linear-region-format.patch b/patches/server/0026-LinearPurpur-Linear-region-format.patch
index cee0824..ac62b87 100644
--- a/patches/server/0026-LinearPurpur-Linear-region-format.patch
+++ b/patches/server/0026-LinearPurpur-Linear-region-format.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LinearPurpur Linear region format
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 6ad2e95ef99790fd30a20201ebe623b9be54f284..eb708f155a19496dcd19e69540274000611f4eee 100644
+index 7615702d87b04699b2dd381c3b0c7e700602af8b..7b11c45914392c01b4d28b104f80e6ed34eb9955 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -31,6 +31,10 @@ dependencies {
@@ -17,7 +17,7 @@ index 6ad2e95ef99790fd30a20201ebe623b9be54f284..eb708f155a19496dcd19e69540274000
 +    implementation("org.lz4:lz4-java:1.8.0")
 +    // LinearPaper end
      implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
-     implementation("org.ow2.asm:asm-commons:9.7")
+     implementation("org.ow2.asm:asm-commons:9.7.1")
      implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
 diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java
 index 73df26b27146bbad2106d57b22dd3c792ed3dd1d..d2f209dd61f4412478a4b8fbe3489787d30bf74b 100644
@@ -120,10 +120,10 @@ index 0000000000000000000000000000000000000000..fda9177bc2c5cc0176f816b9774a2b7d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2874c9c9901aeb0f356dbeb07153abd5f6cd0179..39c5af1e3a4c2abbd02ccc3574d73aa06affcdf2 100644
+index 05871b8addafaf11ce10f16a0fc8d0ad9619e3d0..abe3dbe11066469f030e4f7381f98d38537443d4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1004,10 +1004,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1003,10 +1003,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              while (iterator1.hasNext()) {
                  ServerLevel worldserver2 = (ServerLevel) iterator1.next();
  
diff --git a/patches/server/0028-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0028-Kaiiju-Vanilla-end-portal-teleportation.patch
index a3de533..41caea1 100644
--- a/patches/server/0028-Kaiiju-Vanilla-end-portal-teleportation.patch
+++ b/patches/server/0028-Kaiiju-Vanilla-end-portal-teleportation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Kaiiju Vanilla end portal teleportation
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 91b57934e8acf8fc6f23ba01db04bd7a315b06dd..a2f550d2632459e271a3e9ff796dde4891e12e7a 100644
+index bacc88b735619998927c59ce7b828bfff7574fa8..87c2bb5794cf87a5f048779633de0d0bf2f16d5d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -109,6 +109,7 @@ import net.minecraft.world.level.block.Rotation;
@@ -16,7 +16,7 @@ index 91b57934e8acf8fc6f23ba01db04bd7a315b06dd..a2f550d2632459e271a3e9ff796dde48
  import net.minecraft.world.level.entity.EntityAccess;
  import net.minecraft.world.level.entity.EntityInLevelCallback;
  import net.minecraft.world.level.gameevent.DynamicGameEventListener;
-@@ -4228,13 +4229,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4230,13 +4231,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                          targetPos, 16, // load 16 blocks to be safe from block physics
                          ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGH,
                          (chunks) -> {
@@ -37,7 +37,7 @@ index 91b57934e8acf8fc6f23ba01db04bd7a315b06dd..a2f550d2632459e271a3e9ff796dde48
                                      DimensionTransition.PLAY_PORTAL_SOUND.then(DimensionTransition.PLACE_PORTAL_TICKET),
                                      org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
                                  )
-@@ -4431,6 +4437,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4433,6 +4439,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          if (!this.canPortalAsync(destination, takePassengers)) {
              return false;
          }
@@ -48,7 +48,7 @@ index 91b57934e8acf8fc6f23ba01db04bd7a315b06dd..a2f550d2632459e271a3e9ff796dde48
  
          Vec3 initialPosition = this.position();
          ChunkPos initialPositionChunk = new ChunkPos(
-@@ -4495,9 +4505,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4497,9 +4507,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                          info.postDimensionTransition().onTransition(teleported);
                      }
  
diff --git a/patches/server/0043-Pufferfish-SIMD-Utilities.patch b/patches/server/0043-Pufferfish-SIMD-Utilities.patch
index b65efb1..3adf9db 100644
--- a/patches/server/0043-Pufferfish-SIMD-Utilities.patch
+++ b/patches/server/0043-Pufferfish-SIMD-Utilities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Pufferfish SIMD Utilities
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index eb708f155a19496dcd19e69540274000611f4eee..83b8495bd52ad9ea38e9001a7ab209bf8ecdbe86 100644
+index 7b11c45914392c01b4d28b104f80e6ed34eb9955..5ea6cccfde29132356548e847be4a1720b64998d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -76,6 +76,14 @@ paperweight {
+@@ -77,6 +77,14 @@ paperweight {
      craftBukkitPackageVersion.set("v1_21_R1") // also needs to be updated in MappingEnvironment
  }
  
diff --git a/patches/server/0045-Gale-Optimize-sun-burn-tick.patch b/patches/server/0045-Gale-Optimize-sun-burn-tick.patch
index 36b7a4e..5eb8b3a 100644
--- a/patches/server/0045-Gale-Optimize-sun-burn-tick.patch
+++ b/patches/server/0045-Gale-Optimize-sun-burn-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Optimize sun burn tick
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ff729667384bc07746f4bfa3fe18d09547cc86a2..70e10a88a70608f4067018dfeb1d60127b4a9c25 100644
+index 6497ecce4a826776c487e0e2fcb077f21e02ecda..9b87aa41f03056721757348151b1119016421650 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -315,7 +315,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -17,7 +17,7 @@ index ff729667384bc07746f4bfa3fe18d09547cc86a2..70e10a88a70608f4067018dfeb1d6012
      private BlockPos blockPosition;
      private ChunkPos chunkPosition;
      private Vec3 deltaMovement;
-@@ -2122,9 +2122,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2124,9 +2124,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      /** @deprecated */
      @Deprecated
      public float getLightLevelDependentMagicValue() {
diff --git a/patches/server/0047-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0047-Gale-Skip-entity-move-if-movement-is-zero.patch
index 40f2aab..9644191 100644
--- a/patches/server/0047-Gale-Skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0047-Gale-Skip-entity-move-if-movement-is-zero.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Skip entity move if movement is zero
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 70e10a88a70608f4067018dfeb1d60127b4a9c25..1e38ffc28036a221da9adeff8c07c8c02e736cb8 100644
+index 9b87aa41f03056721757348151b1119016421650..e20533b2ab9f39fc942271b704d644fb382376f7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -324,6 +324,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -16,7 +16,7 @@ index 70e10a88a70608f4067018dfeb1d60127b4a9c25..1e38ffc28036a221da9adeff8c07c8c0
      public boolean onGround;
      public boolean horizontalCollision;
      public boolean verticalCollision;
-@@ -1137,6 +1138,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1139,6 +1140,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      //Luminol end
  
      public void move(MoverType movementType, Vec3 movement) {
@@ -28,7 +28,7 @@ index 70e10a88a70608f4067018dfeb1d60127b4a9c25..1e38ffc28036a221da9adeff8c07c8c0
          final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
          // Paper start - detailed watchdog information
          ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
-@@ -4977,6 +4983,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4981,6 +4987,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public final void setBoundingBox(AABB boundingBox) {
diff --git a/patches/server/0052-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0052-Sparkly-Paper-Optimize-canSee-checks.patch
index 2e3f11b..5726451 100644
--- a/patches/server/0052-Sparkly-Paper-Optimize-canSee-checks.patch
+++ b/patches/server/0052-Sparkly-Paper-Optimize-canSee-checks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Sparkly Paper Optimize canSee checks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 728454fcfbeddcfe1b0a95e89827f33d7f7838bc..adc1e7867dfd7caf1a3a4ad515b6540d277c6b7f 100644
+index 74524dcd4539a31e9d0037cd607ffbfce02f414c..9d6d0c8c2a869c088b7ece7f3390f620d2c348b9 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1221,7 +1221,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1222,7 +1222,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  // Folia end - region threading
  
                  // CraftBukkit start - respect vanish API
@@ -18,7 +18,7 @@ index 728454fcfbeddcfe1b0a95e89827f33d7f7838bc..adc1e7867dfd7caf1a3a4ad515b6540d
                  }
                  // CraftBukkit end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f13128a9e5462ae1047987ad29d35c72f74c5412..f1cb17f33363da495c263829efbbd18d4bd192cd 100644
+index 77576c06ffc0a677b1bfb63d48d39fba2aa2050d..4dfc7186b7ee0f77e681911fc93edc455e7bf19f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -200,7 +200,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -30,7 +30,7 @@ index f13128a9e5462ae1047987ad29d35c72f74c5412..f1cb17f33363da495c263829efbbd18d
      private final Set<UUID> unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player
      private static final WeakHashMap<Plugin, WeakReference<Plugin>> pluginWeakReferences = new WeakHashMap<>();
      private int hash = 0;
-@@ -2253,9 +2253,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2257,9 +2257,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(org.bukkit.entity.Entity entity) {
diff --git a/patches/server/0055-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0055-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch
index 392af0d..0c847ad 100644
--- a/patches/server/0055-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch
+++ b/patches/server/0055-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MrHua269 <wangxyper@163.com>
-Date: Thu, 1 Aug 2024 10:57:48 +0800
+Date: Fri, 25 Oct 2024 00:09:17 +0800
 Subject: [PATCH] KioCG Chunk API and display of chunkhot in tpsbar
 
 
@@ -179,10 +179,10 @@ index 026807e0851d67c6d57e81f573ac1bf8fedc6109..c45f6bd60d1cf7a915aa6ceea07c0929
          if (mspt == -1){
              return BossBar.Color.valueOf(TpsBarConfig.tpsColors.get(3));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 39c5af1e3a4c2abbd02ccc3574d73aa06affcdf2..97ca9a33a369d9f6f44c99fae72f11a730f2f213 100644
+index abe3dbe11066469f030e4f7381f98d38537443d4..870036b5f0d2eea249591b45a8f1071382652440 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1717,6 +1717,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1715,6 +1715,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          // Folia end - region threading
  
@@ -212,7 +212,7 @@ index 39c5af1e3a4c2abbd02ccc3574d73aa06affcdf2..97ca9a33a369d9f6f44c99fae72f11a7
          // Folia - region threading
          if (region == null) this.tickRateManager.tick(); // Folia - region threading
          this.tickChildren(shouldKeepTicking, region); // Folia - region threading
-@@ -1726,6 +1749,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1724,6 +1747,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
  
          // Folia - region threading
@@ -234,7 +234,7 @@ index 39c5af1e3a4c2abbd02ccc3574d73aa06affcdf2..97ca9a33a369d9f6f44c99fae72f11a7
          int playerSaveInterval = io.papermc.paper.configuration.GlobalConfiguration.get().playerAutoSave.rate;
          if (playerSaveInterval < 0) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cc56ebbd47399a2f5591db9b075c8b1a54e9d74c..441f10913528fe67a81ad3760623429616eb6712 100644
+index 3ebea71bbc6ced0d0a325c519436a0199666fafb..2f9ba0b4298206f458d7cd7ca73c132477a0d7b7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1377,6 +1377,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -272,7 +272,7 @@ index cc56ebbd47399a2f5591db9b075c8b1a54e9d74c..441f10913528fe67a81ad37606234296
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 84588c32ada812015fa970a38b36843492af779f..5f58fe6e78ea80f7fd8d5f759577e705b9a926b1 100644
+index 8cfaa94da67bcdd5c3d30479379d384c20b4a1ac..8559d14e4136c9e70c4190db3eb04500c9e530f0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -339,6 +339,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -332,10 +332,10 @@ index 1859477e96709368683fe5707327e92f56fbfc8e..4c4814094552fa4382b1cbe649f24f47
 +    // KioCG end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1e38ffc28036a221da9adeff8c07c8c02e736cb8..ea1098d2ff613ff634c710b6be6994215719391f 100644
+index e20533b2ab9f39fc942271b704d644fb382376f7..7c54abc8480b4184dc3712f02bd2ae2189ac0cc8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -5856,4 +5856,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5860,4 +5860,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end - Expose entity id counter
@@ -425,10 +425,10 @@ index b3377ed06d703f54e01ba174e5a06dc928cdff96..80af7979f9a2078a6c40c958ced1d487
 +    // KioCG end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 5110ca77adcf6daa7ce2247d4fc8af0835b7bd7e..8169536f95e2355e59b00e6d4a7df1ec59da5b5b 100644
+index 2f0a40134ef2fcccf407a5381994c3454040097e..4abfdad701a91b9c20b22064adb943c7e3d5a9a1 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -440,4 +440,11 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -437,4 +437,11 @@ public abstract class Projectile extends Entity implements TraceableEntity {
  
          return DoubleDoubleImmutablePair.of(d0, d1);
      }
@@ -501,13 +501,13 @@ index 45e262308aebafa377a2353661acdd122933b99e..10b2261169d3cd10d736273fe7703f50
 +    // KioCG end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f1cb17f33363da495c263829efbbd18d4bd192cd..816cc239a5377ea03e1bb748451862560fb1e54f 100644
+index 4dfc7186b7ee0f77e681911fc93edc455e7bf19f..4fb1abfa81b02198c823d6e175bde611a321edd3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3585,4 +3585,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         ((ca.spottedleaf.moonrise.patches.chunk_system.player.ChunkSystemServerPlayer)this.getHandle())
-             .moonrise$getViewDistanceHolder().setSendViewDistance(viewDistance);
+@@ -3599,4 +3599,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundEntityEventPacket(((CraftEntity) target).getHandle(), effect.getData()));
      }
+     // Paper end - entity effect API
 +
 +    // KioCG start - ChunkHot
 +    @Override
diff --git a/patches/server/0056-Purpur-use-alternative-keep-alive.patch b/patches/server/0056-Purpur-use-alternative-keep-alive.patch
index d17a379..1d472e5 100644
--- a/patches/server/0056-Purpur-use-alternative-keep-alive.patch
+++ b/patches/server/0056-Purpur-use-alternative-keep-alive.patch
@@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..43bbc2c30bdd3872a0179e0070403c3e
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index d766bb360eb98bab1e067cad032b54fa6455f386..89080162548c8343202bef910865136075172da7 100644
+index ea99a4e39cdfb4eeebc299030f7768b9c684df4e..c9a298808d287a2f82e075536d8a79d2281f1ce2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -74,6 +74,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -79,6 +79,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      private long keepAliveChallenge;
      private long closedListenerTime;
      private boolean closed = false;
@@ -42,7 +42,7 @@ index d766bb360eb98bab1e067cad032b54fa6455f386..89080162548c8343202bef9108651360
      private int latency;
      private volatile boolean suspendFlushingOnServerThread = false;
      public final java.util.Map<java.util.UUID, net.kyori.adventure.resource.ResourcePackCallback> packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks
-@@ -136,6 +137,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -141,6 +142,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
@@ -59,7 +59,7 @@ index d766bb360eb98bab1e067cad032b54fa6455f386..89080162548c8343202bef9108651360
          //PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // CraftBukkit // Paper - handle ServerboundKeepAlivePacket async
          if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
              int i = (int) (Util.getMillis() - this.keepAliveTime);
-@@ -265,6 +276,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -266,6 +277,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          long currentTime = Util.getMillis();
          long elapsedTime = currentTime - this.keepAliveTime;
  
@@ -81,7 +81,7 @@ index d766bb360eb98bab1e067cad032b54fa6455f386..89080162548c8343202bef9108651360
          if (!this.isSingleplayerOwner() && elapsedTime >= 15000L) { // Paper - use vanilla's 15000L between keep alive packets
              if (this.keepAlivePending && !this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // Paper - check keepalive limit, don't fire if already disconnected
                  this.disconnect(ServerCommonPacketListenerImpl.TIMEOUT_DISCONNECTION_MESSAGE, PlayerKickEvent.Cause.TIMEOUT); // Paper - kick event cause
-@@ -276,6 +302,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -277,6 +303,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
              }
          }
          // Paper end - give clients a longer time to respond to pings as per pre 1.12.2 timings
diff --git a/patches/server/0059-Fix-MC-2025.patch b/patches/server/0059-Fix-MC-2025.patch
index 6f9814a..cf90fc7 100644
--- a/patches/server/0059-Fix-MC-2025.patch
+++ b/patches/server/0059-Fix-MC-2025.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix-MC-2025
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ea1098d2ff613ff634c710b6be6994215719391f..3a0279991d1f65f65aeb8e228f04202761b3e85b 100644
+index 7c54abc8480b4184dc3712f02bd2ae2189ac0cc8..2fa5029aa058a7dd8641013b0626a4b5083cdaec 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2623,6 +2623,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2625,6 +2625,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  nbttagcompound.putBoolean("Paper.FreezeLock", true);
              }
              // Paper end
@@ -25,7 +25,7 @@ index ea1098d2ff613ff634c710b6be6994215719391f..3a0279991d1f65f65aeb8e228f042027
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2700,6 +2710,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2702,6 +2712,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                          this.reapplyPosition();
                      }
  
diff --git a/patches/server/0060-FoliaPR-Add-TPS-From-Region.patch b/patches/server/0060-FoliaPR-Add-TPS-From-Region.patch
index 8959813..f412d1f 100644
--- a/patches/server/0060-FoliaPR-Add-TPS-From-Region.patch
+++ b/patches/server/0060-FoliaPR-Add-TPS-From-Region.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] FoliaPR Add TPS From Region
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index be126a3139b1519e7a0ad3d521d72bf0817ccb1c..a1835ef6ec6f1d1e340f3c4817b5897d806c8210 100644
+index 07c6f858596e4926397b467ef5e22cab7e7f999b..d030e8d8a532e906c664796e00eef80ad2a07d7a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3071,6 +3071,42 @@ public final class CraftServer implements Server {
+@@ -3070,6 +3070,42 @@ public final class CraftServer implements Server {
          };
      }