Fix combat sometimes being stuck if using 'KIllEnemyDataIds'
authorLiza Carvelli <liza@carvel.li>
Wed, 14 Aug 2024 07:46:49 +0000 (09:46 +0200)
committerLiza Carvelli <liza@carvel.li>
Wed, 14 Aug 2024 07:46:49 +0000 (09:46 +0200)
Questionable/Controller/CombatController.cs

index 0da45098a4b9a295a9215d6a516a4290fc5e32d1..aa55ed27dbd68f57c580cd6c697f4f7be5e34c3a 100644 (file)
@@ -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