From 0faa1185ae902d6b7b5e65a1175b3a81d55c8456 Mon Sep 17 00:00:00 2001 From: Laise Date: Sun, 25 Jul 2010 07:30:47 +0300 Subject: [PATCH] [10268] If schoolMask present for proc, ignore SpellFamilyFlags check --- src/game/Unit.cpp | 3 ++- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 247ea0c6c..1d38c35b4 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9521,7 +9521,8 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag (spellProcEvent->spellFamilyMask2[i] & procSpell->SpellFamilyFlags2) == 0) continue; } - else if (!triggeredByAura->CanProcFrom(procSpell, spellProcEvent->procEx, procExtra, damage != 0)) + // don't check FamilyFlags if schoolMask exists + else if (!spellProcEvent->schoolMask && !triggeredByAura->CanProcFrom(procSpell, spellProcEvent->procEx, procExtra, damage != 0)) continue; } else if (!triggeredByAura->CanProcFrom(procSpell, PROC_EX_NONE, procExtra, damage != 0)) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index f9bc0c495..3bcc71dba 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 "10267" + #define REVISION_NR "10268" #endif // __REVISION_NR_H__