Browse Source

Fix party & admin chat not working right from console.

GJ 12 years ago
parent
commit
5e9f01ac57
1 changed files with 11 additions and 8 deletions
  1. 11 8
      src/main/java/com/gmail/nossr50/chat/commands/ChatCommand.java

+ 11 - 8
src/main/java/com/gmail/nossr50/chat/commands/ChatCommand.java

@@ -29,26 +29,29 @@ public abstract class ChatCommand implements CommandExecutor {
 
 
             if (chatMode.isEnabled(mcMMOPlayer)) {
             if (chatMode.isEnabled(mcMMOPlayer)) {
                 disableChatMode(sender);
                 disableChatMode(sender);
-                return true;
+            }
+            else {
+                enableChatMode(sender);
             }
             }
 
 
-            enableChatMode(sender);
             return true;
             return true;
 
 
         default:
         default:
             if (args.length == 1) {
             if (args.length == 1) {
-                if (!(sender instanceof Player)) {
-                    return false;
-                }
-
-                mcMMOPlayer = Users.getPlayer((Player) sender);
-
                 if (args[0].equalsIgnoreCase("on")) {
                 if (args[0].equalsIgnoreCase("on")) {
+                    if (!(sender instanceof Player)) {
+                        return false;
+                    }
+
                     enableChatMode(sender);
                     enableChatMode(sender);
                     return true;
                     return true;
                 }
                 }
 
 
                 if (args[0].equalsIgnoreCase("off")) {
                 if (args[0].equalsIgnoreCase("off")) {
+                    if (!(sender instanceof Player)) {
+                        return false;
+                    }
+
                     disableChatMode(sender);
                     disableChatMode(sender);
                     return true;
                     return true;
                 }
                 }