From adb079dd1d76f0c1781e80f5a1c4b50589141e1a Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 16 Nov 2025 22:50:15 +0000
Subject: [PATCH] Protect confirmed tracking from evaluation overwrites

Prevent TrackComboPointCast from overwriting confirmed tracking with
unconfirmed evaluation data. Once DoCast confirms a cast, subsequent
macro evaluations will no longer overwrite the tracking entry.

This fixes the issue where pfUI's second AddEffect call would see
unconfirmed tracking because evaluations overwrote the confirmed data.
---
 ComboPointTracker.lua | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/ComboPointTracker.lua b/ComboPointTracker.lua
index 737916b..73b4519 100644
--- a/ComboPointTracker.lua
+++ b/ComboPointTracker.lua
@@ -188,16 +188,27 @@ function CleveRoids.TrackComboPointCast(spellName)
     local existing = CleveRoids.ComboPointTracking[spellName]
     if existing then
         local age = currentTime - existing.cast_time
-        -- Keep existing if it's fresh (<0.5s) and has more combo points
-        if age < 0.5 and existing.combo_points > comboPoints then
-            -- Don't overwrite better data with worse data
-            if CleveRoids.debug then
-                DEFAULT_CHAT_FRAME:AddMessage(
-                    string.format("|cff888888CleveRoids:|r ComboTrack: Ignoring %s with %d CP (have %d CP)",
-                        spellName, comboPoints, existing.combo_points)
-                )
+        -- Keep existing if it's fresh (<0.5s) and EITHER has more combo points OR is confirmed
+        if age < 0.5 then
+            if existing.combo_points > comboPoints then
+                -- Don't overwrite better data with worse data
+                if CleveRoids.debug then
+                    DEFAULT_CHAT_FRAME:AddMessage(
+                        string.format("|cff888888CleveRoids:|r ComboTrack: Ignoring %s with %d CP (have %d CP)",
+                            spellName, comboPoints, existing.combo_points)
+                    )
+                end
+                return
+            elseif existing.confirmed then
+                -- Don't overwrite confirmed tracking with unconfirmed evaluation
+                if CleveRoids.debug then
+                    DEFAULT_CHAT_FRAME:AddMessage(
+                        string.format("|cff888888CleveRoids:|r ComboTrack: Ignoring %s - already confirmed",
+                            spellName)
+                    )
+                end
+                return
             end
-            return
         end
     end