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!
This commit is contained in:
2
main.py
2
main.py
@@ -88,7 +88,7 @@ shared["load_modules"] = [
|
|||||||
# Per-player notes
|
# Per-player notes
|
||||||
"tag",
|
"tag",
|
||||||
# vanish toggle module - temporary fix
|
# vanish toggle module - temporary fix
|
||||||
"vanishfix",
|
#"vanishfix",
|
||||||
# obisidian mining punishment plugin
|
# obisidian mining punishment plugin
|
||||||
"punishments",
|
"punishments",
|
||||||
# a simple replacement for the buggy essentials /vanish
|
# a simple replacement for the buggy essentials /vanish
|
||||||
|
|||||||
28
misc.py
28
misc.py
@@ -256,19 +256,25 @@ def on_modules_command(sender, command, label, args):
|
|||||||
plugin_header(sender, "Modules")
|
plugin_header(sender, "Modules")
|
||||||
msg(sender, ", ".join([(("&a" if mod in shared["modules"] else "&c") + mod) for mod in shared["load_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")
|
@simplecommand("warn",
|
||||||
def on_warnp_command(sender, command, label, args):
|
usage = "",
|
||||||
sender.hasPermission("utils.warnp"):
|
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())
|
broadcast(None, " &b= &2&lPossible lag incoming! &r-%s" % sender.getDisplayName())
|
||||||
else:
|
|
||||||
noperm(sender)
|
|
||||||
|
|
||||||
""" Something I'm planning for schematics
|
""" Something I'm planning for schematics
|
||||||
@hook.event("player.PlayerCommandPreprocessEvent", "low")
|
@hook.event("player.PlayerCommandPreprocessEvent", "low")
|
||||||
|
|||||||
Reference in New Issue
Block a user