refactor: use skip tick and compensate tick to fix some bugs

luminol-server/minecraft-patches/features/0019-Add-config-to-enable-tick-command.patch

@@ -114,7 +114,7 @@ index cfb37f2e428605965a37dc1eb83f302fe1bd6299..8f7b28e5688252207ad8ce9f3fb6f9c3
          TitleCommand.register(this.dispatcher, context);
          //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 330af9f4de1c72387326816065350e71fe546efe..e62e8b9af7ad3e4454702ac86ad2b27973eba66f 100644
+index ed00a29daccfee1d631bef27c0a3a4ae83140018..56f5568848d0f20b4d706c07dc8114594e0b5337 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -267,7 +267,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

luminol-server/minecraft-patches/features/0022-Force-disable-builtin-spark-plugin.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Force disable builtin spark plugin
 
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index ed00a29daccfee1d631bef27c0a3a4ae83140018..330af9f4de1c72387326816065350e71fe546efe 100644
+index 56f5568848d0f20b4d706c07dc8114594e0b5337..e62e8b9af7ad3e4454702ac86ad2b27973eba66f 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -783,8 +783,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

luminol-server/minecraft-patches/features/0052-Portal-Behavior-Modifiers.patch

@@ -1,90 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sun, 27 Apr 2025 14:26:01 +0800
-Subject: [PATCH] Portal Behavior Modifiers
-
-
-diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 2ea6160492cb23e96271dfbfd3bd35fe03109d6a..36bddc5f5a05044b995e0b87f2c9105a6acfe8fd 100644
---- a/net/minecraft/world/entity/Entity.java
-+++ b/net/minecraft/world/entity/Entity.java
-@@ -1149,7 +1149,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-         //Luminol end
-         try {
-         // Paper end - detailed watchdog information
--        if (this.noPhysics) {
-+        if (this.noPhysics || this.portalProcess != null) { // Luminol - Entity portal-teleport speed fix
-             this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
-         } else {
-             this.wasOnFire = this.isOnFire();
-@@ -3829,20 +3829,27 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
- 
-             EntityTreeNode curr;
-             while ((curr = queue.pollFirst()) != null) {
--                EntityTreeNode[] passengers = curr.passengers;
-+                restore(curr); // Luminol - EndGateway Portal Passengers Fix
-+            }
-+        }
-+
-+        // Luminol Start - EndGateway Portal Passengers Fix
-+        private EntityTreeNode[] restore(EntityTreeNode entity) {
-+                EntityTreeNode[] passengers = entity.passengers;
-                 if (passengers == null) {
--                    continue;
-+                    return null;
-                 }
- 
-                 List<Entity> newPassengers = new java.util.ArrayList<>();
-                 for (EntityTreeNode passenger : passengers) {
-+                    passenger.passengers = restore(passenger);
-                     newPassengers.add(passenger.root);
--                    passenger.root.vehicle = curr.root;
-+                    passenger.root.vehicle = entity.root;
-                 }
--
--                curr.root.passengers = ImmutableList.copyOf(newPassengers);
--            }
-+                entity.root.passengers = ImmutableList.copyOf(newPassengers);
-+                return passengers;
-         }
-+        // Luminol End - EndGateway Portal Passengers Fix
- 
-         public void addTracker() {
-             for (final EntityTreeNode node : this.getFullTree()) {
-@@ -4561,6 +4568,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
- 
-     }
- 
-+    // Luminol start - Add afterPortalLogic
-+    protected void afterPortalLogic() {
-+
-+    }
-+    // Luminol end - Add afterPortalLogic
-+
-     protected boolean portalToAsync(ServerLevel destination, BlockPos portalPos, boolean takePassengers,
-                                     PortalType type, java.util.function.Consumer<Entity> teleportComplete) {
-         ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this, "Cannot portal entity async");
-@@ -4644,6 +4657,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-                         info.postTeleportTransition().onTransition(teleported);
-                     }
- 
-+                    teleported.afterPortalLogic(); // Luminol - Add afterPortalLogic
-+
-                     // Kaiiju start - vanilla end teleportation
-                     /*if (teleportComplete != null) {
-                         teleportComplete.accept(teleported);
-diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
-index 88570bb4aa02896545805d7721c45cf9599befea..bbf9748a36404139356db606dbb3b0cc13c66b50 100644
---- a/net/minecraft/world/entity/item/PrimedTnt.java
-+++ b/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -251,4 +251,10 @@ public class PrimedTnt extends Entity implements TraceableEntity {
-         return !this.level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid();
-     }
-     // Paper end - Option to prevent TNT from moving in water
-+
-+    // Luminol start - Add afterPortalLogic
-+    protected void afterPortalLogic() {
-+        this.setUsedPortal(true);
-+    }
-+    // Luminol start - Add afterPortalLogic
- }

luminol-server/minecraft-patches/features/0053-Portal-Behavior-Modifiers.patch

@@ -0,0 +1,142 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 27 Apr 2025 14:26:01 +0800
+Subject: [PATCH] Portal Behavior Modifiers
+
+
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
+index d8e1febfa14be1c0f4869ae647bd17113660432b..1dfd21fe3ac414cb7f56633e6747cd6fbea65d27 100644
+--- a/net/minecraft/server/level/ServerLevel.java
++++ b/net/minecraft/server/level/ServerLevel.java
+@@ -1353,7 +1353,26 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+         if (levelChunk != null) levelChunk.getChunkHot().startTicking(); try { // KioCG
+         try {
+         // Folia end - profiler
++        // Luminol start - Entity portal-teleport speed fix
+         if (isActive) { // Paper - EAR 2
++            if (entity.flag_portal && !(entity instanceof Player) && entity.flag_compensate_ticks) { // Luminol - after portal compensate tick
++                entity.tick();
++                entity.tick();
++                entity.flag_compensate_ticks = false;
++            if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
++                return;
++            }
++            if (entity.handlePortal()) {
++                return;
++            }
++        } else if (entity.flag_portal && !entity.flag_compensate_ticks) { // Luminol - portal teleport only
++            if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
++                return;
++            }
++            if (entity.handlePortal()) {
++                return;
++            }
++        } else {
+         entity.tick();
+         // Folia start - region threading
+         if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
+@@ -1364,6 +1383,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+             // portalled
+             return;
+         }
++        }
++        // Luminol end - Entity portal-teleport speed fix
+         // Folia end - region threading
+         } else {entity.inactiveTick();} // Paper - EAR 2
+         profilerFiller.pop();
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index 2ea6160492cb23e96271dfbfd3bd35fe03109d6a..97879ba5080db09dde7cd76fe7b0ba502d8df572 100644
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
+@@ -343,6 +343,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+     public long activatedTick = Integer.MIN_VALUE;
+     public boolean isTemporarilyActive;
+     public long activatedImmunityTick = Integer.MIN_VALUE;
++    // Luminol start - Entity portal-teleport speed fix
++    public boolean flag_portal = false;
++    public boolean flag_compensate_ticks = false;
++    // Luminol end - Entity portal-teleport speed fix
+ 
+     public void inactiveTick() {
+     }
+@@ -3305,6 +3309,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+         } else {
+             if (this.portalProcess == null || !this.portalProcess.isSamePortal(portal)) {
+                 this.portalProcess = new PortalProcessor(portal, pos.immutable());
++                this.flag_portal = true; // Luminol - Entity portal-teleport speed fix
+             } else if (!this.portalProcess.isInsidePortalThisTick()) {
+                 this.portalProcess.updateEntryPosition(pos.immutable());
+                 this.portalProcess.setAsInsidePortalThisTick(true);
+@@ -3829,20 +3834,27 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ 
+             EntityTreeNode curr;
+             while ((curr = queue.pollFirst()) != null) {
+-                EntityTreeNode[] passengers = curr.passengers;
++                restore(curr); // Luminol - EndGateway Portal Passengers Fix
++            }
++        }
++
++        // Luminol Start - EndGateway Portal Passengers Fix
++        private EntityTreeNode[] restore(EntityTreeNode entity) {
++                EntityTreeNode[] passengers = entity.passengers;
+                 if (passengers == null) {
+-                    continue;
++                    return null;
+                 }
+ 
+                 List<Entity> newPassengers = new java.util.ArrayList<>();
+                 for (EntityTreeNode passenger : passengers) {
++                    passenger.passengers = restore(passenger);
+                     newPassengers.add(passenger.root);
+-                    passenger.root.vehicle = curr.root;
++                    passenger.root.vehicle = entity.root;
+                 }
+-
+-                curr.root.passengers = ImmutableList.copyOf(newPassengers);
+-            }
++                entity.root.passengers = ImmutableList.copyOf(newPassengers);
++                return passengers;
+         }
++        // Luminol End - EndGateway Portal Passengers Fix
+ 
+         public void addTracker() {
+             for (final EntityTreeNode node : this.getFullTree()) {
+@@ -4561,6 +4573,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ 
+     }
+ 
++    // Luminol start - Add afterPortalLogic
++    protected void afterPortalLogic() {
++        this.flag_compensate_ticks  = true; // Luminol - Entity portal-teleport speed fix
++        this.flag_portal = false; // Luminol - Entity portal-teleport speed fix
++    }
++    // Luminol end - Add afterPortalLogic
++
+     protected boolean portalToAsync(ServerLevel destination, BlockPos portalPos, boolean takePassengers,
+                                     PortalType type, java.util.function.Consumer<Entity> teleportComplete) {
+         ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this, "Cannot portal entity async");
+@@ -4644,6 +4663,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+                         info.postTeleportTransition().onTransition(teleported);
+                     }
+ 
++                    teleported.afterPortalLogic(); // Luminol - Add afterPortalLogic
++
+                     // Kaiiju start - vanilla end teleportation
+                     /*if (teleportComplete != null) {
+                         teleportComplete.accept(teleported);
+diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
+index 88570bb4aa02896545805d7721c45cf9599befea..f2d9ef4429b56785fd9d95abb9d734901d589828 100644
+--- a/net/minecraft/world/entity/item/PrimedTnt.java
++++ b/net/minecraft/world/entity/item/PrimedTnt.java
+@@ -251,4 +251,11 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+         return !this.level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid();
+     }
+     // Paper end - Option to prevent TNT from moving in water
++
++    // Luminol start - Add afterPortalLogic
++    protected void afterPortalLogic() {
++        this.setUsedPortal(true);
++        super.afterPortalLogic();
++    }
++    // Luminol end - Add afterPortalLogic
+ }

luminol-server/minecraft-patches/features/0057-Raytracing-tracker-experiment.patch

@@ -19,7 +19,7 @@ index 7eff847790394aecd058e7a61905da86163b4c6e..9099457f55a2829297ac1db8a69a98ff
                      double rangeY = level.paperConfig().entities.trackingRangeY.get(this.entity, -1);
                      if (rangeY != -1) {
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 2871980e53a66bdacf7c00e7045ad01d68a972d3..2005f769d21de40621beb913446e816b87a03c3a 100644
+index 97879ba5080db09dde7cd76fe7b0ba502d8df572..002466add86b36529bff6787332b575d1f12305b 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -135,7 +135,7 @@ import net.minecraft.world.scores.ScoreHolder;
@@ -31,7 +31,7 @@ index 2871980e53a66bdacf7c00e7045ad01d68a972d3..2005f769d21de40621beb913446e816b
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
-@@ -6080,4 +6080,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -6086,4 +6086,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      // Paper end - Expose entity id counter
  
      public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG