fix: #2217 error in item cooldown conditions

ascott18 · Sep 5, 2024 · 0c83604 · 0c83604
1 parent a94efef
commit 0c83604
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,17 @@
+## v11.0.7
+* Fix: #2217 error in item cooldown conditions
+
+## v11.0.6
+* #2190: Added options to Buff/Debuff icons to source stack count from tooltip numbers.
+* Fix: #2208 Uncommon issue with monk action bars
+* Fix: #2210 Fix desync of current GCD duration
+
+
 ## v11.0.5
 * Spell Cooldown and Reactive Ability icons are vastly more efficient if the tracked ability is on your action bars (macros excluded).
   * This is done by utilizing new WoW 11.0 APIs that are specific to abilities present on action bars.
-* #2190: Added options to Buff/Debuff icons to source stack count from tooltip numbers.
 * Fix: #2197 upstream issue in LibSpellRange-1.0 with range checking in classic/cata.
 * Fix: #2201 Don't treat inactive hero talent trees as learned talents
-* Fix: #2210 Fix desync of current GCD duration
-* Fix: #2208 Uncommon issue with monk action bars
-
 
 ## v11.0.4
 * Fix: #2186 Activation overlays in Retail

diff --git a/Components/Core/Common/Item.lua b/Components/Core/Common/Item.lua
@@ -32,9 +32,6 @@ local GetItemSpell = C_Item and C_Item.GetItemSpell or GetItemSpell
 
 local INVSLOT_LAST_EQUIPPED = INVSLOT_LAST_EQUIPPED
 
-local OnGCD = TMW.OnGCD
-
-
 local Item = TMW:NewClass("Item")
 
 
@@ -165,7 +162,7 @@ function Item:GetCooldownDurationNoGCD()
 	if enable == 0 then
 		return math.huge
 	elseif duration then
-		return ((duration == 0 or OnGCD(duration)) and 0) or (duration - (TMW.time - start))
+		return ((duration == 0 or TMW.OnGCD(duration)) and 0) or (duration - (TMW.time - start))
 	end
 	return 0
 end

diff --git a/Components/GroupModules/GroupModule_IconPosition_Sortable/module.lua b/Components/GroupModules/GroupModule_IconPosition_Sortable/module.lua
@@ -17,8 +17,6 @@ local TMW = TMW
 local L = TMW.L
 local print = TMW.print
 
-local OnGCD = TMW.OnGCD
-
 local IconPosition_Sortable = TMW:NewClass("GroupModule_IconPosition_Sortable", "GroupModule_IconPosition")
 
 

diff --git a/Components/IconModules/IconModule_Texture_Colored/Texture_Colored.lua b/Components/IconModules/IconModule_Texture_Colored/Texture_Colored.lua
@@ -21,8 +21,6 @@ local LMB = LibStub("Masque", true) or (LibMasque and LibMasque("Button"))
 local type = type
 local bitband = bit.band
 
-local OnGCD = TMW.OnGCD
-
 local ColorMSQ, OnlyMSQ
 
 local Texture_Colored = TMW:NewClass("IconModule_Texture_Colored", "IconModule_Texture")

diff --git a/Components/IconModules/IconModule_TimerBar/TimerBar.lua b/Components/IconModules/IconModule_TimerBar/TimerBar.lua
@@ -22,10 +22,6 @@ local LSM = LibStub("LibSharedMedia-3.0")
 local	pairs, wipe =
 		pairs, wipe
 
-local OnGCD = TMW.OnGCD
-
-
-
 local BarsToUpdate = {}
 
 

diff --git a/Options/CHANGELOG.lua b/Options/CHANGELOG.lua
@@ -3,15 +3,20 @@ if not TMW then return end
 TMW.CHANGELOG_LASTVER="10.0.0"
 
 TMW.CHANGELOG = [==[
+## v11.0.7
+* Fix: #2217 error in item cooldown conditions
+
+## v11.0.6
+* #2190: Added options to Buff/Debuff icons to source stack count from tooltip numbers.
+* Fix: #2208 Uncommon issue with monk action bars
+* Fix: #2210 Fix desync of current GCD duration
+
+
 ## v11.0.5
 * Spell Cooldown and Reactive Ability icons are vastly more efficient if the tracked ability is on your action bars (macros excluded).
   * This is done by utilizing new WoW 11.0 APIs that are specific to abilities present on action bars.
-* #2190: Added options to Buff/Debuff icons to source stack count from tooltip numbers.
 * Fix: #2197 upstream issue in LibSpellRange-1.0 with range checking in classic/cata.
 * Fix: #2201 Don't treat inactive hero talent trees as learned talents
-* Fix: #2210 Fix desync of current GCD duration
-* Fix: #2208 Uncommon issue with monk action bars
-
 
 ## v11.0.4
 * Fix: #2186 Activation overlays in Retail

diff --git a/TellMeWhen-Cata.toc b/TellMeWhen-Cata.toc
@@ -18,7 +18,7 @@
 ## X-WoWI-ID: 10855
 ## X-Wago-ID: ZQ6aZqKW
 
-## Version: 11.0.6
+## Version: 11.0.7
 ## Author: Cybeloras of Aerie Peak
 ## IconTexture: Interface\Addons\TellMeWhen\Textures\LDB Icon
 ## AddonCompartmentFunc: TellMeWhen_OnAddonCompartmentClick

diff --git a/TellMeWhen-Classic.toc b/TellMeWhen-Classic.toc
@@ -18,7 +18,7 @@
 ## X-WoWI-ID: 10855
 ## X-Wago-ID: ZQ6aZqKW
 
-## Version: 11.0.6
+## Version: 11.0.7
 ## Author: Cybeloras of Aerie Peak
 ## IconTexture: Interface\Addons\TellMeWhen\Textures\LDB Icon
 ## AddonCompartmentFunc: TellMeWhen_OnAddonCompartmentClick

diff --git a/TellMeWhen.toc b/TellMeWhen.toc
@@ -18,7 +18,7 @@
 ## X-WoWI-ID: 10855
 ## X-Wago-ID: ZQ6aZqKW
 
-## Version: 11.0.6
+## Version: 11.0.7
 ## Author: Cybeloras of Aerie Peak
 ## IconTexture: Interface\Addons\TellMeWhen\Textures\LDB Icon
 ## AddonCompartmentFunc: TellMeWhen_OnAddonCompartmentClick

diff --git a/includes.xml b/includes.xml
@@ -62,10 +62,10 @@
 <Script file="Components\Core\Common\SwingTimerMonitor.lua" />
 <Script file="Components\Core\Common\UpdateTableManager.lua" />
 <Script file="Components\Core\Common\PlayerNames.lua" />
-<Script file="Components\Core\Common\Item.lua" />
-<Script file="Components\Core\Common\Auras.lua" />
 <Script file="Components\Core\Common\Actions.lua" />
 <Script file="Components\Core\Common\Cooldowns.lua" />
+<Script file="Components\Core\Common\Item.lua" />
+<Script file="Components\Core\Common\Auras.lua" />
 <Script file="Components\Core\Common\SpellRange.lua" />
 <Script file="Components\Core\Common\SpellUsable.lua" />
 <Script file="Components\Core\Common\DogTags\DogTags.lua" />