aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-10-12 09:58:05 -0300
committerariel- <ariel-@users.noreply.github.com>2016-10-12 10:01:38 -0300
commit8167d6d4a0a38f2499aa8b84b9976bc1d5b5ccd2 (patch)
tree75e82e418484c7120948376d15936152f47ce501 /src
parent00ad5b2d67908354f742c6110c9829bf54ada410 (diff)
Core/Spell: do not automatically set proc Family Name if no Family Flags present
Closes #18075
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Spells/SpellMgr.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 0c362f8aa53..2cdfb7dec58 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -1942,12 +1942,15 @@ void SpellMgr::LoadSpellProcs()
SpellProcEntry procEntry;
procEntry.SchoolMask = 0;
- procEntry.SpellFamilyName = spellInfo->SpellFamilyName;
procEntry.ProcFlags = spellInfo->ProcFlags;
+ procEntry.SpellFamilyName = 0;
for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i)
if (spellInfo->Effects[i].IsEffect() && isTriggerAura[spellInfo->Effects[i].ApplyAuraName])
procEntry.SpellFamilyMask |= spellInfo->Effects[i].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