From 1669b58374ee02365114523836128b341b6f8863 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 18 Feb 2020 16:59:25 +0100 Subject: [PATCH] Core/Auras: Fixed incorrect cherry-pick merge conflict resolution - fixes procs never triggering Closes #24172 --- src/server/game/Spells/Auras/SpellAuras.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index efa548061e3..074da315ad3 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1729,7 +1729,7 @@ uint32 Aura::GetProcEffectMask(AuraApplication* aurApp, ProcEventInfo& eventInfo return 0; // At least one effect has to pass checks to proc aura - uint32 procEffectMask = 0; + uint32 procEffectMask = aurApp->GetEffectMask(); for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) if (procEffectMask & (1u << i)) if ((procEntry->DisableEffectsMask & (1u << i)) || !GetEffect(i)->CheckEffectProc(aurApp, eventInfo))