diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java
index 529bb476..3b9749dd 100644
--- a/src/engine/gameManager/CombatManager.java
+++ b/src/engine/gameManager/CombatManager.java
@@ -126,6 +126,13 @@ public enum CombatManager {
                 return;
         }
 
+        if (attacker.getTimers().containsKey("Attack" + slot)) {
+            AttackJob ajR = ((AttackJob)attacker.getTimers().get("Attack" + slot).getJob());
+            if(ajR.target.equals(target)){
+                return;
+            }
+        }
+
         target.combatLock.writeLock().lock();
 
         // check if character is in range to attack target