Add support for blocked submenu options

Some menus, such as when targeting other players, use mixins which are themselves menus. We have to dive down one more layer to resolve those. The official UI source does this submenu thing (as opposed to recursion) so this should exactly mimic how the base game now works.

IceCore.lua

@@ -41,6 +41,26 @@ IceCore.TextDecorationStyle = {
 	NoDecoration = L["No decoration"],
 }
 
+local ZM_MAP_ID = 1970
+IceCore.zmPuzzleIds = {
+	--Fugueal Protolock
+	366046,
+	366108,
+	359488,
+	--Mezzonic Protolock
+	366042,
+	366106,
+	351405,
+	--Cantaric Protolock
+	365840,
+	366107,
+	348792,
+}
+IceCore.zmPuzzleMap = {}
+for i=1, #IceCore.zmPuzzleIds do
+	IceCore.zmPuzzleMap[IceCore.zmPuzzleIds[i]] = true
+end
+
 local SUNDER_SPELL_ID = 7386
 local LACERATE_SPELL_ID = 33745
 local MAELSTROM_SPELL_ID = 53817
@@ -259,6 +279,10 @@ function IceCore.prototype:Enable(userToggle)
 		self.IceHUDFrame:RegisterEvent("BARBER_SHOP_OPEN")
 		self.IceHUDFrame:RegisterEvent("BARBER_SHOP_CLOSE")
 	end
+	if C_Map then
+		self.IceHUDFrame:RegisterEvent("PLAYER_ENTERING_WORLD")
+		self.IceHUDFrame:RegisterEvent("ZONE_CHANGED")
+	end
 	self.IceHUDFrame:RegisterEvent("UNIT_AURA")
 	self.IceHUDFrame:SetScript("OnEvent", function(self, event, ...)
 		if (event == "PET_BATTLE_OPENING_START") then
@@ -279,13 +303,48 @@ function IceCore.prototype:Enable(userToggle)
 			end
 		elseif (event == "UNIT_AURA") then
 			local unit = ...
-			if IceHUD.IceCore.settings.bHideDuringShellGame and unit == "player" and IceHUD:HasDebuffs("player", {271571})[1] and UnitInVehicle("player") then
+			if unit ~= "player" then
+				return
+			end
+
+			if IceHUD.IceCore.settings.bHideDuringShellGame and IceHUD:HasAnyDebuff("player", {271571}) and UnitInVehicle("player") then
 				self:RegisterEvent("UNIT_EXITED_VEHICLE")
 				self:Hide()
+			elseif C_Map then
+				local bestMapID = C_Map.GetBestMapForUnit("player")
+				if bestMapID ~= ZM_MAP_ID then
+					return
+				end
+
+				if IceHUD:HasAnyBuff("player", IceCore.zmPuzzleIds) then
+					self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
+					self:Hide()
+				end
 			end
 		elseif (event == "UNIT_EXITED_VEHICLE") then
 			self:UnregisterEvent("UNIT_EXITED_VEHICLE")
 			self:Show()
+		elseif (event == "PLAYER_ENTERING_WORLD" or event == "ZONE_CHANGED") then
+			if C_Map then
+				local bestMapID = C_Map.GetBestMapForUnit("player")
+				if bestMapID == ZM_MAP_ID then
+					if IceHUD:HasAnyBuff("player", IceCore.zmPuzzleIds) then
+						self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
+						self:Hide()
+					end
+				end
+			end
+		elseif (event == "COMBAT_LOG_EVENT_UNFILTERED") then
+			local _,subevent,_,_,_,_,_,_,destName,_,_,spellId = CombatLogGetCurrentEventInfo()
+
+			if subevent == "SPELL_AURA_REMOVED" then
+				if destName == UnitName("player") then
+					if IceCore.zmPuzzleMap[spellId] then
+						self:Show()
+						self:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
+					end
+				end
+			end
 		end
 	end)
 

IceHUD.lua

@@ -35,6 +35,8 @@ IceHUD.PerTargetComboPoints = IceHUD.WowVer < 60000
 IceHUD.CanTrackOtherUnitBuffs = not IceHUD.WowClassic
 IceHUD.CanTrackGCD = not IceHUD.WowClassic
 IceHUD.GetSpellInfoReturnsFunnel = IceHUD.WowMain and IceHUD.WowVer < 60000
