From b2877b0b51125b18f0754cdfb61542d33b7befbb Mon Sep 17 00:00:00 2001 From: shagu Date: Sat, 30 Sep 2017 14:33:05 +0200 Subject: [PATCH] chat: avoid unknown fields in playerdb --- modules/chat.lua | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/modules/chat.lua b/modules/chat.lua index e7d40fe8..22adacfc 100644 --- a/modules/chat.lua +++ b/modules/chat.lua @@ -522,9 +522,7 @@ pfUI:RegisterModule("chat", function () local Name, Class, Level for i = 1, GetNumFriends() do Name, Level, Class = GetFriendInfo(i) - if L["class"] and L["class"][Class] then - Class = L["class"][Class] - end + Class = L["class"][Class] or nil if Name and Level and Class and pfUI_playerDB then pfUI_playerDB[Name] = { class = Class, level = Level } end @@ -533,9 +531,7 @@ pfUI:RegisterModule("chat", function () local Name, Class, Level for i = 1, GetNumGuildMembers() do Name, _, _, Level, Class = GetGuildRosterInfo(i) - if L["class"] and L["class"][Class] then - Class = L["class"][Class] - end + Class = L["class"][Class] or nil if Name and Level and Class and pfUI_playerDB then pfUI_playerDB[Name] = { class = Class, level = Level } end @@ -545,9 +541,7 @@ pfUI:RegisterModule("chat", function () local Name, Class, SubGroup, Level for i = 1, GetNumRaidMembers() do Name, _, SubGroup, Level, Class = GetRaidRosterInfo(i) - if L["class"] and L["class"].Class then - Class = L["class"][Class] - end + Class = L["class"][Class] or nil if Name and Level and Class and pfUI_playerDB then pfUI_playerDB[Name] = { class = Class, level = Level } end @@ -581,9 +575,7 @@ pfUI:RegisterModule("chat", function () local Name, Class, Level for i = 1, GetNumWhoResults() do Name, _, Level, _, Class, _ = GetWhoInfo(i) - if L["class"] and L["class"][Class] then - Class = L["class"][Class] - end + Class = L["class"][Class] or nil if Name and Level and Class and pfUI_playerDB then pfUI_playerDB[Name] = { class = Class, level = Level } end @@ -743,7 +735,7 @@ pfUI:RegisterModule("chat", function () local Name = string.gsub(text, ".*|Hplayer:(.-)|h.*", "%1") if pfUI_playerDB[Name] and pfUI_playerDB[Name].class ~= nil then local Class = pfUI_playerDB[Name].class - if RAID_CLASS_COLORS[Class] ~= nil then + if Class ~= UNKNOWN then local Color = string.format("%02x%02x%02x", RAID_CLASS_COLORS[Class].r * 255, RAID_CLASS_COLORS[Class].g * 255,