fix: changing targetself NoNewHostiles Settings.

ArchiDog1998 · Jan 26, 2023 · 2d2e6fd · 2d2e6fd
1 parent 58c2997
commit 2d2e6fd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/RotationSolver/Actions/BaseAction/BaseAction_Target.cs b/RotationSolver/Actions/BaseAction/BaseAction_Target.cs
@@ -6,6 +6,7 @@
 using RotationSolver.Updaters;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.Metrics;
 using System.Linq;
 using System.Numerics;
 
@@ -329,7 +330,10 @@ private bool TargetSelf(bool mustUse, int aoeCount)
             {
                 if (!Service.Configuration.UseAOEWhenManual && !mustUse) return false;
             }
-            return GetMostObjects(TargetFilterFuncEot(TargetUpdater.HostileTargets, mustUse), aoeCount).Any();
+
+            var tars = TargetFilter.GetObjectInRadius(TargetFilterFuncEot(TargetUpdater.HostileTargets, mustUse), aoeCount);
+            if (tars.Count() < aoeCount) return false;
+            if (Service.Configuration.NoNewHostiles && tars.Any(t => t.TargetObject == null)) return false;
         }
         return true;
     }