Add swingArm flag to Npc#move

FancyMcPlugins · Apr 8, 2024 · 82d9047 · 82d9047
1 parent 7e37e2d
commit 82d9047
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/api/src/main/java/de/oliver/fancynpcs/api/Npc.java b/api/src/main/java/de/oliver/fancynpcs/api/Npc.java
@@ -128,11 +128,11 @@ public void updateForAll() {
         }
     }
 
-    public abstract void move(Player player);
+    public abstract void move(Player player, boolean swingArm);
 
     public void moveForAll() {
         for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-            move(onlinePlayer);
+            move(onlinePlayer, true);
         }
     }
 

diff --git a/implementation_1_19_4/src/main/java/de/oliver/fancynpcs/v1_19_4/Npc_1_19_4.java b/implementation_1_19_4/src/main/java/de/oliver/fancynpcs/v1_19_4/Npc_1_19_4.java
@@ -257,7 +257,7 @@ public void update(Player player) {
         refreshEntityData(player);
 
         if (data.isSpawnEntity() && data.getLocation() != null) {
-            move(player);
+            move(player, true);
         }
 
         NpcAttribute playerPoseAttr = FancyNpcsPlugin.get().getAttributeManager().getAttributeByName(org.bukkit.entity.EntityType.PLAYER, "pose");
@@ -293,7 +293,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
-    public void move(Player player) {
+    public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
         }
@@ -316,7 +316,7 @@ public void move(Player player) {
         ClientboundRotateHeadPacket rotateHeadPacket = new ClientboundRotateHeadPacket(npc, (byte) (data.getLocation().getYaw() * angelMultiplier));
         serverPlayer.connection.send(rotateHeadPacket);
 
-        if (npc instanceof ServerPlayer) {
+        if (swingArm && npc instanceof ServerPlayer) {
             ClientboundAnimatePacket animatePacket = new ClientboundAnimatePacket(npc, 0);
             serverPlayer.connection.send(animatePacket);
         }

diff --git a/implementation_1_20_1/src/main/java/de/oliver/fancynpcs/v1_20_1/Npc_1_20_1.java b/implementation_1_20_1/src/main/java/de/oliver/fancynpcs/v1_20_1/Npc_1_20_1.java
@@ -250,7 +250,7 @@ public void update(Player player) {
         refreshEntityData(player);
 
         if (data.isSpawnEntity() && data.getLocation() != null) {
-            move(player);
+            move(player, true);
         }
 
         NpcAttribute playerPoseAttr = FancyNpcsPlugin.get().getAttributeManager().getAttributeByName(org.bukkit.entity.EntityType.PLAYER, "pose");
@@ -286,7 +286,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
-    public void move(Player player) {
+    public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
         }
@@ -309,7 +309,7 @@ public void move(Player player) {
         ClientboundRotateHeadPacket rotateHeadPacket = new ClientboundRotateHeadPacket(npc, (byte) (data.getLocation().getYaw() * angelMultiplier));
         serverPlayer.connection.send(rotateHeadPacket);
 
-        if (npc instanceof ServerPlayer) {
+        if (swingArm && npc instanceof ServerPlayer) {
             ClientboundAnimatePacket animatePacket = new ClientboundAnimatePacket(npc, 0);
             serverPlayer.connection.send(animatePacket);
         }

diff --git a/implementation_1_20_2/src/main/java/de/oliver/fancynpcs/v1_20_2/Npc_1_20_2.java b/implementation_1_20_2/src/main/java/de/oliver/fancynpcs/v1_20_2/Npc_1_20_2.java
@@ -252,7 +252,7 @@ public void update(Player player) {
         refreshEntityData(player);
 
         if (data.isSpawnEntity() && data.getLocation() != null) {
-            move(player);
+            move(player, true);
         }
 
         NpcAttribute playerPoseAttr = FancyNpcsPlugin.get().getAttributeManager().getAttributeByName(org.bukkit.entity.EntityType.PLAYER, "pose");
@@ -288,7 +288,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
-    public void move(Player player) {
+    public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
         }
@@ -311,7 +311,7 @@ public void move(Player player) {
         ClientboundRotateHeadPacket rotateHeadPacket = new ClientboundRotateHeadPacket(npc, (byte) (data.getLocation().getYaw() * angelMultiplier));
         serverPlayer.connection.send(rotateHeadPacket);
 
-        if (npc instanceof ServerPlayer) {
+        if (swingArm && npc instanceof ServerPlayer) {
             ClientboundAnimatePacket animatePacket = new ClientboundAnimatePacket(npc, 0);
             serverPlayer.connection.send(animatePacket);
         }

diff --git a/implementation_1_20_4/src/main/java/de/oliver/fancynpcs/v1_20_4/Npc_1_20_4.java b/implementation_1_20_4/src/main/java/de/oliver/fancynpcs/v1_20_4/Npc_1_20_4.java
@@ -251,7 +251,7 @@ public void update(Player player) {
         refreshEntityData(player);
 
         if (data.isSpawnEntity() && data.getLocation() != null) {
-            move(player);
+            move(player, true);
         }
 
         NpcAttribute playerPoseAttr = FancyNpcsPlugin.get().getAttributeManager().getAttributeByName(org.bukkit.entity.EntityType.PLAYER, "pose");
@@ -287,7 +287,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
-    public void move(Player player) {
+    public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
         }
@@ -310,7 +310,7 @@ public void move(Player player) {
         ClientboundRotateHeadPacket rotateHeadPacket = new ClientboundRotateHeadPacket(npc, (byte) (data.getLocation().getYaw() * angelMultiplier));
         serverPlayer.connection.send(rotateHeadPacket);
 
-        if (npc instanceof ServerPlayer) {
+        if (swingArm && npc instanceof ServerPlayer) {
             ClientboundAnimatePacket animatePacket = new ClientboundAnimatePacket(npc, 0);
             serverPlayer.connection.send(animatePacket);
         }