*Merge some fixes from tc1

--HG--
branch : trunk

1 files changed, 1 insertions, 9 deletions

diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp
index b31d3231a3b..52b9ba56e3e 100644
--- a/src/game/MotionMaster.cpp
+++ b/src/game/MotionMaster.cpp
@@ -203,14 +203,7 @@ MotionMaster::MoveTargetedHome()
 
     Clear(false);
 
-    if(Unit *target = i_owner->GetCharmerOrOwner())
-    {
-        DEBUG_LOG("Pet or controlled unit (Entry: %u GUID: %u) targeting home",
-            i_owner->GetEntry(), i_owner->GetGUIDLow() );
-
-        MoveFollow(target, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE, MOTION_SLOT_IDLE);
-    }
-    else if(i_owner->GetTypeId() == TYPEID_UNIT)
+    if(i_owner->GetTypeId() == TYPEID_UNIT)
     {
         DEBUG_LOG("Creature (Entry: %u GUID: %u) targeted home", i_owner->GetEntry(), i_owner->GetGUIDLow());
         Mutate(new HomeMovementGenerator<Creature>(), MOTION_SLOT_ACTIVE);
@@ -218,7 +211,6 @@ MotionMaster::MoveTargetedHome()
     else
     {
         sLog.outError("Player (GUID: %u) attempt targeted home", i_owner->GetGUIDLow() );
-        return;
     }
 }