Merge branch 'main' into classic-beta

ElvUI/Core/Modules/Chat/Chat.lua

@@ -309,8 +309,8 @@ do --this can save some main file locals
 		local MelColors = function(t) return specialText(t, 0.98,0.31,0.43, 0.97,0.78,0.13, 0.31,0.76,0.43, 0.49,0.48,0.97, 0.07,0.69,0.92) end
 		--Thradex: summer without you
 		local ThradexColors = function(t) return specialText(t, 0.00,0.60,0.09, 0.22,0.65,0.90, 0.22,0.65,0.90, 1.00,0.74,0.27, 1.00,0.66,0.00, 1.00,0.50,0.20, 0.92,0.31,0.23) end
-		--Repooc: Monk, Demon Hunter, Paladin, Warlock colors
-		local PoocsColors = function(t) return specialText(t, 0,1,0.6, 0.64,0.19,0.79, 0.96,0.55,0.73, 0.53,0.53,0.93) end
+		--Repooc: Something to change it up a little
+		local PoocsColors = function(t) return specialText(t, 0.9,0.8,0.5) end
 
 		itsSimpy = function() return ElvSimpy, SimpyColors end
 		itsElv = function() return ElvBlue, ElvColors end

ElvUI/Core/Modules/Misc/Misc.lua

@@ -38,14 +38,14 @@ local SendChatMessage = SendChatMessage
 local StaticPopup_Hide = StaticPopup_Hide
 local StaticPopupSpecial_Hide = StaticPopupSpecial_Hide
 local UninviteUnit = UninviteUnit
-local UnitExists = UnitExists
 local UnitGUID = UnitGUID
 local UnitInRaid = UnitInRaid
 local UnitName = UnitName
 local IsInGuild = IsInGuild
 local PlaySound = PlaySound
 local GetNumFactions = GetNumFactions
 local GetFactionInfo = GetFactionInfo
+local UnitIsGroupLeader = UnitIsGroupLeader
 local GetWatchedFactionInfo = GetWatchedFactionInfo
 local ExpandAllFactionHeaders = ExpandAllFactionHeaders
 local SetWatchedFactionIndex = SetWatchedFactionIndex
@@ -58,6 +58,7 @@ local IsFriend = C_FriendList.IsFriend
 
 local LE_GAME_ERR_GUILD_NOT_ENOUGH_MONEY = LE_GAME_ERR_GUILD_NOT_ENOUGH_MONEY
 local LE_GAME_ERR_NOT_ENOUGH_MONEY = LE_GAME_ERR_NOT_ENOUGH_MONEY
+local LE_PARTY_CATEGORY_HOME = LE_PARTY_CATEGORY_HOME
 local MAX_PARTY_MEMBERS = MAX_PARTY_MEMBERS
 local UNKNOWN = UNKNOWN
 
@@ -218,17 +219,24 @@ end
 function M:DisbandRaidGroup()
 	if InCombatLockdown() then return end -- Prevent user error in combat
 
-	if UnitInRaid('player') then
-		for i = 1, GetNumGroupMembers() do
-			local name, _, _, _, _, _, _, online = GetRaidRosterInfo(i)
-			if online and name ~= E.myname then
-				UninviteUnit(name)
+	local myIndex = UnitInRaid('player')
+	if myIndex then
+		local _, myRank = GetRaidRosterInfo(myIndex)
+		if myRank == 2 then -- real raid leader
+			for i = 1, GetNumGroupMembers() do
+				if i ~= myIndex then -- dont kick yourself
+					local name = GetRaidRosterInfo(i)
+					if name then
+						UninviteUnit(name)
+					end
+				end
 			end
 		end
-	else
+	elseif not myIndex and UnitIsGroupLeader('player', LE_PARTY_CATEGORY_HOME) then
 		for i = MAX_PARTY_MEMBERS, 1, -1 do
-			if UnitExists('party'..i) then
-				UninviteUnit(UnitName('party'..i))
+			local name = UnitName('party'..i)
+			if name then
+				UninviteUnit(name)
 			end
 		end
 	end