Performance improvements for classic

Author: funkjedi

SheepMonitor.toc

@@ -2,7 +2,7 @@
 ## Title: Sheep Monitor
 ## Notes: Provides various methods of notification to help you keep track of your flock.
 ## Author: funkjedi
-## Version: 1.33
+## Version: 1.34
 ## SavedVariables: SheepMonitorDatabase
 ## OptionalDeps: Ace3, LibAuraInfo-1.0
 ## X-Curse-Project-ID: 28218

changelog.txt

@@ -1,3 +1,6 @@
+1.34
+- performance improvements for classic
+
 1.33
 - fixes for classic CLEU errors
 - guard against secret spellIds

main.lua

@@ -193,8 +193,8 @@ function SheepMonitor:HandleUnitAuraClassic(unitTarget, destGUID)
 end
 
 function SheepMonitor:COMBAT_LOG_EVENT_UNFILTERED(event, ...)
-    local timestamp, eventType, hideCaster, sourceGUID, sourceName, sourceFlags, sourceFlags2, destGUID, destName, destFlags, destFlags2 =
-        CombatLogGetCurrentEventInfo()
+    local timestamp, eventType, hideCaster, sourceGUID, sourceName, sourceFlags, sourceFlags2, destGUID, destName, destFlags, destFlags2,
+        spellId, spellName = CombatLogGetCurrentEventInfo()
 
     local isDamageEvent = damageEventTypes[eventType]
     local isAuraRemoved = eventType == 'SPELL_AURA_REMOVED'
@@ -207,20 +207,19 @@ function SheepMonitor:COMBAT_LOG_EVENT_UNFILTERED(event, ...)
         if eventType == 'SWING_DAMAGE' then
             self:AuraBroken(destGUID, sourceName, 'Melee')
         else
-            local spellId, spellName = select(12, CombatLogGetCurrentEventInfo())
             self:AuraBroken(destGUID, sourceName, spellName or 'Unknown')
         end
     end
 
     if isAuraRemoved then
-        local spellId, spellName = select(12, CombatLogGetCurrentEventInfo())
+        local _
 
-        -- classic always returns a spell id of zero so we
-        -- resolve the spell id using the spell name instead
-        if spellName then
-            spellId = select(7, SheepMonitor.GetSpellInfo(spellName)) or spellId
+        if spellId < 1 and spellName then
+            _, _, _, _, _, _, spellId = SheepMonitor.GetSpellInfo(spellName)
         end
 
+        spellId = spellId or 0
+
         if self.trackableAuras[spellId] then
             self:AuraRemoved(destGUID, spellId)
         end