comparison Main.lua @ 297:57cb63fe5ba8

Only wipe previous_combat_event on non-damaging CLEU subevent or when UNIT_DIED fires (after collecting its data).
author James D. Callahan III <jcallahan@curse.com>
date Mon, 17 Jun 2013 14:39:09 -0500
parents 0cad30f414f6
children 841eeb16dcf7
comparison
equal deleted inserted replaced
296:0cad30f414f6 297:57cb63fe5ba8
1304 source_guid = nil 1304 source_guid = nil
1305 end 1305 end
1306 local killer_guid = source_guid or previous_combat_event.source_guid 1306 local killer_guid = source_guid or previous_combat_event.source_guid
1307 local killer_name = source_name or previous_combat_event.source_name 1307 local killer_name = source_name or previous_combat_event.source_name
1308 1308
1309 table.wipe(previous_combat_event)
1310
1309 if not group_member_uids[killer_guid] and not group_pet_guids[killer_guid] then 1311 if not group_member_uids[killer_guid] and not group_pet_guids[killer_guid] then
1310 Debug("%s: %s was killed by %s (not group member or pet).", sub_event, dest_name or _G.UNKNOWN, killer_name or _G.UNKNOWN) 1312 Debug("%s: %s was killed by %s (not group member or pet).", sub_event, dest_name or _G.UNKNOWN, killer_name or _G.UNKNOWN)
1311 ClearKilledNPC() 1313 ClearKilledNPC()
1312 ClearKilledBossID() 1314 ClearKilledBossID()
1313 return 1315 return
1349 if not NON_DAMAGE_EVENTS[sub_event] then 1351 if not NON_DAMAGE_EVENTS[sub_event] then
1350 -- Uncomment to look for other sub-events to blacklist. 1352 -- Uncomment to look for other sub-events to blacklist.
1351 -- Debug("Recording for %s", sub_event) 1353 -- Debug("Recording for %s", sub_event)
1352 previous_combat_event.source_guid = source_guid 1354 previous_combat_event.source_guid = source_guid
1353 previous_combat_event.source_name = source_name 1355 previous_combat_event.source_name = source_name
1354 previous_combat_event.dest_guid = dest_guid
1355 previous_combat_event.dest_name = dest_name
1356 end 1356 end
1357 return 1357 return
1358 end 1358 end
1359 combat_log_func(sub_event, source_guid, source_name, source_flags, dest_guid, dest_name, dest_flags, ...) 1359 combat_log_func(sub_event, source_guid, source_name, source_flags, dest_guid, dest_name, dest_flags, ...)
1360 table.wipe(previous_combat_event) 1360
1361 if NON_DAMAGE_EVENTS[sub_event] then
1362 table.wipe(previous_combat_event)
1363 end
1361 end 1364 end
1362 1365
1363 local DIPLOMACY_SPELL_ID = 20599 1366 local DIPLOMACY_SPELL_ID = 20599
1364 local MR_POP_RANK1_SPELL_ID = 78634 1367 local MR_POP_RANK1_SPELL_ID = 78634
1365 local MR_POP_RANK2_SPELL_ID = 78635 1368 local MR_POP_RANK2_SPELL_ID = 78635