Merge branch 'master' of https://github.com/MKhayle/XIVComboExpanded

MKhayle · Aug 10, 2024 · 829a715 · 829a715
2 parents dae9825 + dc94b00
commit 829a715
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/XIVComboExpanded/Combos/BRD.cs b/XIVComboExpanded/Combos/BRD.cs
@@ -259,7 +259,7 @@ internal class BardBloodletter : CustomCombo
 
     protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level)
     {
-        if (actionID == BRD.Bloodletter)
+        if (actionID is BRD.Bloodletter or BRD.HeartbreakShot)
         {
             var gauge = GetJobGauge<BRDGauge>();
 
@@ -281,13 +281,13 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
             if (IsEnabled(CustomComboPreset.BardBloodletterFeature))
             {
                 if (level >= BRD.Levels.Sidewinder)
-                    return CalcBestAction(actionID, BRD.Bloodletter, BRD.EmpyrealArrow, BRD.Sidewinder);
+                    return CalcBestAction(actionID, OriginalHook(BRD.Bloodletter), BRD.EmpyrealArrow, BRD.Sidewinder);
 
                 if (level >= BRD.Levels.EmpyrealArrow)
-                    return CalcBestAction(actionID, BRD.Bloodletter, BRD.EmpyrealArrow);
+                    return CalcBestAction(actionID, OriginalHook(BRD.Bloodletter), BRD.EmpyrealArrow);
 
                 if (level >= BRD.Levels.Bloodletter)
-                    return BRD.Bloodletter;
+                    return OriginalHook(BRD.Bloodletter);
             }
 
             if (IsEnabled(CustomComboPreset.BardBloodRainFeature))