Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-09 18:17:04 -06:00
parent cd5088845d 7cc3dfa8d5
commit aeefdeb8db
4 changed files with 62 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/game/SpellAuras.cpp
View File

@@ -915,11 +915,6 @@ void Aura::_AddAura()
void Aura::_RemoveAura()
{
// Remove all triggered by aura spells vs unlimited duration
// except same aura replace case
if(m_removeMode!=AURA_REMOVE_BY_STACK)
CleanupTriggeredSpells();
Unit* caster = GetCaster();
if(caster && IsPersistent())

2
src/game/SpellAuras.h
View File

@@ -295,6 +295,7 @@ class TRINITY_DLL_SPEC Aura
bool IsDeathPersistent() const { return m_isDeathPersist; }
bool IsRemovedOnShapeLost() const { return m_isRemovedOnShapeLost; }
bool IsInUse() const { return m_in_use;}
void CleanupTriggeredSpells();
virtual void Update(uint32 diff);
void ApplyModifier(bool apply, bool Real = false);
@@ -365,7 +366,6 @@ class TRINITY_DLL_SPEC Aura
bool m_in_use:1; // true while in Aura::ApplyModifier call
private:
void CleanupTriggeredSpells();
};
class TRINITY_DLL_SPEC AreaAura : public Aura

3
src/game/SpellMgr.cpp
View File

@@ -1353,6 +1353,9 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool
case SPELL_AURA_PERIODIC_ENERGIZE:
case SPELL_AURA_PERIODIC_MANA_LEECH:
case SPELL_AURA_PERIODIC_LEECH:
case SPELL_AURA_POWER_BURN_MANA:
case SPELL_AURA_OBS_MOD_ENERGY:
case SPELL_AURA_OBS_MOD_HEALTH:
return false;
default:
break;

104
src/game/Unit.cpp
View File

@@ -3779,53 +3779,23 @@ bool Unit::AddAura(Aura *Aur)
SpellEntry const* aurSpellInfo = Aur->GetSpellProto();
spellEffectPair spair = spellEffectPair(Aur->GetId(), Aur->GetEffIndex());
AuraMap::iterator i = m_Auras.find( spair );
// take out same spell
if (i != m_Auras.end())
// passive and persistent auras can stack with themselves any number of times
if (!Aur->IsPassive() && !Aur->IsPersistent())
{
// passive and persistent auras can stack with themselves any number of times
// hack for Incanter's Absorption
if (!Aur->IsPassive() && !Aur->IsPersistent() && aurSpellInfo->Id!=44396)
for(AuraMap::iterator i2 = m_Auras.lower_bound(spair); i2 != m_Auras.upper_bound(spair); ++i2)
{
for(AuraMap::iterator i2 = m_Auras.lower_bound(spair); i2 != m_Auras.upper_bound(spair); ++i2)
if(i2->second->GetCasterGUID()==Aur->GetCasterGUID())
{
if(i2->second->GetCasterGUID()==Aur->GetCasterGUID())
// replace aura if next will > spell StackAmount
if(aurSpellInfo->StackAmount)
{
// Aura can stack on self -> Stack it;
if(aurSpellInfo->StackAmount)
{
i2->second->modStackAmount(1);
delete Aur;
return false;
}
// can be only single (this check done at _each_ aura add
RemoveAura(i2,AURA_REMOVE_BY_STACK);
break;
Aur->SetStackAmount(i2->second->GetStackAmount());
if(Aur->GetStackAmount() < aurSpellInfo->StackAmount)
Aur->SetStackAmount(Aur->GetStackAmount()+1);
}
bool stop = false;
switch(aurSpellInfo->EffectApplyAuraName[Aur->GetEffIndex()])
{
// DoT/HoT/etc
case SPELL_AURA_PERIODIC_DAMAGE: // allow stack
case SPELL_AURA_PERIODIC_DAMAGE_PERCENT:
case SPELL_AURA_PERIODIC_LEECH:
case SPELL_AURA_PERIODIC_HEAL:
case SPELL_AURA_OBS_MOD_HEALTH:
case SPELL_AURA_PERIODIC_MANA_LEECH:
case SPELL_AURA_PERIODIC_ENERGIZE:
case SPELL_AURA_OBS_MOD_ENERGY:
case SPELL_AURA_POWER_BURN_MANA:
break;
default: // not allow
// can be only single (this check done at _each_ aura add
RemoveAura(i2,AURA_REMOVE_BY_STACK);
stop = true;
break;
}
if(stop)
// can be only single (this check done at _each_ aura add
RemoveAura(i2,AURA_REMOVE_BY_STACK);
break;
}
}
@@ -3928,7 +3898,21 @@ void Unit::RemoveRankAurasDueToSpell(uint32 spellId)
{
if(spellmgr.IsRankSpellDueToSpell(spellInfo,i_spellId))
{
RemoveAurasDueToSpell(i_spellId);
// Remove all auras by aura caster
for (uint8 a=0;a<3;++a)
{
spellEffectPair spair = spellEffectPair((*i).second->GetId(), a);
for(AuraMap::iterator iter = m_Auras.lower_bound(spair); iter != m_Auras.upper_bound(spair);)
{
if(iter->second->GetCasterGUID()==(*i).second->GetCasterGUID())
{
RemoveAura(iter, AURA_REMOVE_BY_STACK);
iter = m_Auras.lower_bound(spair);
}
else
++iter;
}
}
if( m_Auras.empty() )
break;
@@ -3988,8 +3972,6 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
uint32 i_effIndex = (*i).second->GetEffIndex();
if(i_spellId == spellId) continue;
bool is_triggered_by_spell = false;
// prevent triggered aura of removing aura that triggered it
for(int j = 0; j < 3; ++j)
@@ -4019,7 +4001,21 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
continue;
}
RemoveAurasDueToSpell(i_spellId);
// Remove all auras by aura caster
for (uint8 a=0;a<3;++a)
{
spellEffectPair spair = spellEffectPair((*i).second->GetId(), a);
for(AuraMap::iterator iter = m_Auras.lower_bound(spair); iter != m_Auras.upper_bound(spair);)
{
if(iter->second->GetCasterGUID()==(*i).second->GetCasterGUID())
{
RemoveAura(iter, AURA_REMOVE_BY_STACK);
iter = m_Auras.lower_bound(spair);
}
else
++iter;
}
}
if( m_Auras.empty() )
break;
@@ -4319,8 +4315,21 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
Aur->ApplyModifier(false,true);
Aur->_RemoveAura();
if(mode != AURA_REMOVE_BY_STACK)
bool stack = false;
spellEffectPair spair = spellEffectPair(Aur->GetId(), Aur->GetEffIndex());
for(AuraMap::const_iterator itr = GetAuras().lower_bound(spair); itr != GetAuras().upper_bound(spair); ++itr)
{
if (itr->second->GetCasterGUID()==GetGUID())
{
stack = true;
}
}
if (!stack)
{
// Remove all triggered by aura spells vs unlimited duration
Aur->CleanupTriggeredSpells();
// Remove Linked Auras
uint32 id = Aur->GetId();
if(spellmgr.GetSpellCustomAttr(id) & SPELL_ATTR_CU_LINK_REMOVE)
{
@@ -4897,7 +4906,10 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
for(AuraMap::const_iterator itr = pVictim->GetAuras().lower_bound(spair); itr != pVictim->GetAuras().upper_bound(spair); ++itr)
{
if (itr->second->GetCasterGUID()==GetGUID())
{
Aur = itr->second;
break;
}
}
if (!Aur)
return false;