Fixed spellid issue when parsing combat log

LeftHandedGlove · Aug 30, 2019 · dd0919c · dd0919c
1 parent dd27246
commit dd0919c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/WeaponSwingTimer_Core.lua b/WeaponSwingTimer_Core.lua
@@ -620,6 +620,7 @@ addon_data.core.MissHandler = function(unit, miss_type, is_offhand)
 end
 
 addon_data.core.SpellHandler = function(unit, spell_id)
+    --print(spell_id)
     local _, player_class, _ = UnitClass('player')
     for class, spell_table in pairs(swing_reset_spells) do
         if player_class == class then

diff --git a/WeaponSwingTimer_Player.lua b/WeaponSwingTimer_Player.lua
@@ -121,7 +121,7 @@ addon_data.player.OnInventoryChange = function()
 end
 
 addon_data.player.OnCombatLogUnfiltered = function(combat_info)
-    local _, event, _, source_guid, _, _, _, dest_guid, _, _, _, spell_id, spell_name, _ = unpack(combat_info)
+    local _, event, _, source_guid, _, _, _, dest_guid, _, _, _, _, spell_name, _ = unpack(combat_info)
     if (source_guid == addon_data.player.guid) then
         if (event == "SWING_DAMAGE") then
             local _, _, _, _, _, _, _, _, _, is_offhand = select(12, unpack(combat_info))
@@ -134,6 +134,7 @@ addon_data.player.OnCombatLogUnfiltered = function(combat_info)
             local miss_type, is_offhand = select(12, unpack(combat_info))
             addon_data.core.MissHandler("player", miss_type, is_offhand)
         elseif (event == "SPELL_DAMAGE") or (event == "SPELL_MISSED") then
+            local _, _, _, _, _, _, spell_id = GetSpellInfo(spell_name)
             addon_data.core.SpellHandler("player", spell_id)
         end
     end

diff --git a/WeaponSwingTimer_Target.lua b/WeaponSwingTimer_Target.lua
@@ -126,7 +126,7 @@ addon_data.target.OnUpdate = function(elapsed)
 end
 
 addon_data.target.OnCombatLogUnfiltered = function(combat_info)
-    local _, event, _, source_guid, _, _, _, dest_guid, _, _, _, spell_id, spell_name, _ = unpack(combat_info)
+    local _, event, _, source_guid, _, _, _, dest_guid, _, _, _, _, spell_name, _ = unpack(combat_info)
     if (source_guid == addon_data.target.guid) then
         if (event == "SWING_DAMAGE") then
             local _, _, _, _, _, _, _, _, _, is_offhand = select(12, unpack(combat_info))
@@ -139,6 +139,7 @@ addon_data.target.OnCombatLogUnfiltered = function(combat_info)
             local miss_type, is_offhand = select(12, unpack(combat_info))
             addon_data.core.MissHandler("target", miss_type, is_offhand)
         elseif (event == "SPELL_DAMAGE") or (event == "SPELL_MISSED") then
+            local _, _, _, _, _, _, spell_id = GetSpellInfo(spell_name)
             addon_data.core.SpellHandler("target", spell_id)
         end
     end