Do not check cooldown if none is set

Fixes false warnings
freya022 · Apr 24, 2024 · 75aaeb3 · 75aaeb3
1 parent f1089a4
commit 75aaeb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/freya02/botcommands/internal/application/ApplicationCommandListener.java b/src/main/java/com/freya02/botcommands/internal/application/ApplicationCommandListener.java
@@ -206,8 +206,8 @@ private boolean canRun(@NotNull GenericCommandInteractionEvent event, Applicatio
 			}
 		}
 
-		if (isNotOwner) {
-			final long cooldown = applicationCommand.getCooldown(event, event::getName);
+		if (isNotOwner && applicationCommand.getCooldownMillis() > 0) {
+			final long cooldown = applicationCommand.getCooldown(event, event::getFullCommandName);
 			if (cooldown > 0) {
 				final DefaultMessages messages = this.context.getDefaultMessages(event);
 				if (applicationCommand.getCooldownScope() == CooldownScope.USER) {

diff --git a/src/main/java/com/freya02/botcommands/internal/prefixed/CommandListener.java b/src/main/java/com/freya02/botcommands/internal/prefixed/CommandListener.java
@@ -230,7 +230,7 @@ private ExecutionResult tryExecute(MessageReceivedEvent event, Member member, bo
 			}
 		}
 
-		if (isNotOwner) {
+		if (isNotOwner && candidate.getCooldownMillis() > 0) {
 			final long cooldown = candidate.getCooldown(event);
 			if (cooldown > 0) {
 				final DefaultMessages messages = this.context.getDefaultMessages(event.getGuild());