From 56be2b47ce2b7d45723e23aa379edf763d90df87 Mon Sep 17 00:00:00 2001 From: ariel- Date: Wed, 12 Oct 2016 09:58:05 -0300 Subject: Core/Spell: do not automatically set proc Family Name if no Family Flags present Closes #18075 (cherry picked from commit 8167d6d4a0a38f2499aa8b84b9976bc1d5b5ccd2) --- src/server/game/Spells/SpellMgr.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3