diff options
author | Duarte Duarte <dnpd.dd@gmail.com> | 2015-02-11 18:40:03 +0000 |
---|---|---|
committer | Nayd <dnpd.dd@gmail.com> | 2015-02-11 18:41:20 +0000 |
commit | 06c7de4178964ebb8e45e76cd72253060c11c5bb (patch) | |
tree | eb1677f2c4d797a4c5d156efaca232e9bb4fbb21 | |
parent | c4d81aa42d4918fa6a9b86bfea017f36192155ed (diff) |
Merge pull request #14098 from ariel-/arenacd
Arena Spells Reset Cooldown micro correction
(cherry picked from commit a3bc75b7b96913eae3343bfde0390cf921748011)
-rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 74a36ecbcf6..679429b8b6c 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -3974,7 +3974,7 @@ void Player::RemoveSpellCategoryCooldown(uint32 cat, bool update /* = false */) void Player::RemoveArenaSpellCooldowns(bool removeActivePetCooldowns) { - // remove cooldowns on spells that have <= 10 min CD + // remove cooldowns on spells that have < 10 min CD SpellCooldowns::iterator itr, next; for (itr = m_spellCooldowns.begin(); itr != m_spellCooldowns.end(); itr = next) @@ -3982,10 +3982,10 @@ void Player::RemoveArenaSpellCooldowns(bool removeActivePetCooldowns) next = itr; ++next; SpellInfo const* entry = sSpellMgr->GetSpellInfo(itr->first); - // check if spellentry is present and if the cooldown is less or equal to 10 min + // check if spellentry is present and if the cooldown is less than 10 min if (entry && - entry->RecoveryTime <= 10 * MINUTE * IN_MILLISECONDS && - entry->CategoryRecoveryTime <= 10 * MINUTE * IN_MILLISECONDS) + entry->RecoveryTime < 10 * MINUTE * IN_MILLISECONDS && + entry->CategoryRecoveryTime < 10 * MINUTE * IN_MILLISECONDS) { // remove & notify RemoveSpellCooldown(itr->first, true); |