Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Aviana/LunaUnitFrames
Browse files Browse the repository at this point in the history
  • Loading branch information
Aviana committed Dec 4, 2020
2 parents a8331ee + 1c0f63f commit d6fb95b
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions LunaUnitFrames.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1305,11 +1305,13 @@ frame:SetScript("OnEvent", function(self, event, addon)
elseif( event == "ADDON_LOADED" and ( addon == "Blizzard_ArenaUI" or addon == "Blizzard_CompactRaidFrames" ) and not LUF.InCombatLockdown) then
LUF:HideBlizzardFrames()
elseif event == "PLAYER_REGEN_DISABLED" then
LUF.db.profile.locked = true
LUF.InCombatLockdown = true
LUF:UpdateMovers()
if( ACR ) then
ACR:NotifyChange("LunaUnitFrames")
if not LUF.db.profile.locked then
LUF.db.profile.locked = true
LUF.InCombatLockdown = true
LUF:UpdateMovers()
if( ACR ) then
ACR:NotifyChange("LunaUnitFrames")
end
end
elseif event == "PLAYER_REGEN_ENABLED" then
LUF.InCombatLockdown = nil
Expand Down Expand Up @@ -1342,4 +1344,4 @@ function LUF:AutoswitchProfileSetup()
elseif self.db.char.switchtype == "GROUP" then
frame:RegisterEvent("GROUP_ROSTER_UPDATE")
end
end
end

0 comments on commit d6fb95b

Please sign in to comment.