fix: fixed the relationship between AllTargetsCanAttack and `NoHost…

…ileNames`.
ArchiDog1998 · Oct 25, 2023 · 0d03263 · 0d03263
1 parent 387565b
commit 0d03263
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1,4 +1,4 @@
 {
-  "ClickingCount": 17599,
+  "ClickingCount": 19142,
   "SaidUsers": []
 }
diff --git a/RotationSolver/Updaters/TargetUpdater.cs b/RotationSolver/Updaters/TargetUpdater.cs
@@ -163,15 +163,8 @@ private unsafe static void UpdateHostileTargets(IEnumerable<BattleChara> allTarg
     private static IEnumerable<BattleChara> GetHostileTargets(IEnumerable<BattleChara> allAttackableTargets)
     {
         var type = DataCenter.RightNowTargetToHostileType;
-        if (type == TargetHostileType.AllTargetsCanAttack || Service.CountDownTime > 0)
-        {
-            return allAttackableTargets;
-        }
-
-        uint[] ids = GetEnemies();
 
         var fateId = DataCenter.FateId;
-
         allAttackableTargets = allAttackableTargets.Where(b =>
         {
             if (Svc.ClientState == null) return false;
@@ -189,7 +182,12 @@ private static IEnumerable<BattleChara> GetHostileTargets(IEnumerable<BattleChar
             return tarFateId == 0 || tarFateId == fateId;
         });
 
+        if (type == TargetHostileType.AllTargetsCanAttack || Service.CountDownTime > 0)
+        {
+            return allAttackableTargets;
+        }
 
+        uint[] ids = GetEnemies();
         var hostiles = allAttackableTargets.Where(t =>
         {
             if (ids.Contains(t.ObjectId)) return true;