diff --git a/build-number.txt b/build-number.txt index 254aba48..5b398d96 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -1297 \ No newline at end of file +1299 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java index 657741ce..dc675458 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java @@ -1,10 +1,7 @@ package me.chayapak1.chomens_bot.commands; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.command.Command; -import me.chayapak1.chomens_bot.command.CommandContext; -import me.chayapak1.chomens_bot.command.CommandException; -import me.chayapak1.chomens_bot.command.TrustLevel; +import me.chayapak1.chomens_bot.command.*; import me.chayapak1.chomens_bot.plugins.MusicPlayerPlugin; import me.chayapak1.chomens_bot.song.Instrument; import me.chayapak1.chomens_bot.song.Loop; @@ -65,7 +62,7 @@ public class MusicCommand extends Command { @Override public Component execute(CommandContext context) throws CommandException { - if (context.bot.music.locked) throw new CommandException(Component.text("Managing music is currently locked")); + if (context.bot.music.locked && !(context instanceof ConsoleCommandContext)) throw new CommandException(Component.text("Managing music is currently locked")); final String action = context.getString(false, true, true); 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 b0c07fa6..f531d87f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java @@ -84,14 +84,17 @@ public class CommandHandlerPlugin { CommandContext context, MessageReceivedEvent event ) { - if (disabled || commandPerSecond > 100) return null; - - commandPerSecond++; - final boolean inGame = context instanceof PlayerCommandContext; 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; + } + + commandPerSecond++; + final String[] splitInput = input.trim().split("\\s+"); if (splitInput.length == 0) return null;