+IceHUD.CanHookDestroyTotem = IceHUD.WowClassic or IceHUD.WowClassicBC
+IceHUD.ShouldUpdateTargetHealthEveryTick = (IceHUD.WowClassic or IceHUD.WowClassicBC) and GetCVarBool("predictedHealth")
 
 IceHUD.UnitPowerEvent = "UNIT_POWER_UPDATE"
 
@@ -42,6 +44,8 @@ IceHUD.validBarList = { "Bar", "HiBar", "RoundBar", "ColorBar", "RivetBar", "Riv
 	"BloodGlaives", "ArcHUD", "FangRune", "DHUD", "CleanCurvesOut", "CleanTank", "PillTank", "GemTank" }
 IceHUD.validCustomModules = {Bar="Buff/Debuff watcher", Counter="Buff/Debuff stack counter", CD="Cooldown bar", Health="Health bar", Mana="Mana bar", CounterBar="Stack count bar"}
 
+IceHUD_UnitFrame_DropDown = CreateFrame("Frame", "IceHUD_UnitFrame_DropDown", UIParent, "UIDropDownMenuTemplate")
+
 --@debug@
 IceHUD.optionsLoaded = true
 --@end-debug@
@@ -492,6 +496,30 @@ do
 	function IceHUD:HasDebuffs(unit, spellIDs, filter)
 		return IceHUD:HasBuffs(unit, spellIDs, filter and filter.."|HARMFUL" or "HARMFUL")
 	end
+
+	function IceHUD:HasAnyBuff(unit, spellIDs, filter)
+		local buffs = IceHUD:HasBuffs(unit, spellIDs, filter)
+
+		for i=1, #buffs do
+			if buffs[i] then
+				return true
+			end
+		end
+
+		return false
+	end
+
+	function IceHUD:HasAnyDebuff(unit, spellIDs, filter)
+		local debuffs = IceHUD:HasDebuffs(unit, spellIDs, filter)
+
+		for i=1, #debuffs do
+			if debuffs[i] then
+				return true
+			end
+		end
+
+		return false
+	end
 end
 
 function IceHUD:OnDisable()
@@ -658,31 +686,69 @@ function IceHUD:GetIsInLFGGroup()
 	return IsInLFGGroup
 end
 
-local BLACKLISTED_UNIT_MENU_OPTIONS = {
-	SET_FOCUS = "ICEHUD_SET_FOCUS",
-	CLEAR_FOCUS = "ICEHUD_CLEAR_FOCUS",
-    PET_DISMISS = "ICEHUD_PET_DISMISS",
-	LOCK_FOCUS_FRAME = true,
-	UNLOCK_FOCUS_FRAME = true,
-}
+local BLACKLISTED_UNIT_MENU_OPTIONS = {}
+if UnitPopupButtons then
+	BLACKLISTED_UNIT_MENU_OPTIONS = {
+		SET_FOCUS = "ICEHUD_SET_FOCUS",
+		CLEAR_FOCUS = "ICEHUD_CLEAR_FOCUS",
+		LOCK_FOCUS_FRAME = true,
+		UNLOCK_FOCUS_FRAME = true,
+	}
+	if select(2, UnitClass("player")) ~= "WARLOCK" then
+		BLACKLISTED_UNIT_MENU_OPTIONS[PET_DISMISS] = "ICEHUD_PET_DISMISS"
+	end
 
-UnitPopupButtons["ICEHUD_SET_FOCUS"] = {
-	text = L["Type %s to set focus"]:format(SLASH_FOCUS1),
-	tooltipText = L["Blizzard currently does not provide a proper way to right-click focus with custom unit frames."],
-	dist = 0,
-}
+	UnitPopupButtons["ICEHUD_SET_FOCUS"] = {
+		text = L["Type %s to set focus"]:format(SLASH_FOCUS1),
+		tooltipText = L["Blizzard currently does not provide a proper way to right-click focus with custom unit frames."],
+		dist = 0,
+	}
 
-UnitPopupButtons["ICEHUD_CLEAR_FOCUS"] = {
-	text = L["Type %s to clear focus"]:format(SLASH_CLEARFOCUS1),
-	tooltipText = L["Blizzard currently does not provide a proper way to right-click focus with custom unit frames."],
-	dist = 0,
-}
+	UnitPopupButtons["ICEHUD_CLEAR_FOCUS"] = {
+		text = L["Type %s to clear focus"]:format(SLASH_CLEARFOCUS1),
+		tooltipText = L["Blizzard currently does not provide a proper way to right-click focus with custom unit frames."],
+		dist = 0,
+	}
 
