Merge pull request #54 from FFXIV-CombatReborn/Ninja-Rewritef-Furreal

Doton fix final
FFXIV-CombatReborn · Apr 20, 2024 · c531ae9 · c531ae9
2 parents a659834 + 41c0e05
commit c531ae9
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/BasicRotations/Melee/NIN_Beta.cs b/BasicRotations/Melee/NIN_Beta.cs
@@ -152,8 +152,7 @@ private bool ChoiceNinjutsu(out IAction? act)
             //Aoe
             if (KatonPvE.CanUse(out _))
             {
-                if (!Player.HasStatus(true, StatusID.Doton) && !IsMoving
-                    && (!TenChiJinPvE.Cooldown.WillHaveOneCharge(6)) || !TenChiJinPvE.Cooldown.IsCoolingDown)
+                if (!Player.HasStatus(true, StatusID.Doton) && !IsMoving && !IsLastGCD(false, DotonPvE) && (!TenChiJinPvE.Cooldown.WillHaveOneCharge(6)) || !TenChiJinPvE.Cooldown.IsCoolingDown)
                     SetNinjutsu(DotonPvE);
                 else SetNinjutsu(KatonPvE);
                 return false;
@@ -229,7 +228,7 @@ private bool DoNinjutsu(out IAction? act)
             {
                 if (RaitonPvE_18877.CanUse(out act, skipAoeCheck: true)) return true;
             }
-            else if (chiId == DotonPvE_18880.ID && !IsLastAction(false, DotonPvE_18880))
+            else if (chiId == DotonPvE_18880.ID && !IsLastAction(false, DotonPvE_18880) && !Player.HasStatus(true, StatusID.Doton))
             {
                 if (DotonPvE_18880.CanUse(out act, skipAoeCheck: true)) return true;
             }