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() /// Replacement action ID. /// True if the action has changed, otherwise false. - 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;