*Fix the bug that escorted creatures return to their spawnpoint after engaging combat.

--HG--
branch : trunk

1 files changed, 4 insertions, 3 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index e55b54996f0..eede4b4bed2 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10536,9 +10536,10 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
 
     if(GetTypeId() != TYPEID_PLAYER)
     {
-        //if(GetMotionMaster()->GetMotionSlotType(MOTION_SLOT_IDLE) != IDLE_MOTION_TYPE)
-        //if (((Creature *)this)->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
-            //((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation());
+        // Set home position at place of engaging combat for escorted creatures
+        if(((Creature*)this)->IsAIEnabled)
+            if (((Creature *)this)->AI()->IsEscorted())
+                ((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation());
         if(enemy)
         {
             if(((Creature*)this)->IsAIEnabled)