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 8.0 error when playing as a Monk

Browse Source 
Fixed 8.0 castbar sometimes showing gibberish text and sometimes disappearing when the cast wasn't complete yet
This commit is contained in:
Chris Pickett
2018-07-18 01:19:22 -05:00
parent e32a1267eb
commit 9b42735e7c
4 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
IceCastBar.lua
View File

@ -412,7 +412,7 @@ function IceCastBar.prototype:StopBar()
end end
function IceCastBar.prototype:GetShortRank(rank) function IceCastBar.prototype:GetShortRank(rank)
if (rank) then if IceHUD.WowVer < 80000 and rank then
local _, _, sRank = string.find(rank, "(%d+)") local _, _, sRank = string.find(rank, "(%d+)")
if (sRank) then if (sRank) then
return " (" .. sRank .. ")" return " (" .. sRank .. ")"
@ -427,30 +427,30 @@ end
-- NORMAL SPELLS -- -- NORMAL SPELLS --
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
function IceCastBar.prototype:SpellCastSent(event, unit, spell, rank, target, lineId) function IceCastBar.prototype:SpellCastSent(event, unit, target, castGuid, spellId)
if (unit ~= self.unit) then return end if (unit ~= self.unit) then return end
IceHUD:Debug("SpellCastSent", unit, spell, rank, target, lineId) IceHUD:Debug("SpellCastSent", unit, target, castGuid, spellId)
end end
function IceCastBar.prototype:SpellCastChanged(event, arg1) function IceCastBar.prototype:SpellCastChanged(event, cancelled)
IceHUD:Debug("SpellCastChanged", arg1) IceHUD:Debug("SpellCastChanged", cancelled)
end end
function IceCastBar.prototype:SpellCastStart(event, unit, spell, rank, lineId, spellId) function IceCastBar.prototype:SpellCastStart(event, unit, castGuid, spellId)
if (unit ~= self.unit) then return end if (unit ~= self.unit) then return end
IceHUD:Debug("SpellCastStart", unit, spell, rank, lineId, spellId) IceHUD:Debug("SpellCastStart", unit, castGuid, spellId)
--UnitCastingInfo(unit) --UnitCastingInfo(unit)
self:StartBar(IceCastBar.Actions.Cast) self:StartBar(IceCastBar.Actions.Cast)
self.current = lineId self.current = castGuid
end end
function IceCastBar.prototype:SpellCastStop(event, unit, spell, rank, lineId, spellId) function IceCastBar.prototype:SpellCastStop(event, unit, castGuid, spellId)
if (unit ~= self.unit) then return end if (unit ~= self.unit) then return end
IceHUD:Debug("SpellCastStop", unit, spell, self.current, rank, lineId, spellId) IceHUD:Debug("SpellCastStop", unit, castGuid, spellId)
-- ignore if not coming from current spell -- ignore if not coming from current spell
if (self.current and lineId and self.current ~= lineId) then if (self.current and castGuid and self.current ~= castGuid) then
return return
end end
@ -464,12 +464,12 @@ function IceCastBar.prototype:SpellCastStop(event, unit, spell, rank, lineId, sp
end end
function IceCastBar.prototype:SpellCastFailed(event, unit, spell, rank, lineId, spellId) function IceCastBar.prototype:SpellCastFailed(event, castGuid, spellId)
if (unit ~= self.unit) then return end if (unit ~= self.unit) then return end
IceHUD:Debug("SpellCastFailed", unit, self.current, lineId, spellId) IceHUD:Debug("SpellCastFailed", unit, castGuid, spellId)
-- ignore if not coming from current spell -- ignore if not coming from current spell
if (self.current and lineId and self.current ~= lineId) then if (self.current and castGuid and self.current ~= castGuid) then
return return
end end
@ -492,12 +492,12 @@ function IceCastBar.prototype:SpellCastFailed(event, unit, spell, rank, lineId,
self:StartBar(IceCastBar.Actions.Failure, "Failed") self:StartBar(IceCastBar.Actions.Failure, "Failed")
end end
function IceCastBar.prototype:SpellCastInterrupted(event, unit, spell, rank, lineId, spellId) function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellId)
if (unit ~= self.unit) then return end if (unit ~= self.unit) then return end
IceHUD:Debug("SpellCastInterrupted", unit, self.current, lineId, spellId) IceHUD:Debug("SpellCastInterrupted", unit, castGuid, spellId)
-- ignore if not coming from current spell -- ignore if not coming from current spell
if (self.current and lineId and self.current ~= lineId) then if (self.current and castGuid and self.current ~= castGuid) then
return return
end end
@ -506,7 +506,7 @@ function IceCastBar.prototype:SpellCastInterrupted(event, unit, spell, rank, lin
self:StartBar(IceCastBar.Actions.Failure, "Interrupted") self:StartBar(IceCastBar.Actions.Failure, "Interrupted")
end end
function IceCastBar.prototype:SpellCastDelayed(event, unit, delay) function IceCastBar.prototype:SpellCastDelayed(event, unit, castGuid, spellId)
if (unit ~= self.unit) then return end if (unit ~= self.unit) then return end
--IceHUD:Debug("SpellCastDelayed", unit, UnitCastingInfo(unit)) --IceHUD:Debug("SpellCastDelayed", unit, UnitCastingInfo(unit))
@ -519,7 +519,7 @@ function IceCastBar.prototype:SpellCastDelayed(event, unit, delay)
end end
function IceCastBar.prototype:SpellCastSucceeded(event, unit, spell, rank, lineId, spellId) function IceCastBar.prototype:SpellCastSucceeded(event, castGuid, spellId)
if (unit ~= self.unit) then return end if (unit ~= self.unit) then return end
--IceHUD:Debug("SpellCastSucceeded", unit, spell, rank) --IceHUD:Debug("SpellCastSucceeded", unit, spell, rank)
@ -529,7 +529,7 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, spell, rank, lineI
end end
-- ignore if not coming from current spell -- ignore if not coming from current spell
if (self.current and self.current ~= lineId) then if (self.current and self.current ~= castGuid) then
return return
end end

1
IceHUD.toc
View File

@ -6,7 +6,6 @@
## Version: @project-version@ ## Version: @project-version@
## SavedVariables: IceCoreDB ## SavedVariables: IceCoreDB
## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-2.0, LibDualSpec-1.0, LibDBIcon-1.0, AceGUI-3.0-SharedMediaWidgets ## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-2.0, LibDualSpec-1.0, LibDBIcon-1.0, AceGUI-3.0-SharedMediaWidgets
## X-Compatible-With: 70300
## X-Category: HUDs ## X-Category: HUDs
## X-Website: https://www.wowace.com/projects/ice-hud ## X-Website: https://www.wowace.com/projects/ice-hud
## X-WoWI-ID: 8149 ## X-WoWI-ID: 8149

4
changelog.txt
View File

@ -1,3 +1,7 @@
v1.11.1:
- Fixed error when playing as a Monk
- Fixed castbar sometimes showing gibberish text and sometimes disappearing when the cast wasn't complete yet
v1.11.0: v1.11.0:
- Updated TOC for 8.0 - Updated TOC for 8.0

12
modules/CastBar.lua
View File

@ -407,14 +407,14 @@ end
-- OVERRIDE -- OVERRIDE
function CastBar.prototype:SpellCastSent(event, unit, spell, rank, target, lineId) function CastBar.prototype:SpellCastSent(event, unit, castGuid, spellId)
CastBar.super.prototype.SpellCastSent(self, event, unit, spell, rank, target, lineId) CastBar.super.prototype.SpellCastSent(self, event, unit, castGuid, spellId)
if (unit ~= self.unit) then return end if (unit ~= self.unit) then return end
if IceHUD.WowVer < 70000 then if IceHUD.WowVer < 70000 then
self.spellCastSent = GetTime() self.spellCastSent = GetTime()
end end
self.sentSpell = lineId self.sentSpell = castGuid
end end
-- OVERRIDE -- OVERRIDE
@ -426,15 +426,15 @@ function CastBar.prototype:SpellCastChanged(event, arg1)
end end
-- OVERRIDE -- OVERRIDE
function CastBar.prototype:SpellCastStart(event, unit, spell, rank, lineId, spellId) function CastBar.prototype:SpellCastStart(event, unit, castGuid, spellId)
CastBar.super.prototype.SpellCastStart(self, event, unit, spell, rank, lineId, spellId) CastBar.super.prototype.SpellCastStart(self, event, unit, castGuid, spellId)
if (unit ~= self.unit) then return end if (unit ~= self.unit) then return end
if not self:IsVisible() or not self.actionDuration then if not self:IsVisible() or not self.actionDuration then
return return
end end
if self.sentSpell ~= lineId then if self.sentSpell ~= castGuid then
self.spellCastSent = nil self.spellCastSent = nil
end end