Revert "fix entering arena in combat bug"
This reverts commit 755a3e52b5
.
This commit is contained in:
parent
915c213eb5
commit
d2da0a22ae
18
Frame.lua
18
Frame.lua
@ -110,7 +110,7 @@ function Gladdy:CreateFrame()
|
|||||||
self.anchor:Hide()
|
self.anchor:Hide()
|
||||||
end
|
end
|
||||||
|
|
||||||
self.frame:SetAlpha(0)
|
self.frame:Hide()
|
||||||
end
|
end
|
||||||
|
|
||||||
function Gladdy:UpdateFrame()
|
function Gladdy:UpdateFrame()
|
||||||
@ -279,7 +279,13 @@ end
|
|||||||
|
|
||||||
function Gladdy:HideFrame()
|
function Gladdy:HideFrame()
|
||||||
if (self.frame) then
|
if (self.frame) then
|
||||||
self.frame:SetAlpha(0)
|
if InCombatLockdown() then
|
||||||
|
self.startTest = nil
|
||||||
|
self.hideFrame = true
|
||||||
|
else
|
||||||
|
self.frame:Hide()
|
||||||
|
end
|
||||||
|
|
||||||
self.frame.testing = nil
|
self.frame.testing = nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -304,8 +310,14 @@ function Gladdy:ToggleFrame(i)
|
|||||||
self:Reset()
|
self:Reset()
|
||||||
self.curBracket = i
|
self.curBracket = i
|
||||||
self:UpdateFrame()
|
self:UpdateFrame()
|
||||||
|
if InCombatLockdown() then
|
||||||
|
Gladdy:Print("Gladdy frames show as soon as you leave combat")
|
||||||
|
self.showFrame = true
|
||||||
|
self.startTest = true
|
||||||
|
else
|
||||||
self:Test()
|
self:Test()
|
||||||
self.frame:SetAlpha(1)
|
self.frame:Show()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
42
Gladdy.lua
42
Gladdy.lua
@ -250,16 +250,13 @@ end
|
|||||||
function Gladdy:OnEnable()
|
function Gladdy:OnEnable()
|
||||||
self:RegisterEvent("UPDATE_BATTLEFIELD_STATUS")
|
self:RegisterEvent("UPDATE_BATTLEFIELD_STATUS")
|
||||||
self:RegisterEvent("PLAYER_ENTERING_WORLD")
|
self:RegisterEvent("PLAYER_ENTERING_WORLD")
|
||||||
|
self:RegisterEvent("PLAYER_REGEN_ENABLED")
|
||||||
|
|
||||||
self:CreateFrame()
|
if (IsAddOnLoaded("Clique")) then
|
||||||
for i = 1, 5 do
|
for i = 1, 5 do
|
||||||
self:CreateButton(i)
|
self:CreateButton(i)
|
||||||
end
|
end
|
||||||
self.curBracket = 5
|
|
||||||
self:UpdateFrame()
|
|
||||||
self:Reset()
|
|
||||||
|
|
||||||
if (IsAddOnLoaded("Clique")) then
|
|
||||||
ClickCastFrames = ClickCastFrames or {}
|
ClickCastFrames = ClickCastFrames or {}
|
||||||
ClickCastFrames[self.buttons.arena1.secure] = true
|
ClickCastFrames[self.buttons.arena1.secure] = true
|
||||||
ClickCastFrames[self.buttons.arena2.secure] = true
|
ClickCastFrames[self.buttons.arena2.secure] = true
|
||||||
@ -301,6 +298,7 @@ end
|
|||||||
|
|
||||||
function Gladdy:Test()
|
function Gladdy:Test()
|
||||||
self.frame.testing = true
|
self.frame.testing = true
|
||||||
|
if self.curBracket then
|
||||||
for i = 1, self.curBracket do
|
for i = 1, self.curBracket do
|
||||||
local unit = "arena" .. i
|
local unit = "arena" .. i
|
||||||
if (not self.buttons[unit]) then
|
if (not self.buttons[unit]) then
|
||||||
@ -319,6 +317,7 @@ function Gladdy:Test()
|
|||||||
button:SetAlpha(1)
|
button:SetAlpha(1)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
---------------------------
|
---------------------------
|
||||||
|
|
||||||
@ -351,6 +350,23 @@ function Gladdy:UPDATE_BATTLEFIELD_STATUS(_, index)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function Gladdy:PLAYER_REGEN_ENABLED()
|
||||||
|
if self.showFrame then
|
||||||
|
self:UpdateFrame()
|
||||||
|
if self.startTest then
|
||||||
|
self:Test()
|
||||||
|
self.startTest = nil
|
||||||
|
end
|
||||||
|
self.frame:Show()
|
||||||
|
self.showFrame = nil
|
||||||
|
end
|
||||||
|
if self.hideFrame then
|
||||||
|
self:Reset()
|
||||||
|
self.frame:Hide()
|
||||||
|
self.hideFrame = nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
---------------------------
|
---------------------------
|
||||||
|
|
||||||
-- RESET FUNCTIONS (ARENA LEAVE)
|
-- RESET FUNCTIONS (ARENA LEAVE)
|
||||||
@ -428,8 +444,20 @@ function Gladdy:JoinedArena()
|
|||||||
self.curBracket = 2
|
self.curBracket = 2
|
||||||
end
|
end
|
||||||
|
|
||||||
Gladdy:SendMessage("JOINED_ARENA")
|
for i = 1, self.curBracket do
|
||||||
self.frame:SetAlpha(1)
|
if (not self.buttons["arena" .. i]) then
|
||||||
|
self:CreateButton(i)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
self:SendMessage("JOINED_ARENA")
|
||||||
|
if InCombatLockdown() then
|
||||||
|
Gladdy:Print("Gladdy frames show as soon as you leave combat")
|
||||||
|
self.showFrame = true
|
||||||
|
else
|
||||||
|
self:UpdateFrame()
|
||||||
|
self.frame:Show()
|
||||||
|
end
|
||||||
for i=1, self.curBracket do
|
for i=1, self.curBracket do
|
||||||
self.buttons["arena" .. i]:SetAlpha(1)
|
self.buttons["arena" .. i]:SetAlpha(1)
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user