diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2016-11-04 14:21:28 -0300 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-12-10 18:16:47 +0100 |
| commit | 02b4dc5512d8f6f31e69e7ac836de8b0d02e04cd (patch) | |
| tree | 13fb212dbca201a33da2127e3dc7b4ce7db5409a /src/server/game/Spells/SpellMgr.cpp | |
| parent | e2ad91ddbc0a2ee23319995f15e2c2474560638f (diff) | |
Core/Spell: apply SPELLFAMILY_GENERIC mods to all spells by default
Closes #18160
(cherry picked from commit 4f1ef6985e1a83f3a10673d20648f452e93a3004)
# Conflicts:
# src/server/game/Spells/Auras/SpellAuraEffects.cpp
# src/server/game/Spells/SpellMgr.cpp
Diffstat (limited to 'src/server/game/Spells/SpellMgr.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index e49ac050c50..f4f32059e35 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -480,13 +480,9 @@ bool SpellMgr::CanSpellTriggerProcOnEvent(SpellProcEntry const& procEntry, ProcE // check spell family name/flags (if set) for spells if (eventInfo.GetTypeMask() & (PERIODIC_PROC_FLAG_MASK | SPELL_PROC_FLAG_MASK)) { - SpellInfo const* eventSpellInfo = eventInfo.GetSpellInfo(); - - if (procEntry.SpellFamilyName && eventSpellInfo && (procEntry.SpellFamilyName != eventSpellInfo->SpellFamilyName)) - return false; - - if (procEntry.SpellFamilyMask && eventSpellInfo && !(procEntry.SpellFamilyMask & eventSpellInfo->SpellFamilyFlags)) - return false; + if (SpellInfo const* eventSpellInfo = eventInfo.GetSpellInfo()) + if (!eventSpellInfo->IsAffected(procEntry.SpellFamilyName, procEntry.SpellFamilyMask)) + return false; } // check spell type mask (if set) |