Merge pull request #15727 from ShinDarth/duel-cd

Core/SpellHistory: Improved Cooldown Duel Reset

1 files changed, 4 insertions, 0 deletions

diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp
index 0ae5fe97b13..3c157f0b17b 100644
--- a/src/server/game/Spells/SpellHistory.cpp
+++ b/src/server/game/Spells/SpellHistory.cpp
@@ -677,6 +677,10 @@ 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)
+                continue;
+
             cooldowns[itr->first] = cooldownDuration;
         }