From 5e45af38d19b4e1b0d059382bb07a92e91d6c24a Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Wed, 22 Jan 2025 18:38:24 +0100
Subject: [PATCH] Fix target switching logic in combat

---
 Questionable/Controller/CombatController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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