From 971a9c33281a6be2423ed0c68b6334a8950c77d9 Mon Sep 17 00:00:00 2001
From: AffluentAvo <diemcletsplay@gmail.com>
Date: Fri, 7 Aug 2020 16:49:18 +0200
Subject: [PATCH] fixed @mention not responding

---
 .../sokobot/listener/CommandListener.java     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/me/polymarsdev/sokobot/listener/CommandListener.java b/src/main/java/me/polymarsdev/sokobot/listener/CommandListener.java
index bf28863..2a83509 100644
--- a/src/main/java/me/polymarsdev/sokobot/listener/CommandListener.java
+++ b/src/main/java/me/polymarsdev/sokobot/listener/CommandListener.java
@@ -73,16 +73,19 @@ public class CommandListener extends ListenerAdapter {
             String prefix = Bot.getPrefix(guild);
             String arg = args[0].toLowerCase();
             boolean isCommand;
-            if (arg.startsWith(prefix)) {
-                if (commandsNoPrefix.contains(arg)) {
-                    isCommand = true;
+            if (isMention) isCommand = true;
+            else {
+                if (arg.startsWith(prefix)) {
+                    if (commandsNoPrefix.contains(arg)) {
+                        isCommand = true;
+                    } else {
+                        String commandName = arg.substring(prefix.length()).toLowerCase();
+                        isCommand = commands.containsKey(commandName);
+                        if (isCommand) arg = commandName;
+                    }
                 } else {
-                    String commandName = arg.substring(prefix.length()).toLowerCase();
-                    isCommand = commands.containsKey(commandName);
-                    if (isCommand) arg = commandName;
+                    isCommand = commandsNoPrefix.contains(arg);
                 }
-            } else {
-                isCommand = commandsNoPrefix.contains(arg);
             }
             if (isCommand) {
                 if (!hasPermissions(guild, channel)) {