Merge pull request #446 from FFXIV-CombatReborn/unnamed-status-fix

Update ECommons submodule and add null checks to prevent bricking due to statuses without names
FFXIV-CombatReborn · Nov 17, 2024 · c530fe4 · c530fe4
2 parents c8bae17 + 484efaf
commit c530fe4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/ECommons b/ECommons
diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -12,6 +12,7 @@
 using RotationSolver.Basic.Configuration.Conditions;
 using RotationSolver.Basic.Rotations.Duties;
 using Svg.FilterEffects;
+using System.Linq;
 using Action = Lumina.Excel.Sheets.Action;
 using CharacterManager = FFXIVClientStructs.FFXIV.Client.Game.Character.CharacterManager;
 
@@ -471,11 +472,11 @@ public static IBattleChara? DispelTarget
         get
         {
             var weakenPeople = DataCenter.PartyMembers?
-                .Where(o => o is IBattleChara b && b.StatusList != null && b.StatusList.Any(StatusHelper.CanDispel)) ?? Enumerable.Empty<IBattleChara>();
+                .Where(o => o is IBattleChara b && b.StatusList != null && b.StatusList.Any(status => status != null && StatusHelper.CanDispel(status))) ?? Enumerable.Empty<IBattleChara>();
             var weakenNPC = DataCenter.FriendlyNPCMembers?
-                .Where(o => o is IBattleChara b && b.StatusList != null && b.StatusList.Any(StatusHelper.CanDispel)) ?? Enumerable.Empty<IBattleChara>();
+                .Where(o => o is IBattleChara b && b.StatusList != null && b.StatusList.Any(status => status != null && StatusHelper.CanDispel(status))) ?? Enumerable.Empty<IBattleChara>();
             var dyingPeople = weakenPeople
-                .Where(o => o is IBattleChara b && b.StatusList != null && b.StatusList.Any(StatusHelper.IsDangerous));
+                .Where(o => o is IBattleChara b && b.StatusList != null && b.StatusList.Any(status => status != null && StatusHelper.IsDangerous(status)));
 
             return dyingPeople.OrderBy(ObjectHelper.DistanceToPlayer).FirstOrDefault()
                    ?? weakenPeople.OrderBy(ObjectHelper.DistanceToPlayer).FirstOrDefault()

diff --git a/RotationSolver.Basic/Helpers/StatusHelper.cs b/RotationSolver.Basic/Helpers/StatusHelper.cs
@@ -364,6 +364,7 @@ public static bool IsInvincible(this Status status)
     /// <returns>True if the status is a priority, otherwise false.</returns>
     public static bool IsPriority(this Status status)
     {
+        if (status == null) return false;
         return OtherConfiguration.PriorityStatus.Any(id => (uint)id == status.StatusId);
     }
 
@@ -374,6 +375,7 @@ public static bool IsPriority(this Status status)
     /// <returns>True if the status needs to be dispelled, otherwise false.</returns>
     public static bool IsDangerous(this Status status)
     {
+        if (status == null) return false;
         if (!status.CanDispel()) return false;
         if (status.StackCount > 2) return true;
         if (status.RemainingTime > 20) return true;
@@ -387,6 +389,7 @@ public static bool IsDangerous(this Status status)
     /// <returns>True if the status can be dispelled, otherwise false.</returns>
     public static bool CanDispel(this Status status)
     {
+        if (status == null) return false;
         return status.GameData.Value.CanDispel && status.RemainingTime > 1 + DataCenter.DefaultGCDRemain;
     }
 }