diff --git a/calc.py b/calc.py index 058d68c..7c752e7 100644 --- a/calc.py +++ b/calc.py @@ -53,7 +53,7 @@ def on_calc_command(sender, command, label, args): if not checkargs(sender, args, 0, 1): return True if not is_player(sender): - msg(sender, "&cYou are not a player!" % sender) + msg(sender, "&cYou are not a player!") return True toggle(sender, calc_users, name = "Calc") diff --git a/main.py b/main.py index 4f06411..92c7315 100644 --- a/main.py +++ b/main.py @@ -30,6 +30,8 @@ def on_disable(): info("Loading RedstonerUtils...") + + # Import all modules, in this order shared["load_modules"] = [ # Collection of tiny utilities @@ -80,6 +82,7 @@ shared["load_modules"] = [ #"loginsecurity" # NOTICE: If you add something here, please add a small descriptive comment above! ] + shared["modules"] = {} for module in shared["load_modules"]: try: @@ -87,4 +90,5 @@ for module in shared["load_modules"]: info("Module %s loaded." % module) except: error("Failed to import module %s:" % module) - error(print_traceback()) \ No newline at end of file + error(print_traceback()) + diff --git a/misc.py b/misc.py index 03ebad1..c35b11a 100644 --- a/misc.py +++ b/misc.py @@ -9,6 +9,7 @@ import org.bukkit.Bukkit as Bukkit from basecommands import simplecommand + @hook.event("player.PlayerJoinEvent", "monitor") def on_join(event): """ @@ -37,12 +38,11 @@ def on_join(event): player.teleport(player.getWorld().getSpawnLocation()) -# Prevent /up griefing. //up is blocked by PlotMe. @hook.event("player.PlayerCommandPreprocessEvent", "low") -def on_command(event): - if event.getMessage()[:4].lower() == "/up ": - event.setCancelled(True) - runas(event.getPlayer(), event.getMessage()) # Adds / automatically. +def cmd_event(event): + args = event.getMessage().split(" ") + if args[0].lower() in ("/up", "/worldedit:up"): + event.setMessage("//up " + " ".join(args[1:])) """ Disabled while builder can't access Trusted diff --git a/plugin.yml b/plugin.yml index bdd5acb..4991e40 100644 --- a/plugin.yml +++ b/plugin.yml @@ -2,3 +2,4 @@ name: RedstonerUtils main: main.py version: 3.1.0 author: redstone_sheep +