From 7c6757d7ee652c8e688caa5c6856d116c1f034c1 Mon Sep 17 00:00:00 2001 From: QAston Date: Sun, 17 May 2009 18:00:33 +0200 Subject: *Update proc system. --HG-- branch : trunk --- src/game/SpellMgr.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/game/SpellMgr.cpp') diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 8ff309a9581..4d5a9775d98 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1222,6 +1222,8 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr if((procFlags & EventProcFlag) == 0) return false; + bool hasFamilyMask = false; + /* Check Periodic Auras * Both hots and dots can trigger if spell has no PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL @@ -1288,10 +1290,17 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr if ((spellProcEvent->spellFamilyMask & procSpell->SpellFamilyFlags ) == 0) return false; active = true; // Spell added manualy -> so its active spell + hasFamilyMask = true; } } } + if (procExtra & PROC_EX_INTERNAL_REQ_FAMILY) + { + if (!hasFamilyMask) + return false; + } + // Check for extra req (if none) and hit/crit if (procEvent_procEx == PROC_EX_NONE) { -- cgit v1.2.3