login ctd potential fix

Jaksuhn · Dec 11, 2023 · c5dc294 · c5dc294
1 parent 166ae81
commit c5dc294
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/RotationSolver.Basic/Helpers/StatusHelper.cs b/RotationSolver.Basic/Helpers/StatusHelper.cs
@@ -1,5 +1,6 @@
 using Dalamud.Game.ClientState.Statuses;
 using ECommons.Automation;
+using ECommons.DalamudServices;
 using ECommons.ExcelServices;
 using ECommons.GameHelpers;
 using RotationSolver.Basic.Configuration;
@@ -172,11 +173,20 @@ private static IEnumerable<Status> GetStatus(this BattleChara obj, bool isFromSe
 
     private static IEnumerable<Status> GetAllStatus(this BattleChara obj, bool isFromSelf)
     {
-        if (obj == null) return Array.Empty<Status>();
+        try
+        {
+            if (obj == null) return Array.Empty<Status>();
+            if (obj.StatusList == null) return Array.Empty<Status>();
 
-        return obj.StatusList.Where(status => !isFromSelf
-                                              || status.SourceId == Player.Object.ObjectId
-                                              || status.SourceObject?.OwnerId == Player.Object.ObjectId);
+            return obj.StatusList.Where(status => !isFromSelf
+                                                  || status.SourceId == Player.Object.ObjectId
+                                                  || status.SourceObject?.OwnerId == Player.Object.ObjectId);
+        }
+        catch (Exception ex)
+        {
+            Svc.Log.Error($"Failed to {nameof(GetAllStatus)}", ex);
+            return Array.Empty<Status>();
+        }
     }
 
     /// <summary>

diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs
@@ -20,10 +20,11 @@ namespace RotationSolver.Updaters;
 
 internal static class MajorUpdater
 {
-    public static bool IsValid => Svc.Condition.Any()
+    public static unsafe bool IsValid => Svc.Condition.Any()
         && !Svc.Condition[ConditionFlag.BetweenAreas]
         && !Svc.Condition[ConditionFlag.BetweenAreas51]
-        && Player.Available;
+        && Player.Available
+        && Player.Interactable;
 
     static bool _showedWarning, _work;
     static Exception _threadException;