Make summoned creatures go back to summoner on evade if summoner is alive. This should take care of most (all?) errors about controlled creatures trying to target home.

--HG--
branch : trunk

1 files changed, 9 insertions, 1 deletions

diff --git a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp
index 289b6b925c5..657a1f41b5b 100644
--- a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp
+++ b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp
@@ -1038,7 +1038,15 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI
         m_creature->CombatStop();
         m_creature->LoadCreaturesAddon();
         if( m_creature->isAlive() )
-            m_creature->GetMotionMaster()->MoveTargetedHome();
+        {
+            if (Unit* owner = m_creature->GetOwner())
+            {
+                if (owner->isAlive())
+                    m_creature->GetMotionMaster()->MoveFollow(owner,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE);
+            } 
+            else
+                m_creature->GetMotionMaster()->MoveTargetedHome();
+        }
 
         m_creature->SetLootRecipient(NULL);