Core/Spell: apply SPELLFAMILY_GENERIC mods to all spells by default

2017-12-11 11:05:01 -05:00
parent 74950e0d66
commit 3760bfcdbb
3 changed files with 23 additions and 20 deletions
@@ -505,12 +505,9 @@ namespace Game.Entities
            if (eventInfo.GetTypeMask().HasAnyFlag(ProcFlags.PeriodicMask | ProcFlags.SpellMask))
            {
                SpellInfo eventSpellInfo = eventInfo.GetSpellInfo();
-
-                if (procEntry.SpellFamilyName != 0 && eventSpellInfo != null && (procEntry.SpellFamilyName != eventSpellInfo.SpellFamilyName))
-                    return false;
-
-                if (eventSpellInfo != null && !(procEntry.SpellFamilyMask & eventSpellInfo.SpellFamilyFlags))
-                    return false;
+                if (eventSpellInfo != null)
+                    if (!eventSpellInfo.IsAffected(procEntry.SpellFamilyName, procEntry.SpellFamilyMask))
+                        return false;
            }

            // check spell type mask (if set)