From 1e1efcd35ffa8fb7aba53b8ddfe147cabb400279 Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Sat, 27 Jul 2024 23:10:08 +0200
Subject: [PATCH] Fix targeting logic picking the furthest away enemy in some
 cases

---
 Questionable/Controller/CombatController.cs   | 25 ++++++++++++++-----
 Questionable/Controller/MovementController.cs |  1 +
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Questionable/Controller/CombatController.cs b/Questionable/Controller/CombatController.cs
index 923b7c86..f8c38a7d 100644
--- a/Questionable/Controller/CombatController.cs
+++ b/Questionable/Controller/CombatController.cs
@@ -21,6 +21,7 @@ namespace Questionable.Controller;
 internal sealed class CombatController : IDisposable
 {
     private readonly List<ICombatModule> _combatModules;
+    private readonly MovementController _movementController;
     private readonly ITargetManager _targetManager;
     private readonly IObjectTable _objectTable;
     private readonly ICondition _condition;
@@ -30,11 +31,18 @@ internal sealed class CombatController : IDisposable
 
     private CurrentFight? _currentFight;
 
-    public CombatController(IEnumerable<ICombatModule> combatModules, ITargetManager targetManager,
-        IObjectTable objectTable, ICondition condition, IClientState clientState, GameFunctions gameFunctions,
+    public CombatController(
+        IEnumerable<ICombatModule> combatModules,
+        MovementController movementController,
+        ITargetManager targetManager,
+        IObjectTable objectTable,
+        ICondition condition,
+        IClientState clientState,
+        GameFunctions gameFunctions,
         ILogger<CombatController> logger)
     {
         _combatModules = combatModules.ToList();
+        _movementController = movementController;
         _targetManager = targetManager;
         _objectTable = objectTable;
         _condition = condition;
@@ -71,7 +79,7 @@ internal sealed class CombatController : IDisposable
     /// <returns>true if still in combat, false otherwise</returns>
     public bool Update()
     {
-        if (_currentFight == null)
+        if (_currentFight == null || _movementController.IsPathfinding || _movementController.IsPathRunning)
             return false;
 
         var target = _targetManager.Target;
@@ -104,7 +112,7 @@ internal sealed class CombatController : IDisposable
         else
         {
             var nextTarget = FindNextTarget();
-            if (nextTarget != null)
+            if (nextTarget is { IsDead: false })
             {
                 _logger.LogInformation("Setting next target to {TargetName} ({TargetId:X8})",
                     nextTarget.Name.ToString(), nextTarget.GameObjectId);
@@ -163,10 +171,15 @@ internal sealed class CombatController : IDisposable
             }
         }
 
-        return _objectTable.Select(x => (GameObject: x, Priority: GetKillPriority(x)))
+        return _objectTable.Select(x => new
+            {
+                GameObject = x,
+                Priority = GetKillPriority(x),
+                Distance = Vector3.Distance(x.Position, _clientState.LocalPlayer!.Position),
+            })
             .Where(x => x.Priority > 0)
             .OrderByDescending(x => x.Priority)
-            .ThenByDescending(x => Vector3.Distance(x.GameObject.Position, _clientState.LocalPlayer!.Position))
+            .ThenBy(x => x.Distance)
             .Select(x => x.GameObject)
             .FirstOrDefault();
     }
diff --git a/Questionable/Controller/MovementController.cs b/Questionable/Controller/MovementController.cs
index dca221d0..5332c404 100644
--- a/Questionable/Controller/MovementController.cs
+++ b/Questionable/Controller/MovementController.cs
@@ -313,6 +313,7 @@ internal sealed class MovementController : IDisposable
     {
         _navmeshIpc.Stop();
         ResetPathfinding();
+        Destination = null;
 
         if (InputManager.IsAutoRunning())
         {