get rid of throw

Jaksuhn · Jan 24, 2024 · 2124aed · 2124aed
1 parent a72459a
commit 2124aed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -81,9 +81,8 @@ public static unsafe bool IsAlliance(this GameObject obj)
         }
         catch (Exception ex)
         {
-            // Log or print the exception details for debugging
             Svc.Log.Error($"Exception in {nameof(IsAlliance)}: {ex}");
-            throw; // Rethrow the exception to maintain the original exception flow
+            return false;
         }
     }
 

diff --git a/RotationSolver.Basic/Helpers/StatusHelper.cs b/RotationSolver.Basic/Helpers/StatusHelper.cs
@@ -176,11 +176,12 @@ private static IEnumerable<Status> GetAllStatus(this BattleChara obj, bool isFro
         try
         {
             if (obj == null) return Array.Empty<Status>();
-            if (obj.StatusList == null) return Array.Empty<Status>();
+            if (obj.StatusList == null || obj.StatusList.Length == 0) return Array.Empty<Status>();
 
-            return obj.StatusList.Where(status => !isFromSelf
+            return obj?.StatusList?.Where(status => !isFromSelf
                                                   || status.SourceId == Player.Object.ObjectId
-                                                  || status.SourceObject?.OwnerId == Player.Object.ObjectId);
+                                                  || status.SourceObject?.OwnerId == Player.Object.ObjectId)
+                ?? Array.Empty<Status>();
         }
         catch (Exception ex)
         {