[12901] Scripted creatures which are on transport shouldn't move to h…

…ome position
cmangos · Aug 10, 2015 · a53a3f6 · a53a3f6 · Schmoozerd · Aug 11, 2015
1 parent 3aabee3
commit a53a3f6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp
@@ -1087,7 +1087,8 @@ void CreatureEventAI::EnterEvadeMode()
     m_creature->DeleteThreatList();
     m_creature->CombatStop(true);
 
-    if (m_creature->isAlive())
+    // only alive creatures that are not on transport can return to home position
+    if (m_creature->isAlive() && !m_creature->IsBoarded())
         m_creature->GetMotionMaster()->MoveTargetedHome();
 
     m_creature->SetLootRecipient(NULL);

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12900"
+ #define REVISION_NR "12901"
 #endif // __REVISION_NR_H__