From 694bdd43e3ba01303af3ac10a474674c94711df3 Mon Sep 17 00:00:00 2001 From: Laise Date: Mon, 30 Aug 2010 10:07:10 +0300 Subject: [PATCH] [10425] Add comment in Aura::CanProcFrom --- src/game/SpellAuras.cpp | 3 +++ src/game/SpellMgr.cpp | 1 + src/shared/revision_nr.h | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index fc8d80f57..aeb6fb4b8 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -940,6 +940,9 @@ bool Aura::CanProcFrom(SpellEntry const *spell, uint32 EventProcEx, uint32 procE } else { + // SpellFamilyName check is performed in SpellMgr::IsSpellProcEventCanTriggeredBy and it is done once for whole holder + // note: SpellFamilyName is not checked if no spell_proc_event is defined + if (((uint64*)ptr)[0] & spell->SpellFamilyFlags) return true; diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 8e4f87288..8a191b41a 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1525,6 +1525,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const * spellP return false; } } + // Check for extra req (if none) and hit/crit if (procEvent_procEx == PROC_EX_NONE) { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 5e6800ddd..0b21a4ff6 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 "10424" + #define REVISION_NR "10425" #endif // __REVISION_NR_H__