fix for crash on login when on jobs that check statuses

Jaksuhn · Feb 22, 2024 · 8d485ba · 8d485ba
1 parent 392d639
commit 8d485ba
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/RotationSolver.Basic/Helpers/StatusHelper.cs b/RotationSolver.Basic/Helpers/StatusHelper.cs
@@ -173,21 +173,8 @@ private static IEnumerable<Status> GetStatus(this BattleChara obj, bool isFromSe
 
     private static IEnumerable<Status> GetAllStatus(this BattleChara obj, bool isFromSelf)
     {
-        try
-        {
-            if (obj == null) return Array.Empty<Status>();
-            if (obj.StatusList == null || obj.StatusList.Length == 0) return Array.Empty<Status>();
-
-            return obj?.StatusList?.Where(status => !isFromSelf
-                                                  || status.SourceId == Player.Object.ObjectId
-                                                  || status.SourceObject?.OwnerId == Player.Object.ObjectId)
-                ?? Array.Empty<Status>();
-        }
-        catch (Exception ex)
-        {
-            Svc.Log.Error($"Failed to {nameof(GetAllStatus)}", ex);
-            return Array.Empty<Status>();
-        }
+        if (obj is not BattleChara b) return [];
+        return b.StatusList.Where(status => !isFromSelf || status.SourceId == Player.Object.ObjectId || status.SourceObject?.OwnerId == Player.Object.ObjectId);
     }
 
     /// <summary>

diff --git a/RotationSolver.Basic/RotationSolver.Basic.csproj b/RotationSolver.Basic/RotationSolver.Basic.csproj
@@ -19,6 +19,7 @@
 		<EnableWindowsTargeting>true</EnableWindowsTargeting>
 		<UseWindowsForms>true</UseWindowsForms>
 		<Platforms>x64</Platforms>
+		<LangVersion>preview</LangVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

diff --git a/RotationSolver/RotationSolver.csproj b/RotationSolver/RotationSolver.csproj
@@ -9,6 +9,7 @@
 		<EnableWindowsTargeting>true</EnableWindowsTargeting>
 		<UseWindowsForms>true</UseWindowsForms>
 		<Platforms>x64</Platforms>
+		<LangVersion>preview</LangVersion>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 	  <DebugType>full</DebugType>

diff --git a/XIVPainter b/XIVPainter