aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-02-05 09:36:07 +0100
committerShauren <shauren.trinity@gmail.com>2015-02-05 09:36:07 +0100
commit0ac3a21d3331e5a65873e0c76dad7e64213d0536 (patch)
tree39771a178737000ecc897b1e1ea6bea740ab8aba
parent1d894f1b9d3bce2b8f900c294f16ce6666de2901 (diff)
Core/Spells: Added missed iterator check to Player::GetCastSpellInfo
Closes #14030
-rw-r--r--src/server/game/Entities/Player/Player.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 46e455765d3..67b1985c2dd 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -27160,9 +27160,10 @@ Difficulty Player::CheckLoadedLegacyRaidDifficultyID(Difficulty difficulty)
SpellInfo const* Player::GetCastSpellInfo(SpellInfo const* spellInfo) const
{
auto overrides = m_overrideSpells.find(spellInfo->Id);
- for (uint32 spellId : overrides->second)
- if (SpellInfo const* newInfo = sSpellMgr->GetSpellInfo(spellId))
- return Unit::GetCastSpellInfo(newInfo);
+ if (overrides != m_overrideSpells.end())
+ for (uint32 spellId : overrides->second)
+ if (SpellInfo const* newInfo = sSpellMgr->GetSpellInfo(spellId))
+ return Unit::GetCastSpellInfo(newInfo);
return Unit::GetCastSpellInfo(spellInfo);
}