Replaced UNIT_COMBO_POINTS with UNIT_POWER for Legion

This commit is contained in:
Parnic
2016-05-24 00:52:56 -05:00
parent 9b5df60efa
commit 5fbf85811e
3 changed files with 30 additions and 6 deletions

View File

@ -238,7 +238,11 @@ function ComboPoints.prototype:Enable(core)
self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateComboPoints") self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateComboPoints")
if IceHUD.WowVer >= 30000 then if IceHUD.WowVer >= 30000 then
if IceHUD.WowVer < 70000 then
self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints") self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
else
self:RegisterEvent("UNIT_POWER", "UpdateComboPoints")
end
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints") self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints") self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
self:RegisterEvent("PLAYER_TALENT_UPDATE", "AddAnticipation") self:RegisterEvent("PLAYER_TALENT_UPDATE", "AddAnticipation")
@ -405,7 +409,11 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
end end
function ComboPoints.prototype:UpdateComboPoints() function ComboPoints.prototype:UpdateComboPoints(...)
if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
return
end
local points, anticipate, _ local points, anticipate, _
if IceHUD.IceCore:IsInConfigMode() then if IceHUD.IceCore:IsInConfigMode() then
points = 5 points = 5

View File

@ -66,7 +66,11 @@ function ComboPointsBar.prototype:Enable(core)
self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateComboPoints") self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdateComboPoints")
if IceHUD.WowVer >= 30000 then if IceHUD.WowVer >= 30000 then
if IceHUD.WowVer < 70000 then
self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints") self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateComboPoints")
else
self:RegisterEvent("UNIT_POWER", "UpdateComboPoints")
end
self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints") self:RegisterEvent("UNIT_ENTERED_VEHICLE", "UpdateComboPoints")
self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints") self:RegisterEvent("UNIT_EXITED_VEHICLE", "UpdateComboPoints")
else else
@ -80,7 +84,11 @@ function ComboPointsBar.prototype:CreateFrame()
self:UpdateComboPoints() self:UpdateComboPoints()
end end
function ComboPointsBar.prototype:UpdateComboPoints() function ComboPointsBar.prototype:UpdateComboPoints(...)
if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
return
end
local points local points
if IceHUD.IceCore:IsInConfigMode() then if IceHUD.IceCore:IsInConfigMode() then
points = 5 points = 5

View File

@ -50,7 +50,11 @@ function SliceAndDice.prototype:Enable(core)
SliceAndDice.super.prototype.Enable(self, core) SliceAndDice.super.prototype.Enable(self, core)
self:RegisterEvent("UNIT_AURA", "UpdateSliceAndDice") self:RegisterEvent("UNIT_AURA", "UpdateSliceAndDice")
if IceHUD.WowVer < 70000 then
self:RegisterEvent("UNIT_COMBO_POINTS", "ComboPointsChanged") self:RegisterEvent("UNIT_COMBO_POINTS", "ComboPointsChanged")
else
self:RegisterEvent("UNIT_POWER", "ComboPointsChanged")
end
if not self.moduleSettings.alwaysFullAlpha then if not self.moduleSettings.alwaysFullAlpha then
self:Show(false) self:Show(false)
@ -65,7 +69,11 @@ function SliceAndDice.prototype:Disable(core)
SliceAndDice.super.prototype.Disable(self, core) SliceAndDice.super.prototype.Disable(self, core)
end end
function SliceAndDice.prototype:ComboPointsChanged() function SliceAndDice.prototype:ComboPointsChanged(...)
if select('#', ...) >= 3 and select(1, ...) == "UNIT_POWER" and select(3, ...) ~= "COMBO_POINTS" then
return
end
self:TargetChanged() self:TargetChanged()
self:UpdateDurationBar() self:UpdateDurationBar()
end end