From 586a450ec96ac982d134471ac51f960ab52bbadb Mon Sep 17 00:00:00 2001 From: ariel- Date: Wed, 15 Mar 2017 13:44:24 -0300 Subject: Core/Auras: use vectors and remove HasEffect check - Already checked in GetApplicationList (cherrypicked from 5eac21098efa35f3c6807a57bc44cc887c0cbc6a) --- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index dac41685c72..53452b767d6 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -771,12 +771,11 @@ void AuraEffect::ChangeAmount(int32 newAmount, bool mark, bool onStackOrReapply) if (!handleMask) return; - std::list effectApplications; + std::vector effectApplications; GetApplicationList(effectApplications); - for (std::list::const_iterator apptItr = effectApplications.begin(); apptItr != effectApplications.end(); ++apptItr) - if ((*apptItr)->HasEffect(GetEffIndex())) - HandleEffect(*apptItr, handleMask, false); + for (AuraApplication* aurApp : effectApplications) + HandleEffect(aurApp, handleMask, false); if (handleMask & AURA_EFFECT_HANDLE_CHANGE_AMOUNT) { @@ -787,9 +786,8 @@ void AuraEffect::ChangeAmount(int32 newAmount, bool mark, bool onStackOrReapply) CalculateSpellMod(); } - for (std::list::const_iterator apptItr = effectApplications.begin(); apptItr != effectApplications.end(); ++apptItr) - if ((*apptItr)->HasEffect(GetEffIndex())) - HandleEffect(*apptItr, handleMask, true); + for (AuraApplication* aurApp : effectApplications) + HandleEffect(aurApp, handleMask, true); if (GetSpellInfo()->HasAttribute(SPELL_ATTR8_AURA_SEND_AMOUNT)) GetBase()->SetNeedClientUpdateForTargets(); @@ -931,12 +929,12 @@ void AuraEffect::Update(uint32 diff, Unit* caster) m_periodicTimer += m_period - diff; UpdatePeriodic(caster); - std::list effectApplications; + std::vector effectApplications; GetApplicationList(effectApplications); + // tick on targets of effects - for (std::list::const_iterator apptItr = effectApplications.begin(); apptItr != effectApplications.end(); ++apptItr) - if ((*apptItr)->HasEffect(GetEffIndex())) - PeriodicTick(*apptItr, caster); + for (AuraApplication* aurApp : effectApplications) + PeriodicTick(aurApp, caster); } } } -- cgit v1.2.3