From 7630b3c6273541f057a168e4abf724903f63f79d Mon Sep 17 00:00:00 2001 From: Gacko Date: Sun, 30 Mar 2014 15:05:04 +0200 Subject: SmartAI: Use same method for removing auras in EnterEvadeMode as in CreatureAI Also fixes warnings about duplicate auras. Self-casted auras were not removed on entering evade mode in SAI as they are in CreatureAI. --- src/server/game/AI/SmartScripts/SmartAI.cpp | 16 +--------------- src/server/game/AI/SmartScripts/SmartAI.h | 2 -- 2 files changed, 1 insertion(+), 17 deletions(-) (limited to 'src') diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index a203aeb6b97..23dea877776 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -412,26 +412,12 @@ void SmartAI::MovementInform(uint32 MovementType, uint32 Data) MovepointReached(Data); } -void SmartAI::RemoveAuras() -{ - /// @fixme: duplicated logic in CreatureAI::_EnterEvadeMode (could use RemoveAllAurasExceptType) - Unit::AuraApplicationMap& appliedAuras = me->GetAppliedAuras(); - for (Unit::AuraApplicationMap::iterator iter = appliedAuras.begin(); iter != appliedAuras.end();) - { - Aura const* aura = iter->second->GetBase(); - if (!aura->IsPassive() && !aura->HasEffectType(SPELL_AURA_CONTROL_VEHICLE) && !aura->HasEffectType(SPELL_AURA_CLONE_CASTER) && aura->GetCasterGUID() != me->GetGUID()) - me->RemoveAura(iter); - else - ++iter; - } -} - void SmartAI::EnterEvadeMode() { if (!me->IsAlive() || me->IsInEvadeMode()) return; - RemoveAuras(); + me->RemoveAllAurasExceptType(SPELL_AURA_CONTROL_VEHICLE, SPELL_AURA_CLONE_CASTER); me->AddUnitState(UNIT_STATE_EVADE); me->DeleteThreatList(); diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index dcf64b657f8..4d66b976746 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -193,8 +193,6 @@ class SmartAI : public CreatureAI } void StartDespawn() { mDespawnState = 2; } - void RemoveAuras(); - void OnSpellClick(Unit* clicker, bool& result); private: -- cgit v1.2.3