*Merge.

*One rev skipped:  Fixed exploit with several spells being casted on pet with no de-buff applied. Author: Elron.

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp
index ee6cc05a5d2..51e684c5a6c 100644
--- a/src/game/MotionMaster.cpp
+++ b/src/game/MotionMaster.cpp
@@ -242,7 +242,7 @@ void
 MotionMaster::MoveChase(Unit* target, float dist, float angle)
 {
     // ignore movement request if target not exist
-    if(!target)
+    if(!target || target == i_owner)
         return;
 
     i_owner->clearUnitState(UNIT_STAT_FOLLOW);
@@ -268,7 +268,7 @@ void
 MotionMaster::MoveFollow(Unit* target, float dist, float angle, MovementSlot slot)
 {
     // ignore movement request if target not exist
-    if(!target)
+    if(!target || target == i_owner)
         return;
 
     i_owner->addUnitState(UNIT_STAT_FOLLOW);