Merge pull request #15947 from ShinDarth/duel-exploit

Core/Spell: Fix exploit in duel cooldown reset handling

1 files changed, 1 insertions, 3 deletions

diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp
index ed5c31c25c6..faad54d0af7 100644
--- a/src/server/game/Spells/SpellHistory.cpp
+++ b/src/server/game/Spells/SpellHistory.cpp
@@ -695,9 +695,7 @@ void SpellHistory::RestoreCooldownStateAfterDuel()
         // check for spell with onHold active before and during the duel
         for (auto itr = _spellCooldownsBeforeDuel.begin(); itr != _spellCooldownsBeforeDuel.end(); ++itr)
         {
-            if (!itr->second.OnHold &&
-                _spellCooldowns.find(itr->first) != _spellCooldowns.end() &&
-                !_spellCooldowns[itr->first].OnHold)
+            if (!itr->second.OnHold && !_spellCooldowns[itr->first].OnHold)
                 _spellCooldowns[itr->first] = _spellCooldownsBeforeDuel[itr->first];
         }