From 6445b6f8c876bb5593aaf083e03d5c3c022d68b1 Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Fri, 10 Nov 2017 00:37:22 +0000 Subject: [PATCH] Correctly handle death by station --- plugins/inara.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/plugins/inara.py b/plugins/inara.py index f4fe2227..ad771b77 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -365,16 +365,12 @@ def journal_entry(cmdr, is_beta, system, station, entry, state): # Combat if entry['event'] == 'Died': + data = OrderedDict([ ('starsystemName', system) ]) if 'Killers' in entry: - add_event('addCommanderCombatDeath', entry['timestamp'], - OrderedDict([('starsystemName', system), - ('wingOpponentNames', [x['Name'] for x in entry['Killers']]), - ])) - else: - add_event('addCommanderCombatDeath', entry['timestamp'], - OrderedDict([('starsystemName', system), - ('opponentName', entry['KillerName']), - ])) + data['wingOpponentNames'] = [x['Name'] for x in entry['Killers']] + elif 'KillerName' in entry: + data['opponentName'] = entry['KillerName'] + add_event('addCommanderCombatDeath', entry['timestamp'], data) elif entry['event'] == 'Interdicted': add_event('addCommanderCombatInterdicted', entry['timestamp'],