Merge branch 'nick_delay-altnick-switching' into next

* nick_delay-altnick-switching:
  * Don't reset altchars when attempting to grab a juped nick

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -7,6 +7,7 @@ next
   * Fix bot getting confusd when changing to long nicks
   * Add [bot]set var 'groups' to configure what groups bots are in
   * Add chanset 'groups' to take a list of groups that should join. 'chanset #chan groups { main backup }'
+  * Fix case where nick would rotated to NICK1 when already on NICK2 and NICK was unavailable
 
 1.4.0 - http://wraith.botpack.net/milestone/1.4.0
   * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.

src/mod/server.mod/servmsg.c

@@ -1005,11 +1005,13 @@ static void nick_available(bool is_jupe, bool is_orig) {
     // Don't switch to the nick if already on jupenick
   } else if (is_orig && !match_my_nick(origbotname) && (!jupenick[0] || !match_my_nick(jupenick))) {
     if (!tried_nick || ((now - tried_nick) > 2)) {
-      altnick_char = rolls = 0;
       tried_nick = now;
-      dprintf(DP_MODE_NEXT, "NICK %s\n", origbotname);
-      if (!nick_juped)
+      if (!nick_juped) {
+        // Only reset altnick if the nick isn't juped - perfectly fine staying on rotated nick if nick_delay is in effect
+        altnick_char = rolls = 0;
         putlog(LOG_MISC, "*", "Switching back to nick '%s'", origbotname);
+      }
+      dprintf(DP_MODE_NEXT, "NICK %s\n", origbotname);
     }
   }
 }