Fix /irc nick

cnaude · Nov 13, 2014 · d5ba009 · d5ba009
1 parent afa27d3
commit d5ba009
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/src/main/java/com/cnaude/purpleirc/Commands/Nick.java b/src/main/java/com/cnaude/purpleirc/Commands/Nick.java
@@ -31,7 +31,7 @@ public class Nick implements IRCCommandInterface {
     private final String usage = "[bot] [nick]";
     private final String desc = "Change bot's IRC nick.";
     private final String name = "nick";
-    private final String fullUsage = ChatColor.WHITE + "Usage: " + ChatColor.GOLD + "/irc " + name + " " + usage; 
+    private final String fullUsage = ChatColor.WHITE + "Usage: " + ChatColor.GOLD + "/irc " + name + " " + usage;
 
     /**
      *
@@ -52,15 +52,7 @@ public void dispatch(CommandSender sender, String[] args) {
             String bot = plugin.botify(args[1]);
             String nick = args[2];
             if (plugin.ircBots.containsKey(bot)) {
-                if (plugin.ircBots.containsKey(nick)) {
-                    sender.sendMessage(ChatColor.RED 
-                            + "There is already a bot with that nick!");
-                } else {
-                    plugin.ircBots.get(bot).asyncChangeNick(sender, nick);
-                    PurpleBot ircBot = plugin.ircBots.remove(bot);
-                    plugin.ircBots.put(nick, ircBot);
-                    ircBot.botNick = nick;
-                }
+                plugin.ircBots.get(bot).asyncChangeNick(sender, nick);
             } else {
                 sender.sendMessage(plugin.invalidBotName.replace("%BOT%", bot));
             }

diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
@@ -93,6 +93,7 @@ public final class PurpleBot {
     public long chatDelay;
     public String botServer;
     public String bindAddress;
+    public String nick;
     public String botNick;
     public List<String> altNicks;
     int nickIndex = 0;
@@ -587,7 +588,8 @@ private void loadConfig() {
             relayPrivateChat = config.getBoolean("relay-private-chat", false);
             partInvalidChannels = config.getBoolean("part-invalid-channels", false);
             partInvalidChannelsMsg = config.getString("part-invalid-channels-message", "");
-            botNick = config.getString("nick", "");
+            nick = config.getString("nick", "");
+            botNick = nick;
             altNicks = config.getStringList("alt-nicks");
             plugin.loadTemplates(config, botNick);
             botLogin = config.getString("login", "PircBot");
@@ -2904,7 +2906,7 @@ public void altNickChange() {
             return;
         }
         if (nickIndex >= 0 && nickIndex < altNicks.size()) {
-            botNick = altNicks.get(nickIndex);
+            botNick = altNicks.get(nickIndex).replace("%NICK%", nick);
             nickIndex++;
         } else {
             nickIndex = 0;

diff --git a/src/main/resources/SampleBot.yml b/src/main/resources/SampleBot.yml
@@ -5,7 +5,7 @@
 #
 # nick - Your bot's unique nickname
 nick: AwesomeBot
-# if your bot's nick is in use try these alternates
+# If your bot's nick is in use try these alternates. Leave blank for none.
 alt-nicks:
     - AwesomeBot_
     - AwesomeBotA