diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java
index ccc90008..da4a806b 100644
--- a/src/engine/gameManager/CombatManager.java
+++ b/src/engine/gameManager/CombatManager.java
@@ -632,6 +632,8 @@ public enum CombatManager {
     }
     public static void cancelAutoAttackJob(AbstractCharacter attacker, mbEnums.EquipSlotType slot) {
 
+        if(attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter) == false)
+            return;
         attacker.getTimestamps().put("Attack" + slot.name(), System.currentTimeMillis());
 
         //handle auto attack job creation