diff --git a/plugins/fancynpcs/fn-api/src/main/java/de/oliver/fancynpcs/api/Npc.java b/plugins/fancynpcs/fn-api/src/main/java/de/oliver/fancynpcs/api/Npc.java
index 62ce4a5d..124fda95 100644
--- a/plugins/fancynpcs/fn-api/src/main/java/de/oliver/fancynpcs/api/Npc.java
+++ b/plugins/fancynpcs/fn-api/src/main/java/de/oliver/fancynpcs/api/Npc.java
@@ -118,12 +118,20 @@ public abstract class Npc {
 
     public abstract void lookAt(Player player, Location location);
 
-    public abstract void update(Player player);
+    public abstract void update(Player player, boolean swingArm);
+
+    public void update(Player player) {
+        update(player, true);
+    }
+
+    public void updateForAll(boolean swingArm) {
+        for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
+            update(onlinePlayer, swingArm);
+        }
+    }
 
     public void updateForAll() {
-        for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-            update(onlinePlayer);
-        }
+        updateForAll(true);
     }
 
     public abstract void move(Player player, boolean swingArm);
diff --git a/plugins/fancynpcs/implementation_1_19_4/src/main/java/de/oliver/fancynpcs/v1_19_4/Npc_1_19_4.java b/plugins/fancynpcs/implementation_1_19_4/src/main/java/de/oliver/fancynpcs/v1_19_4/Npc_1_19_4.java
index bb6144dc..a104f97d 100644
--- a/plugins/fancynpcs/implementation_1_19_4/src/main/java/de/oliver/fancynpcs/v1_19_4/Npc_1_19_4.java
+++ b/plugins/fancynpcs/implementation_1_19_4/src/main/java/de/oliver/fancynpcs/v1_19_4/Npc_1_19_4.java
@@ -190,7 +190,7 @@ public class Npc_1_19_4 extends Npc {
     }
 
     @Override
