From 2120bc0d3055576db84a731463dd6b82b21008a0 Mon Sep 17 00:00:00 2001 From: QAston Date: Mon, 13 Jul 2009 18:05:53 +0200 Subject: [PATCH] *Fix a bug that creatures with owner chase their enemies after death. *fix a typo breaking procflags on aura remove - shattered barrier and master of subtlety work again --HG-- branch : trunk --- src/game/CreatureAI.cpp | 2 +- src/game/SpellMgr.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp index 9f06ca38b5..654c6450b0 100644 --- a/src/game/CreatureAI.cpp +++ b/src/game/CreatureAI.cpp @@ -195,7 +195,7 @@ void CreatureAI::EnterEvadeMode() return; if(Unit *owner = me->GetCharmerOrOwner()) - me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE, MOTION_SLOT_IDLE); + me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE, MOTION_SLOT_ACTIVE); else me->GetMotionMaster()->MoveTargetedHome(); diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 7c71198d3c..9e0b69d077 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1393,13 +1393,13 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr // Exist req for PROC_EX_EX_TRIGGER_ALWAYS if (procEvent_procEx & PROC_EX_EX_TRIGGER_ALWAYS) return true; - // Check Extra Requirement like (hit/crit/miss/resist/parry/dodge/block/immune/reflect/absorb and other) - if (procEvent_procEx & procExtra) - return true; // PROC_EX_NOT_ACTIVE_SPELL and PROC_EX_ONLY_ACTIVE_SPELL flags handle: if passed checks before if ((procExtra & (PROC_EX_NORMAL_HIT|PROC_EX_CRITICAL_HIT)) && ((procEvent_procEx & (AURA_SPELL_PROC_EX_MASK | AURA_REMOVE_PROC_EX_MASK)) == 0)) return true; } + // Check Extra Requirement like (hit/crit/miss/resist/parry/dodge/block/immune/reflect/absorb and other) + if (procEvent_procEx & procExtra) + return true; } return false; }