diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 28b636d5f..4ed1b6f67 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -768,6 +768,7 @@ void AreaAura::Update(uint32 diff) if(actualSpellInfo != GetSpellProto()) actualBasePoints = actualSpellInfo->EffectBasePoints[m_effIndex]; AreaAura *aur = new AreaAura(actualSpellInfo, m_effIndex, &actualBasePoints, (*tIter), caster, NULL); + aur->SetAuraDuration(GetAuraDuration()); (*tIter)->AddAura(aur); } } diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 79c5d6250..8671be397 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -1886,11 +1886,9 @@ void Spell::EffectTriggerSpell(uint32 i) { // remove all harmful spells on you... if( // ignore positive and passive auras - !iter->second->IsPositive() && !iter->second->IsPassive() && + !iter->second->IsPositive() && !iter->second->IsPassive() && // ignore physical auras - (GetSpellSchoolMask(iter->second->GetSpellProto()) & SPELL_SCHOOL_MASK_NORMAL)==0 && - // ignore immunity persistent spells - !( iter->second->GetSpellProto()->AttributesEx & 0x10000 ) ) + (GetSpellSchoolMask(iter->second->GetSpellProto()) & SPELL_SCHOOL_MASK_NORMAL)==0 ) { m_caster->RemoveAurasDueToSpell(iter->second->GetSpellProto()->Id); iter = Auras.begin(); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 3f4a1d1c8..06c2662ce 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7067" + #define REVISION_NR "7068" #endif // __REVISION_NR_H__