fix: fixed some null bug.

ArchiDog1998 · Apr 4, 2023 · 7d2fe93 · 7d2fe93
1 parent f36cc11
commit 7d2fe93
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/RotationSolver.Basic/Helpers/TargetFilter.cs b/RotationSolver.Basic/Helpers/TargetFilter.cs
@@ -21,7 +21,8 @@ internal static BattleChara DefaultChooseFriend(IEnumerable<BattleChara> availab
         var tankTars = availableCharas.GetJobCategory(JobRole.Tank);
 
         var tankTar = tankTars.OrderBy(ObjectHelper.GetHealingRatio).FirstOrDefault();
-        if (tankTar.GetHealingRatio() < Service.Config.HealthTankRatio) return tankTar;
+        if (tankTar != null &&　tankTar.GetHealingRatio() < Service.Config.HealthTankRatio)
+            return tankTar;
 
         var tar = availableCharas.OrderBy(ObjectHelper.GetHealingRatio).FirstOrDefault();
         if (tar.GetHealingRatio() < 1) return tar;

diff --git a/RotationSolver/Updaters/PreviewUpdater.cs b/RotationSolver/Updaters/PreviewUpdater.cs
@@ -129,9 +129,11 @@ internal static unsafe void PulseActionBar(uint actionID)
 
     private unsafe static bool IsActionSlotRight(ActionBarSlot slot, HotBarSlot* hot, uint actionID)
     {
-        if ((IntPtr)hot == IntPtr.Zero) return false;
-        if (hot->IconTypeA != HotbarSlotType.CraftAction && hot->IconTypeA != HotbarSlotType.Action) return false;
-        if (hot->IconTypeB != HotbarSlotType.CraftAction && hot->IconTypeB != HotbarSlotType.Action) return false;
+        if ((IntPtr)hot != IntPtr.Zero)
+        {
+            if (hot->IconTypeA != HotbarSlotType.CraftAction && hot->IconTypeA != HotbarSlotType.Action) return false;
+            if (hot->IconTypeB != HotbarSlotType.CraftAction && hot->IconTypeB != HotbarSlotType.Action) return false;
+        }
 
         return Service.GetAdjustedActionId((uint)slot.ActionId) == actionID;
     }