Set handle.ax for head yaw

CitizensDev · Mar 12, 2013 · 30a31bd · 30a31bd
1 parent 6b41334
commit 30a31bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java
@@ -16,6 +16,7 @@
 import net.minecraft.server.v1_4_R1.DamageSource;
 import net.minecraft.server.v1_4_R1.EnchantmentManager;
 import net.minecraft.server.v1_4_R1.Entity;
+import net.minecraft.server.v1_4_R1.EntityHuman;
 import net.minecraft.server.v1_4_R1.EntityLiving;
 import net.minecraft.server.v1_4_R1.EntityMonster;
 import net.minecraft.server.v1_4_R1.EntityPlayer;
@@ -267,6 +268,8 @@ public static void setHeadYaw(EntityLiving handle, float yaw) {
             yaw -= 360.0F;
         }
         handle.az = yaw;
+        if (!(handle instanceof EntityHuman))
+            handle.ax = yaw;
         handle.aA = yaw;
     }
 

diff --git a/src/main/java/net/citizensnpcs/util/Util.java b/src/main/java/net/citizensnpcs/util/Util.java
@@ -47,9 +47,9 @@ public static NPCPushEvent callPushEvent(NPC npc, Vector vector) {
     public static void faceEntity(LivingEntity from, LivingEntity at) {
         if (from.getWorld() != at.getWorld())
             return;
-        double xDiff, yDiff, zDiff;
         Location atLocation = at.getLocation(AT_LOCATION);
         Location fromLocation = from.getLocation(FROM_LOCATION);
+        double xDiff, yDiff, zDiff;
         xDiff = atLocation.getX() - fromLocation.getX();
         yDiff = atLocation.getY() - fromLocation.getY();
         zDiff = atLocation.getZ() - fromLocation.getZ();