-UnitPopupButtons["ICEHUD_PET_DISMISS"] = {
-	text = L["Use your Dismiss Pet spell to dismiss a pet"],
-	tooltipText = L["Blizzard currently does not provide a proper way to right-click dismiss a pet with custom unit frames."],
-	dist = 0,
-}
+	UnitPopupButtons["ICEHUD_PET_DISMISS"] = {
+		text = L["Use your Dismiss Pet spell to dismiss a pet"],
+		tooltipText = L["Blizzard currently does not provide a proper way to right-click dismiss a pet with custom unit frames."],
+		dist = 0,
+	}
+elseif UnitPopupSetFocusButtonMixin then
+	IceHUDUnitPopupSetFocusButtonMixin = CreateFromMixins(UnitPopupButtonBaseMixin)
+	function IceHUDUnitPopupSetFocusButtonMixin:GetText()
+		return L["Type %s to set focus"]:format(SLASH_FOCUS1)
+	end
+	function IceHUDUnitPopupSetFocusButtonMixin:OnClick()
+	end
+
+	IceHUDUnitPopupClearFocusButtonMixin = CreateFromMixins(UnitPopupButtonBaseMixin)
+	function IceHUDUnitPopupClearFocusButtonMixin:GetText()
+		return L["Type %s to clear focus"]:format(SLASH_CLEARFOCUS1)
+	end
+	function IceHUDUnitPopupClearFocusButtonMixin:OnClick()
+	end
+
+	IceHUDUnitPopupPetDismissButtonMixin = CreateFromMixins(UnitPopupButtonBaseMixin)
+	function IceHUDUnitPopupPetDismissButtonMixin:GetText()
+		return L["Use your Dismiss Pet spell to dismiss a pet"]
+	end
+	function IceHUDUnitPopupPetDismissButtonMixin:CanShow()
+		return UnitPopupPetDismissButtonMixin:CanShow()
+	end
+	function IceHUDUnitPopupPetDismissButtonMixin:OnClick()
+	end
+
+	BLACKLISTED_UNIT_MENU_OPTIONS[SET_FOCUS] = IceHUDUnitPopupSetFocusButtonMixin
+	BLACKLISTED_UNIT_MENU_OPTIONS[CLEAR_FOCUS] = IceHUDUnitPopupClearFocusButtonMixin
+	BLACKLISTED_UNIT_MENU_OPTIONS[LOCK_FOCUS_FRAME] = true
+	BLACKLISTED_UNIT_MENU_OPTIONS[UNLOCK_FOCUS_FRAME] = true
+
+	if select(2, UnitClass("player")) ~= "WARLOCK" then
+		BLACKLISTED_UNIT_MENU_OPTIONS[PET_DISMISS] = IceHUDUnitPopupPetDismissButtonMixin
+	end
+end
 
 local munged_unit_menus = {}
 local function munge_unit_menu(menu)
@@ -703,11 +769,34 @@ local function munge_unit_menu(menu)
 	end
 
 	local found = false
-	local _, v
-	for _, v in ipairs(data) do
-		if BLACKLISTED_UNIT_MENU_OPTIONS[v] then
-			found = true
-			break
+	if data.GetMenuButtons then
+		local btns = data.GetMenuButtons()
+		for i=1, #btns do
+			if btns[i].IsMenu() then
+				local subbtns = btns[i].GetMenuButtons()
+				for j=1, #subbtns do
+					if BLACKLISTED_UNIT_MENU_OPTIONS[subbtns[j]:GetText()] then
+						found = true
+						break
+					end
+				end
+			else
+				if BLACKLISTED_UNIT_MENU_OPTIONS[btns[i]:GetText()] then
+					found = true
+					break
+				end
+			end
+
+			if found then
+				break
+			end
+		end
+	else
+		for _, v in ipairs(data) do
+			if BLACKLISTED_UNIT_MENU_OPTIONS[v] then
+				found = true
+				break
+			end
 		end
 	end
 
