Core/Auras: Fixed incorrect cherry-pick merge conflict resolution - fixes procs never triggering

Port From (https://github.com/TrinityCore/TrinityCore/commit/1669b58374ee02365114523836128b341b6f8863)
2020-02-22 19:10:40 -05:00
parent dc738bb434
commit b7897eec42
2 changed files with 2 additions and 2 deletions
@@ -1713,7 +1713,7 @@ namespace Game.Spells
                return 0;

            // At least one effect has to pass checks to proc aura
-            uint procEffectMask = 0;
+            uint procEffectMask = aurApp.GetEffectMask();
            for (byte i = 0; i < SpellConst.MaxEffects; ++i)
                if ((procEffectMask & (1u << i)) != 0)
                    if ((procEntry.DisableEffectsMask & (1u << i)) != 0 || !GetEffect(i).CheckEffectProc(aurApp, eventInfo))