Core/Spell: reimplemented TRIGGERED_DISALLOW_PROC_EVENTS trigger flag

2017-12-11 11:20:38 -05:00
parent 0602114c92
commit e26e0783ab
4 changed files with 30 additions and 3 deletions
@@ -1893,6 +1893,11 @@ namespace Game.Entities

        void TriggerAurasProcOnEvent(ProcEventInfo eventInfo, List<Tuple<uint, AuraApplication>> aurasTriggeringProc)
        {
+            Spell triggeringSpell = eventInfo.GetProcSpell();
+            bool disableProcs = triggeringSpell && triggeringSpell.IsProcDisabled();
+            if (disableProcs)
+                SetCantProc(true);
+
            foreach (var aurAppProc in aurasTriggeringProc)
            {
                AuraApplication aurApp = aurAppProc.Item2;
@@ -1910,6 +1915,9 @@ namespace Game.Entities
                if (spellInfo.HasAttribute(SpellAttr3.DisableProc))
                    SetCantProc(false);
            }
+
+            if (disableProcs)
+                SetCantProc(false);
        }

        void SetCantProc(bool apply)