* Port [3959] to 1.2.16 from trunk

 * Fix more bugs from jupenick changes


svn: 3960

src/mod/server.mod/servmsg.c

@@ -824,6 +824,7 @@ static void got303(char *from, char *msg)
     } else if (!ison_orig && rfc_casecmp(botname, origbotname) && (!jupenick[0] || !match_my_nick(jupenick))) {
       if (!nick_juped)
         putlog(LOG_MISC, "*", "Switching back to nick %s", origbotname);
+      altnick_char = rolls = 0;
       dprintf(DP_SERVER, "NICK %s\n", origbotname);
     }
   }

src/set.c

@@ -305,8 +305,10 @@ sdprintf("var (mem): %s -> %s", var->name, datain ? datain : "(NULL)");
           // Unset and there was an old value
           } else if (!data && olddata) { 
             // Unset jupenick, try for 'nick' now if we were on jupenick
-            if (match_my_nick(olddata))
+            if (match_my_nick(olddata)) {
+              altnick_char = rolls = 0;
               dprintf(DP_SERVER, "NICK %s\n", origbotname);
+            }
           }
         }
       } else if (var->flags & VAR_NICK) {