fix: fix with fateManager..GOD!

ArchiDog1998 · Jan 25, 2023 · 6ba62e4 · 6ba62e4
1 parent a74bfea
commit 6ba62e4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/RotationSolver/Updaters/TargetUpdater_Hostile.cs b/RotationSolver/Updaters/TargetUpdater_Hostile.cs
@@ -1,4 +1,5 @@
 using Dalamud.Game.ClientState.Objects.Types;
+using Dalamud.Logging;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.Fate;
 using FFXIVClientStructs.FFXIV.Client.UI;
@@ -36,11 +37,26 @@ internal static partial class TargetUpdater
 
     internal static bool IsHostileCastingToTank { get; private set; } = false;
 
-
+    internal static unsafe bool Infate
+    {
+        get
+        {
+            try
+            {
+                return Service.Configuration.ChangeTargetForFate && (IntPtr)FateManager.Instance() != IntPtr.Zero && FateManager.Instance()->FateJoined > 0
+            && Service.ClientState.LocalPlayer.Level <= FateManager.Instance()->CurrentFate->MaxLevel;
+            }
+            catch(Exception ex)
+            {
+                PluginLog.Error(ex.StackTrace);
+                return false;
+            }
+        }
+    }
 
     internal unsafe static void UpdateHostileTargets()
     {
-        var inFate = Service.Configuration.ChangeTargetForFate && (IntPtr)FateManager.Instance() != IntPtr.Zero && FateManager.Instance()->FateJoined > 0;
+        var inFate = Infate;
 
         AllTargets = TargetFilter.GetTargetable(TargetFilter.GetObjectInRadius(Service.ObjectTable, 30).Where(obj =>
         {

diff --git a/RotationSolver/Windows/RotationConfigWindow_Debug.cs b/RotationSolver/Windows/RotationConfigWindow_Debug.cs
@@ -24,7 +24,7 @@ private unsafe void DrawDebugTab()
         ImGui.Text("Friends: " + TargetUpdater.PartyMembers.Count().ToString());
         if ((IntPtr)FateManager.Instance() != IntPtr.Zero)
         {
-            ImGui.Text("Fate: " + FateManager.Instance()->FateJoined.ToString());
+            ImGui.Text("Fate: " + TargetUpdater.Infate.ToString());
         }
 
         if (ImGui.CollapsingHeader("Status"))