Merge pull request #819 from FFXIV-CombatReborn/vprhotfix

Hotfix for Viper Rework

Author: LTS-FFXIV

BasicRotations/Melee/VPR_Default.cs

@@ -392,16 +392,12 @@ protected override bool GeneralGCD(out IAction? act)
                     return true;
             }
 
-            var Htarget = HuntersCoilPvE.Target.Target;
-            if (Htarget != null && CanHitPositional(EnemyPositional.Flank, HuntersCoilPvE.Target.Target) &&
-                HuntersCoilPvE.CanUse(out act, skipComboCheck: true))
+            if (HuntersCoilPvE.CanUse(out act, skipComboCheck: true) && HuntersCoilPvE.Target.Target != null && CanHitPositional(EnemyPositional.Flank, HuntersCoilPvE.Target.Target))
             {
                 return true;
             }
 
-            var Starget = SwiftskinsCoilPvE.Target.Target;
-            if (Starget != null && CanHitPositional(EnemyPositional.Rear, SwiftskinsCoilPvE.Target.Target) &&
-                SwiftskinsCoilPvE.CanUse(out act, skipComboCheck: true))
+            if (SwiftskinsCoilPvE.CanUse(out act, skipComboCheck: true) && SwiftskinsCoilPvE.Target.Target != null && CanHitPositional(EnemyPositional.Rear, SwiftskinsCoilPvE.Target.Target))
             {
                 return true;
             }

RotationSolver.Basic/Helpers/ObjectHelper.cs

@@ -81,8 +81,16 @@ internal static bool HasPositional(this IBattleChara battleChara)
             return false;
         }
 
-        if (battleChara.StatusList == null)
+        try
         {
+            if (battleChara.StatusList == null)
+            {
+                return false;
+            }
+        }
+        catch
+        {
+            // StatusList threw, treat as unavailable
             return false;
         }
 

RotationSolver.Basic/Helpers/StatusHelper.cs

@@ -336,6 +336,19 @@ private static IEnumerable<byte> StatusStacks(this IBattleChara battleChara, boo
     /// <returns></returns>
     public static bool HasStatus(this IBattleChara battleChara, bool isFromSelf, params StatusID[] statusIDs)
     {
+        try
+        {
+            if (battleChara.StatusList == null)
+            {
+                return false;
+            }
+        }
+        catch
+        {
+            // StatusList threw, treat as unavailable
+            return false;
+        }
+
         if (HasApplyStatus(battleChara, statusIDs))
         {
             return true;
@@ -417,9 +430,27 @@ internal static string GetStatusName(StatusID id)
     /// <param name="isFromSelf">Whether the statuses are from self.</param>
     /// <param name="statusIDs">The status IDs to look for.</param>
     /// <returns>An enumerable of statuses.</returns>
-    private static IEnumerable<Status> GetStatus(this IBattleChara battleChara, bool isFromSelf, params StatusID[] statusIDs)
+    private static List<Status> GetStatus(this IBattleChara battleChara, bool isFromSelf, params StatusID[] statusIDs)
     {
-        IEnumerable<Status> allStatuses = battleChara.GetAllStatus(isFromSelf);
+        if (battleChara == null)
+        {
+            return [];
+        }
+
+        try
+        {
+            if (battleChara.StatusList == null)
+            {
+                return [];
+            }
+        }
+        catch
+        {
+            // StatusList threw, treat as unavailable
+            return [];
+        }
+
+        List<Status> allStatuses = battleChara.GetAllStatus(isFromSelf);
         if (allStatuses == null)
         {
             return [];
@@ -458,13 +489,26 @@ private static IEnumerable<Status> GetStatus(this IBattleChara battleChara, bool
     /// <param name="battleChara">The object to get the statuses from.</param>
     /// <param name="isFromSelf">Whether the statuses are from self.</param>
     /// <returns>An enumerable of all statuses.</returns>
-    private static IEnumerable<Status> GetAllStatus(this IBattleChara battleChara, bool isFromSelf)
+    private static List<Status> GetAllStatus(this IBattleChara battleChara, bool isFromSelf)
     {
         if (battleChara == null)
         {
             return [];
         }
 
+        try
+        {
+            if (battleChara.StatusList == null)
+            {
+                return [];
+            }
+        }
+        catch
+        {
+            // StatusList threw, treat as unavailable
+            return [];
+        }
+
         ulong playerId = Player.Object.GameObjectId;
         List<Status> result = [];