diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/SpellHistory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp index d3aa6dfdf09..cf7c87d8929 100644 --- a/src/server/game/Spells/SpellHistory.cpp +++ b/src/server/game/Spells/SpellHistory.cpp @@ -593,9 +593,6 @@ void SpellHistory::ModifySpellCooldown(CooldownStorageType::iterator& itr, Durat itr->second.CooldownEnd = itr->second.CategoryEnd; } - if (itr->second.CooldownEnd <= now) - itr = EraseCooldown(itr); - if (Player* playerOwner = GetPlayerOwner()) { WorldPackets::Spells::ModifyCooldown modifyCooldown; @@ -605,6 +602,9 @@ void SpellHistory::ModifySpellCooldown(CooldownStorageType::iterator& itr, Durat modifyCooldown.WithoutCategoryCooldown = withoutCategoryCooldown; playerOwner->SendDirectMessage(modifyCooldown.Write()); } + + if (itr->second.CooldownEnd <= now) + itr = EraseCooldown(itr); } void SpellHistory::ModifyCooldown(uint32 spellId, Duration cooldownMod, bool withoutCategoryCooldown) |