From e35e47c2f72115e50d924cd16042eb2addc3de1f Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Thu, 26 Aug 2021 02:15:07 +0200 Subject: [PATCH] fix(Core/Movement): properly initialized combat distance for creatures with SAI script (#7437) - Closes #7331 --- src/server/game/AI/SmartScripts/SmartAI.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index abc5ed821..5041676e9 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -800,7 +800,8 @@ void SmartAI::AttackStart(Unit* who) me->GetMotionMaster()->MovementExpired(); me->StopMoving(); } - me->GetMotionMaster()->MoveChase(who, GetScript()->GetCasterActualDist() ? GetScript()->GetCasterActualDist() : GetScript()->GetActualCombatDist()); + float range = GetScript()->GetCasterActualDist() > 0.f ? GetScript()->GetCasterActualDist() : GetScript()->GetActualCombatDist(); + me->GetMotionMaster()->MoveChase(who, range > 0.f ? ChaseRange(range) : std::optional()); } } }