aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortreeston <treeston.mmoc@gmail.com>2017-07-06 20:43:20 +0200
committertreeston <treeston.mmoc@gmail.com>2017-07-06 20:43:30 +0200
commit88543c0eaad932950ebf72a1c43e6b583318b38a (patch)
treead2b134a160a4cce1655c8dba27c64e9cf377088 /src
parentac50034df7fa6cf67b95e0920ca8fbbe8001a510 (diff)
Formation idle: Remove more shitty code. Fixes #19995 for real this time.
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Creature/CreatureGroups.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
index 0a7e9d51a1e..3984a81cf71 100644
--- a/src/server/game/Entities/Creature/CreatureGroups.cpp
+++ b/src/server/game/Entities/Creature/CreatureGroups.cpp
@@ -232,8 +232,7 @@ void CreatureGroup::LeaderMoveTo(Position const& destination, uint32 id /*= 0*/,
for (CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
{
Creature* member = itr->first;
- uint8 groupAI = sFormationMgr->CreatureGroupMap[member->GetSpawnId()]->groupAI;
- if (member == m_leader || !member->IsAlive() || member->GetVictim() || !(groupAI & FLAG_IDLE_IN_FORMATION))
+ if (member == m_leader || !member->IsAlive() || member->IsEngaged() || !(itr->second->groupAI & FLAG_IDLE_IN_FORMATION))
continue;
if (itr->second->point_1)