From 185365de645224461fc2a1433ddaef5a86101d7b Mon Sep 17 00:00:00 2001 From: shagu Date: Mon, 12 Dec 2016 18:46:14 +0100 Subject: [PATCH] player: fix debuff timer and border color --- modules/player.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/player.lua b/modules/player.lua index 5db6b873..d1e7bcdd 100644 --- a/modules/player.lua +++ b/modules/player.lua @@ -435,22 +435,23 @@ pfUI:RegisterModule("player", function () end) pfUI.uf.player.debuff.debuffs[i]:SetScript("OnUpdate", function() - local timeleft = GetPlayerBuffTimeLeft(GetPlayerBuff(this:GetID()-1,"HARMFUL")) + local timeleft = GetPlayerBuffTimeLeft(this:GetID()-1,"HARMFUL") + if timeleft ~= nil and timeleft ~= 0 then -- if there are more than 0 seconds left if timeleft < 60 then -- show seconds if less than 60 seconds - pfUI.uf.player.debuff.debuffs[i].cd:SetText(ceil(timeleft)) + pfUI.uf.player.debuff.debuffs[this:GetID()].cd:SetText(ceil(timeleft)) elseif timeleft < 3600 then -- show minutes if less than 3600 seconds (1 hour) - pfUI.uf.player.debuff.debuffs[i].cd:SetText(ceil(timeleft/60)..'m') + pfUI.uf.player.debuff.debuffs[this:GetID()].cd:SetText(ceil(timeleft/60)..'m') else -- otherwise show hours - pfUI.uf.player.buff.buffs[i].cd:SetText(ceil(timeleft/3600) .. 'h') + pfUI.uf.player.debuff.debuffs[this:GetID()].cd:SetText(ceil(timeleft/3600) .. 'h') end else -- if there's no time left or not set, empty buff text - pfUI.uf.player.buff.buffs[i].cd:SetText("") + pfUI.uf.player.debuff.debuffs[this:GetID()].cd:SetText("") end end) @@ -493,7 +494,7 @@ pfUI:RegisterModule("player", function () local stacks = GetPlayerBuffApplications(GetPlayerBuff(i-1,"HARMFUL")) pfUI.utils:CreateBackdrop(pfUI.uf.player.debuff.debuffs[i], default_border) - pfUI.uf.player.debuff.debuffs[i]:SetNormalTexture(GetPlayerBuffTexture(GetPlayerBuff(i-1,"HARMFUL"))) + pfUI.uf.player.debuff.debuffs[i]:SetNormalTexture(UnitDebuff("player", i)) for i,v in ipairs({pfUI.uf.player.debuff.debuffs[i]:GetRegions()}) do if v.SetTexCoord then v:SetTexCoord(.08, .92, .08, .92) end end