Merge pull request #439 from FFXIV-CombatReborn/even-more-redtext

Handle null values in DataCenter's DispelTarget property more carefully
FFXIV-CombatReborn · Oct 25, 2024 · 7e0ffab · 7e0ffab
2 parents fee5ea2 + f587866
commit 7e0ffab
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -463,10 +463,10 @@ public static IBattleChara? DispelTarget
     {
         get
         {
-            var weakenPeople = DataCenter.PartyMembers
-                .Where(o => o is IBattleChara b && b.StatusList != null && b.StatusList.Any(StatusHelper.CanDispel));
-            var weakenNPC = DataCenter.FriendlyNPCMembers
-                .Where(o => o is IBattleChara b && b.StatusList != null && b.StatusList.Any(StatusHelper.CanDispel));
+            var weakenPeople = DataCenter.PartyMembers?
+                .Where(o => o is IBattleChara b && b.StatusList != null && b.StatusList.Any(StatusHelper.CanDispel)) ?? Enumerable.Empty<IBattleChara>();
+            var weakenNPC = DataCenter.FriendlyNPCMembers?
+                .Where(o => o is IBattleChara b && b.StatusList != null && b.StatusList.Any(StatusHelper.CanDispel)) ?? Enumerable.Empty<IBattleChara>();
             var dyingPeople = weakenPeople
                 .Where(o => o is IBattleChara b && b.StatusList != null && b.StatusList.Any(StatusHelper.IsDangerous));