Merge pull request #3890 from OverCrave/master

Fix adminchat returning too early if send by the console

src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java

@@ -55,14 +55,13 @@ public abstract class ChatCommand implements TabExecutor {
                 return true;
 
             case 1:
-                if (!CommandUtils.hasPlayerDataKey(sender)) {
-                    return true;
-                }
-
                 if (CommandUtils.shouldEnableToggle(args[0])) {
                     if (CommandUtils.noConsoleUsage(sender)) {
                         return true;
                     }
+                    if (!CommandUtils.hasPlayerDataKey(sender)) {
+                        return true;
+                    }
 
                     enableChatMode(UserManager.getPlayer(sender.getName()), sender);
                     return true;
@@ -72,6 +71,9 @@ public abstract class ChatCommand implements TabExecutor {
                     if (CommandUtils.noConsoleUsage(sender)) {
                         return true;
                     }
+                    if (!CommandUtils.hasPlayerDataKey(sender)) {
+                        return true;
+                    }
 
                     disableChatMode(UserManager.getPlayer(sender.getName()), sender);
                     return true;