diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-02-18 16:59:25 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-02-18 16:59:25 +0100 |
| commit | 1669b58374ee02365114523836128b341b6f8863 (patch) | |
| tree | 4b2d79eca99f1d29c7af8b9aa6daf92e8297846c | |
| parent | a693d30f7959e70749083f5d2401f2654456ac4a (diff) | |
Core/Auras: Fixed incorrect cherry-pick merge conflict resolution - fixes procs never triggering
Closes #24172
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuras.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |