diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java
index d5fc4b56..e1558930 100644
--- a/src/engine/gameManager/CombatManager.java
+++ b/src/engine/gameManager/CombatManager.java
@@ -104,6 +104,16 @@ public enum CombatManager {
 
     public static void processAttack(AbstractCharacter attacker, AbstractWorldObject target, mbEnums.EquipSlotType slot) {
 
+        if(attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
+            if (!attacker.isCombat())
+                return;
+
+            if (attacker.getTimestamps().get("Attack" + slot.name()) != null && attacker.getTimestamps().get("Attack" + slot.name()) < System.currentTimeMillis()) {
+                setAutoAttackJob(attacker, slot, 1000);
+                return;
+            }
+        }
+
         // check if character is in range to attack target
 
         PlayerBonuses bonus = attacker.getBonuses();