diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java
index 33e38d308..f49e8f213 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java
@@ -225,6 +225,16 @@ public class ScriptLivingBase<T extends EntityLivingBase> extends ScriptEntity<T
 		return getMCEntity();
 	}
 
+    @Override
+    public float getRotation(){
+        return entity.renderYawOffset;
+    }
+
+    @Override
+    public void setRotation(float rotation){
+        entity.renderYawOffset = rotation;
+    }
+
 	/**
 	 * Makes the entity swing its hand
 	 */
diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
index d9f02a23a..987326092 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
@@ -93,8 +93,12 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 	}
 
 	public void setRotation(float rotation){
-		npc.ai.orientation = (int)rotation;
-		super.setRotation(rotation);
+        super.setRotation(rotation);
+        int r = (int) rotation;
+        if(entity.ai.orientation != r) {
+            entity.ai.orientation = r;
+            entity.updateClient = true;
+        }
 	}
 
 	public void setRotationType(int rotationType){