Clamp controller look yaw for entityinsentients as well

CitizensDev · Nov 26, 2016 · d968384 · d968384
1 parent 974cb61
commit d968384
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
@@ -612,6 +612,12 @@ public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly)
         if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(), to.getYaw(),
                     to.getPitch());
+            while (((EntityInsentient) handle).aO >= 180F) {
+                ((EntityInsentient) handle).aO -= 360F;
+            }
+            while (((EntityInsentient) handle).aO < -180F) {
+                ((EntityInsentient) handle).aO += 360F;
+            }
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setTargetLook(to);
         }

diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java
@@ -108,11 +108,12 @@ public void a(PathType pathtype, float f) {
 
     @Override
     public void A_() {
-        livingEntityBaseTick();
         super.A_();
         if (npc == null)
             return;
 
+        livingEntityBaseTick();
+
         if (updateCounter + 1 > Setting.PACKET_UPDATE_DELAY.asInt()) {
             updateEffects = true;
         }

diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
@@ -644,6 +644,13 @@ public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly)
         if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(), to.getYaw(),
                     to.getPitch());
+
+            while (((EntityInsentient) handle).aP >= 180F) {
+                ((EntityInsentient) handle).aP -= 360F;
+            }
+            while (((EntityInsentient) handle).aP < -180F) {
+                ((EntityInsentient) handle).aP += 360F;
+            }
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setTargetLook(to);
         }