From: Liza Carvelli <liza@carvel.li>
Date: Wed, 22 Jan 2025 17:38:24 +0000 (+0100)
Subject: Fix target switching logic in combat
X-Git-Tag: v4.16~16
X-Git-Url: https://git.jacobcasper.com/?a=commitdiff_plain;h=5e45af38d19b4e1b0d059382bb07a92e91d6c24a;p=Questionable.git

Fix target switching logic in combat
---

diff --git a/Questionable/Controller/CombatController.cs b/Questionable/Controller/CombatController.cs
index 73fe17df..ea10fa7c 100644
--- a/Questionable/Controller/CombatController.cs
+++ b/Questionable/Controller/CombatController.cs
@@ -157,7 +157,7 @@ internal sealed class CombatController : IDisposable
         {
             int currentTargetPriority = GetKillPriority(target);
             var nextTarget = FindNextTarget();
-            int nextTargetPriority = GetKillPriority(target);
+            int nextTargetPriority = nextTarget != null ? GetKillPriority(nextTarget) : 0;
 
             if (nextTarget != null && nextTarget.Equals(target))
             {
@@ -176,7 +176,7 @@ internal sealed class CombatController : IDisposable
             }
             else if (nextTarget != null)
             {
-                if (nextTargetPriority > currentTargetPriority)
+                if (nextTargetPriority > currentTargetPriority || currentTargetPriority == 0)
                     SetTarget(nextTarget);
             }
             else