From b4b79254b1f4f6f8fd9724037129e0276611d432 Mon Sep 17 00:00:00 2001 From: Crum Date: Fri, 13 Jul 2018 23:25:17 -0500 Subject: [PATCH] update --- ElvUI/Modules/DataTexts/Guild.lua | 6 ++++-- ElvUI/Modules/Misc/Misc.lua | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ElvUI/Modules/DataTexts/Guild.lua b/ElvUI/Modules/DataTexts/Guild.lua index 00f618f..45b0004 100644 --- a/ElvUI/Modules/DataTexts/Guild.lua +++ b/ElvUI/Modules/DataTexts/Guild.lua @@ -23,7 +23,9 @@ local L_EasyMenu = L_EasyMenu local SetItemRef = SetItemRef local ToggleFriendsFrame = ToggleFriendsFrame -local CHAT_MSG_WHISPER_INFORM, GUILD, GUILD_MOTD, GUILD_ONLINE_LABEL, GUILD_RANK1_DESC, LABEL_NOTE, OPTIONS_MENU, PARTY_INVITE = CHAT_MSG_WHISPER_INFORM, GUILD, GUILD_MOTD, GUILD_ONLINE_LABEL, GUILD_RANK1_DESC, LABEL_NOTE, OPTIONS_MENU, PARTY_INVITE +local CHAT_MSG_WHISPER_INFORM, GUILD, GUILD_MOTD, GUILD_ONLINE_LABEL, GUILD_RANK1_DESC = CHAT_MSG_WHISPER_INFORM, GUILD, GUILD_MOTD, GUILD_ONLINE_LABEL, GUILD_RANK1_DESC +local LABEL_NOTE, OPTIONS_MENU, PARTY_INVITE = LABEL_NOTE, OPTIONS_MENU, PARTY_INVITE + local RAID_CLASS_COLORS = RAID_CLASS_COLORS local tthead, ttsubh, ttoff = {r=0.4, g=0.78, b=1}, {r=0.75, g=0.9, b=1}, {r=.3,g=1,b=.3} @@ -205,7 +207,7 @@ local function OnEnter(self, _, noUpdate) if info[5] ~= "" then DT.tooltip:AddLine(format(noteString, info[5]), ttsubh.r, ttsubh.g, ttsubh.b, 1) end if info[6] ~= "" then DT.tooltip:AddLine(format(officerNoteString, info[6]), ttoff.r, ttoff.g, ttoff.b, 1) end else - DT.tooltip:AddDoubleLine(format(levelNameStatusString, levelc.r*255, levelc.g*255, levelc.b*255, info[3], info[1], info[2], info[8]), info[4], classc.r,classc.g,classc.b, zonec.r,zonec.g,zonec.b) + DT.tooltip:AddDoubleLine(format(levelNameStatusString, levelc.r*255, levelc.g*255, levelc.b*255, info[3], info[1], " " .. info[8]), info[4], classc.r,classc.g,classc.b, zonec.r,zonec.g,zonec.b) end shown = shown + 1 end diff --git a/ElvUI/Modules/Misc/Misc.lua b/ElvUI/Modules/Misc/Misc.lua index f269850..77c2508 100644 --- a/ElvUI/Modules/Misc/Misc.lua +++ b/ElvUI/Modules/Misc/Misc.lua @@ -20,7 +20,7 @@ local IsInGuild = IsInGuild local IsInInstance = IsInInstance local IsShiftKeyDown = IsShiftKeyDown local RepairAllItems = RepairAllItems -local UninviteUnit = UninviteUnit +local UninviteByName = UninviteByName local UnitInRaid = UnitInRaid local UnitName = UnitName local UIErrorsFrame = UIErrorsFrame @@ -100,13 +100,13 @@ function M:DisbandRaidGroup() for i = 1, GetNumRaidMembers() do local name, _, _, _, _, _, _, online = GetRaidRosterInfo(i) if online and name ~= E.myname then - UninviteUnit(name) + UninviteByName(name) end end else for i = MAX_PARTY_MEMBERS, 1, -1 do if GetPartyMember(i) then - UninviteUnit(UnitName("party"..i)) + UninviteByName(UnitName("party"..i)) end end end