From 8ffa50c4369e4626cccd834b21bbed0a92527652 Mon Sep 17 00:00:00 2001 From: jomo Date: Wed, 2 Jul 2014 01:13:12 +0200 Subject: fix deleteing non-existing report --- reports.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'reports.py') diff --git a/reports.py b/reports.py index 006a5fa..8616a28 100644 --- a/reports.py +++ b/reports.py @@ -35,13 +35,16 @@ def tp(sender, rep_id): def deleteReport(sender, rep_id): - report = reports[rep_id] - reports.pop(rep_id) - saveReports() - msg(sender, "&aReport #%s deleted." % rep_id) - reporter = server.getOfflinePlayer(report['player']) - plugHeader(reporter, "Report") - msg(reporter, "&aReport '&e%s&a' was resolved by %s." % (report['msg'], sender.getName())) + report = reports.get(rep_id) + if report: + reports.pop(rep_id) + saveReports() + msg(sender, "&aReport #%s deleted." % rep_id) + reporter = server.getOfflinePlayer(report['player']) + plugHeader(reporter, "Report") + msg(reporter, "&aReport '&e%s&a' was resolved by %s." % (report['msg'], sender.getName())) + else: + msg(sender, "&cThat report does not exist!") def saveReports(): try: -- cgit v1.2.3