revert polearms inclusion for TG (3.4.1 removes them again)

fix for rare queue error (cooldown can return nil shortly after loading screen)
Rottenbeer · Jan 19, 2023 · 6df4cc4 · 6df4cc4
1 parent a2939e7
commit 6df4cc4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 32 deletions.
diff --git a/ItemRack/ItemRack.lua b/ItemRack/ItemRack.lua
@@ -100,7 +100,7 @@ ItemRackItems = {
 }
 
 ItemRack.NoTitansGrip = {
-	--["Polearms"] = 1, -- 3.3.5 / Wrath Classic support Polearm Titan's Grip
+	["Polearms"] = 1, -- reverted in 3.4.1 to block Polearms from Titan's Grip again
 	["Fishing Poles"] = 1,
 	["Staves"] = 1
 }

diff --git a/ItemRack/ItemRackQueue.lua b/ItemRack/ItemRackQueue.lua
@@ -86,6 +86,7 @@ end
 
 function ItemRack.ItemNearReady(id)
 	local start,duration = GetItemCooldown(id)
+	if not tonumber(start) then return end -- can return nil shortly after loading screen
 	if start==0 or math.max(start + duration - GetTime(),0)<=30 then
 		return true
 	end

diff --git a/ItemRack/ItemRack_Wrath.toc b/ItemRack/ItemRack_Wrath.toc
diff --git a/ItemRackOptions/ItemRackOptions_Wrath.toc b/ItemRackOptions/ItemRackOptions_Wrath.toc