From b6e8348403067a61cf3510bcfa9def34cf78c49a Mon Sep 17 00:00:00 2001
From: Taurenkey <github@taurenkey.co.uk>
Date: Sat, 3 Aug 2024 14:27:06 +0100
Subject: [PATCH] Fix queued actions interfering

---
 XIVSlothCombo/CustomCombo/CustomCombo.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/XIVSlothCombo/CustomCombo/CustomCombo.cs b/XIVSlothCombo/CustomCombo/CustomCombo.cs
index eb34fe993..48d0a6c0c 100644
--- a/XIVSlothCombo/CustomCombo/CustomCombo.cs
+++ b/XIVSlothCombo/CustomCombo/CustomCombo.cs
@@ -1,8 +1,11 @@
 using Dalamud.Utility;
+using ECommons.DalamudServices;
+using FFXIVClientStructs.FFXIV.Client.Game;
 using XIVSlothCombo.Attributes;
 using XIVSlothCombo.Combos;
 using XIVSlothCombo.Combos.PvE;
 using XIVSlothCombo.CustomComboNS.Functions;
+using XIVSlothCombo.Extensions;
 
 namespace XIVSlothCombo.CustomComboNS
 {
@@ -50,10 +53,13 @@ protected CustomCombo()
         /// <param name="newActionID"> Replacement action ID. </param>
         /// <returns> True if the action has changed, otherwise false. </returns>
 
-        public bool TryInvoke(uint actionID, byte level, uint lastComboMove, float comboTime, out uint newActionID)
+        public unsafe bool TryInvoke(uint actionID, byte level, uint lastComboMove, float comboTime, out uint newActionID)
         {
             newActionID = 0;
 
+            if (ActionManager.Instance()->QueuedActionType == ActionType.Action && ActionManager.Instance()->QueuedActionId != actionID)
+                return false;
+
             if (!IsEnabled(Preset))
                 return false;