diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2016-10-12 09:58:05 -0300 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-09-06 12:57:15 +0200 |
| commit | 56be2b47ce2b7d45723e23aa379edf763d90df87 (patch) | |
| tree | 55b5188d1df18bece56ee97f45b532cc87e05821 | |
| parent | df6e7b30973218e7306adbcf7010d3c93c59a1dc (diff) | |
Core/Spell: do not automatically set proc Family Name if no Family Flags present
Closes #18075
(cherry picked from commit 8167d6d4a0a38f2499aa8b84b9976bc1d5b5ccd2)
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 83b7d2fc72d..f1bf941759e 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1895,12 +1895,15 @@ void SpellMgr::LoadSpellProcs() SpellProcEntry procEntry; procEntry.SchoolMask = 0; - procEntry.SpellFamilyName = spellInfo->SpellFamilyName; procEntry.ProcFlags = spellInfo->ProcFlags; + procEntry.SpellFamilyName = 0; for (SpellEffectInfo const* effect : spellInfo->GetEffectsForDifficulty(DIFFICULTY_NONE)) if (effect && effect->IsEffect() && isTriggerAura[effect->ApplyAuraName]) procEntry.SpellFamilyMask |= effect->SpellClassMask; + if (procEntry.SpellFamilyMask) + procEntry.SpellFamilyName = spellInfo->SpellFamilyName; + procEntry.SpellTypeMask = PROC_SPELL_TYPE_MASK_ALL; procEntry.SpellPhaseMask = PROC_SPELL_PHASE_HIT; procEntry.HitMask = PROC_HIT_NONE; // uses default proc @see SpellMgr::CanSpellTriggerProcOnEvent |