Permalink
Browse files

[3147] Scripted creatures which are on transport shouldn't move to ho…

…me position
  • Loading branch information...
1 parent 05ddea0 commit 4ec687c47f5a6ad4f2ca3a82fb0133ee662bc813 @xfurry xfurry committed Aug 10, 2015
Showing with 3 additions and 2 deletions.
  1. +2 −1 include/sc_creature.cpp
  2. +1 −1 sd2_revision_nr.h
@@ -130,7 +130,8 @@ void ScriptedAI::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);
View
@@ -1,4 +1,4 @@
#ifndef __SD2_REVISION_NR_H__
#define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "3146"
+ #define SD2_REVISION_NR "3147"
#endif // __SD2_REVISION_NR_H__

0 comments on commit 4ec687c

Please sign in to comment.