If we cant find anything to unlock then break out of the while so we …

…do not have an infinite loop (freeze)
Instruktor · May 7, 2013 · f32020e · f32020e
1 parent 27fb69f
commit f32020e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Questor.Modules/Combat/Combat.cs b/Questor.Modules/Combat/Combat.cs
@@ -966,9 +966,10 @@ private void TargetCombatants()
                     //
                     // Assume that if we have no non-scrambling high value targets that we will have low value targets we can untarget elsewhere
                     //
+                    break;
                 }
 
-                if (unlockThisHighValueTarget != null && unlockThisHighValueTarget.IsTarget && unlockThisHighValueTarget.UnlockTarget("Combat.TargetCombatants"))
+                if (unlockThisHighValueTarget.IsTarget && unlockThisHighValueTarget.UnlockTarget("Combat.TargetCombatants"))
                 {
                     Logging.Log("Combat", "unlocking high value target [" + unlockThisHighValueTarget.Name + "][ID: " + Cache.Instance.MaskedID(unlockThisHighValueTarget.Id) + "]{" + highValueTargetsTargeted.Count + "} [" + Math.Round(unlockThisHighValueTarget.Distance / 1000, 0) + "k away]", Logging.Teal);
                     //highValueTargets.Remove(unlockThisHighValueTarget);
@@ -995,9 +996,10 @@ private void TargetCombatants()
                     //
                     // Assume that if we have no non-scrambling low value targets that we will have high value targets we can untarget elsewhere
                     //
+                    break;
                 }
 
-                if ((unlockThisLowValueTarget != null) && unlockThisLowValueTarget.IsTarget && unlockThisLowValueTarget.UnlockTarget("Combat.TargetCombatants"))
+                if (unlockThisLowValueTarget.IsTarget && unlockThisLowValueTarget.UnlockTarget("Combat.TargetCombatants"))
                 {
                     Logging.Log("Combat", "unlocking low  value target [" + unlockThisLowValueTarget.Name + "][ID: " + Cache.Instance.MaskedID(unlockThisLowValueTarget.Id) + "]{" + lowValueTargetsTargeted.Count + "} [" + Math.Round(unlockThisLowValueTarget.Distance / 1000, 0) + "k away]", Logging.Teal);
                     //lowValueTargets.Remove(unlockThisLowValueTarget);
@@ -1028,6 +1030,7 @@ private void TargetCombatants()
                     //
                     // Assume that if we have no non-scrambling targets that we will have to kill some of them as we have run out of slots (all slots should have warp scramblers targeted if this is null)
                     //
+                    break;
                 }
 
                 if ((unlockAnyNonWarpScramblingTarget != null) && unlockAnyNonWarpScramblingTarget.IsTarget && unlockAnyNonWarpScramblingTarget.UnlockTarget("Combat.TargetCombatants"))