|
@@ -836,13 +836,13 @@ static int nick_which(const char* nick, bool& is_jupe, bool& is_orig) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static void nick_available(bool is_jupe, bool is_orig) {
|
|
static void nick_available(bool is_jupe, bool is_orig) {
|
|
|
- if (jupenick[0] && is_jupe && rfc_casecmp(botname, jupenick) && !match_my_nick((jupenick))) {
|
|
|
|
|
|
|
+ if (jupenick[0] && is_jupe && !match_my_nick((jupenick))) {
|
|
|
if (!jnick_juped)
|
|
if (!jnick_juped)
|
|
|
putlog(LOG_MISC, "*", "Switching back to jupenick '%s'", jupenick);
|
|
putlog(LOG_MISC, "*", "Switching back to jupenick '%s'", jupenick);
|
|
|
tried_jupenick = 1;
|
|
tried_jupenick = 1;
|
|
|
dprintf(DP_SERVER, "NICK %s\n", jupenick);
|
|
dprintf(DP_SERVER, "NICK %s\n", jupenick);
|
|
|
// Don't switch to the nick if already on jupenick
|
|
// Don't switch to the nick if already on jupenick
|
|
|
- } else if (is_orig && rfc_casecmp(botname, origbotname) && !match_my_nick(origbotname) && (!jupenick[0] || !match_my_nick(jupenick))) {
|
|
|
|
|
|
|
+ } else if (is_orig && !match_my_nick(origbotname) && (!jupenick[0] || !match_my_nick(jupenick))) {
|
|
|
if (!nick_juped)
|
|
if (!nick_juped)
|
|
|
putlog(LOG_MISC, "*", "Switching back to nick '%s'", origbotname);
|
|
putlog(LOG_MISC, "*", "Switching back to nick '%s'", origbotname);
|
|
|
altnick_char = rolls = 0;
|
|
altnick_char = rolls = 0;
|