From 2327ff4d6dab16cedb5e82c50f1cdcce8983abde Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 22 Dec 2019 15:46:48 +0100 Subject: Core/Movement: Fix fleeing speed to 66% run speed Fix AssistanceMovementGenerator using 100% MOVE_RUN speed instead of 66% . Please note that the fleeing mechanic still has some open issues that this single commit doesn't fix (cherry picked from commit 862d47394b8c879f42902f03ecd112b65ff631c2) --- src/server/game/Movement/MotionMaster.cpp | 2 +- src/server/game/Movement/MovementGenerators/PointMovementGenerator.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index b6d764862a1..3e788ccfc86 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -990,7 +990,7 @@ void MotionMaster::MoveSeekAssistance(float x, float y, float z) _owner->AttackStop(); _owner->CastStop(); _owner->ToCreature()->SetReactState(REACT_PASSIVE); - Add(new AssistanceMovementGenerator(EVENT_ASSIST_MOVE, x, y, z)); + Add(new AssistanceMovementGenerator(EVENT_ASSIST_MOVE, x, y, z, _owner->GetSpeed(MOVE_RUN) * 0.66f)); } else TC_LOG_ERROR("movement.motionmaster", "MotionMaster::MoveSeekAssistance: '%s', attempted to seek assistance.", _owner->GetGUID().ToString().c_str()); diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h index 4a2f1a2631a..e519892b671 100644 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h @@ -63,7 +63,7 @@ class PointMovementGenerator : public MovementGeneratorMedium { public: - explicit AssistanceMovementGenerator(uint32 id, float x, float y, float z) : PointMovementGenerator(id, x, y, z, true) { } + explicit AssistanceMovementGenerator(uint32 id, float x, float y, float z, float speed = 0.0f) : PointMovementGenerator(id, x, y, z, true, speed) { } void Finalize(Unit*, bool, bool) override; MovementGeneratorType GetMovementGeneratorType() const override; -- cgit v1.2.3