From 29d5f562475f82a2001caa7e7913d5b0eed9dfb2 Mon Sep 17 00:00:00 2001 From: Lynx3d Date: Wed, 8 Dec 2010 02:10:14 +0100 Subject: [PATCH] [10836] Again ignore EffectSpellClassMask when SchoolMask given in spell_proc_event. There's just too much garbage in dbc... Should restore some damage school based talents broken with [10830], hopefully without excessively triggering other spells again that shouldn't. --- src/game/Unit.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 5d2b6377b..d140289b9 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9765,8 +9765,8 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag (spellProcEvent->spellFamilyMask2[i] & procSpell->SpellFamilyFlags2) == 0) continue; } - // don't check dbc FamilyFlags unless spellFamilyName != 0 - else if (!triggeredByAura->CanProcFrom(procSpell, spellProcEvent->procEx, procExtra, damage != 0, spellProcEvent->spellFamilyName != 0)) + // don't check dbc FamilyFlags if schoolMask exists + else if (!triggeredByAura->CanProcFrom(procSpell, spellProcEvent->procEx, procExtra, damage != 0, !spellProcEvent->schoolMask)) continue; } else if (!triggeredByAura->CanProcFrom(procSpell, PROC_EX_NONE, procExtra, damage != 0, true)) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index c5b1dad27..b7be7e78c 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10835" + #define REVISION_NR "10836" #endif // __REVISION_NR_H__