@@ -6,7 +6,7 @@ if c ~= "PALADIN" then return end local Cork = Cork local UnitAura = UnitAura local SpellCastableOnUnit, IconLine = Cork.SpellCastableOnUnit, Cork.IconLine -local ldb = LibStub:GetLibrary("LibDataBroker-1.1") +local ldb, ae = LibStub:GetLibrary("LibDataBroker-1.1"), LibStub("AceEvent-3.0") Cork.hasraidspell = true @@ -67,7 +67,7 @@ local dataobj = ldb:NewDataObject("Cork Blessings", {type = "cork"}) function dataobj:Init() known = {} RefreshKnownSpells() end local function Test(unit) - if not Cork.dbpc["Blessings-enabled"] or not Cork:ValidUnit(unit, true) then return end + if not Cork.dbpc["Blessings-enabled"] or IsResting() or not Cork:ValidUnit(unit, true) then return end if not HasMyBlessing(unit) then local _, class = UnitClass(unit) local spell = Cork.dbpc["Blessings-"..class] @@ -78,6 +78,8 @@ end Cork:RegisterRaidEvents("Blessings", dataobj, Test) dataobj.Scan = Cork:GenerateRaidScan(Test) +ae.RegisterEvent(dataobj, "PLAYER_UPDATE_RESTING", "Scan") + function dataobj:CorkIt(frame) RefreshKnownSpells() modules/PaladinBlessings.lua @@ -27,7 +27,7 @@ local function Test() local crusading = name and isMine == "player" if mounted and not crusading then return iconline - elseif crusading and not mounted then + elseif crusading and not mounted and not IsResting() then for buff in pairs(auras) do local name, _, _, _, _, _, _, isMine = UnitAura("player", buff) if name and isMine == "player" then return end modules/PaladinCrusaderAura.lua @@ -25,7 +25,7 @@ function Cork:GenerateRaidBuffer(spellname, multispellname, icon, defaultstate) end local function Test(unit) - if not Cork.dbpc[spellname.."-enabled"] or not Cork:ValidUnit(unit) then return end + if not Cork.dbpc[spellname.."-enabled"] or IsResting() or not Cork:ValidUnit(unit) then return end if not (UnitAura(unit, spellname) or multispellname and UnitAura(unit, multispellname)) then local _, token = UnitClass(unit) @@ -35,6 +35,9 @@ function Cork:GenerateRaidBuffer(spellname, multispellname, icon, defaultstate) Cork:RegisterRaidEvents(spellname, dataobj, Test) dataobj.Scan = Cork:GenerateRaidScan(Test) + ae.RegisterEvent(dataobj, "PLAYER_UPDATE_RESTING", "Scan") + + if multispellname then dataobj.RaidLine = IconLine(icon, multispellname.." (%d)") end templates/RaidBuffer.lua @@ -11,13 +11,14 @@ function Cork:GenerateSelfBuffer(spellname, icon) function dataobj:Init() Cork.defaultspc[spellname.."-enabled"] = GetSpellInfo(spellname) ~= nil end - local function Test(unit) if Cork.dbpc[spellname.."-enabled"] and not UnitAura("player", spellname) then return iconline end end - - LibStub("AceEvent-3.0").RegisterEvent("Cork "..spellname, "UNIT_AURA", function(event, unit) if unit == "player" then dataobj.player = Test() end end) + local function Test(unit) if Cork.dbpc[spellname.."-enabled"] and not UnitAura("player", spellname) and not IsResting() then return iconline end end function dataobj:Scan() self.player = Test() end function dataobj:CorkIt(frame) if self.player then return frame:SetManyAttributes("type1", "spell", "spell", spellname, "unit", "player") end end + + ae.RegisterEvent("Cork "..spellname, "UNIT_AURA", function(event, unit) if unit == "player" then dataobj.player = Test() end end) + ae.RegisterEvent(dataobj, "PLAYER_UPDATE_RESTING", "Scan") end templates/SelfBuffer.lua @@ -30,7 +30,7 @@ function Cork:GenerateAdvancedSelfBuffer(modulename, spellidlist) end local function Test() - if Cork.dbpc[modulename.."-enabled"] then + if Cork.dbpc[modulename.."-enabled"] and not IsResting() then for _,buff in pairs(buffnames) do local name, _, _, _, _, _, _, isMine = UnitAura("player", buff) if name and isMine then return end @@ -42,8 +42,6 @@ function Cork:GenerateAdvancedSelfBuffer(modulename, spellidlist) end end - LibStub("AceEvent-3.0").RegisterEvent("Cork "..modulename, "UNIT_AURA", function(event, unit) if unit == "player" then dataobj.player = Test() end end) - function dataobj:Scan() self.player = Test() end function dataobj:CorkIt(frame) @@ -52,6 +50,9 @@ function Cork:GenerateAdvancedSelfBuffer(modulename, spellidlist) if self.player then return frame:SetManyAttributes("type1", "spell", "spell", spell, "unit", "player") end end + ae.RegisterEvent("Cork "..modulename, "UNIT_AURA", function(event, unit) if unit == "player" then dataobj.player = Test() end end) + ae.RegisterEvent(dataobj, "PLAYER_UPDATE_RESTING", "Scan") + ---------------------- -- Config -- templates/SelfBufferAdvanced.lua bb34f3465df634f0656dedca6e46d56a43bfe4aa Tekkub tekkub@gmail.com http://github.com/tekkub/cork/commit/6511d4469da8971f53c40aa0f8023ac4636e6e4f 6511d4469da8971f53c40aa0f8023ac4636e6e4f 2009-05-19T22:33:00-07:00 2009-05-19T22:33:00-07:00 Make buffer modules hide when in town (resting) 6019c039d53e0d6e0abbb94c403095c4bffa5d0d Tekkub tekkub@gmail.com