diff --git a/README.md b/README.md index 60e772e..3c66527 100644 --- a/README.md +++ b/README.md @@ -143,6 +143,10 @@ If you want the server to load a file (*module*) on startup, add it to the `modu Never use tabs! Use 2 spaces to indent. +## Quotes +Always use double-quotes! +Only use single-quotes when the string contains double-quotes that would need to be escaped. + ## Comments Comments are good! Please comment everything that's non-obious or makes it easier to understand diff --git a/chatgroups.py b/chatgroups.py index 7975d79..103061b 100644 --- a/chatgroups.py +++ b/chatgroups.py @@ -1,5 +1,6 @@ #pylint: disable=F0401 from helpers import * +from java.utils.UUID import fromString as juuid import simplejson as json chatgroups_filename = "plugins/redstoner-utils.py.dir/files/chatgroups.json" @@ -30,9 +31,11 @@ def onChatgroupCommand(sender, args): group = groups[str(sender.getUniqueId())] msg(sender, "&aCurrent chatgroup: %s" % group) users = [] - for user, ugroup in groups.iteritems(): + for uid, ugroup in groups.iteritems(): if ugroup == group: - users += [user] + usr = server.getPlayer(juuid(uid)) + if usr: + users.append(usr.getDisplayName()) msg(sender, "&aUsers in this group:") msg(sender, "&a%s" % ", ".join(users)) else: diff --git a/reports.py b/reports.py index c084074..e715ac0 100644 --- a/reports.py +++ b/reports.py @@ -22,7 +22,7 @@ def printHelp(sender): def printList(sender): msg(sender, "&a" + str(len(reports)) + " reports:") for i, report in enumerate(reports): - msg(sender, "&8[&e" + str(i) + " &c" + report['time'] + "&8] &3" + report['player'] + "&f: &a" + report['msg']) + msg(sender, "&8[&e" + str(i) + " &c" + report["time"] + "&8] &3" + report["player"] + "&f: &a" + report["msg"]) def tp(sender, rep_id): if rep_id >= len(reports) or rep_id < 0: @@ -30,7 +30,7 @@ def tp(sender, rep_id): return True else: report = reports[rep_id] - safetp(sender, server.getWorld(report['world']), report['x'], report['y'], report['z'], report['yaw'], report['pitch']) + safetp(sender, server.getWorld(report["world"]), report["x"], report["y"], report["z"], report["yaw"], report["pitch"]) msg(sender, "&aTeleported to report #%s" % rep_id ) @@ -40,9 +40,9 @@ def deleteReport(sender, rep_id): reports.pop(rep_id) saveReports() msg(sender, "&aReport #%s deleted." % rep_id) - reporter = server.getOfflinePlayer(report['player']) + reporter = server.getOfflinePlayer(report["player"]) plugHeader(reporter, "Report") - msg(reporter, "&aReport '&e%s&a' was resolved by %s." % (report['msg'], sender.getName())) + msg(reporter, "&aReport '&e%s&a" was resolved by %s." % (report["msg"], sender.getName())) else: msg(sender, "&cThat report does not exist!")