aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorccrs <ccrs@users.noreply.github.com>2020-05-03 17:03:12 +0200
committerShauren <shauren.trinity@gmail.com>2022-01-02 00:30:33 +0100
commit06334ab734f25a31853a78936d534a11e2b56c0f (patch)
tree2d76b0555fbc392ae189775cbe28f4148a465473
parente6c0022a4d814a536800b7834a35db7d4d484f57 (diff)
Core/Movement: de832b6 followup
lets keep that failsafe there, doesnt hurt (cherry picked from commit 71ed2e5d5e4b46700a7e02bbdf53e44bfd7b4d14)
-rw-r--r--src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp
index 448e1c3dc50..ee789dc97d1 100644
--- a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp
@@ -104,6 +104,14 @@ bool FollowMovementGenerator::Update(Unit* owner, uint32 diff)
}
}
+ if (owner->HasUnitState(UNIT_STATE_FOLLOW_MOVE) && owner->movespline->Finalized())
+ {
+ RemoveFlag(MOVEMENTGENERATOR_FLAG_INFORM_ENABLED);
+ _path = nullptr;
+ owner->ClearUnitState(UNIT_STATE_FOLLOW_MOVE);
+ DoMovementInform(owner, target);
+ }
+
if (!_lastTargetPosition || _lastTargetPosition->GetExactDistSq(target->GetPosition()) > 0.0f)
{
_lastTargetPosition = target->GetPosition();