Change how npc looking works

CitizensDev · Apr 25, 2020 · fe8eb4e · fe8eb4e
1 parent f9b0397
commit fe8eb4e
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 8 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -228,7 +228,6 @@ public boolean spawn(Location at, SpawnReason reason) {
             return false;
         }
         data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
-
         at = at.clone();
 
         if (reason == SpawnReason.CHUNK_LOAD || reason == SpawnReason.COMMAND) {

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerLook.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerLook.java
@@ -42,7 +42,7 @@ public void a() {
                 this.a.aQ += 360F;
             }
         } else {
-            this.a.yaw = this.a.aQ + 40;
+            this.a.yaw = b(this.a.yaw, this.a.aK, -40F);
             // this.a.aQ = a(this.a.aQ, this.a.aO, 10.0F);
         }
         float f3 = MathHelper.g(this.a.aQ - this.a.aO);
@@ -101,6 +101,16 @@ public boolean b() {
         return this.d;
     }
 
+    public float b(float var0, float var1, float var2) {
+        float var3 = c(var0, var1);
+        float var4 = MathHelper.a(var3, -var2, var2);
+        return var1 - var4;
+    }
+
+    public float c(float var0, float var1) {
+        return MathHelper.g(var1 - var0);
+    }
+
     public double e() {
         return this.e;
     }

diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerLook.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerLook.java
@@ -42,7 +42,7 @@ public void a() {
                 this.a.aP += 360F;
             }
         } else {
-            this.a.yaw = this.a.aP + 40;
+            this.a.yaw = this.b(this.a.yaw, this.a.aP, -40F);
             // this.a.aP = a(this.a.aP, this.a.aN, 10.0F);
         }
         float f3 = MathHelper.g(this.a.aP - this.a.aN);
@@ -101,6 +101,16 @@ public boolean b() {
         return this.d;
     }
 
+    public float b(float var0, float var1, float var2) {
+        float var3 = c(var0, var1);
+        float var4 = MathHelper.a(var3, -var2, var2);
+        return var1 - var4;
+    }
+
+    public float c(float var0, float var1) {
+        return MathHelper.g(var1 - var0);
+    }
+
     public double e() {
         return this.e;
     }

diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerLook.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerLook.java
@@ -42,7 +42,7 @@ public void a() {
                 this.a.aP += 360F;
             }
         } else {
-            this.a.yaw = this.a.aP + 40;
+            this.a.yaw = this.b(this.a.yaw, this.a.aP, -40F);
             // this.a.aP = a(this.a.aP, this.a.aN, 10.0F);
         }
         float f3 = MathHelper.g(this.a.aP - this.a.aN);
@@ -101,6 +101,16 @@ public boolean b() {
         return this.d;
     }
 
+    public float b(float var0, float var1, float var2) {
+        float var3 = c(var0, var1);
+        float var4 = MathHelper.a(var3, -var2, var2);
+        return var1 - var4;
+    }
+
+    public float c(float var0, float var1) {
+        return MathHelper.g(var1 - var0);
+    }
+
     public double e() {
         return this.e;
     }

diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerLook.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerLook.java
@@ -43,7 +43,7 @@ public void a() {
                 this.a.aS += 360F;
             }
         } else {
-            this.a.yaw = this.a.aS + 40;
+            this.a.yaw = b(this.a.yaw, this.a.aS, -40F);
             // this.a.aP = a(this.a.aS, this.a.aQ, 10.0F);
         }
         float f3 = MathHelper.g(this.a.aS - this.a.aQ);
@@ -103,6 +103,16 @@ public boolean b() {
         return this.d;
     }
 
+    public float b(float var0, float var1, float var2) {
+        float var3 = c(var0, var1);
+        float var4 = MathHelper.a(var3, -var2, var2);
+        return var1 - var4;
+    }
+
+    public float c(float var0, float var1) {
+        return MathHelper.g(var1 - var0);
+    }
+
     public double e() {
         return this.e;
     }

diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerLook.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerLook.java
@@ -31,7 +31,7 @@ public void a() {
             this.a.yaw = this.a.aM;
             this.a.pitch = this.a(this.a.pitch, this.g(), this.c);
         } else {
-            this.a.yaw = this.a.aM + 40;
+            this.a.yaw = MathHelper.b(this.a.yaw, this.a.aM, -40F);
             // this.a.aM = this.a(this.a.aM, this.a.aK, 10.0F);
         }
 

diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java
@@ -77,6 +77,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
     private final CitizensNPC npc;
     private final Location packetLocationCache = new Location(null, 0, 0, 0);
     private final SkinPacketTracker skinTracker;
+
     private int updateCounter = 0;
 
     public EntityHumanNPC(MinecraftServer minecraftServer, WorldServer world, GameProfile gameProfile,

diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerLook.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerLook.java
@@ -31,7 +31,7 @@ public void a() {
             this.a.yaw = this.a.aK;
             this.a.pitch = this.a(this.a.pitch, this.g(), this.c);
         } else {
-            this.a.yaw = this.a.aK + 40;
+            this.a.yaw = MathHelper.b(this.a.yaw, this.a.aK, -40F);
             // this.a.aK = this.a(this.a.aK, this.a.aI, 10.0F);
         }
 

diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerLook.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerLook.java
@@ -43,7 +43,7 @@ public void a() {
                 this.a.aK += 360F;
             }
         } else {
-            this.a.yaw = this.a.aK + 40;
+            this.a.yaw = b(this.a.yaw, this.a.aK, -40F);
             // this.a.aK = a(this.a.aK, this.a.aI, 10.0F);
         }
         float f3 = MathHelper.g(this.a.aK - this.a.aI);
@@ -102,6 +102,16 @@ public boolean b() {
         return this.d;
     }
 
+    public float b(float var0, float var1, float var2) {
+        float var3 = c(var0, var1);
+        float var4 = MathHelper.a(var3, -var2, var2);
+        return var1 - var4;
+    }
+
+    public float c(float var0, float var1) {
+        return MathHelper.g(var1 - var0);
+    }
+
     public double e() {
         return this.e;
     }