From 4404674c2948cad339d6434e7b50a3aef969ea75 Mon Sep 17 00:00:00 2001 From: Dico200 Date: Sat, 19 Sep 2015 02:22:21 +0200 Subject: [PATCH] Disabled vanishfix, preparing merge I replaced /warn and /warnp commands with @simplecommand hook. they happened to be missing the 'if' from the permission checks and this takes care of some other things as well. I added a module called vanish which will replace essentials vanish which happens to be really buggy as you know. I added a serversigns module but it is not added to main.py and thus it will not cause problems! --- main.py | 2 +- misc.py | 30 ++++++++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/main.py b/main.py index eb9ca94..1367148 100644 --- a/main.py +++ b/main.py @@ -88,7 +88,7 @@ shared["load_modules"] = [ # Per-player notes "tag", # vanish toggle module - temporary fix - "vanishfix", + #"vanishfix", # obisidian mining punishment plugin "punishments", # a simple replacement for the buggy essentials /vanish diff --git a/misc.py b/misc.py index a29454b..9aadae9 100644 --- a/misc.py +++ b/misc.py @@ -256,19 +256,25 @@ def on_modules_command(sender, command, label, args): plugin_header(sender, "Modules") msg(sender, ", ".join([(("&a" if mod in shared["modules"] else "&c") + mod) for mod in shared["load_modules"]])) -@hook.command("warn") -def on_warn_command(sender, command, label, args): - sender.hasPermission("utils.warn"): - broadcast(None, " &b= &2&lLag incoming! &r-%s" % sender.getDisplayName()) - else: - noperm(sender) -@hook.command("warnp") -def on_warnp_command(sender, command, label, args): - sender.hasPermission("utils.warnp"): - broadcast(None, " &b= &2&lPossible lag incoming! &r-%s" % sender.getDisplayName()) - else: - noperm(sender) +@simplecommand("warn", + usage = "", + description = "Warns everybody on the server that you will cause lag shortly", + amax = 0, + helpSubcmd = True): +def warn_command(sender, command, label, args): + broadcast(None, " &b= &2&lLag incoming! &r-%s" % sender.getDisplayName()) + + +@simplecommand("warnp", + usage = "", + description = "Warns everybody on the server that you might cause lag shortly", + amax = 0, + helpSubcmd = True): +def warn_command(sender, command, label, args): + broadcast(None, " &b= &2&lPossible lag incoming! &r-%s" % sender.getDisplayName()) + + """ Something I'm planning for schematics @hook.event("player.PlayerCommandPreprocessEvent", "low")