Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-26 11:52:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Update dispel code and fix crash related to it. Thanks to megamage.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-03-23 01:54:50 +01:00
parent b5eed3626d
commit ce71c0e798
7 changed files with 120 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/game/Unit.cpp
View File

@@ -505,37 +505,22 @@ void Unit::RemoveAuraTypeByCaster(AuraType auraType, uint64 casterGUID)
void Unit::RemoveSpellsCausingAuraWithDispel(AuraType auraType, Spell * spell)
{
if (auraType >= TOTAL_AURAS) return;
DispelEntry entry;
DispelSet dispel_list;
AuraList::iterator iter, next;
for (iter = m_modAuras[auraType].begin(); iter != m_modAuras[auraType].end(); iter = next)
{
next = iter;
++next;
if (*iter)
{
if (!(*iter)->GetDispelChance( spell))
continue;
RemoveAurasDueToSpell((*iter)->GetId());
if (!m_modAuras[auraType].empty())
next = m_modAuras[auraType].begin();
else
return;
}
}
std::deque <Aura *> dispel_list;
AuraList const& dispelAuras = GetAurasByType(auraType);
for(AuraList::const_iterator itr = dispelAuras.begin(); itr != dispelAuras.end(); ++itr)
{
if (!(*iter)->GetDispelChance( spell))
continue;
dispel_list.push_back(*iter);
entry.casterGuid = (*iter)->GetCasterGUID();
entry.spellId = (*iter)->GetId();
entry.caster = (*iter)->GetCaster();
dispel_list.insert (entry);
}
for(;!dispel_list.empty();)
for(DispelSet::iterator itr = dispel_list.begin(); itr != dispel_list.end();++itr)
{
RemoveAurasDueToSpell(dispel_list.front()->GetId());
dispel_list.pop_front();
entry = *itr;
if (GetDispelChance(spell, entry.caster, entry.spellId))
RemoveAurasByCasterSpell(entry.spellId, entry.casterGuid);
}
}
@@ -4341,7 +4326,6 @@ void Unit::RemoveNotOwnSingleTargetAuras()
else
++iter;
}
}
void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)