mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 10:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10030] Add aura remove modes for expire and absorb shield break cases and use GetTarget()/GetSpellProto() instead of m_target/m_spellProto

Browse source
This commit is contained in:
Laise 2010-06-05 09:11:27 +03:00
parent fc3e046348
commit f94175f90f
4 changed files with 1145 additions and 1053 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/game/Unit.cpp
View file

@ -2132,7 +2132,7 @@ void Unit::CalculateAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolMask, D
{
if ((*i)->GetModifier()->m_amount<=0)
{
RemoveAurasDueToSpell((*i)->GetId());
RemoveAurasDueToSpell((*i)->GetId(), NULL, AURA_REMOVE_BY_SHIELD_BREAK);
i = vSchoolAbsorb.begin();
}
else
@ -3312,7 +3312,7 @@ void Unit::_UpdateSpells( uint32 time )
if ((*i).second)
{
if ( !(*i).second->GetAuraDuration() && !((*i).second->IsPermanent() || ((*i).second->IsPassive())) )
RemoveAura(i);
RemoveAura(i, AURA_REMOVE_BY_EXPIRE);
else
++i;
}
@ -4139,14 +4139,14 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
return true;
}
void Unit::RemoveAura(uint32 spellId, SpellEffectIndex effindex, Aura* except)
void Unit::RemoveAura(uint32 spellId, SpellEffectIndex effindex, Aura* except, AuraRemoveMode mode)
{
spellEffectPair spair = spellEffectPair(spellId, effindex);
for(AuraMap::iterator iter = m_Auras.lower_bound(spair); iter != m_Auras.upper_bound(spair);)
{
if(iter->second!=except)
{
RemoveAura(iter);
RemoveAura(iter, mode);
iter = m_Auras.lower_bound(spair);
}
else
@ -4373,10 +4373,10 @@ void Unit::RemoveSingleAuraByCasterSpell(uint32 spellId, SpellEffectIndex effind
}
void Unit::RemoveAurasDueToSpell(uint32 spellId, Aura* except)
void Unit::RemoveAurasDueToSpell(uint32 spellId, Aura* except, AuraRemoveMode mode)
{
for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
RemoveAura(spellId,SpellEffectIndex(i),except);
RemoveAura(spellId,SpellEffectIndex(i),except, mode);
}
void Unit::RemoveAurasDueToItemSpell(Item* castItem,uint32 spellId)