Merge pull request #452 from FFXIV-CombatReborn/redtext

Update ECommons submodule and improve null checks
FFXIV-CombatReborn · Nov 28, 2024 · ff7c6d4 · ff7c6d4
2 parents 2940b80 + 1484a1d
commit ff7c6d4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/ECommons b/ECommons
diff --git a/RotationSolver.Basic/Actions/ActionTargetInfo.cs b/RotationSolver.Basic/Actions/ActionTargetInfo.cs
@@ -951,7 +951,7 @@ private readonly bool CanGetTarget(IGameObject target, IGameObject subTarget)
             if (Service.Config.FilterStopMark)
             {
                 var filteredCharacters = MarkingHelper.FilterStopCharacters(IGameObjects);
-                if (filteredCharacters?.Any() ?? false)
+                if (filteredCharacters != null && filteredCharacters.Any())
                 {
                     IGameObjects = filteredCharacters;
                 }

diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -320,6 +320,7 @@ internal static bool IsTopPriorityHostile(this IGameObject obj)
 
         if (obj is IBattleChara b)
         {
+            // Ensure StatusList is not null before calling Any
             if (b.StatusList != null && b.StatusList.Any(StatusHelper.IsPriority)) return true;
         }
+3 −0		ECommons/GameFunctions/CharacterFunctions.cs
+4 −0		ECommons/GenericHelpers.cs
+1 −1		ECommons/Hooks/DirectorUpdate.cs
+1 −1		ECommons/MathHelpers/MathHelper.cs
+50 −0		ECommons/PartyFunctions/UniversalParty.cs
+2 −0		ECommons/PartyFunctions/UniversalPartyMember.cs
-Original file line number
+Diff line change
@@ Expand Up @@
             if (obj is IBattleChara b)
             {
+                // Ensure StatusList is not null before calling Any
                 if (b.StatusList != null && b.StatusList.Any(StatusHelper.IsPriority)) return true;
             }
@@ Expand Down @@