|
|
@ -197,8 +197,6 @@ public enum CombatManager { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
checkForProc(attacker,target,weapon); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//get delay for the auto attack job
|
|
|
|
//get delay for the auto attack job
|
|
|
|
long delay = 5000; |
|
|
|
long delay = 5000; |
|
|
|
|
|
|
|
|
|
|
@ -359,6 +357,9 @@ public enum CombatManager { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//check for proccing
|
|
|
|
|
|
|
|
checkForProc(attacker,target,weapon); |
|
|
|
|
|
|
|
|
|
|
|
//calculate the base damage
|
|
|
|
//calculate the base damage
|
|
|
|
int damage = ThreadLocalRandom.current().nextInt(min, max + 1); |
|
|
|
int damage = ThreadLocalRandom.current().nextInt(min, max + 1); |
|
|
|
if (damage == 0) { |
|
|
|
if (damage == 0) { |
|
|
|