Merge branch 'main' into ptr

Author: kodewdle

ElvUI_Libraries/Core/oUF/colors.lua

@@ -106,40 +106,41 @@ local colors = {
 	},
 }
 
--- We do this because people edit the vars directly, and changing the default
--- globals makes SPICE FLOW!
-local function customClassColors()
-	if(_G.CUSTOM_CLASS_COLORS) then
-		local function updateColors()
-			for classToken, color in next, _G.CUSTOM_CLASS_COLORS do
-				colors.class[classToken] = oUF:CreateColor(color.r, color.g, color.b)
-			end
+do	-- We do this because people edit the vars directly, and changing the default globals makes SPICE FLOW!
+	local function updateColors()
+		for classToken, color in next, _G.CUSTOM_CLASS_COLORS do
+			colors.class[classToken] = oUF:CreateColor(color.r, color.g, color.b)
+		end
 
-			for _, obj in next, oUF.objects do
-				obj:UpdateAllElements('CUSTOM_CLASS_COLORS')
-			end
+		for _, obj in next, oUF.objects do
+			obj:UpdateAllElements('CUSTOM_CLASS_COLORS')
 		end
+	end
+
+	local function customClassColors()
+		if not _G.CUSTOM_CLASS_COLORS then return end
 
 		updateColors()
+
 		_G.CUSTOM_CLASS_COLORS:RegisterCallback(updateColors)
 
 		return true
 	end
-end
-
-if(not customClassColors()) then
-	for classToken, color in next, _G.RAID_CLASS_COLORS do
-		colors.class[classToken] = oUF:CreateColor(color.r, color.g, color.b)
-	end
 
-	local eventHandler = CreateFrame('Frame')
-	eventHandler:RegisterEvent('ADDON_LOADED')
-	eventHandler:SetScript('OnEvent', function(self)
-		if(customClassColors()) then
-			self:UnregisterEvent('ADDON_LOADED')
-			self:SetScript('OnEvent', nil)
+	if not customClassColors() then
+		for classToken, color in next, _G.RAID_CLASS_COLORS do
+			colors.class[classToken] = oUF:CreateColor(color.r, color.g, color.b)
 		end
-	end)
+
+		local eventHandler = CreateFrame('Frame')
+		eventHandler:RegisterEvent('ADDON_LOADED')
+		eventHandler:RegisterEvent('PLAYER_ENTERING_WORLD')
+		eventHandler:SetScript('OnEvent', function(frame)
+			if customClassColors() then
+				frame:UnregisterAllEvents()
+			end
+		end)
+	end
 end
 
 for debuffType, color in next, DebuffColors do