Merge pull request #19 from FFXIV-CombatReborn/ogcd-fix

Corrected animation lock code to fix oGCDs
FFXIV-CombatReborn · Mar 29, 2024 · dff1315 · dff1315
2 parents b667743 + 179dc0a
commit dff1315
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/RotationSolver.Basic/Actions/ActionCooldownInfo.cs b/RotationSolver.Basic/Actions/ActionCooldownInfo.cs
@@ -166,16 +166,8 @@ internal bool CooldownCheck(bool isEmpty, bool onLastAbility, bool ignoreClippin
 
         if (!_action.Info.IsRealGCD)
         {
-            if (onLastAbility)
-            {
-                if (DataCenter.NextAbilityToNextGCD > ActionManagerHelper.GetCurrentAnimationLock() + DataCenter.Ping + DataCenter.MinAnimationLock) return false;
-            }
-            else if (!ignoreClippingCheck)
-            {
-                if (DataCenter.NextAbilityToNextGCD < ActionManagerHelper.GetCurrentAnimationLock()) return false;
-            }
+            if (ActionManagerHelper.GetCurrentAnimationLock() > 0) return false;
         }
-
         return true;
     }
 }
diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -128,7 +128,7 @@ public static IAction? CommandNextAction
             return next?.Act ?? ActionSequencerAction;
         }
     }
-    public static Job Job { get; set; }
+    public static Job Job => Player.Job;
 
     public static JobRole Role => Service.GetSheet<ClassJob>().GetRow((uint)Job)?.GetJobRole() ?? JobRole.None;
 

diff --git a/RotationSolver/Updaters/RotationUpdater.cs b/RotationSolver/Updaters/RotationUpdater.cs
@@ -509,14 +509,12 @@ private static void UpdateCustomRotation()
                 DataCenter.RightNowRotation = instance;
             }
             RightRotationActions = DataCenter.RightNowRotation?.AllActions ?? [];
-            DataCenter.Job = DataCenter.RightNowRotation?.Job ?? Job.ADV;
             return;
         }
 
         CustomRotation.MoveTarget = null;
         DataCenter.RightNowRotation = null;
         RightRotationActions = [];
-        DataCenter.Job = DataCenter.RightNowRotation?.Job ?? Job.ADV;
 
         static ICustomRotation? GetRotation(Type? t)
         {