From ddc85dc0e2ca5728fdd74d70224eb23abc52d6db Mon Sep 17 00:00:00 2001 From: Repooc Date: Wed, 26 Oct 2016 20:15:59 -0400 Subject: [PATCH] Revert "Another in restricted area fix this time for minimap coords Previous commit fixes 369 which is similar issues" This reverts commit 3e7334b22fbb950a5e6da84f4f8d2ca666f25ba0. --- ElvUI_SLE/modules/minimap/minimapcoords.lua | 29 +++++++-------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/ElvUI_SLE/modules/minimap/minimapcoords.lua b/ElvUI_SLE/modules/minimap/minimapcoords.lua index be1e971..3985666 100644 --- a/ElvUI_SLE/modules/minimap/minimapcoords.lua +++ b/ElvUI_SLE/modules/minimap/minimapcoords.lua @@ -6,8 +6,6 @@ local _G = _G local cluster = _G["MinimapCluster"] local UIFrameFadeIn = UIFrameFadeIn -MM.RestrictedArea = false - local function HideMinimap() cluster:Hide() end @@ -20,8 +18,8 @@ end local function CreateCoords() local x, y = T.GetPlayerMapPosition("player") - if x then x = T.format(E.db.sle.minimap.coords.format, x * 100) else x = "0" end - if y then y = T.format(E.db.sle.minimap.coords.format, y * 100) else y = "0" end + x = T.format(E.db.sle.minimap.coords.format, x * 100) + y = T.format(E.db.sle.minimap.coords.format, y * 100) return x, y end @@ -29,14 +27,11 @@ end function MM:UpdateCoords(elapsed) MM.coordspanel.elapsed = (MM.coordspanel.elapsed or 0) + elapsed if MM.coordspanel.elapsed < E.db.sle.minimap.coords.throttle then return end - if not MM.RestrictedArea then - local x, y = CreateCoords() - if x == "0" or x == "0.0" or x == "0.00" then x = "-" end - if y == "0" or y == "0.0" or y == "0.00" then y = "-" end - MM.coordspanel.Text:SetText(x.." , "..y) - else - MM.coordspanel.Text:SetText("-") - end + + local x, y = CreateCoords() + if x == "0" or x == "0.0" or x == "0.00" then x = "-" end + if y == "0" or y == "0.0" or y == "0.00" then y = "-" end + MM.coordspanel.Text:SetText(x.." , "..y) MM:CoordsSize() MM.coordspanel.elapsed = 0 end @@ -92,15 +87,6 @@ function MM:CreateCoordsFrame() MM:UpdateCoordinatesPosition() end -function MM:PLAYER_ENTERING_WORLD() - local x = T.GetPlayerMapPosition("player") - if not x then - MM.RestrictedArea = true - else - MM.RestrictedArea = false - end -end - function MM:UpdateSettings() if E.db.sle.minimap.alpha then E.db.sle.minimap.alpha = nil end if not MM.coordspanel then @@ -124,7 +110,6 @@ end function MM:Initialize() if not SLE.initialized or not E.private.general.minimap.enable then return end - self:RegisterEvent("PLAYER_ENTERING_WORLD") hooksecurefunc(M, 'UpdateSettings', MM.UpdateSettings) MM:UpdateSettings() -- 1.7.9.5