Added arguments command and label to all command executor functions,
hopefully for massive performance increase.
This is due to the following mess in PythonLoader:
``` Java
@Override
public boolean onCommand(CommandSender sender, Command command, String
label, String[] args) {
boolean result;
if (argcount == -1) {
try {
result = call(4, sender, command, label, args);
argcount = 4;
} catch (PyException e) {
//this could goof up someone ... they'll probably yell at us and
eventually read this code ... fuck them
if (e.type == Py.TypeError && (e.value.toString().endsWith("takes
exactly 3 arguments (4 given)") || e.value.toString().endsWith("takes
exactly 4 arguments (5 given)"))) {
result = call(3, sender, command, label, args);
argcount = 3;
} else if (e.type == Py.TypeError && (e.value.toString().endsWith("takes
exactly 2 arguments (4 given)") || e.value.toString().endsWith("takes
exactly 3 arguments (5 given)"))) {
result = call(2, sender, command, label, args);
argcount = 2;
} else {
throw e;
}
}
} else {
result = call(argcount, sender, command, label, args);
}
return result;
}
```
Note: Still WIP on reports - I'm working on making it keep solved
reports to fix issue 10
175 lines
6.0 KiB
Python
175 lines
6.0 KiB
Python
from helpers import *
|
|
from java.util.UUID import fromString as juuid
|
|
import time
|
|
import thread
|
|
from traceback import format_exc as trace
|
|
|
|
|
|
time_format = "%Y.%m.%d %H:%M"
|
|
reports = open_json_file("reports", [])
|
|
check_reports = True
|
|
check_delay = 60 * 10 # Every 10 minutes, staff will be notified about pending reports.
|
|
rp_permission = "utils.rp"
|
|
|
|
|
|
def print_help(sender):
|
|
msg(sender, " &2/report <text> &eReport something")
|
|
msg(sender, " &2/rp open|closed &eList open/closed reports (id, player, text)")
|
|
msg(sender, " &2/rp tp <id> &eTeleport to report's location & show details")
|
|
msg(sender, " &2/rp close <id> &eResolve a report")
|
|
msg(sender, " &2/rp del <id> &eDelete a report (admin only)")
|
|
|
|
|
|
def print_list(sender, closed):
|
|
try: # new thread, anything can happen.
|
|
targeted_reports = enumerate(reports)
|
|
for i, report in targeted_reports:
|
|
if report["closed"] != closed:
|
|
targeted_reports.pop(report)
|
|
|
|
msg(sender, "&a%s %s reports:" % (len(targeted_reports), "closed" if closed else "open"))
|
|
for i, report in targeted_reports:
|
|
name = retrieve_player(report["uuid"]).getName()
|
|
msg(sender, "&8[&e%s &c%s&8] &3%s&f: &a%s" % (i, report["time"], name, report["msg"]))
|
|
except:
|
|
warn("Failed to complete report's print_list() thread")
|
|
error(trace())
|
|
|
|
|
|
def tp_report(sender, rep_id):
|
|
if rep_id >= len(reports) or rep_id < 0:
|
|
msg(sender, "&cReport &3#" + str(rep_id) + "&c does not exist!")
|
|
return True
|
|
else:
|
|
report = reports[rep_id]
|
|
safetp(sender, server.getWorld(report["world"]), report["x"], report["y"], report["z"], report["yaw"], report["pitch"])
|
|
msg(sender, "&aTeleported to %s&areport #%s" % ("&cclosed " if report["closed"] else "", rep_id))
|
|
|
|
|
|
def solve_report(sender, rep_id):
|
|
if len(reports) > rep_id >= 0:
|
|
report = reports[rep_id]
|
|
report["closed"] = True
|
|
save_reports()
|
|
msg(sender, "&aReport #%s solved." % rep_id)
|
|
reporter = server.getOfflinePlayer(juuid(report["uuid"]))
|
|
plugin_header(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 delete_report(sender, rep_id):
|
|
if not sender.hasPermission(rp_permission + ".del"):
|
|
noperm(sender)
|
|
return
|
|
if len(reports) > rep_id >= 0:
|
|
report = reports[rep_id]
|
|
del reports[report]
|
|
save_reports()
|
|
msg(sender, "&aReport #%s deleted." % rep_id)
|
|
reporter = server.getOfflinePlayer(juuid(report["uuid"]))
|
|
plugin_header(reporter, "Report")
|
|
msg(reporter, "&aReport '&e%s&a' was &cdeleted &aby %s." % (report["msg"], sender.getName()))
|
|
else:
|
|
msg(sender, "&cThat report does not exist!")
|
|
|
|
|
|
def save_reports():
|
|
save_json_file("reports", reports)
|
|
|
|
|
|
@hook.command("rp")
|
|
def on_rp_command(sender, command, label, args):
|
|
if sender.hasPermission(rp_permission):
|
|
plugin_header(sender, "Reports")
|
|
if len(args) > 0:
|
|
if args[0] == "closed":
|
|
# needs to run in seperate thread because of getOfflinePlayer
|
|
thread.start_new_thread(print_list, (sender, True,))
|
|
elif args[0] == "open":
|
|
thread.start_new_thread(print_list, (sender, False,))
|
|
else:
|
|
if not checkargs(sender, args, 2, 2):
|
|
return True
|
|
try:
|
|
repid = int(args[1])
|
|
except ValueError:
|
|
msg(sender, "&cDoesn't look like &3" + args[1] + "&c is a valid number!")
|
|
print_help(sender)
|
|
return True
|
|
if args[0] == "tp":
|
|
if not is_player(sender):
|
|
msg(sender, "&conly players can do this")
|
|
return True
|
|
tp_report(sender, repid)
|
|
elif args[0] == "close":
|
|
solve_report(sender, repid)
|
|
elif args[0] == "del":
|
|
delete_report(sender, repid)
|
|
else:
|
|
print_help(sender)
|
|
else:
|
|
print_help(sender)
|
|
else:
|
|
noperm(sender)
|
|
return True
|
|
|
|
|
|
@hook.command("report")
|
|
def on_report_command(sender, command, label, args):
|
|
plugin_header(sender, "Report")
|
|
if not is_player(sender):
|
|
msg(sender, "&conly players can do this")
|
|
return True
|
|
if not checkargs(sender, args, 1, -1):
|
|
return True
|
|
text = " ".join(args)
|
|
loc = sender.getLocation()
|
|
reporter = sender.name
|
|
reporter_id = uid(sender)
|
|
report = {
|
|
"uuid": reporter_id,
|
|
"msg": text,
|
|
"x": int(loc.x),
|
|
"y": int(loc.y),
|
|
"z": int(loc.z),
|
|
"yaw": int(loc.yaw),
|
|
"pitch": int(loc.pitch),
|
|
"world": loc.getWorld().name,
|
|
"time": time.strftime(time_format),
|
|
"closed": False
|
|
}
|
|
reports.append(report)
|
|
save_reports()
|
|
broadcast(rp_permission, "&aReport #" + str(len(reports) -1) + ": " + reporter + "&f: " + text)
|
|
msg(sender, "&aReported \"&e" + text + "&a\"")
|
|
return True
|
|
|
|
|
|
def reports_reminder(): # needs 2 args for unknown reason
|
|
while True:
|
|
for i in range(0, check_delay*2):
|
|
time.sleep(0.5) # check every 0.5 seconds if we should kill the thread
|
|
if not check_reports:
|
|
info("Reports reminder thread killed.")
|
|
thread.exit()
|
|
targeted_reports = get_reports(False)
|
|
if len(targeted_reports) > 0:
|
|
broadcast(rp_permission, "&2--=[ Reports ]=--\n&aThere are %s open reports!" % len(targeted_reports))
|
|
|
|
|
|
def stop_reporting():
|
|
global check_reports
|
|
info("Ending reports reminder thread")
|
|
check_reports = False
|
|
|
|
def get_reports(closed):
|
|
targeted_reports = []
|
|
for report in reports:
|
|
if report["closed"] == closed:
|
|
targeted_reports.add(report)
|
|
return targeted_reports
|
|
|
|
|
|
thread.start_new_thread(reports_reminder, ()) |