From fc91116946246d01fe8aecbc42dc056ec63f6b1e Mon Sep 17 00:00:00 2001 From: Road-block Date: Wed, 9 Aug 2017 18:12:23 +0300 Subject: [PATCH] Bugfix Reserves List --- shootyepgp.lua | 10 ++++++++-- shootyepgp.toc | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/shootyepgp.lua b/shootyepgp.lua index 4329fa1..d00a8b5 100644 --- a/shootyepgp.lua +++ b/shootyepgp.lua @@ -617,6 +617,9 @@ function sepgp:reservesToggle(flag) if (flag) then -- we want in if (reservesChannelID) and reservesChannelID ~= 0 then sepgp.reservesChannelID = reservesChannelID + if not self:IsEventRegistered("CHAT_MSG_CHANNEL") then + sepgp:RegisterEvent("CHAT_MSG_CHANNEL","captureReserveChatter") + end return true else sepgp:RegisterEvent("CHAT_MSG_CHANNEL_NOTICE","reservesChannelChange") @@ -629,6 +632,9 @@ function sepgp:reservesToggle(flag) LeaveChannelByName(sepgp_reservechannel) return else + if sepgp:IsEventRegistered("CHAT_MSG_CHANNEL") then + sepgp:UnregisterEvent("CHAT_MSG_CHANNEL") + end return false end end @@ -700,14 +706,14 @@ function sepgp:captureReserveChatter(text, sender, _, _, _, _, _, _, channel) reserves_blacklist[reserve_alt] = true table.insert(sepgp.reserves,{reserve,reserve_class,reserve_rank,reserve_alt}) else - sepgp:defaultPrint(string.format("|cffff0000%s|r has already added a member to Reserves. Discarding!")) + sepgp:defaultPrint(string.format("|cffff0000%s|r trying to add %s to Reserves, but has already added a member. Discarding!",reserve_alt,reserve)) end else if not reserves_blacklist[reserve] then reserves_blacklist[reserve] = true table.insert(sepgp.reserves,{reserve,reserve_class,reserve_rank}) else - sepgp:defaultPrint(string.format("|cffff0000%s|r has already added a member to Reserves. Discarding!")) + sepgp:defaultPrint(string.format("|cffff0000%s|r has already been added to Reserves. Discarding!",reserve)) end end end diff --git a/shootyepgp.toc b/shootyepgp.toc index 232dfce..a5f4134 100644 --- a/shootyepgp.toc +++ b/shootyepgp.toc @@ -2,7 +2,7 @@ ## Title: shootyepgp ## Notes: Effort Points/Gear Points Loot System ## Author: shooty, Roadblock -## Version: 2.1 +## Version: 2.11 ## OptionalDeps: Ace2 ## SavedVariables: sepgp_saychannel,sepgp_groupbyclass,sepgp_raidonly,sepgp_decay,sepgp_reservechannel,sepgp_main,sepgp_progress,sepgp_discount ## SavedVariablesPerCharacter: