From 4b673b14a79e4819f45414126bcc919c6968c1bd Mon Sep 17 00:00:00 2001 From: Jrc13245 Date: Wed, 25 Feb 2026 21:47:27 -0500 Subject: [PATCH] fix auto shot spammable for all classes and when used with conditionals --- Core.lua | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Core.lua b/Core.lua index 21ced9d..27913b9 100644 --- a/Core.lua +++ b/Core.lua @@ -2501,7 +2501,12 @@ function CleveRoids.DoWithConditionals(msg, hook, fixEmptyTargetFunc, targetBefo conditionals.target = origTarget return true end - -- AutoShot/Shoot: checkchanneled prevents toggle (already handled below) + -- AutoShot/Shoot: skip cast if already active to prevent toggle-off + if not CleveRoids.CheckChanneled(msg) then + if needRetarget then TargetLastTarget() end + conditionals.target = origTarget + return false + end else -- Self-buff/shapeshift: skip if already active on player if CleveRoids.ValidatePlayerBuff(msg) then @@ -5603,8 +5608,8 @@ function CleveRoids.Frame:UNIT_INVENTORY_CHANGED() end function CleveRoids.Frame:START_AUTOREPEAT_SPELL() - local _, className = UnitClass("player") - if className == "HUNTER" then + local spells = CleveRoids.Spells[BOOKTYPE_SPELL] + if spells and spells[CleveRoids.Localized.AutoShot] then CleveRoids.CurrentSpell.autoShot = true else CleveRoids.CurrentSpell.wand = true @@ -5615,8 +5620,8 @@ function CleveRoids.Frame:START_AUTOREPEAT_SPELL() end function CleveRoids.Frame:STOP_AUTOREPEAT_SPELL() - local _, className = UnitClass("player") - if className == "HUNTER" then + local spells = CleveRoids.Spells[BOOKTYPE_SPELL] + if spells and spells[CleveRoids.Localized.AutoShot] then CleveRoids.CurrentSpell.autoShot = false else CleveRoids.CurrentSpell.wand = false