From 6015dccda14b1eba9609daaafb0f26f74bbc85de Mon Sep 17 00:00:00 2001 From: Vito <241317476+Vito-URP@users.noreply.github.com> Date: Sun, 15 Nov 2026 22:17:32 +0000 Subject: [PATCH] Keep NPC move speed and stop range on SetPos/SetRot Setting the position or rotation of a moving NPC re-runs move() to aim it at its target again, but it passed only the target and move type, so the speed and stop range fell back to the defaults. An NPC told to walk at walking speed (auto type) started jogging after the first NPC_SetRot, and a driver moving at a custom speed jumped to speed 1.0. move() also wrote the speed into a local that shadowed the moveSpeed_ member, so the member was never set. Store it in the member and pass it, with stopRange_, from setPosition, setVehiclePosition, setRotation and setVehicleRotation. --- Server/Components/NPCs/NPC/npc.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Server/Components/NPCs/NPC/npc.cpp b/Server/Components/NPCs/NPC/npc.cpp index 74ef1fb6a..04c34ccd8 100644 --- a/Server/Components/NPCs/NPC/npc.cpp +++ b/Server/Components/NPCs/NPC/npc.cpp @@ -209,7 +209,7 @@ void NPC::setPosition(const Vector3& pos, bool immediateUpdate) if (moving_) { - move(targetPosition_, moveType_); + move(targetPosition_, moveType_, moveSpeed_, stopRange_); } } @@ -232,7 +232,7 @@ void NPC::setVehiclePosition(const Vector3& position, bool immediateUpdate) if (moving_) { - move(targetPosition_, moveType_); + move(targetPosition_, moveType_, moveSpeed_, stopRange_); } } } @@ -253,7 +253,7 @@ void NPC::setRotation(const GTAQuat& rot, bool immediateUpdate) if (moving_) { - move(targetPosition_, moveType_); + move(targetPosition_, moveType_, moveSpeed_, stopRange_); } } @@ -276,7 +276,7 @@ void NPC::setVehicleRotation(const GTAQuat& rotation, bool immediateUpdate) if (moving_) { - move(targetPosition_, moveType_); + move(targetPosition_, moveType_, moveSpeed_, stopRange_); } } } @@ -446,7 +446,7 @@ bool NPC::move(Vector3 pos, NPCMoveType moveType, float moveSpeed, float stopRan removeKey(Key::WALK); // Determine which speed to use based on moving type - float moveSpeed_ = moveSpeed; + moveSpeed_ = moveSpeed; moveType_ = moveType; if (moveType_ == NPCMoveType_Drive)