*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

@@ -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();
 

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;
 }