Merge pull request #166 from FFXIV-CombatReborn/remove-target-updater

Fixed null reference bug with "AverageTimeToKill"
FFXIV-CombatReborn · Jun 3, 2024 · a1beedc · a1beedc
2 parents ba9bcaf + fe10501
commit a1beedc
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 33 deletions.
diff --git a/RotationSolver.Basic/Actions/BaseAction.cs b/RotationSolver.Basic/Actions/BaseAction.cs
@@ -148,7 +148,7 @@ public bool CanUse(out IAction act, bool skipStatusProvideCheck = false, bool sk
             && IActionHelper.IsLastAction(IActionHelper.MovingActions)) return false; //No range actions after moving.
 
         if (DataCenter.AverageTimeToKill < Config.TimeToKill) return false;
-        if (DataCenter.TimeToUntargetable < Config.TimeToUntargetable) return false;
+        if (DataCenter.AverageTimeToKill < Config.TimeToUntargetable) return false;
 
         PreviewTarget = TargetInfo.FindTarget(skipAoeCheck, skipStatusProvideCheck);
         if (PreviewTarget == null) return false;

diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -376,7 +376,23 @@ public static BattleChara? DispelTarget
     public static BattleChara[] AllTargets => Svc.Objects.OfType<BattleChara>().GetObjectInRadius(30)
         .Where(o => !o.IsDummy() || !Service.Config.DisableTargetDummys).ToArray();
 
-    public static uint[] TreasureCharas { get; internal set; } = [];
+    public static uint[] TreasureCharas
+    {
+        get
+        {
+            List<uint> charas = new(5);
+            //60687 - 60691 For treasure hunt.
+            for (int i = 60687; i <= 60691; i++)
+            {
+                var b = AllTargets.FirstOrDefault(obj => obj.GetNamePlateIcon() == i);
+                if (b == null || b.CurrentHp == 0) continue;
+                charas.Add(b.ObjectId);
+            }
+
+            return charas.ToArray();
+        }
+    }
+
     public static bool HasHostilesInRange => NumberOfHostilesInRange > 0;
     public static bool HasHostilesInMaxRange => NumberOfHostilesInMaxRange > 0;
     public static int NumberOfHostilesInRange => AllHostileTargets.Count(o => o.DistanceToPlayer() <= JobRange);
@@ -410,15 +426,14 @@ public static float AverageTimeToKill
     {
         get
         {
-            return DataCenter.AllHostileTargets.Select(b => b.GetTimeToKill()).Where(v => !float.IsNaN(v)).Average();
+            var validTimes = AllHostileTargets.Select(b => b.GetTimeToKill()).Where(v => !float.IsNaN(v)).ToList();
+            return validTimes.Any() ? validTimes.Average() : 0; 
         }
     }
 
-    public static float TimeToUntargetable { get; private set; }
+    public static bool IsHostileCastingAOE => IsCastingAreaVfx() || AllHostileTargets.Any(IsHostileCastingArea);
 
-    public static bool IsHostileCastingAOE => IsCastingAreaVfx() || DataCenter.AllHostileTargets.Any(IsHostileCastingArea);
-
-    public static bool IsHostileCastingToTank => IsCastingTankVfx() || DataCenter.AllHostileTargets.Any(IsHostileCastingTank);
+    public static bool IsHostileCastingToTank => IsCastingTankVfx() || AllHostileTargets.Any(IsHostileCastingTank);
 
     public static bool HasPet
     {
@@ -465,9 +480,9 @@ private static float GetPartyMemberHPRatio(BattleChara member)
     }
 
     public static IEnumerable<float> PartyMembersHP => RefinedHP.Values.Where(r => r > 0);
-    public static float PartyMembersMinHP => PartyMembersHP.Any() ? DataCenter.PartyMembersHP.Min() : 0;
+    public static float PartyMembersMinHP => PartyMembersHP.Any() ? PartyMembersHP.Min() : 0;
     public static float PartyMembersAverHP => PartyMembersHP.Average();
-    public static float PartyMembersDifferHP => (float)Math.Sqrt(DataCenter.PartyMembersHP.Average(d => Math.Pow(d - DataCenter.PartyMembersAverHP, 2)));
+    public static float PartyMembersDifferHP => (float)Math.Sqrt(PartyMembersHP.Average(d => Math.Pow(d - PartyMembersAverHP, 2)));
 
     public static bool HPNotFull => PartyMembersMinHP < 1;
 
@@ -516,8 +531,6 @@ public static float DPSTaken
 
     public static ActionID LastAbility { get; private set; } = 0;
 
-    public const float DefaultAnimationLock = 0.6f;
-
     internal static unsafe void AddActionRec(Action act)
     {
         if (!Player.Available) return;

diff --git a/RotationSolver/Updaters/SocialUpdater.cs b/RotationSolver/Updaters/SocialUpdater.cs
@@ -69,8 +69,6 @@ internal static void Enable()
 
     static async void DutyState_DutyCompleted(object? sender, ushort e)
     {
-        if (DataCenter.PartyMembers.Length < 2) return;
-
         await Task.Delay(new Random().Next(4000, 6000));
 
         Service.Config.DutyEnd.AddMacro();

diff --git a/RotationSolver/Updaters/TargetUpdater.cs b/RotationSolver/Updaters/TargetUpdater.cs
@@ -14,16 +14,14 @@ internal static partial class TargetUpdater
     static readonly ObjectListDelay<BattleChara> 
         _raisePartyTargets = new(() => Service.Config.RaiseDelay),
         _raiseAllTargets = new(() => Service.Config.RaiseDelay);
-    internal unsafe static void UpdateTarget()
+    internal static void UpdateTarget()
     {
-        UpdateTimeToKill(DataCenter.AllHostileTargets);
-
-        UpdateNamePlate(DataCenter.AllTargets);
+        UpdateTimeToKill();
     }
 
     private static DateTime _lastUpdateTimeToKill = DateTime.MinValue;
     private static readonly TimeSpan _timeToKillSpan = TimeSpan.FromSeconds(0.5);
-    private static void UpdateTimeToKill(IEnumerable<BattleChara> allTargets)
+    private static void UpdateTimeToKill()
     {
         var now = DateTime.Now;
         if (now - _lastUpdateTimeToKill < _timeToKillSpan) return;
@@ -34,20 +32,7 @@ private static void UpdateTimeToKill(IEnumerable<BattleChara> allTargets)
             DataCenter.RecordedHP.Dequeue();
         }
 
-        DataCenter.RecordedHP.Enqueue((now, new SortedList<uint, float>(allTargets.Where(b => b != null && b.CurrentHp != 0).ToDictionary(b => b.ObjectId, b => b.GetHealthRatio()))));
-    }
-
-
-    private static void UpdateNamePlate(IEnumerable<BattleChara> allTargets)
-    {
-        List<uint> charas = new(5);
-        //60687 - 60691 For treasure hunt.
-        for (int i = 60687; i <= 60691; i++)
-        {
-            var b = allTargets.FirstOrDefault(obj => obj.GetNamePlateIcon() == i);
-            if (b == null || b.CurrentHp == 0) continue;
-            charas.Add(b.ObjectId);
-        }
-        DataCenter.TreasureCharas = [.. charas];
+        DataCenter.RecordedHP.Enqueue((now, new SortedList<uint, float>(DataCenter.AllTargets.Where(b => b != null && b.CurrentHp != 0).ToDictionary(b => b.ObjectId, b => b.GetHealthRatio()))));
     }
+
 }