From 3c7bd7409df00f3f7c42374322e90ce8a9038531 Mon Sep 17 00:00:00 2001 From: Dico200 Date: Sun, 26 Jun 2016 05:48:36 +0200 Subject: Fix serversigns derp --- main.py | 2 +- serversigns.py | 37 +++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/main.py b/main.py index 88b9c57..2cb80b4 100644 --- a/main.py +++ b/main.py @@ -22,7 +22,7 @@ def on_enable(): if "blockplacemods" in shared["modules"]: shared["modules"]["blockplacemods"].schedule_torch_breaker() if "serversigns" in shared["modules"]: - shared["modules"]["serversigns"].check_all_signs() + shared["modules"]["serversigns"].check_all_signs_and_intercept_command() info("RedstonerUtils enabled!") diff --git a/serversigns.py b/serversigns.py index 9241ee6..7626cef 100644 --- a/serversigns.py +++ b/serversigns.py @@ -392,7 +392,25 @@ def can_build2(player, block): return not event.isCancelled() -def check_all_signs(): +def check_all_signs_and_intercept_command(): + + try: + CommandInterceptions = shared["modules"]["misc"].CommandInterceptions + rsutils_cmd = CommandInterceptions.cmd_map.get("redstonerutils:serversigns") + label = rsutils_cmd.getLabel() + + def interception(sender, args): + rsutils_cmd.execute(sender, label, args) + return False + + def tab_completion(original, sender, alias, args): + return rsutils_cmd.tabComplete(sender, alias, args) + + shared["modules"]["misc"].CommandInterceptions.register("serversigns", "serversigns", interception, tab_completion) + except: + error("[Serversigns] failed to force commands") + error(trace()) + """ Check if all registered signs have an associated sign block in the world. WorldEdit commands could remove them without notification. @@ -403,20 +421,3 @@ def check_all_signs(): for loc in signs: if server.getWorld(loc[0]).getBlockAt(loc[1], loc[2], loc[3]).getType() not in (Material.WALL_SIGN, Material.SIGN_POST): del signs[loc] - -try: - CommandInterceptions = shared["modules"]["misc"].CommandInterceptions - rsutils_cmd = CommandInterceptions.cmd_map.get("redstonerutils:serversigns") - label = rsutils_cmd.getLabel() - - def interception(sender, args): - rsutils_cmd.execute(sender, label, args) - return False - - def tab_completetion(original, sender, alias, args): - return rsutils_cmd.tabComplete(sender, alias, args) - - shared["modules"]["misc"].CommandInterceptions.register("serversigns", "serversigns", interception, tab_completion) -except: - error("[Serversigns] failed to force commands") - error(trace()) -- cgit v1.2.3