diff options
| author | MitchesD <majklprofik@seznam.cz> | 2015-10-23 12:09:41 +0200 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2015-11-07 00:43:18 +0100 |
| commit | b236f5f50d2c87291546d0de9775954b6ba47c64 (patch) | |
| tree | d4c73364ced60dfbd5c169cf302fcd9f01847944 /src | |
| parent | 949c0b58a9d8bba3873b851883e8739a0c7cac5d (diff) | |
Merge pull request #15755 from ShinDarth/reset-stealth
Fixed some rare stealth/prowl visual bugs after duel cd reset
(cherry picked from commit 6f844f36c30bcb0367b2561681c226f69925b429)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/SpellHistory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp index 6a72fe5c773..c2d1356e61a 100644 --- a/src/server/game/Spells/SpellHistory.cpp +++ b/src/server/game/Spells/SpellHistory.cpp @@ -913,7 +913,8 @@ void SpellHistory::RestoreCooldownStateAfterDuel() Clock::time_point now = Clock::now(); uint32 cooldownDuration = c.second.CooldownEnd > now ? std::chrono::duration_cast<std::chrono::milliseconds>(c.second.CooldownEnd - now).count() : 0; - if (cooldownDuration == 0) + // cooldownDuration must be between 0 and 10 minutes in order to avoid any visual bugs + if (cooldownDuration == 0 || cooldownDuration > 10 * MINUTE * IN_MILLISECONDS) continue; spellCooldown.SpellCooldowns.emplace_back(c.first, cooldownDuration); |