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

[8223] Simplify code for AURA_STATE_CONFLAGRATE remove at aura remove.

Browse source
This commit is contained in:
VladimirMangos 2009-07-21 01:22:51 +04:00
parent e612d0778a
commit e16a784ae8
2 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/game/SpellAuras.cpp
View file

@ -1086,6 +1086,7 @@ void Aura::_RemoveAura()
uint32 removeState = 0; uint32 removeState = 0;
uint64 removeFamilyFlag = m_spellProto->SpellFamilyFlags; uint64 removeFamilyFlag = m_spellProto->SpellFamilyFlags;
uint32 removeFamilyFlag2 = m_spellProto->SpellFamilyFlags2;
switch(m_spellProto->SpellFamilyName) switch(m_spellProto->SpellFamilyName)
{ {
case SPELLFAMILY_PALADIN: case SPELLFAMILY_PALADIN:
@ -1097,23 +1098,9 @@ void Aura::_RemoveAura()
if ((m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000004)) || if ((m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000004)) ||
(m_spellProto->SpellFamilyFlags2 & 0x00000002)) (m_spellProto->SpellFamilyFlags2 & 0x00000002))
{ {
// it can have both from same caster or same effect from different casters removeFamilyFlag = UI64LIT(0x0000000000000004);
bool removeAuraState=true; removeFamilyFlag2 = 0x00000002;
Unit::AuraList const& dotList = m_target->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE); removeState = AURA_STATE_CONFLAGRATE;
for(Unit::AuraList::const_iterator i = dotList.begin(); i != dotList.end(); ++i)
{
if ((*i)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_WARLOCK &&
// Immolate
(((*i)->GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000000004)) ||
// Shadowflame
((*i)->GetSpellProto()->SpellFamilyFlags2 & 0x00000002)))
{
removeAuraState=false;
break;
}
}
if(removeAuraState)
removeState = AURA_STATE_CONFLAGRATE;
} }
break; break;
case SPELLFAMILY_DRUID: case SPELLFAMILY_DRUID:
@ -1147,7 +1134,7 @@ void Aura::_RemoveAura()
{ {
SpellEntry const *auraSpellInfo = (*i).second->GetSpellProto(); SpellEntry const *auraSpellInfo = (*i).second->GetSpellProto();
if(auraSpellInfo->SpellFamilyName == m_spellProto->SpellFamilyName && if(auraSpellInfo->SpellFamilyName == m_spellProto->SpellFamilyName &&
auraSpellInfo->SpellFamilyFlags & removeFamilyFlag) (auraSpellInfo->SpellFamilyFlags & removeFamilyFlag || auraSpellInfo->SpellFamilyFlags2 & removeFamilyFlag2))
{ {
found = true; found = true;
break; break;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8222" #define REVISION_NR "8223"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__