From 138a84b6cd579e81217f3e0f80d092a5c84b8517 Mon Sep 17 00:00:00 2001 From: Peter Eliasson Date: Thu, 28 Jul 2016 22:12:39 +0200 Subject: [PATCH] Attempt fixes for some parses not being added. * Make sure we are always in our own guild. * Use skada role and class data if available --- src/main.lua | 7 +++++-- src/parse_modules/parse_modules_core.lua | 8 ++++++-- src/parse_modules/skada.lua | 4 +++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main.lua b/src/main.lua index 26790e3..6900213 100644 --- a/src/main.lua +++ b/src/main.lua @@ -101,9 +101,12 @@ end -- Tests if a player with name playerName is in the same -- guild as the player running this addon. function addon:IsInMyGuild(playerName) - if self.guildName then + if UnitIsUnit(playerName, "player") then + -- We are always in our own guild + return true + elseif self.guildName then local guildName, _, _ = GetGuildInfo(playerName) - return guildName == self.guildName + return (guildName == self.guildName); else return false end diff --git a/src/parse_modules/parse_modules_core.lua b/src/parse_modules/parse_modules_core.lua index 3753eb7..190126f 100644 --- a/src/parse_modules/parse_modules_core.lua +++ b/src/parse_modules/parse_modules_core.lua @@ -68,8 +68,12 @@ end local function setAdditionalDataForPlayers(players) for _, player in ipairs(players) do - player.role = UnitGroupRolesAssigned(player.name); - _, player.class = UnitClass(player.name); + if not player.role then + player.role = UnitGroupRolesAssigned(player.name); + end + if not player.class then + _, player.class = UnitClass(player.name); + end end end diff --git a/src/parse_modules/skada.lua b/src/parse_modules/skada.lua index a60e56b..3c22f1d 100644 --- a/src/parse_modules/skada.lua +++ b/src/parse_modules/skada.lua @@ -25,7 +25,9 @@ function mod:GetPlayersFromSet(skadaSet) id = player.id, name = player.name, damage = player.damage, - healing = player.healing + healing = player.healing, + role = player.role, + class = player.class }; tinsert(players, playerData); end -- 1.7.9.5