diff --git a/FreshShit/WhoSniffer/event.lua b/FreshShit/WhoSniffer/event.lua index 0c027ea..328cea2 100644 --- a/FreshShit/WhoSniffer/event.lua +++ b/FreshShit/WhoSniffer/event.lua @@ -2,34 +2,36 @@ function() for i = 1, GetNumWhoResults() do local name, guild, level, race, class, zone = GetWhoInfo(i) - local faction = aura_env.raceMap[race] - if not faction then print("Unknown faction for race", race) end - if faction == "Alliance" then - local player = aura_env.alliance[name] - if not player then - player = Player.new(name, guild, race, class, zone) - local timestamp = date("%Y-%m-%dT%H:%M:%S") - if not WeakAurasSaved.Cyka.WhoSniffer[name] then WeakAurasSaved.Cyka.WhoSniffer[name] = {} end - WeakAurasSaved.Cyka.WhoSniffer[name][timestamp] = { - ["name"] = name, - ["guild"] = guild, - ["race"] = race, - ["class"] = class, - ["zone"] = zone, - } + if zone ~= "Siege of Orgrimmar" then + local faction = aura_env.raceMap[race] + if not faction then print("Unknown faction for race", race) end + if faction == "Alliance" then + local player = aura_env.alliance[name] + if not player then + player = Player.new(name, guild, race, class, zone) + local timestamp = date("%Y-%m-%dT%H:%M:%S") + if not WeakAurasSaved.Cyka.WhoSniffer[name] then WeakAurasSaved.Cyka.WhoSniffer[name] = {} end + WeakAurasSaved.Cyka.WhoSniffer[name][timestamp] = { + ["name"] = name, + ["guild"] = guild, + ["race"] = race, + ["class"] = class, + ["zone"] = zone, + } - local stinky = WeakAurasSaved.Cyka.stinkies[name] - if stinky then - PlaySoundFile("Interface\\Sounds\\Domination.ogg", "Master") - else - PlaySoundFile("Interface\\Sounds\\Cloak.ogg", "Master") + local stinky = WeakAurasSaved.Cyka.stinkies[name] + if stinky then + PlaySoundFile("Interface\\Sounds\\Domination.ogg", "Master") + else + PlaySoundFile("Interface\\Sounds\\Cloak.ogg", "Master") + end + + aura_env.Notify(player) end - - aura_env.Notify(player) + player:Touch() + player.zone = zone + aura_env.alliance[name] = player end - player:Touch() - player.zone = zone - aura_env.alliance[name] = player end end -- Turns out WA cannot do this ( diff --git a/FreshShit/WhoSniffer/init.lua b/FreshShit/WhoSniffer/init.lua index 233d23d..2d47e09 100644 --- a/FreshShit/WhoSniffer/init.lua +++ b/FreshShit/WhoSniffer/init.lua @@ -57,7 +57,7 @@ local function padString(input, targetLength, left) end aura_env.messageQueue = {} -aura_env.ttl = 60 +aura_env.ttl = 6 aura_env.whoQueryIdx = 1 aura_env.whoQueries = { "g-\"БеспредеЛ\"",