wow-mods/ice-hud
1
0
Fork 0
mirror of https://github.com/parnic/ice-hud.git synced 2025-06-16 14:50:13 -05:00
Code Issues Projects Releases Wiki Activity

- fixed some errors that could pop up with totems and custom bars

Browse Source
This commit is contained in:
Parnic
2010-12-08 14:29:47 +00:00
parent 6eda5b5f9d
commit 9257809e38
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/CustomBar.lua
View File

@ -501,7 +501,7 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
return offHandExpiration/1000, offHandExpiration/1000, offHandCharges, GetInventoryItemTexture("player", slotId) return offHandExpiration/1000, offHandExpiration/1000, offHandCharges, GetInventoryItemTexture("player", slotId)
end end
return nil, nil, nil, nil return nil
end end
local i = 1 local i = 1
@ -535,22 +535,24 @@ function IceCustomBar.prototype:GetAuraDuration(unitName, buffName)
for i=1,MAX_TOTEMS do for i=1,MAX_TOTEMS do
local haveTotem, totemName, startTime, realDuration, icon = GetTotemInfo(i) local haveTotem, totemName, startTime, realDuration, icon = GetTotemInfo(i)
if self.moduleSettings.maxDuration and self.moduleSettings.maxDuration ~= 0 then if haveTotem and totemName then
duration = self.moduleSettings.maxDuration if self.moduleSettings.maxDuration and self.moduleSettings.maxDuration ~= 0 then
else duration = self.moduleSettings.maxDuration
duration = realDuration else
end duration = realDuration
end
if ((self.moduleSettings.exactMatch and totemName:upper() == buffName:upper()) if ((self.moduleSettings.exactMatch and totemName:upper() == buffName:upper())
or (not self.moduleSettings.exactMatch and string.match(totemName:upper(), buffName:upper()))) then or (not self.moduleSettings.exactMatch and string.match(totemName:upper(), buffName:upper()))) then
endTime = startTime + realDuration endTime = startTime + realDuration
remaining = endTime - GetTime() remaining = endTime - GetTime()
return duration, remaining, 1, icon, endTime return duration, remaining, 1, icon, endTime
end
end end
end end
end end
return nil, nil, nil, nil return nil
end end
function IceCustomBar.prototype:UpdateCustomBarEvent(event, unit) function IceCustomBar.prototype:UpdateCustomBarEvent(event, unit)