summaryrefslogtreecommitdiff
path: root/src/game-server/attack.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game-server/attack.cpp')
-rw-r--r--src/game-server/attack.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game-server/attack.cpp b/src/game-server/attack.cpp
index e807df6a..9118b10c 100644
--- a/src/game-server/attack.cpp
+++ b/src/game-server/attack.cpp
@@ -101,9 +101,11 @@ Attack *Attacks::getTriggerableAttack()
if (!mCurrentAttack)
return 0;
- int warmupTime = mCurrentAttack->getAttackInfo()->getWarmupTime();
- if (mAttackTimer.remaining() <= warmupTime)
+ int cooldownTime = mCurrentAttack->getAttackInfo()->getCooldownTime();
+ if (mAttackTimer.remaining() <= cooldownTime)
+ {
return mCurrentAttack;
+ }
return 0;
}