diff --git a/luminol-server/minecraft-patches/features/0020-Skip-collision-check-if-the-block-is-not-belong-to-c.patch b/luminol-server/minecraft-patches/features/0020-Skip-collision-check-if-the-block-is-not-belong-to-c.patch
index ef4a482..8c2be3d 100644
--- a/luminol-server/minecraft-patches/features/0020-Skip-collision-check-if-the-block-is-not-belong-to-c.patch
+++ b/luminol-server/minecraft-patches/features/0020-Skip-collision-check-if-the-block-is-not-belong-to-c.patch
@@ -6,16 +6,18 @@ Subject: [PATCH] Skip collision check if the block is not belong to current
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index c87db2d497ca9ed2e8aad5f1bc52555ff0952b80..759db5813cc83daa6f0e397483fdb8bd90950a72 100644
+index c87db2d497ca9ed2e8aad5f1bc52555ff0952b80..a5c032f2e89681008c4fac6930b90d9a6c4f5531 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -1675,6 +1675,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1675,6 +1675,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                          return;
                      }
  
++                    // Luminol start - Try fixing folia's old position issue
 +                    if(!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.level, blockPos) && me.earthme.luminol.config.modules.fixes.FoliaOldPositionIssueFixConfig.enabled) {
 +                        continue;
 +                    }
++                    // Luminol end
 +
                      BlockState blockState = this.level().getBlockState(blockPos);
                      if (!blockState.isAir() && set.add(blockPos.asLong())) {
diff --git a/luminol-server/minecraft-patches/features/0024-Kaiiju-Vanilla-end-portal-teleportation.patch b/luminol-server/minecraft-patches/features/0024-Kaiiju-Vanilla-end-portal-teleportation.patch
index 5d3e791..a8aef67 100644
--- a/luminol-server/minecraft-patches/features/0024-Kaiiju-Vanilla-end-portal-teleportation.patch
+++ b/luminol-server/minecraft-patches/features/0024-Kaiiju-Vanilla-end-portal-teleportation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Kaiiju Vanilla end portal teleportation
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 759db5813cc83daa6f0e397483fdb8bd90950a72..975c6bdbfbf3ff5f721b98e561b3bb0f0ca943b9 100644
+index a5c032f2e89681008c4fac6930b90d9a6c4f5531..201f1f5d45b941ea2980be60b8256c04b93fd4d1 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -110,6 +110,7 @@ import net.minecraft.world.level.block.Rotation;
@@ -16,7 +16,7 @@ index 759db5813cc83daa6f0e397483fdb8bd90950a72..975c6bdbfbf3ff5f721b98e561b3bb0f
  import net.minecraft.world.level.entity.EntityAccess;
  import net.minecraft.world.level.entity.EntityInLevelCallback;
  import net.minecraft.world.level.gameevent.DynamicGameEventListener;
-@@ -4269,13 +4270,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4271,13 +4272,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                          targetPos, 16, // load 16 blocks to be safe from block physics
                          ca.spottedleaf.concurrentutil.util.Priority.HIGH,
                          (chunks) -> {
@@ -37,7 +37,7 @@ index 759db5813cc83daa6f0e397483fdb8bd90950a72..975c6bdbfbf3ff5f721b98e561b3bb0f
                                      TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
                                      org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
                                  )
-@@ -4471,6 +4477,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4473,6 +4479,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          if (!this.canPortalAsync(destination, takePassengers)) {
              return false;
          }
@@ -48,7 +48,7 @@ index 759db5813cc83daa6f0e397483fdb8bd90950a72..975c6bdbfbf3ff5f721b98e561b3bb0f
  
          Vec3 initialPosition = this.position();
          ChunkPos initialPositionChunk = new ChunkPos(
-@@ -4535,9 +4545,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4537,9 +4547,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                          info.postTeleportTransition().onTransition(teleported);
                      }
  
diff --git a/luminol-server/minecraft-patches/features/0026-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/luminol-server/minecraft-patches/features/0026-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch
index 3fe9efe..c643b5f 100644
--- a/luminol-server/minecraft-patches/features/0026-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch
+++ b/luminol-server/minecraft-patches/features/0026-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch
@@ -159,10 +159,10 @@ index 23b342cc31c7e72ade0e1ccad86a9ccf34380f13..249cb7326c8e4012dcffdb6bbb7bfc1f
 +    // KioCG end
  }
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 975c6bdbfbf3ff5f721b98e561b3bb0f0ca943b9..71b751ec16ecbbcc18bcc228d0ebe7bfea0eb15d 100644
+index 201f1f5d45b941ea2980be60b8256c04b93fd4d1..831ec1162e09692c5a45c64d9fe87177ddc6ab54 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -5944,4 +5944,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5946,4 +5946,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return ((ServerLevel) this.level).isPositionEntityTicking(this.blockPosition());
      }
      // Paper end - Expose entity id counter
diff --git a/luminol-server/minecraft-patches/features/0033-Gale-Skip-entity-move-if-movement-is-zero.patch b/luminol-server/minecraft-patches/features/0033-Gale-Skip-entity-move-if-movement-is-zero.patch
index 002bbe1..6bdec9c 100644
--- a/luminol-server/minecraft-patches/features/0033-Gale-Skip-entity-move-if-movement-is-zero.patch
+++ b/luminol-server/minecraft-patches/features/0033-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/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 71b751ec16ecbbcc18bcc228d0ebe7bfea0eb15d..1a011dccbf116410d6b268917965f89c206ea693 100644
+index 831ec1162e09692c5a45c64d9fe87177ddc6ab54..cbc4958a1616dd3b10d1985dc4bd12c43cc7e226 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1104,7 +1104,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -23,7 +23,7 @@ index 71b751ec16ecbbcc18bcc228d0ebe7bfea0eb15d..1a011dccbf116410d6b268917965f89c
          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");
-@@ -5035,6 +5042,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5037,6 +5044,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public final void setBoundingBox(AABB bb) {