Autorot fixes

PunishXIV · Dec 1, 2024 · bb70dc5 · bb70dc5
1 parent b2771f0
commit bb70dc5
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/WrathCombo/AutoRotation/AutoRotationController.cs b/WrathCombo/AutoRotation/AutoRotationController.cs
@@ -102,7 +102,6 @@ internal static void Run()
                 if (action.IsHeal)
                 {
                     if (!AutomateHealing(preset.Key, attributes, gameAct) && Svc.Targets.Target != null && !Svc.Targets.Target.IsHostile() && Environment.TickCount64 > LastHealAt + 1000)
-                        Svc.Targets.Target = null;
 
                     if ((healTarget != null && !action.IsAoE) || (aoeheal && action.IsAoE))
                         return;
@@ -117,6 +116,7 @@ internal static void Run()
                     continue;
                 }
 
+                if (!action.IsHeal)
                 AutomateDPS(preset.Key, attributes, gameAct);
             }
 
@@ -351,7 +351,6 @@ public static class AutoRotationHelper
                         HealerRotationMode.Lowest_Current => HealerTargeting.GetLowestCurrent(),
                         _ => HealerTargeting.ManualTarget(),
                     };
-
                     return target;
                 }
 
@@ -550,7 +549,7 @@ public static class HealerTargeting
                 if (Svc.Targets.Target == null) return null;
                 var t = Svc.Targets.Target;
                 bool goodToHeal = CustomComboFunctions.GetTargetHPPercent(t) <= (TargetHasRegen(t) ? Service.Configuration.RotationConfig.HealerSettings.SingleTargetRegenHPP : Service.Configuration.RotationConfig.HealerSettings.SingleTargetHPP);
-                if (goodToHeal)
+                if (goodToHeal && !t.IsHostile())
                 {
                     return t;
                 }