|
|
@ -126,6 +126,13 @@ public enum CombatManager { |
|
|
|
return; |
|
|
|
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(); |
|
|
|
target.combatLock.writeLock().lock(); |
|
|
|
|
|
|
|
|
|
|
|
// check if character is in range to attack target
|
|
|
|
// check if character is in range to attack target
|
|
|
|