@@ -718,15 +807,42 @@ local function munge_unit_menu(menu)
 	end
 
 	local new_data = {}
-	for _, v in ipairs(data) do
-		local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[v]
-		if v == "PET_DISMISS" and select(2, UnitClass("player")) == "WARLOCK" then
-			blacklisted = false
+	if data.GetMenuButtons then
+		local new_buttons_list = {}
+		local btns = data.GetMenuButtons()
+		for i=1, #btns do
+			if btns[i].IsMenu() then
+				local subbtns = btns[i].GetMenuButtons()
+				for j=1, #subbtns do
+					local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[subbtns[j]:GetText()]
+					if not blacklisted then
+						new_buttons_list[#new_buttons_list+1] = subbtns[j]
+					elseif blacklisted ~= true then
+						new_buttons_list[#new_buttons_list+1] = blacklisted
+					end
+				end
+			else
+				local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[btns[i]:GetText()]
+				if not blacklisted then
+					new_buttons_list[#new_buttons_list+1] = btns[i]
+				elseif blacklisted ~= true then
+					new_buttons_list[#new_buttons_list+1] = blacklisted
+				end
+			end
 		end
-		if not blacklisted then
-			new_data[#new_data+1] = v
-		elseif blacklisted ~= true then
-			new_data[#new_data+1] = blacklisted
+
+		new_data = data
+		function new_data:GetMenuButtons()
+			return new_buttons_list
+		end
+	else
+		for _, v in ipairs(data) do
+			local blacklisted = BLACKLISTED_UNIT_MENU_OPTIONS[v]
+			if not blacklisted then
+				new_data[#new_data+1] = v
+			elseif blacklisted ~= true then
+				new_data[#new_data+1] = blacklisted
+			end
 		end
 	end
 	local new_menu_name = "ICEHUD_" .. menu
@@ -772,7 +888,6 @@ local function figure_unit_menu(unit)
 	return "PLAYER"
 end
 
-IceHUD_UnitFrame_DropDown = CreateFrame("Frame", "IceHUD_UnitFrame_DropDown", UIParent, "UIDropDownMenuTemplate")
 if UnitPopupFrames then
 	UnitPopupFrames[#UnitPopupFrames+1] = "IceHUD_UnitFrame_DropDown"
 end

IceHUD.toc

@@ -1,7 +1,7 @@
-## Interface: 90100
-## Interface-Retail: 90100
-## Interface-Classic: 11306
-## Interface-BCC: 20501
+## Interface: 90205
+## Interface-Retail: 90205
+## Interface-Classic: 11403
+## Interface-BCC: 20504
 ## Author: Parnic, originally created by Iceroth
 ## Name: IceHUD
 ## Title: IceHUD |cff7fff7f-Ace3-|r

IceHUD_Options/IceHUD_Options.toc

@@ -1,7 +1,7 @@
-## Interface: 90100
-## Interface-Retail: 90100
-## Interface-Classic: 11306
-## Interface-BCC: 20501
+## Interface: 90205
+## Interface-Retail: 90205
+## Interface-Classic: 11403
+## Interface-BCC: 20504
 ## Title: IceHUD |cff7fff7f-Options-|r
 ## Author: Parnic
 ## Version: @project-version@

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 parnic
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

changelog.md

@@ -1,5 +1,64 @@
 # Changelog
 
+v1.13.14.3:
+
+- Restored right-click menus on Info and Health bars when targeting other players.
+
+v1.13.14.2:
+
+- Restored right-click menus on Info and Health bars.
+
+v1.13.14.1:
+
+- Restored guard around array that doesn't exist on Classic clients.
+
+v1.13.14:
+
+- Fixed target health updating infrequently on Classic.
+- Fixed compatibility with WoW 9.2.5.
+- Updated TOC for all game flavors.
+
+v1.13.13:
+
+- Slight optimization of Zereth Mortis puzzle detection logic.
+- Fixed target health updating infrequently on Classic-BC.
+- Fixed reported error in TargetInvuln module.
+
+v1.13.12:
+
+- Hide IceHUD during Zereth Mortis puzzles
+- Fixed default player and target frames coming back sometimes (github issue #19)
+- Updated TOC for 9.2.0 and 1.14.2
+
+v1.13.11:
+
+- Fixed totem bar dismissal for BC-Classic and Classic
+- Updated TOC for BC-Clasic
+
+v1.13.10:
+
+- Updated TOCs for 9.1.5 and 1.14.1
+
+v1.13.9:
+
+- Fixed FocusMana modules attempting to register invalid events in Classic builds.
+- Add support for multiple anima-charged combo points to display at once.
+- Update TOC for Classic 1.14.0
+
+v1.13.8.1:
+
+- Updated TOC for BC-Classic and Classic.
+
+v1.13.8:
+
+- Fixed Paladin GCD not functioning in BC-Classic.
+
+v1.13.7:
+
+- Fixed energy ticker when zoning back into an instance after dying (Classic builds)
+- Added newer Fear spell to CC modules.
+- Fixed the straight textures (Tanks) not showing the lowest or highest values appropriately (10% could look empty, 90% could look full).
+
 v1.13.6:
 
 - Updated TOC to 9.1

modules/ComboPoints.lua

@@ -330,8 +330,7 @@ function ComboPoints.prototype:UpdateMaxComboPoints(event, unit, powerType)
 end
 
 function ComboPoints.prototype:UpdateChargedComboPoints()
-	local chargedPowerPoints = GetUnitChargedPowerPoints("player")
-	self.chargedPowerPointIndex = chargedPowerPoints and chargedPowerPoints[1]
+	self.chargedPowerPoints = GetUnitChargedPowerPoints("player")
 	self:CreateComboFrame()
 	self:UpdateComboPoints()
 end
@@ -445,7 +444,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 			g = g - ((1 / maxComboPoints)*i)
 		end
 
-		if i == self.chargedPowerPointIndex and self.moduleSettings.bShowAnimaCharged then
+		if self.moduleSettings.bShowAnimaCharged and self:IsAnimaChargedPoint(i) then
 			self.frame.graphical[i].texture:SetVertexColor(self:GetColor("KyrianAnimaComboPoint"))
 		else
 			self.frame.graphical[i].texture:SetVertexColor(r, g, b)
@@ -494,6 +493,20 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
 	end
 end
 
+function ComboPoints.prototype:IsAnimaChargedPoint(point)
+	if not self.chargedPowerPoints then
+		return false
+	end
+
+	for i=1, #self.chargedPowerPoints do
+		if self.chargedPowerPoints[i] == point then
+			return true
+		end
+	end
+
+	return false
+end
+
 function ComboPoints.prototype:UpdateComboPoints(...)
 	if select('#', ...) >= 3 and select(1, ...) == IceHUD.UnitPowerEvent and select(3, ...) ~= "COMBO_POINTS" then
 		return

modules/FocusMana.lua

@@ -39,9 +39,9 @@ end
 function FocusMana.prototype:Enable(core)
 	FocusMana.super.prototype.Enable(self, core)
 
-	if IceHUD.WowVer >= 40000 then
+	if not IceHUD.PerPowerEventsExist then
 		self:RegisterEvent(IceHUD.UnitPowerEvent, "UpdateEvent")
-		if IceHUD.WowVer < 80000 then
+		if IceHUD.EventExistsUnitMaxPower then
 			self:RegisterEvent("UNIT_MAXPOWER", "UpdateEvent")
 		end
 	else

modules/GlobalCoolDown.lua

@@ -286,6 +286,10 @@ function GlobalCoolDown.prototype:GetSpellId()
 			MONK=100780, -- jab
 		}
 
+		if IceHUD.WowClassicBC or IceHUD.WowClassic then
+			defaultSpells["PALADIN"] = 635
+		end
+
 		local _, unitClass = UnitClass("player")
 		return defaultSpells[unitClass]
 	end

modules/PlayerHealth.lua

@@ -1407,15 +1407,18 @@ end
 
 
 function PlayerHealth.prototype:ShowBlizz()
-	PlayerFrame:Show()
-	PlayerFrame:GetScript("OnLoad")(PlayerFrame)
+	PlayerFrame:SetParent(self.OriginalPlayerFrameParent or UIParent)
 end
 
 
 function PlayerHealth.prototype:HideBlizz()
-	PlayerFrame:Hide()
+	if not self.PlayerFrameParent then
+		self.PlayerFrameParent = CreateFrame("Frame")
+		self.PlayerFrameParent:Hide()
+	end
 
-	PlayerFrame:UnregisterAllEvents()
+	self.OriginalPlayerFrameParent = PlayerFrame:GetParent()
+	PlayerFrame:SetParent(self.PlayerFrameParent)
 end
 
 function PlayerHealth.prototype:HideBlizzardParty()

modules/PlayerMana.lua

@@ -280,7 +280,7 @@ function PlayerMana.prototype:ManaType(event, unit)
 
 	if self:ShouldUseTicker() then
 		-- register ticker for rogue energy
-		if (self.moduleSettings.tickerEnabled and (self.manaType == SPELL_POWER_ENERGY) and self.alive) then
+		if self.moduleSettings.tickerEnabled and self.manaType == SPELL_POWER_ENERGY then
 			self.tickerFrame:Show()
 			self.tickerFrame:SetScript("OnUpdate", function() self:EnergyTick() end)
 		else
@@ -438,7 +438,7 @@ function PlayerMana.prototype:EnergyTick()
 		return
 	end
 
-	if not (self.tickStart) then
+	if not self.tickStart or not self.alive then
 		self.tickerFrame:Hide()
 		return
 	end

modules/TargetCC.lua

@@ -113,6 +113,8 @@ local IncapacitateCCList = {
 local FearCCList = {
 	-- Psychic Scream
 	8122,
+	-- Fear (Retail)
+	118699,
 	-- Fear
 	5782,
 	-- Howl of Terror

modules/TargetHealth.lua

@@ -642,6 +642,10 @@ function IceTargetHealth.prototype:Enable(core)
 			self:RegisterEvent("LFG_PROPOSAL_FAILED", "CheckPartyRole")
 			self:RegisterEvent("LFG_ROLE_UPDATE", "CheckPartyRole")
 		end
+
+		if IceHUD.ShouldUpdateTargetHealthEveryTick and self.unit == "target" then
+			self.frame:SetScript("OnUpdate", function() self:Update(self.unit) end)
+		end
 	end
 
 	if (self.moduleSettings.hideBlizz) then
@@ -659,6 +663,10 @@ function IceTargetHealth.prototype:Disable(core)
 
 	UnregisterUnitWatch(self.frame)
 
+	if self.registerEvents and IceHUD.ShouldUpdateTargetHealthEveryTick and self.unit == "target" then
+		self.frame:SetScript("OnUpdate", nil)
+	end
+
 	if self.moduleSettings.hideBlizz then
 		self:ShowBlizz()
 	end
@@ -1057,20 +1065,25 @@ end
 
 
 function IceTargetHealth.prototype:ShowBlizz()
-	TargetFrame:Show()
-	TargetFrame:GetScript("OnLoad")(TargetFrame)
-
-	ComboFrame:Show()
-	ComboFrame:GetScript("OnLoad")(ComboFrame)
+	TargetFrame:SetParent(self.OriginalTargetFrameParent or UIParent)
+	ComboFrame:SetParent(self.OriginalComboFrameParent or UIParent)
 end
 
 
 function IceTargetHealth.prototype:HideBlizz()
-	TargetFrame:Hide()
-	TargetFrame:UnregisterAllEvents()
+	if not self.TargetFrameParent then
+		self.TargetFrameParent = CreateFrame("Frame")
+		self.TargetFrameParent:Hide()
+	end
+	if not self.ComboFrameParent then
+		self.ComboFrameParent = CreateFrame("Frame")
+		self.ComboFrameParent:Hide()
+	end
 
-	ComboFrame:Hide()
-	ComboFrame:UnregisterAllEvents()
+	self.OriginalTargetFrameParent = TargetFrame:GetParent()
+	TargetFrame:SetParent(self.TargetFrameParent)
+	self.OriginalComboFrameParent = ComboFrame:GetParent()
+	ComboFrame:SetParent(self.ComboFrameParent)
 end
 
 function IceTargetHealth.prototype:UpdateBar(scale, color, alpha)

modules/TargetInvuln.lua

@@ -197,7 +197,7 @@ end
 function TargetInvuln.prototype:UpdateTargetBuffs(event, unit, isUpdate)
 	local name, duration, remaining
 
-	if not isUpdate then
+	if not isUpdate or not self.lastUpdateTime then
 		self.buffName, self.buffDuration, self.buffRemaining = self:GetMaxbuffDuration(self.unit, self.buffList)
 	else
 		self.buffRemaining = math.max(0, self.buffRemaining - (GetTime() - self.lastUpdateTime))

modules/Totems.lua

@@ -287,10 +287,9 @@ function Totems.prototype:CreateTotemFrame()
 		self.frame.graphical = {}
 	end
 
-	local totemType
 	for i=1, self.numTotems do
-		slot = TOTEM_PRIORITIES[i]
-		self:CreateTotem(slot,  self.totemNames[slot])
+		local slot = TOTEM_PRIORITIES[i]
+		self:CreateTotem(slot, self.totemNames[slot])
 	end
 end
 
@@ -340,7 +339,6 @@ function Totems.prototype:CreateTotem(i, name)
 		return
 	end
 	local haveTotem, name, startTime, duration, icon = GetTotemInfo(i)
-	local bWasNewFrame = false
 	if (not self.frame.graphical[i]) then
 		self.frame.graphical[i] = CreateFrame("Frame", nil, self.frame)
 		self.frame.graphical[i].totem = self.frame.graphical[i]:CreateTexture(nil, "LOW")
@@ -349,7 +347,6 @@ function Totems.prototype:CreateTotem(i, name)
 
 		self.frame.graphical[i].totem:SetTexture(icon)
 		self.frame.graphical[i].totem:SetAllPoints(self.frame.graphical[i])
-		bWasNewFrame = true
 	end
 
 	self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
@@ -376,9 +373,9 @@ function Totems.prototype:CreateTotem(i, name)
 		self.graphicalOnLeave = function() GameTooltip:Hide() end
 	end
 	if not self.graphicalOnMouseUp then
-		self.graphicalOnMouseUp = function (self, mouseButton)
+		self.graphicalOnMouseUp = function (button, mouseButton)
 			if mouseButton == "RightButton" then
-				DestroyTotem(self.slot)
+				DestroyTotem(button.slot)
 			end
 		end
 	end
@@ -406,18 +403,19 @@ function Totems.prototype:CreateTotem(i, name)
 		self.frame.graphical[i]:EnableMouse(true)
 		self.frame.graphical[i]:SetScript("OnEnter", self.graphicalOnEnter)
 		self.frame.graphical[i]:SetScript("OnLeave", self.graphicalOnLeave)
+		if IceHUD.CanHookDestroyTotem then
+			self.frame.graphical[i]:SetScript("OnMouseUp", self.graphicalOnMouseUp)
+		end
 	else
 		self.frame.graphical[i]:EnableMouse(false)
 		self.frame.graphical[i]:SetScript("OnEnter", nil)
 		self.frame.graphical[i]:SetScript("OnLeave", nil)
+		if IceHUD.CanHookDestroyTotem then
+			self.frame.graphical[i]:SetScript("OnMouseUp", nil)
+		end
 	end
 	self.frame.graphical[i].slot = i
 	self.frame.graphical[i].name = name
-
-	-- it looks like HookScript will continue to add handlers every time instead of replacing them like SetScript
-	if (bWasNewFrame) then
-		--self.frame.graphical[i]:HookScript("OnMouseUp", self.graphicalOnMouseUp)
-	end
 end
 
 -- Load us up

readme.md

@@ -1,7 +1,5 @@
 # IceHUD
 
-## If you are getting a `PLAYER_TALENT_UPDATE` error in LibRangeCheck-2.0 on BC-Classic, please see https://www.wowace.com/projects/ice-hud/issues/303 - this is not IceHUD's fault.
-
 IceHUD is a highly configurable and customizable HUD addon in the spirit of DHUD, MetaHUD, and others designed to keep your focus in the center of the screen where your character is.
 
 ## **What it is**

this_version.md

@@ -1,6 +1,19 @@
 # Changelog
 
-v1.13.6:
+v1.13.14.3:
 
-- Updated TOC to 9.1
-- Packaged an updated DogTag library with a fix for Classic-era `[Class]` tags.
+- Restored right-click menus on Info and Health bars when targeting other players.
+
+v1.13.14.2:
+
+- Restored right-click menus on Info and Health bars.
+
+v1.13.14.1:
+
+- Restored guard around array that doesn't exist on Classic clients.
+
+v1.13.14:
+
+- Fixed target health updating infrequently on Classic.
+- Fixed compatibility with WoW 9.2.5.
+- Updated TOC for all game flavors.