more fixes

tukui-org · Nov 15, 2024 · 67c55c1 · 67c55c1
1 parent 8c99a6b
commit 67c55c1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua
@@ -611,6 +611,17 @@ function M:ClusterPoint(_, anchor)
 	end
 end
 
+function M:PLAYER_ENTERING_WORLD(_, initLogin, isReload)
+	if initLogin or isReload then
+		local LFGIconBorder = _G.MiniMapLFGFrameBorder or _G.MiniMapLFGBorder or _G.LFGMinimapFrameBorder
+		if LFGIconBorder then
+			LFGIconBorder:Hide()
+		end
+	end
+
+	M:Update_ZoneText()
+end
+
 function M:Initialize()
 	if E.private.general.minimap.enable then
 		Minimap:SetMaskTexture(E.Retail and 130937 or [[interface\chatframe\chatframebackground]])
@@ -711,7 +722,7 @@ function M:Initialize()
 	Minimap.location:Hide() -- Fixes blizzard's font rendering issue, keep after M:SetScale
 	M:SetScale(Minimap.location, 1)
 
-	M:RegisterEvent('PLAYER_ENTERING_WORLD', 'Update_ZoneText')
+	M:RegisterEvent('PLAYER_ENTERING_WORLD')
 	M:RegisterEvent('ZONE_CHANGED_NEW_AREA', 'Update_ZoneText')
 	M:RegisterEvent('ZONE_CHANGED_INDOORS', 'Update_ZoneText')
 	M:RegisterEvent('ZONE_CHANGED', 'Update_ZoneText')
@@ -769,10 +780,6 @@ function M:Initialize()
 		M:SetupHybridMinimap()
 	end
 
-	if _G.MiniMapLFGFrame then
-		(E.Cata and _G.MiniMapLFGFrameBorder or _G.MiniMapLFGBorder):Hide()
-	end
-
 	M:RegisterEvent('ADDON_LOADED')
 	M:UpdateSettings()
 end

diff --git a/ElvUI/Core/Modules/Misc/Misc.lua b/ElvUI/Core/Modules/Misc/Misc.lua
@@ -300,6 +300,8 @@ function M:ADDON_LOADED(_, addon)
 		M:SetupInspectPageInfo()
 	elseif addon == 'Blizzard_PTRFeedback' then
 		KillFeedback(_G.PTR_IssueReporter)
+	elseif addon == 'Blizzard_GroupFinder_VanillaStyle' then
+		M:LoadQueueStatus()
 	end
 end
 
@@ -368,7 +370,6 @@ function M:Initialize()
 	M:LoadChatBubbles()
 	M:LoadLoot()
 	M:ToggleItemLevelInfo(true)
-	M:LoadQueueStatus()
 	M:ZoneTextToggle()
 	M:ToggleInterrupt()
 
@@ -385,7 +386,11 @@ function M:Initialize()
 	M:RegisterEvent('QUEST_COMPLETE')
 	M:RegisterEvent('ADDON_LOADED')
 
-	for _, addon in next, { 'Blizzard_InspectUI', 'Blizzard_PTRFeedback' } do
+	if not E.ClassicAnniv then
+		M:LoadQueueStatus()
+	end
+
+	for _, addon in next, { 'Blizzard_InspectUI', 'Blizzard_PTRFeedback', E.ClassicAnniv and 'Blizzard_GroupFinder_VanillaStyle' or nil } do
 		if IsAddOnLoaded(addon) then
 			M:ADDON_LOADED(nil, addon)
 		end

diff --git a/ElvUI/Core/Modules/Misc/QueueStatus.lua b/ElvUI/Core/Modules/Misc/QueueStatus.lua
@@ -145,7 +145,7 @@ function M:HandleQueueStatus(creation)
 end
 
 function M:GetQueueStatusButton()
-	return _G.QueueStatusButton or _G.MiniMapLFGFrame or _G.LFGMinimapFrameIcon
+	return _G.QueueStatusButton or _G.MiniMapLFGFrame or _G.LFGMinimapFrame
 end
 
 function M:LoadQueueStatus()

diff --git a/ElvUI/Core/init.lua b/ElvUI/Core/init.lua
@@ -190,8 +190,13 @@ E.Wrath = WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC
 E.Retail = WOW_PROJECT_ID == WOW_PROJECT_MAINLINE
 E.Classic = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
 
-E.ClassicHC = IsHardcoreActive and IsHardcoreActive()
-E.ClassicSOD = IsEngravingEnabled and IsEngravingEnabled()
+do
+	local season = C_Seasons and C_Seasons.GetActiveSeason()
+	E.ClassicHC = season == 3 -- Hardcore
+	E.ClassicSOD = season == 2 -- Season of Discovery
+	E.ClassicAnniv = season == 11 -- Anniversary
+	E.ClassicAnnivHC = season == 12 -- Anniversary Hardcore
+end
 
 -- Item Qualitiy stuff, also used by MerathilisUI
 E.QualityColors = CopyTable(_G.BAG_ITEM_QUALITY_COLORS)