Merge pull request #501 from FFXIV-CombatReborn/woopsEsuna

Fix to esuna bug
FFXIV-CombatReborn · Dec 31, 2024 · c2d3e29 · c2d3e29
2 parents 3eba4a4 + c439beb
commit c2d3e29
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -2721,6 +2721,18 @@ private static unsafe void DrawStatus()
             ImGui.Text("Friendly NPC Members: None");
         }
 
+        // Display dispel target
+        var dispelTarget = DataCenter.DispelTarget;
+        if (dispelTarget != null)
+        {
+            ImGui.Text("Dispel Target:");
+            ImGui.Text($"- {dispelTarget.Name}");
+        }
+        else
+        {
+            ImGui.Text("Dispel Target: None");
+        }
+
         ImGui.Text($"TerritoryType: {DataCenter.TerritoryContentType}");
         ImGui.Text($"DPSTaken: {DataCenter.DPSTaken}");
         ImGui.Text($"IsHostileCastingToTank: {DataCenter.IsHostileCastingToTank}");

diff --git a/RotationSolver/Updaters/TargetUpdater.cs b/RotationSolver/Updaters/TargetUpdater.cs
@@ -219,8 +219,8 @@ private static List<IBattleChara> GetAllHostileTargets()
     private static IBattleChara? GetDispelTarget()
     {
         var rotation = DataCenter.RightNowRotation;
-        if ((Player.Job == Job.WHM || Player.Job == Job.SCH || Player.Job == Job.AST || Player.Job == Job.SGE ||
-            Player.Job == Job.BRD) && Service.Config.DispelAll)
+        if (Player.Job == Job.WHM || Player.Job == Job.SCH || Player.Job == Job.AST || Player.Job == Job.SGE ||
+            Player.Job == Job.BRD)
         {
             var weakenPeople = DataCenter.PartyMembers?
                 .Where(o => o is IBattleChara b && b.StatusList != null &&
@@ -236,8 +236,10 @@ private static List<IBattleChara> GetAllHostileTargets()
                                       ?? weakenPeople.OrderBy(ObjectHelper.DistanceToPlayer).FirstOrDefault()
                                       ?? weakenNPC.OrderBy(ObjectHelper.DistanceToPlayer).FirstOrDefault();
         }
-
-        return null;
+        else
+        {
+            return null;
+        }
     }
 
     private static void UpdateTimeToKill()