diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-04-02 17:05:46 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-04-02 17:05:46 +0200 |
| commit | e52878b6b5600c2ed6fe8a60fbc27d220f807a2e (patch) | |
| tree | 23384fd87c6befac3d628128ceb53d7dc8b433a2 /src/server/scripts/World | |
| parent | e241ff45c5e58e039ffecd32848b40104b22fb9b (diff) | |
Core/Spells: Renamed EnsureSpellInfo to AssertSpellInfo to minimize differences between branches
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/duel_reset.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/World/duel_reset.cpp b/src/server/scripts/World/duel_reset.cpp index 7982a5639ec..b04f3ec0aa7 100644 --- a/src/server/scripts/World/duel_reset.cpp +++ b/src/server/scripts/World/duel_reset.cpp @@ -105,7 +105,7 @@ class DuelResetScript : public PlayerScript { SpellHistory::Clock::time_point now = SpellHistory::Clock::now(); uint32 cooldownDuration = itr->second.CooldownEnd > now ? std::chrono::duration_cast<std::chrono::milliseconds>(itr->second.CooldownEnd - now).count() : 0; - SpellInfo const* spellInfo = sSpellMgr->EnsureSpellInfo(itr->first); + SpellInfo const* spellInfo = sSpellMgr->AssertSpellInfo(itr->first); return spellInfo->RecoveryTime < 10 * MINUTE * IN_MILLISECONDS && spellInfo->CategoryRecoveryTime < 10 * MINUTE * IN_MILLISECONDS && !itr->second.OnHold @@ -119,7 +119,7 @@ class DuelResetScript : public PlayerScript // remove cooldowns on spells that have < 10 min CD and has no onHold player->GetSpellHistory()->ResetCooldowns([](SpellHistory::CooldownStorageType::iterator itr) -> bool { - SpellInfo const* spellInfo = sSpellMgr->EnsureSpellInfo(itr->first); + SpellInfo const* spellInfo = sSpellMgr->AssertSpellInfo(itr->first); return spellInfo->RecoveryTime < 10 * MINUTE * IN_MILLISECONDS && spellInfo->CategoryRecoveryTime < 10 * MINUTE * IN_MILLISECONDS && !itr->second.OnHold; |