Tick fake players in network updating phase

src/main/java/carpet/CarpetServer.java

@@ -15,6 +15,7 @@
 import carpet.commands.PerimeterInfoCommand;
 import carpet.commands.PlayerCommand;
 import carpet.commands.ProfileCommand;
+import carpet.patches.FakePlayerManager;
 import carpet.script.ScriptCommand;
 import carpet.commands.SpawnCommand;
 import carpet.commands.TestCommand;
@@ -190,6 +191,7 @@ public static void onServerClosed(MinecraftServer server)
             LoggerRegistry.stopLoggers();
             HUDController.resetScarpetHUDs();
             ParticleParser.resetCache();
+            FakePlayerManager.reset();
             extensions.forEach(e -> e.onServerClosed(server));
             minecraft_server = null;
         }

src/main/java/carpet/CarpetSettings.java

@@ -1030,4 +1030,11 @@ public enum FungusGrowthMode {
             category = {SURVIVAL, FEATURE}
     )
     public static FungusGrowthMode thickFungusGrowth = FungusGrowthMode.FALSE;
+
+
+    @Rule(
+            desc = "make fake players ticked in entity phase, like legacy carpet.",
+            category = CREATIVE
+    )
+    public static boolean fakePlayerTicksLikeEntities = true;
 }

src/main/java/carpet/mixins/PlayerList_fakePlayersMixin.java

@@ -1,5 +1,6 @@
 package carpet.mixins;
 
+import carpet.patches.FakePlayerManager;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.Connection;
@@ -41,7 +42,9 @@ private ServerGamePacketListenerImpl replaceNetworkHandler(MinecraftServer serve
     {
         if (playerIn instanceof EntityPlayerMPFake fake)
         {
-            return new NetHandlerPlayServerFake(this.server, clientConnection, fake, cookie);
+            var handler = new NetHandlerPlayServerFake(this.server, clientConnection, fake, cookie);
+            FakePlayerManager.add(handler);
+            return handler;
         }
         else
         {

src/main/java/carpet/mixins/ServerConnectionListener_fakePlayersMixin.java

@@ -0,0 +1,22 @@
+package carpet.mixins;
+
+import carpet.CarpetSettings;
+import carpet.patches.FakePlayerManager;
+import net.minecraft.server.network.ServerConnectionListener;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ServerConnectionListener.class)
+public class ServerConnectionListener_fakePlayersMixin {
+    @Inject(
+            method = "tick",
+            at = @At("RETURN")
+    )
+    private void tickFakePlayers(CallbackInfo ci) {
+        if (!CarpetSettings.fakePlayerTicksLikeEntities) {
+            FakePlayerManager.tick();
+        }
+    }
+}

src/main/java/carpet/mixins/ServerPlayer_actionPackMixin.java

@@ -1,13 +1,17 @@
 package carpet.mixins;
 
+import carpet.CarpetSettings;
 import carpet.fakes.ServerPlayerInterface;
 import carpet.helpers.EntityPlayerActionPack;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.TickTask;
 import net.minecraft.server.level.ClientInformation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -16,8 +20,10 @@
 @Mixin(ServerPlayer.class)
 public abstract class ServerPlayer_actionPackMixin implements ServerPlayerInterface
 {
+    @Shadow @Final public MinecraftServer server;
     @Unique
     public EntityPlayerActionPack actionPack;
+
     @Override
     public EntityPlayerActionPack getActionPack()
     {
@@ -33,6 +39,12 @@ private void onServerPlayerEntityContructor(MinecraftServer minecraftServer, Ser
     @Inject(method = "tick", at = @At(value = "HEAD"))
     private void onTick(CallbackInfo ci)
     {
-        actionPack.onUpdate();
+        if (CarpetSettings.fakePlayerTicksLikeEntities) {
+            actionPack.onUpdate();
+        }
+        else {
+            // submit to main thread like other c2s packets
+            server.tell(new TickTask(server.getTickCount(), actionPack::onUpdate));
+        }
     }
 }

src/main/java/carpet/patches/EntityPlayerMPFake.java

@@ -1,6 +1,8 @@
 package carpet.patches;
 
 import carpet.CarpetSettings;
+import carpet.fakes.ServerPlayerInterface;
+import carpet.utils.Messenger;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.UUIDUtil;
@@ -31,8 +33,6 @@
 import net.minecraft.world.level.block.entity.SkullBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
-import carpet.fakes.ServerPlayerInterface;
-import carpet.utils.Messenger;
 
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -166,7 +166,9 @@ public void tick()
         try
         {
             super.tick();
-            this.doTick();
+            if (CarpetSettings.fakePlayerTicksLikeEntities) {
+                this.doTick();
+            }
         }
         catch (NullPointerException ignored)
         {

src/main/java/carpet/patches/FakePlayerManager.java

@@ -0,0 +1,34 @@
+package carpet.patches;
+
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FakePlayerManager {
+    private static List<ServerGamePacketListenerImpl> connections = new ArrayList<>();
+
+    public static void reset() {
+        connections.clear();
+    }
+
+    public static void add(ServerGamePacketListenerImpl connection) {
+        connections.add(connection);
+    }
+
+    public static void tick() {
+        for (ServerGamePacketListenerImpl connection : FakePlayerManager.connections) {
+            // from ServerGamePacketListenerImpl#tick
+
+            connection.player.xo = connection.player.getX();
+            connection.player.yo = connection.player.getY();
+            connection.player.zo = connection.player.getZ();
+
+            connection.player.doTick();
+            //  connection.player.absMoveTo(connection.firstGoodX, connection.firstGoodY, connection.firstGoodZ, connection.player.getYRot(), connection.player.getXRot());
+
+            // todo: vehicle?
+        }
+        connections.removeIf(connection -> connection.player.hasDisconnected());
+    }
+}

src/main/java/carpet/patches/NetHandlerPlayServerFake.java

@@ -9,6 +9,7 @@
 import net.minecraft.server.network.CommonListenerCookie;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import net.minecraft.world.entity.RelativeMovement;
+
 import java.util.Set;
 
 public class NetHandlerPlayServerFake extends ServerGamePacketListenerImpl

src/main/resources/carpet.mixins.json

@@ -56,6 +56,7 @@
     "MinecraftServer_scarpetMixin",
     "ExperienceOrb_xpNoCooldownMixin",
     "Player_xpNoCooldownMixin",
+    "ServerConnectionListener_fakePlayersMixin",
     "ServerPlayer_actionPackMixin",
     "PlayerList_coreMixin",
     "PlayerList_fakePlayersMixin",