fix: fix the MemberHP calculation bug when the count of hps is zero.

ArchiDog1998 · Feb 2, 2023 · 9dd502a · 9dd502a
1 parent 4bf54e3
commit 9dd502a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/RotationSolver/Configuration/PluginConfiguration.cs b/RotationSolver/Configuration/PluginConfiguration.cs
@@ -118,7 +118,7 @@ public class PluginConfiguration : IPluginConfiguration
     public float InterruptDelayMax = 1;
 
     public bool UseWorkTask = true;
-    public int WorkTaskDelay = 20;
+    public int WorkTaskDelay = 10;
     public bool ShowWorkTaskFPS = true;
 
     public bool UseStopCasting = false;

diff --git a/RotationSolver/Helpers/TargetFilter.cs b/RotationSolver/Helpers/TargetFilter.cs
@@ -343,7 +343,10 @@ internal static IEnumerable<T> GetObjectInRadius<T>(this IEnumerable<T> objects,
     internal static float DistanceToPlayer(this GameObject obj)
     {
         if (obj == null) return float.MaxValue;
-        var distance = Vector3.Distance(Service.ClientState.LocalPlayer.Position, obj.Position) - Service.ClientState.LocalPlayer.HitboxRadius;
+        var player = Service.ClientState.LocalPlayer;
+        if (player == null) return float.MaxValue;
+
+        var distance = Vector3.Distance(player.Position, obj.Position) - player.HitboxRadius;
         distance -= Math.Max(obj.HitboxRadius, Service.Configuration.ObjectMinRadius);
         return distance;
     }

diff --git a/RotationSolver/Rotations/Healer/AST/AST_Default.cs b/RotationSolver/Rotations/Healer/AST/AST_Default.cs
@@ -1,5 +1,6 @@
 using Dalamud.Game.ClientState.JobGauge.Enums;
 using RotationSolver.Actions;
+using RotationSolver.Configuration.RotationConfig;
 using RotationSolver.Data;
 using RotationSolver.Helpers;
 using RotationSolver.Rotations.Basic;

diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs
@@ -1,4 +1,5 @@
 using Dalamud.Game;
+using Dalamud.Logging;
 using RotationSolver.Commands;
 using System;
 using System.Threading.Tasks;

diff --git a/RotationSolver/Updaters/TargetUpdater_Friends.cs b/RotationSolver/Updaters/TargetUpdater_Friends.cs
@@ -131,8 +131,15 @@ private unsafe static void UpdateFriends(IEnumerable<BattleChara> allTargets)
         #endregion
 
         PartyMembersHP = PartyMembers.Select(ObjectHelper.GetHealthRatio).Where(r => r > 0);
-        PartyMembersAverHP = PartyMembersHP.Average();
-        PartyMembersDifferHP = (float)Math.Sqrt(PartyMembersHP.Average(d => Math.Pow(d - PartyMembersAverHP, 2)));
+        if (PartyMembersHP.Any())
+        {
+            PartyMembersAverHP = PartyMembersHP.Average();
+            PartyMembersDifferHP = (float)Math.Sqrt(PartyMembersHP.Average(d => Math.Pow(d - PartyMembersAverHP, 2)));
+        }
+        else
+        {
+            PartyMembersAverHP = PartyMembersDifferHP = 0;
+        }
 
         UpdateCanHeal(Service.ClientState.LocalPlayer);
     }