Skip to content

Commit e08b478

Browse files
authored
Merge pull request #835 from FFXIV-CombatReborn/berzerkerhotfix
Hotfix for Berserker
2 parents a967460 + 632cc46 commit e08b478

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

BasicRotations/Duty/PhantomDefault.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -254,18 +254,6 @@ public override bool AttackAbility(IAction nextGCD, out IAction? act)
254254
}
255255
#endregion Utility/Non-scaling abilities that don't care about burst
256256

257-
if (DeadlyBlowPvE.CanUse(out act, skipComboCheck: true)) // Ideally we want to use this in burst windows, but 30 second cooldown means we can use it outside of burst windows too
258-
{
259-
if (BerserkerLevel == 2)
260-
{
261-
return true;
262-
}
263-
if (BerserkerLevel >= 3 && (!RagePvE.IsEnabled || Player.WillStatusEndGCD(1, 0, true, StatusID.PentupRage) || (RagePvE.Cooldown.IsCoolingDown && !Player.HasStatus(true, StatusID.PentupRage))))
264-
{
265-
return true;
266-
}
267-
}
268-
269257
#region Burst abilities
270258
if (ShouldHoldBurst())
271259
{
@@ -589,6 +577,18 @@ public override bool GeneralGCD(out IAction? act)
589577
return true;
590578
}
591579

580+
if (DeadlyBlowPvE.CanUse(out act, skipComboCheck: true)) // Ideally we want to use this in burst windows, but 30 second cooldown means we can use it outside of burst windows too
581+
{
582+
if (BerserkerLevel == 2)
583+
{
584+
return true;
585+
}
586+
if (BerserkerLevel >= 3 && (!RagePvE.IsEnabled || Player.WillStatusEndGCD(1, 0, true, StatusID.PentupRage) || (RagePvE.Cooldown.IsCoolingDown && !Player.HasStatus(true, StatusID.PentupRage))))
587+
{
588+
return true;
589+
}
590+
}
591+
592592
if (ShouldHoldBurst())
593593
{
594594
return false;

0 commit comments

Comments
 (0)