From 6ba3a1cd2d5170b6d88711911651fea68c0dc2f9 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Thu, 13 Feb 2025 18:32:21 +0700 Subject: [PATCH] refactor: make the bot disabled message only show when command is valid --- build-number.txt | 2 +- .../chomens_bot/plugins/CommandHandlerPlugin.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build-number.txt b/build-number.txt index f0cec364..ae6f1163 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -1505 \ No newline at end of file +1507 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java index 8e3f24b0..6f2b7436 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java @@ -88,10 +88,7 @@ public class CommandHandlerPlugin { final boolean discord = context instanceof DiscordCommandContext; final boolean console = context instanceof ConsoleCommandContext; - if (!console) { - if (disabled) return Component.text("ChomeNS Bot is currently disabled").color(NamedTextColor.RED); - else if (commandPerSecond > 100) return null; - } + if (commandPerSecond > 100) return null; commandPerSecond++; @@ -108,6 +105,8 @@ public class CommandHandlerPlugin { if (command == null && !inGame) return Component.text("Unknown command: " + commandName).color(NamedTextColor.RED); else if (command == null) return null; + if (!console && disabled) return Component.text("ChomeNS Bot is currently disabled").color(NamedTextColor.RED); + final TrustLevel trustLevel = command.trustLevel; if (trustLevel != TrustLevel.PUBLIC && splitInput.length < 2 && inGame) return Component.text("Please provide a hash").color(NamedTextColor.RED);