Skip to content

Commit

Permalink
Partial fix for issue #114, Crafting in Combat
Browse files Browse the repository at this point in the history
  • Loading branch information
b-morgan committed Jun 6, 2024
1 parent eb0a429 commit 69a6692
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions Skillet.lua
Original file line number Diff line number Diff line change
Expand Up @@ -884,16 +884,14 @@ end
--
function Skillet:ADDON_ACTION_BLOCKED()
DA.TRACE("ADDON_ACTION_BLOCKED()")
-- print("|cf0f00000Skillet-Classic|r: Combat lockdown restriction." ..
-- " Leave combat and try again.")
-- self:HideAllWindows()
DA.MARK3("|cf0f00000Skillet-Classic|r: Combat lockdown restriction. Leave combat and try again.")
self:HideAllWindows()
end

function Skillet:PLAYER_REGEN_DISABLED()
DA.TRACE("PLAYER_REGEN_DISABLED()")
-- print("|cf0f00000Skillet-Classic|r: Combat lockdown restriction." ..
-- " Leave combat and try again.")
-- self:HideAllWindows()
DA.MARK3("|cf0f00000Skillet-Classic|r: Combat lockdown restriction. Leave combat and try again.")
self:HideAllWindows()
end

function Skillet:PLAYER_REGEN_ENABLED()
Expand Down Expand Up @@ -1017,6 +1015,10 @@ end

function Skillet:TRADE_SKILL_SHOW()
DA.TRACE("TRADE_SKILL_SHOW")
if UnitAffectingCombat("player") then
DA.MARK3(0,"|cff8888ffSkillet|r: Combat lockdown restriction.".." Leave combat and try again.")
return
end
Skillet.tradeUpdate = 0
DA.TRACE("TRADE_SKILL_SHOW: hideTradeSkillFrame= "..tostring(Skillet.hideTradeSkillFrame))
if Skillet.hideTradeSkillFrame then
Expand All @@ -1037,6 +1039,10 @@ end

function Skillet:CRAFT_SHOW()
DA.TRACE("CRAFT_SHOW")
if UnitAffectingCombat("player") then
DA.MARK3(0,"|cff8888ffSkillet|r: Combat lockdown restriction.".." Leave combat and try again.")
return
end
if Skillet.castSpellID == 5149 then
--
-- Beast Training opened
Expand Down

0 comments on commit 69a6692

Please sign in to comment.