diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2020-05-02 22:52:01 +0200 |
|---|---|---|
| committer | ccrs <ccrs@users.noreply.github.com> | 2020-05-02 22:52:01 +0200 |
| commit | b8422e667b242ae4ab2bbdfda43656ed1fe485ae (patch) | |
| tree | 9c11718e8b4269f6d80c8590726c580f4f15f312 /src/server/game/Entities/Creature | |
| parent | 9b5375f858b7a9bac409cc0b17c56391f2787f5b (diff) | |
Core/Movement: 0e2342c followup
Diffstat (limited to 'src/server/game/Entities/Creature')
| -rw-r--r-- | src/server/game/Entities/Creature/CreatureGroups.cpp | 3 |
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 fd7ae9eb9d7..6d70541326a 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -290,8 +290,7 @@ void CreatureGroup::LeaderStartedMoving() float angle = pair.second->FollowAngle + float(M_PI); // for some reason, someone thought it was a great idea to invert relativ angles... float dist = pair.second->FollowDist; - MovementGenerator const* moveGen = member->GetMotionMaster()->GetMovementGenerator([](MovementGenerator const* movement)->bool { return movement->GetMovementGeneratorType() == FORMATION_MOTION_TYPE; }, MOTION_SLOT_DEFAULT); - if (!moveGen) + if (!member->HasUnitState(UNIT_STATE_FOLLOW_FORMATION)) member->GetMotionMaster()->MoveFormation(_leader, dist, angle, pair.second->LeaderWaypointIDs[0], pair.second->LeaderWaypointIDs[1]); } } |
