diff --git a/basecommands.py b/basecommands.py index 3f113bc..b88731f 100644 --- a/basecommands.py +++ b/basecommands.py @@ -7,7 +7,6 @@ current_main = None to_see_permission = "utils.showpermission" # See cmd permission in help def maincommand(function): - global current_main current_main = function return function @@ -37,7 +36,6 @@ class subcommand(): self.call = None def __call__(self, f): - global current_subs def call_sub(sender, command, label, args): isPlayer = is_player(sender) if not isSenderValid(senderLimit, isPlayer): @@ -85,7 +83,6 @@ def command(cmd, cmd = cmd.lower() - global curent_subs subcommands = [] for subcmd in current_subs: subcmd.setParent(cmd) @@ -93,7 +90,6 @@ def command(cmd, info(subcommands) current_subs = [] - global current_main main_function = current_main current_main = None if main_function == None and len(subcommands) != 0: diff --git a/misc.py b/misc.py index 5bace4a..ea20030 100644 --- a/misc.py +++ b/misc.py @@ -6,6 +6,7 @@ import thread import org.bukkit.inventory.ItemStack as ItemStack import org.bukkit.Bukkit as Bukkit import org.bukkit.event.player.PlayerChatEvent as PlayerChatEvent +import basecommands from basecommands import simplecommand """ @@ -86,6 +87,18 @@ def on_me_command(sender, command, label, args): broadcast("utils.me", "&7- %s &7%s %s" % (sender.getDisplayName() if isinstance(sender, Player) else "&9CONSOLE", u"\u21E6", " ".join(args))) return None +""" +@basecommands.command("damnyou", aliases = ["dam"]) +def damnyou_command(): + + @basecommands.subcommand("me") + def me(sender, command, label, args): + info("me ran") + + @basecommands.maincommand + def main(sender, command, label, args): + info("main ran") +""" #@hook.command("gm") #def on_gm_command(sender, args): @@ -192,9 +205,7 @@ def on_modules_command(sender, command, label, args): list all modules, unloaded modules in red """ plugin_header(sender, "Modules") - for mod in shared["load_modules"]: - color = "a" if mod in shared["modules"] else "c" - msg(sender, "&" + color + mod) + msg(sender, ", ".join([(("&a" if mod in shared["modules"] else "&c") + mod) for mod in shared["load_modules"]])) @hook.event("player.PlayerTeleportEvent")