Add safety check when removing a spell

cmangos · Nov 2, 2016 · 718dad4 · 718dad4
1 parent 16a97ba
commit 718dad4
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
@@ -3394,6 +3394,11 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank, bo
     for (SpellLearnSpellMap::const_iterator child_itr = spell_bounds.first; child_itr != spell_bounds.second; ++child_itr)
         removeSpell(child_itr->second.spell, !IsPassiveSpell(child_itr->second.spell), learn_low_rank);
 
+    // search again just in case
+    itr = m_spells.find(spell_id);
+    if (itr == m_spells.end())
+        return;
+
     PlayerSpell& playerSpell = itr->second;
     if (playerSpell.state == PLAYERSPELL_REMOVED || (disabled && playerSpell.disabled))
         return;