Skip to content

Commit

Permalink
Add another check for in combat
Browse files Browse the repository at this point in the history
  • Loading branch information
b-morgan committed Nov 30, 2024
1 parent 9d88047 commit c2b80f3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Skillet.lua
Original file line number Diff line number Diff line change
Expand Up @@ -900,13 +900,15 @@ end

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

function Skillet:PLAYER_REGEN_ENABLED()
DA.TRACE("PLAYER_REGEN_ENABLED()")
self.inCombat = false
end

function Skillet:PLAYER_LOGOUT()
Expand Down Expand Up @@ -1316,6 +1318,10 @@ end
--
function Skillet:SkilletShowWindow()
DA.DEBUG(0,"SkilletShowWindow(), currentTrade= "..tostring(self.currentTrade)..", scanInProgress= "..tostring(scanInProgress))
if UnitAffectingCombat("player") then
DA.MARK3(0,"|cff8888ffSkillet|r: Combat lockdown restriction.".." Leave combat and try again.")
return
end
if self:IsModKey2Down() then
self.db.realm.skillDB[self.currentPlayer][self.currentTrade] = {}
end
Expand Down
1 change: 1 addition & 0 deletions SkilletNewsData.lua
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Skillet.NewsData = {
{ name = "Fixes",
data = {
{ header = "Plugins", body = "Fix Auctionator sorting errors" },
{ header = "Combat", body = "Add another check for in combat" },
},
},
{ name = "Changes",
Expand Down

0 comments on commit c2b80f3

Please sign in to comment.