Rename /msg to /ircm and /r to /ircr.

cnaude · Jun 25, 2015 · 6f9ac85 · 6f9ac85
1 parent 1f81ed9
commit 6f9ac85
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/com/cnaude/purpleirc/CommandHandlers.java b/src/main/java/com/cnaude/purpleirc/CommandHandlers.java
@@ -128,7 +128,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
                     return true;
                 }
             }
-        } else if (commandLabel.equalsIgnoreCase("msg")) {
+        } else if (commandLabel.equalsIgnoreCase("ircm")) {
             if (!sender.hasPermission("irc.smsg")) {
                 sender.sendMessage(plugin.noPermission);
                 return true;
@@ -141,7 +141,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
                 commands.get("smsg").dispatch(sender, list.toArray(new String[list.size()]));
                 return true;
             }
-        } else if (commandLabel.equalsIgnoreCase("r")) {
+        } else if (commandLabel.equalsIgnoreCase("ircr")) {
             if (!sender.hasPermission("irc.smsg")) {
                 sender.sendMessage(plugin.noPermission);
                 return true;

diff --git a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
@@ -290,8 +290,8 @@ public void onEnable() {
         getCommand("irc").setExecutor(commandHandlers);
         getCommand("irc").setTabCompleter(ircTabCompleter);
         if (overrideMsgCmd) {
-            getCommand("msg").setExecutor(commandHandlers);
-            getCommand("r").setExecutor(commandHandlers);
+            getCommand("ircm").setExecutor(commandHandlers);
+            getCommand("ircr").setExecutor(commandHandlers);
         }
         regexGlobber = new RegexGlobber();
         tokenizer = new ChatTokenizer(this);

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -26,10 +26,10 @@ commands:
     irc:
         description: Various irc commands
         usage: /<command> help - List all irc commands available.
-    msg:
+    ircm:
         description: Shortcut for /irc smsg.
         usage: /<command> [player] message
-    r:
+    ircr:
         description: Shortut for replying to private messages.
         usage: /<command> message
 permissions: