mirror of
https://github.com/parnic/ice-hud.git
synced 2025-06-16 14:50:13 -05:00
- fixed a potential nil access problem in the CastBar
- fixed a bug causing TargetInfo lines to be forced to contain data. now any of the lines can be empty if the user chooses
This commit is contained in:
@ -378,7 +378,7 @@ function CastBar.prototype:SpellCastStart(unit, spell, rank)
|
|||||||
CastBar.super.prototype.SpellCastStart(self, unit, spell, rank)
|
CastBar.super.prototype.SpellCastStart(self, unit, spell, rank)
|
||||||
if (unit ~= self.unit) then return end
|
if (unit ~= self.unit) then return end
|
||||||
|
|
||||||
local lag = GetTime() - self.spellCastSent
|
local lag = GetTime() - (self.spellCastSent or 0)
|
||||||
|
|
||||||
local pos = lag / self.actionDuration
|
local pos = lag / self.actionDuration
|
||||||
local y = self.settings.barHeight - (pos * self.settings.barHeight)
|
local y = self.settings.barHeight - (pos * self.settings.barHeight)
|
||||||
|
@ -1008,24 +1008,14 @@ function TargetInfo.prototype:Update(unit)
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if DogTag == nil or self.moduleSettings.line1Tag == '' then
|
if DogTag == nil then
|
||||||
-- local reactionColor = UnitSelectionColor("target")
|
|
||||||
-- if (self.tapped) then
|
|
||||||
-- reactionColor = self:GetHexColor("Tapped")
|
|
||||||
-- end
|
|
||||||
|
|
||||||
-- local line1 = string.format("%s", self.name or '')
|
|
||||||
self.frame.targetName:SetText(self.name or '')
|
self.frame.targetName:SetText(self.name or '')
|
||||||
self.frame.targetName:SetVertexColor(UnitSelectionColor("target"))
|
self.frame.targetName:SetVertexColor(UnitSelectionColor("target"))
|
||||||
end
|
|
||||||
|
|
||||||
if DogTag == nil or self.moduleSettings.line2Tag == '' then
|
|
||||||
local line2 = string.format("%s %s%s%s%s%s",
|
local line2 = string.format("%s %s%s%s%s%s",
|
||||||
self.level or '', self.classLocale or '', self.pvp or '', self.leader or '', self.classification or '', self.targetCombat or '')
|
self.level or '', self.classLocale or '', self.pvp or '', self.leader or '', self.classification or '', self.targetCombat or '')
|
||||||
self.frame.targetInfo:SetText(line2)
|
self.frame.targetInfo:SetText(line2)
|
||||||
end
|
|
||||||
|
|
||||||
if DogTag == nil or self.moduleSettings.line3Tag == '' then
|
|
||||||
local realm = self.realm and " " .. self.realm or ""
|
local realm = self.realm and " " .. self.realm or ""
|
||||||
local line3 = string.format("%s%s", self.guild or '', realm)
|
local line3 = string.format("%s%s", self.guild or '', realm)
|
||||||
self.frame.targetGuild:SetText(line3)
|
self.frame.targetGuild:SetText(line3)
|
||||||
|
Reference in New Issue
Block a user