diff options
| -rw-r--r-- | src/game/BattleGround.cpp | 6 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 9 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index 7f5a1182cdc..acb3f25ae31 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -410,7 +410,11 @@ void BattleGround::Update(uint32 diff) Unit::AuraMap & aurMap = plr->GetAuras(); for(Unit::AuraMap::iterator iter = aurMap.begin(); iter != aurMap.end();) { - if (iter->second->GetAuraDuration()<=30*IN_MILISECONDS) + if (!iter->second->IsPermanent() + && iter->second->GetAuraDuration()<=30*IN_MILISECONDS + && iter->second->IsPositive() + && (!(iter->second->GetSpellProto()->Attributes & SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY)) + && (!iter->second->IsAuraType(SPELL_AURA_MOD_INVISIBILITY))) { plr->RemoveAura(iter); } diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 19b451a9040..12008b94ddb 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -423,15 +423,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) break; } - case SPELLFAMILY_MAGE: - { - // Arcane Blast - if(m_spellInfo->SpellFamilyFlags[0] & 0x20000000) - { - m_caster->CastSpell(m_caster,36032,true); - } - break; - } case SPELLFAMILY_WARRIOR: { // Bloodthirst |