From 1066fe59c93efdcd8b20f8e6d062d7e5cc141548 Mon Sep 17 00:00:00 2001 From: ariel- Date: Sat, 3 Dec 2016 19:42:23 -0300 Subject: [PATCH] Core/Auras: calculate periodic bonuses before specific mods, fixes Imp. Devouring Plague damage --- src/server/game/Entities/Unit/Unit.cpp | 2 +- src/server/game/Spells/Auras/SpellAuras.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 4c13df6786e..014039cf003 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -3268,8 +3268,8 @@ void Unit::_ApplyAura(AuraApplication * aurApp, uint8 effMask) if (aurApp->GetRemoveMode()) return; - aura->HandleAuraSpecificMods(aurApp, caster, true, false); aura->HandleAuraSpecificPeriodics(aurApp, caster); + aura->HandleAuraSpecificMods(aurApp, caster, true, false); // apply effects of the aura for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 8f93719e204..4f7e332e961 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -883,11 +883,13 @@ void Aura::SetStackAmount(uint8 stackAmount) m_effects[i]->ChangeAmount(m_effects[i]->CalculateAmount(caster), false, true); for (std::list::const_iterator apptItr = applications.begin(); apptItr != applications.end(); ++apptItr) + { if (!(*apptItr)->GetRemoveMode()) { - HandleAuraSpecificMods(*apptItr, caster, true, true); HandleAuraSpecificPeriodics(*apptItr, caster); + HandleAuraSpecificMods(*apptItr, caster, true, true); } + } SetNeedClientUpdateForTargets(); }