josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix a crash with sudden death and similar auras.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-06-08 21:22:46 +02:00
parent 07e868c87c
commit 0ae0f36f87
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.cpp
+13 -9
View File
@@ -17126,24 +17126,28 @@ void Player::RemoveSpellMods(Spell * spell)
std::set <Aura *> checkedSpells; std::set <Aura *> checkedSpells;
AuraEffectList const & auraList = GetAurasByType(SPELL_AURA_ABILITY_IGNORE_AURASTATE); AuraEffectList const & auraList = GetAurasByType(SPELL_AURA_ABILITY_IGNORE_AURASTATE);
for(AuraEffectList::const_iterator itr = auraList.begin(); itr != auraList.end(); ++itr) for(AuraEffectList::const_iterator itr = auraList.begin(); itr != auraList.end();)
{ {
if (!(*itr)->GetParentAura()->GetAuraCharges()) AuraEffect * aur = *itr;
++itr;
if (!aur->GetParentAura()->GetAuraCharges())
continue; continue;
SpellEntry const * spellInfo = (*itr)->GetSpellProto();
SpellEntry const * spellInfo = aur->GetSpellProto();
if (spellInfo->SpellFamilyName != spell->m_spellInfo->SpellFamilyName || if (spellInfo->SpellFamilyName != spell->m_spellInfo->SpellFamilyName ||
checkedSpells.find((*itr)->GetParentAura()) != checkedSpells.end()) checkedSpells.find(aur->GetParentAura()) != checkedSpells.end())
continue; continue;
flag96 const * mask = spellmgr.GetSpellAffect((*itr)->GetId(), (*itr)->GetEffIndex());
flag96 const * mask = spellmgr.GetSpellAffect(aur->GetId(), aur->GetEffIndex());
if (!mask) if (!mask)
mask = &spellInfo->EffectSpellClassMask[(*itr)->GetEffIndex()]; mask = &spellInfo->EffectSpellClassMask[aur->GetEffIndex()];
if (spell->m_spellInfo->SpellFamilyFlags & *mask) if (spell->m_spellInfo->SpellFamilyFlags & *mask)
{ {
checkedSpells.insert((*itr)->GetParentAura()); checkedSpells.insert(aur->GetParentAura());
spell->m_appliedMods.erase((*itr)->GetParentAura()); spell->m_appliedMods.erase(aur->GetParentAura());
if ((*itr)->GetParentAura()->DropAuraCharge()) if (aur->GetParentAura()->DropAuraCharge())
itr = auraList.begin(); itr = auraList.begin();
} }
} }