-    public void update(Player player) {
+    public void update(Player player, boolean swingArm) {
         if (npc == null) {
             return;
         }
@@ -271,7 +271,7 @@ public class Npc_1_19_4 extends Npc {
         refreshEntityData(player);
 
         if (data.isSpawnEntity() && data.getLocation() != null) {
-            move(player, true);
+            move(player, swingArm);
         }
 
         NpcAttribute playerPoseAttr = FancyNpcsPlugin.get().getAttributeManager().getAttributeByName(org.bukkit.entity.EntityType.PLAYER, "pose");
diff --git a/plugins/fancynpcs/implementation_1_20_1/src/main/java/de/oliver/fancynpcs/v1_20_1/Npc_1_20_1.java b/plugins/fancynpcs/implementation_1_20_1/src/main/java/de/oliver/fancynpcs/v1_20_1/Npc_1_20_1.java
index ad0ccd03..8151c153 100644
--- a/plugins/fancynpcs/implementation_1_20_1/src/main/java/de/oliver/fancynpcs/v1_20_1/Npc_1_20_1.java
+++ b/plugins/fancynpcs/implementation_1_20_1/src/main/java/de/oliver/fancynpcs/v1_20_1/Npc_1_20_1.java
@@ -191,7 +191,7 @@ public class Npc_1_20_1 extends Npc {
     }
 
     @Override
-    public void update(Player player) {
+    public void update(Player player, boolean swingArm) {
         if (npc == null) {
             return;
         }
@@ -271,7 +271,7 @@ public class Npc_1_20_1 extends Npc {
         refreshEntityData(player);
 
         if (data.isSpawnEntity() && data.getLocation() != null) {
-            move(player, true);
+            move(player, swingArm);
         }
 
         NpcAttribute playerPoseAttr = FancyNpcsPlugin.get().getAttributeManager().getAttributeByName(org.bukkit.entity.EntityType.PLAYER, "pose");
diff --git a/plugins/fancynpcs/implementation_1_20_2/src/main/java/de/oliver/fancynpcs/v1_20_2/Npc_1_20_2.java b/plugins/fancynpcs/implementation_1_20_2/src/main/java/de/oliver/fancynpcs/v1_20_2/Npc_1_20_2.java
index fc6b2fa9..02e7c0fe 100644
--- a/plugins/fancynpcs/implementation_1_20_2/src/main/java/de/oliver/fancynpcs/v1_20_2/Npc_1_20_2.java
+++ b/plugins/fancynpcs/implementation_1_20_2/src/main/java/de/oliver/fancynpcs/v1_20_2/Npc_1_20_2.java
@@ -188,7 +188,7 @@ public class Npc_1_20_2 extends Npc {
     }
 
     @Override
-    public void update(Player player) {
+    public void update(Player player, boolean swingArm) {
         if (npc == null) {
             return;
         }
@@ -266,7 +266,7 @@ public class Npc_1_20_2 extends Npc {
         refreshEntityData(player);
 
         if (data.isSpawnEntity() && data.getLocation() != null) {
-            move(player, true);
+            move(player, swingArm);
         }
 
         NpcAttribute playerPoseAttr = FancyNpcsPlugin.get().getAttributeManager().getAttributeByName(org.bukkit.entity.EntityType.PLAYER, "pose");
diff --git a/plugins/fancynpcs/implementation_1_20_4/src/main/java/de/oliver/fancynpcs/v1_20_4/Npc_1_20_4.java b/plugins/fancynpcs/implementation_1_20_4/src/main/java/de/oliver/fancynpcs/v1_20_4/Npc_1_20_4.java
index f689e286..77f07c25 100644
--- a/plugins/fancynpcs/implementation_1_20_4/src/main/java/de/oliver/fancynpcs/v1_20_4/Npc_1_20_4.java
+++ b/plugins/fancynpcs/implementation_1_20_4/src/main/java/de/oliver/fancynpcs/v1_20_4/Npc_1_20_4.java
@@ -187,7 +187,7 @@ public class Npc_1_20_4 extends Npc {
     }
 
     @Override
-    public void update(Player player) {
+    public void update(Player player, boolean swingArm) {
         if (npc == null) {
             return;
         }
@@ -265,7 +265,7 @@ public class Npc_1_20_4 extends Npc {
         refreshEntityData(player);
 
         if (data.isSpawnEntity() && data.getLocation() != null) {
-            move(player, true);
+            move(player, swingArm);
         }
 
         NpcAttribute playerPoseAttr = FancyNpcsPlugin.get().getAttributeManager().getAttributeByName(org.bukkit.entity.EntityType.PLAYER, "pose");
diff --git a/plugins/fancynpcs/implementation_1_20_6/src/main/java/de/oliver/fancynpcs/v1_20_6/Npc_1_20_6.java b/plugins/fancynpcs/implementation_1_20_6/src/main/java/de/oliver/fancynpcs/v1_20_6/Npc_1_20_6.java
index ab8ca178..411ccf6b 100644
--- a/plugins/fancynpcs/implementation_1_20_6/src/main/java/de/oliver/fancynpcs/v1_20_6/Npc_1_20_6.java
+++ b/plugins/fancynpcs/implementation_1_20_6/src/main/java/de/oliver/fancynpcs/v1_20_6/Npc_1_20_6.java
@@ -187,7 +187,7 @@ public class Npc_1_20_6 extends Npc {
     }
 
     @Override
-    public void update(Player player) {
+    public void update(Player player, boolean swingArm) {
         if (npc == null) {
             return;
         }
@@ -265,7 +265,7 @@ public class Npc_1_20_6 extends Npc {
         refreshEntityData(player);
 
         if (data.isSpawnEntity() && data.getLocation() != null) {
-            move(player, true);
+            move(player, swingArm);
         }
 
         NpcAttribute playerPoseAttr = FancyNpcsPlugin.get().getAttributeManager().getAttributeByName(org.bukkit.entity.EntityType.PLAYER, "pose");
diff --git a/plugins/fancynpcs/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java b/plugins/fancynpcs/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java
index 24faf08c..9afba70f 100644
--- a/plugins/fancynpcs/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java
+++ b/plugins/fancynpcs/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java
@@ -199,7 +199,7 @@ public class Npc_1_21_1 extends Npc {
     }
 
     @Override
-    public void update(Player player) {
+    public void update(Player player, boolean swingArm) {
         if (npc == null) {
             return;
         }
@@ -277,7 +277,7 @@ public class Npc_1_21_1 extends Npc {
         refreshEntityData(player);
 
         if (data.isSpawnEntity() && data.getLocation() != null) {
-            move(player, true);
+            move(player, swingArm);
         }
 
         NpcAttribute playerPoseAttr = FancyNpcsPlugin.get().getAttributeManager().getAttributeByName(org.bukkit.entity.EntityType.PLAYER, "pose");
diff --git a/plugins/fancynpcs/implementation_1_21_3/src/main/java/de/oliver/fancynpcs/v1_21_3/Npc_1_21_3.java b/plugins/fancynpcs/implementation_1_21_3/src/main/java/de/oliver/fancynpcs/v1_21_3/Npc_1_21_3.java
index 654ddf1f..19ba3129 100644
--- a/plugins/fancynpcs/implementation_1_21_3/src/main/java/de/oliver/fancynpcs/v1_21_3/Npc_1_21_3.java
+++ b/plugins/fancynpcs/implementation_1_21_3/src/main/java/de/oliver/fancynpcs/v1_21_3/Npc_1_21_3.java
@@ -210,7 +210,7 @@ public class Npc_1_21_3 extends Npc {
     }
 
     @Override
-    public void update(Player player) {
+    public void update(Player player, boolean swingArm) {
         if (npc == null) {
             return;
         }
@@ -288,7 +288,7 @@ public class Npc_1_21_3 extends Npc {
         refreshEntityData(player);
 
         if (data.isSpawnEntity() && data.getLocation() != null) {
-            move(player, true);
+            move(player, swingArm);
         }
 
         NpcAttribute playerPoseAttr = FancyNpcsPlugin.get().getAttributeManager().getAttributeByName(org.bukkit.entity.EntityType.PLAYER, "pose");
diff --git a/plugins/fancynpcs/implementation_1_21_4/src/main/java/de/oliver/fancynpcs/v1_21_4/Npc_1_21_4.java b/plugins/fancynpcs/implementation_1_21_4/src/main/java/de/oliver/fancynpcs/v1_21_4/Npc_1_21_4.java
index ee6a741f..1c302925 100644
--- a/plugins/fancynpcs/implementation_1_21_4/src/main/java/de/oliver/fancynpcs/v1_21_4/Npc_1_21_4.java
+++ b/plugins/fancynpcs/implementation_1_21_4/src/main/java/de/oliver/fancynpcs/v1_21_4/Npc_1_21_4.java
@@ -210,7 +210,7 @@ public class Npc_1_21_4 extends Npc {
     }
 
     @Override
-    public void update(Player player) {
+    public void update(Player player, boolean swingArm) {
         if (npc == null) {
             return;
         }
@@ -288,7 +288,7 @@ public class Npc_1_21_4 extends Npc {
         refreshEntityData(player);
 
         if (data.isSpawnEntity() && data.getLocation() != null) {
-            move(player, true);
+            move(player, swingArm);
         }
 
         NpcAttribute playerPoseAttr = FancyNpcsPlugin.get().getAttributeManager().getAttributeByName(org.bukkit.entity.EntityType.PLAYER, "pose");
diff --git a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/Npc_1_21_5.java b/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/Npc_1_21_5.java
index bbbede2a..fd459e13 100644
--- a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/Npc_1_21_5.java
+++ b/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/Npc_1_21_5.java
@@ -208,9 +208,8 @@ public class Npc_1_21_5 extends Npc {
         ClientboundRotateHeadPacket rotateHeadPacket = new ClientboundRotateHeadPacket(npc, (byte) (location.getYaw() * angelMultiplier));
         serverPlayer.connection.send(rotateHeadPacket);
     }
-
     @Override
-    public void update(Player player) {
+    public void update(Player player, boolean swingArm) {
         if (npc == null) {
             return;
         }
@@ -288,7 +287,7 @@ public class Npc_1_21_5 extends Npc {
         refreshEntityData(player);
 
         if (data.isSpawnEntity() && data.getLocation() != null) {
-            move(player, true);
+            move(player, swingArm);
         }
 
         NpcAttribute playerPoseAttr = FancyNpcsPlugin.get().getAttributeManager().getAttributeByName(org.bukkit.entity.EntityType.PLAYER, "pose");
diff --git a/plugins/fancynpcs/implementation_1_21_6/src/main/java/de/oliver/fancynpcs/v1_21_6/Npc_1_21_6.java b/plugins/fancynpcs/implementation_1_21_6/src/main/java/de/oliver/fancynpcs/v1_21_6/Npc_1_21_6.java
index a292a58e..8760e55c 100644
--- a/plugins/fancynpcs/implementation_1_21_6/src/main/java/de/oliver/fancynpcs/v1_21_6/Npc_1_21_6.java
+++ b/plugins/fancynpcs/implementation_1_21_6/src/main/java/de/oliver/fancynpcs/v1_21_6/Npc_1_21_6.java
@@ -210,7 +210,7 @@ public class Npc_1_21_6 extends Npc {
     }
 
     @Override
-    public void update(Player player) {
+    public void update(Player player, boolean swingArm) {
         if (npc == null) {
             return;
         }
@@ -298,7 +298,7 @@ public class Npc_1_21_6 extends Npc {
         refreshEntityData(player);
 
         if (data.isSpawnEntity() && data.getLocation() != null) {
-            move(player, true);
+            move(player, swingArm);
         }
 
         NpcAttribute playerPoseAttr = FancyNpcsPlugin.get().getAttributeManager().getAttributeByName(org.bukkit.entity.EntityType.PLAYER, "pose");