diff options
author | ModoX <moardox@gmail.com> | 2024-08-02 22:46:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-02 22:46:29 +0200 |
commit | 51872d50ff250df0bad130ab7843b69ea921a1f1 (patch) | |
tree | 400b15502387320ea22f15a9c6956bdce54226e3 /src/server/game/Movement/MotionMaster.cpp | |
parent | 6159206592569c3138a448d38f6ce41d93a72422 (diff) |
Core/Movement: Made fixed ChaseAngle optional and added possibility to ignore setting walk/run depending on target (#30101)
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
-rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 90313da2a4a..190eec705f0 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -609,7 +609,7 @@ void MotionMaster::MoveRandom(float wanderDistance /*= 0.0f*/, Optional<Millisec scriptResult->SetResult(MovementStopReason::Interrupted); } -void MotionMaster::MoveFollow(Unit* target, float dist, ChaseAngle angle, Optional<Milliseconds> duration /*= {}*/, MovementSlot slot/* = MOTION_SLOT_ACTIVE*/, +void MotionMaster::MoveFollow(Unit* target, float dist, Optional<ChaseAngle> angle /*= {}*/, Optional<Milliseconds> duration /*= {}*/, bool ignoreTargetWalk /*= false*/, MovementSlot slot/* = MOTION_SLOT_ACTIVE*/, Optional<Scripting::v2::ActionResultSetter<MovementStopReason>>&& scriptResult /*= {}*/) { // Ignore movement request if target not exist @@ -621,7 +621,7 @@ void MotionMaster::MoveFollow(Unit* target, float dist, ChaseAngle angle, Option } TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveFollow: '{}', starts following '{}'", _owner->GetGUID(), target->GetGUID()); - Add(new FollowMovementGenerator(target, dist, angle, duration, std::move(scriptResult)), slot); + Add(new FollowMovementGenerator(target, dist, angle, duration, ignoreTargetWalk, std::move(scriptResult)), slot); } void MotionMaster::MoveChase(Unit* target, Optional<ChaseRange> dist, Optional<ChaseAngle> angle) |