# HG changeset patch # User James D. Callahan III # Date 1371497949 18000 # Node ID 57cb63fe5ba8012eb5fed65d995504430dd56360 # Parent 0cad30f414f68386808a69876727aa7d78c2f74f Only wipe previous_combat_event on non-damaging CLEU subevent or when UNIT_DIED fires (after collecting its data). diff -r 0cad30f414f6 -r 57cb63fe5ba8 Main.lua --- a/Main.lua Mon Jun 17 12:51:19 2013 -0500 +++ b/Main.lua Mon Jun 17 14:39:09 2013 -0500 @@ -1306,6 +1306,8 @@ local killer_guid = source_guid or previous_combat_event.source_guid local killer_name = source_name or previous_combat_event.source_name + table.wipe(previous_combat_event) + if not group_member_uids[killer_guid] and not group_pet_guids[killer_guid] then Debug("%s: %s was killed by %s (not group member or pet).", sub_event, dest_name or _G.UNKNOWN, killer_name or _G.UNKNOWN) ClearKilledNPC() @@ -1351,13 +1353,14 @@ -- Debug("Recording for %s", sub_event) previous_combat_event.source_guid = source_guid previous_combat_event.source_name = source_name - previous_combat_event.dest_guid = dest_guid - previous_combat_event.dest_name = dest_name end return end combat_log_func(sub_event, source_guid, source_name, source_flags, dest_guid, dest_name, dest_flags, ...) - table.wipe(previous_combat_event) + + if NON_DAMAGE_EVENTS[sub_event] then + table.wipe(previous_combat_event) + end end local DIPLOMACY_SPELL_ID = 20599