From 369d9557bb4381f6960c0229ac6bddbde0b6b2c1 Mon Sep 17 00:00:00 2001 From: Britt Yazel Date: Mon, 27 Nov 2023 18:49:46 -0800 Subject: [PATCH] Revert optimization that may be causing delays --- CollectUnitAuras.lua | 21 +++++++-------------- EnhancedRaidFrames.lua | 6 ++---- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/CollectUnitAuras.lua b/CollectUnitAuras.lua index 8160b7e..ac51ad7 100644 --- a/CollectUnitAuras.lua +++ b/CollectUnitAuras.lua @@ -101,8 +101,6 @@ function EnhancedRaidFrames:UpdateUnitAuras(unit, payload, parentFrame) payload.isFullUpdate = true --force a full update if we don't have a table for the unit yet end - local shouldUpdateFrames = false - -- If we get a full update signal, reset the table and rescan all auras for the unit if payload.isFullUpdate then -- Clear out the table @@ -110,7 +108,7 @@ function EnhancedRaidFrames:UpdateUnitAuras(unit, payload, parentFrame) -- Iterate through all buffs and debuffs on the unit for _, filter in pairs({"HELPFUL", "HARMFUL"}) do AuraUtil.ForEachAura(unit, filter, nil, function(auraData) - shouldUpdateFrames = self:addToAuraTable(parentFrame, auraData) + self:addToAuraTable(parentFrame, auraData) end, true); end return @@ -119,7 +117,7 @@ function EnhancedRaidFrames:UpdateUnitAuras(unit, payload, parentFrame) -- If new auras are added, update the table with their payload information if payload.addedAuras then for _, auraData in pairs(payload.addedAuras) do - shouldUpdateFrames = self:addToAuraTable(parentFrame, auraData) + self:addToAuraTable(parentFrame, auraData) end end @@ -129,7 +127,7 @@ function EnhancedRaidFrames:UpdateUnitAuras(unit, payload, parentFrame) parentFrame.ERF_unitAuras[auraInstanceID] = nil --it's possible for auraData to return nil if the aura was removed just prior to us querying it local auraData = C_UnitAuras.GetAuraDataByAuraInstanceID(unit, auraInstanceID) - shouldUpdateFrames = self:addToAuraTable(parentFrame, auraData) + self:addToAuraTable(parentFrame, auraData) end end @@ -138,23 +136,19 @@ function EnhancedRaidFrames:UpdateUnitAuras(unit, payload, parentFrame) for _, auraInstanceID in pairs(payload.removedAuraInstanceIDs) do if parentFrame.ERF_unitAuras[auraInstanceID] then parentFrame.ERF_unitAuras[auraInstanceID] = nil - shouldUpdateFrames = true end end end - - if shouldUpdateFrames then - self:UpdateIndicators(parentFrame) - end + + self:UpdateIndicators(parentFrame) end --- Add or update an aura to the ERFAuras table ---@param parentFrame table @The raid frame that we're updating ---@param auraData table @Payload from UNIT_AURA event ----@return boolean @True if we added or updated an aura function EnhancedRaidFrames:addToAuraTable(parentFrame, auraData) if not auraData then - return false + return end -- Quickly check if we're watching for this aura, and ignore if we aren't @@ -170,9 +164,8 @@ function EnhancedRaidFrames:addToAuraTable(parentFrame, auraData) end parentFrame.ERF_unitAuras[auraData.auraInstanceID] = auraData - return true --return true if we added or updated an aura + return end - return false end --- Called by our UNIT_AURA listeners and is used to store unit aura information for a given unit. diff --git a/EnhancedRaidFrames.lua b/EnhancedRaidFrames.lua index 83ee0ba..a73a06e 100644 --- a/EnhancedRaidFrames.lua +++ b/EnhancedRaidFrames.lua @@ -67,11 +67,9 @@ function EnhancedRaidFrames:OnEnable() self:UpdateAllIndicators(true) end) - -- Hook our UpdateStockIndicatorVisibility function onto the default UtilSetBuff, UtilSetDebuff, and UtilSetDispelDebuff functions. + -- Hook our UpdateStockIndicatorVisibility function onto the default UpdateAuras function. -- We use SecureHook() because the default function is protected, and we want to make sure our code runs after the default code. - self:SecureHook("CompactUnitFrame_UtilSetBuff", function(frame) self:UpdateStockIndicatorVisibility(frame) end) - self:SecureHook("CompactUnitFrame_UtilSetDebuff", function(frame) self:UpdateStockIndicatorVisibility(frame) end) - self:SecureHook("CompactUnitFrame_UtilSetDispelDebuff", function(frame) self:UpdateStockIndicatorVisibility(frame) end) + self:SecureHook("CompactUnitFrame_UpdateAuras", function(frame) self:UpdateStockIndicatorVisibility(frame) end) --also hook the UpdateWidgetsOnlyMode function as it also seems to trigger the stock buff/debuff frames self:SecureHook("CompactUnitFrame_UpdateWidgetsOnlyMode", function(frame) self:UpdateStockIndicatorVisibility(frame) end)