Trial manually calling aiStep for players with /npc ai turned on

main/src/main/java/net/citizensnpcs/util/NMS.java

@@ -728,12 +728,7 @@ public class NMS {
     }
 
     public static Runnable playerTicker(Player entity) {
-        Runnable tick = BRIDGE.playerTicker(entity);
+        return BRIDGE.playerTicker(entity instanceof NPCHolder ? ((NPCHolder) entity).getNPC() : null, entity);
-        return () -> {
-            if (entity.isValid()) {
-                tick.run();
-            }
-        };
     }
 
     public static void registerEntityClass(Class<?> clazz) {

main/src/main/java/net/citizensnpcs/util/NMSBridge.java

@@ -161,7 +161,7 @@ public interface NMSBridge {
 
     public void playAnimation(PlayerAnimation animation, Player player, Iterable<Player> to);
 
-    public Runnable playerTicker(Player entity);
+    public Runnable playerTicker(NPC npc, Player entity);
 
     public void registerEntityClass(Class<?> clazz);
 

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java

@@ -965,8 +965,10 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public Runnable playerTicker(Player next) {
+    public Runnable playerTicker(NPC npc, Player next) {
         return () -> {
+            if (!next.isValid())
+                return;
             EntityPlayer entity = (EntityPlayer) getHandle(next);
             boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get("removefromplayerlist",
                     Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java

@@ -1018,8 +1018,10 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public Runnable playerTicker(Player next) {
+    public Runnable playerTicker(NPC npc, Player next) {
         return () -> {
+            if (!next.isValid())
+                return;
             EntityPlayer entity = (EntityPlayer) getHandle(next);
             boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get("removefromplayerlist",
                     Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java

@@ -1025,8 +1025,10 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public Runnable playerTicker(Player next) {
+    public Runnable playerTicker(NPC npc, Player next) {
         return () -> {
+            if (!next.isValid())
+                return;
             EntityPlayer entity = (EntityPlayer) getHandle(next);
             boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get("removefromplayerlist",
                     Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());

v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java

@@ -1061,8 +1061,10 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public Runnable playerTicker(Player next) {
+    public Runnable playerTicker(NPC npc, Player next) {
         return () -> {
+            if (!next.isValid())
+                return;
             EntityPlayer entity = (EntityPlayer) getHandle(next);
             boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get("removefromplayerlist",
                     Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java

@@ -1130,8 +1130,16 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public Runnable playerTicker(Player entity) {
+    public Runnable playerTicker(NPC npc, Player entity) {
-        return ((EntityPlayer) getHandle(entity))::playerTick;
+        EntityPlayer player = (EntityPlayer) getHandle(entity);
+        return () -> {
+            if (!entity.isValid())
+                return;
+            if (npc != null && npc.useMinecraftAI()) {
+                player.movementTick();
+            }
+            player.playerTick();
+        };
     }
 
     @Override

v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java

@@ -1147,8 +1147,16 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public Runnable playerTicker(Player entity) {
+    public Runnable playerTicker(NPC npc, Player entity) {
-        return ((EntityPlayer) getHandle(entity))::playerTick;
+        EntityPlayer player = (EntityPlayer) getHandle(entity);
+        return () -> {
+            if (!entity.isValid())
+                return;
+            if (npc != null && npc.useMinecraftAI()) {
+                player.movementTick();
+            }
+            player.playerTick();
+        };
     }
 
     @Override

v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java

@@ -1171,8 +1171,16 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public Runnable playerTicker(Player entity) {
+    public Runnable playerTicker(NPC npc, Player entity) {
-        return ((EntityPlayer) getHandle(entity))::playerTick;
+        EntityPlayer player = (EntityPlayer) getHandle(entity);
+        return () -> {
+            if (!entity.isValid())
+                return;
+            if (npc != null && npc.useMinecraftAI()) {
+                player.movementTick();
+            }
+            player.playerTick();
+        };
     }
 
     @Override

v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java

@@ -1177,8 +1177,16 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public Runnable playerTicker(Player entity) {
+    public Runnable playerTicker(NPC npc, Player entity) {
-        return ((ServerPlayer) getHandle(entity))::doTick;
+        ServerPlayer player = (ServerPlayer) getHandle(entity);
+        return () -> {
+            if (!entity.isValid())
+                return;
+            if (npc != null && npc.useMinecraftAI()) {
+                player.aiStep();
+            }
+            player.doTick();
+        };
     }
 
     @Override

v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java

@@ -1186,8 +1186,16 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public Runnable playerTicker(Player entity) {
+    public Runnable playerTicker(NPC npc, Player entity) {
-        return ((ServerPlayer) getHandle(entity))::doTick;
+        ServerPlayer player = (ServerPlayer) getHandle(entity);
+        return () -> {
+            if (!entity.isValid())
+                return;
+            if (npc != null && npc.useMinecraftAI()) {
+                player.aiStep();
+            }
+            player.doTick();
+        };
     }
 
     @Override

v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java

@@ -1313,8 +1313,16 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public Runnable playerTicker(Player entity) {
+    public Runnable playerTicker(NPC npc, Player entity) {
-        return ((ServerPlayer) getHandle(entity))::doTick;
+        ServerPlayer player = (ServerPlayer) getHandle(entity);
+        return () -> {
+            if (!entity.isValid())
+                return;
+            if (npc != null && npc.useMinecraftAI()) {
+                player.aiStep();
+            }
+            player.doTick();
+        };
     }
 
     @Override

v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/util/NMSImpl.java

@@ -1285,8 +1285,16 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public Runnable playerTicker(Player entity) {
+    public Runnable playerTicker(NPC npc, Player entity) {
-        return ((ServerPlayer) getHandle(entity))::doTick;
+        ServerPlayer player = (ServerPlayer) getHandle(entity);
+        return () -> {
+            if (!entity.isValid())
+                return;
+            if (npc != null && npc.useMinecraftAI()) {
+                player.aiStep();
+            }
+            player.doTick();
+        };
     }
 
     @Override

v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java

@@ -901,12 +901,17 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public Runnable playerTicker(Player next) {
+    public Runnable playerTicker(NPC npc, Player next) {
         return () -> {
+            if (!next.isValid())
+                return;
             EntityPlayer entity = (EntityPlayer) getHandle(next);
             boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get("removefromplayerlist",
                     Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
             entity.l();
+            if (npc != null && npc.useMinecraftAI()) {
+                entity.m();
+            }
             if (!removeFromPlayerList)
                 return;
             if (!entity.dead) {