From: Liza Carvelli <liza@carvel.li>
Date: Wed, 14 Aug 2024 07:46:49 +0000 (+0200)
Subject: Fix combat sometimes being stuck if using 'KIllEnemyDataIds'
X-Git-Tag: v2.7~2
X-Git-Url: https://git.jacobcasper.com/?a=commitdiff_plain;h=503b4ef77cf6d956c1d18c341a4b4614f0d942c6;p=Questionable.git

Fix combat sometimes being stuck if using 'KIllEnemyDataIds'
---

diff --git a/Questionable/Controller/CombatController.cs b/Questionable/Controller/CombatController.cs
index 0da45098..aa55ed27 100644
--- a/Questionable/Controller/CombatController.cs
+++ b/Questionable/Controller/CombatController.cs
@@ -260,6 +260,13 @@ internal sealed class CombatController : IDisposable
                         Vector3.Distance(_clientState.LocalPlayer?.Position ?? Vector3.Zero, battleNpc.Position) > 50)
                         return 25;
                 }
+                else
+                {
+                    // as part of KillEnemyDataIds, not ComplexCombatData
+                    // TODO maybe remove KillEnemyDataIds, rename ComplexCombatData to CombatData
+                    if (gameObjectStruct->NamePlateIconId != 0)
+                        return 29;
+                }
             }
 
             // stuff trying to kill us