aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMitchesD <majklprofik@seznam.cz>2015-10-23 12:09:41 +0200
committerMitchesD <majklprofik@seznam.cz>2015-10-23 12:09:41 +0200
commit6f844f36c30bcb0367b2561681c226f69925b429 (patch)
treec9fa17e888e41403dcb0a04a94f94dfdbdd05710 /src
parentb2575a04ce076aaaa0d0cb38737950b202127132 (diff)
parent81980ae58c2107ae0ac2fded2155c8580541a74e (diff)
Merge pull request #15755 from ShinDarth/reset-stealth
Fixed some rare stealth/prowl visual bugs after duel cd reset
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Spells/SpellHistory.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp
index 3c157f0b17b..ca0e8cc6238 100644
--- a/src/server/game/Spells/SpellHistory.cpp
+++ b/src/server/game/Spells/SpellHistory.cpp
@@ -678,7 +678,8 @@ void SpellHistory::RestoreCooldownStateAfterDuel()
Clock::time_point now = Clock::now();
uint32 cooldownDuration = itr->second.CooldownEnd > now ? std::chrono::duration_cast<std::chrono::milliseconds>(itr->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;
cooldowns[itr->first] = cooldownDuration;