Fix regression introduced in r480, where /BKI on non-joined clients no longer ignored.

git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@499 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2014-09-23 13:46:47 +00:00
parent e808dbe94b
commit a3170cf578
2 changed files with 3 additions and 3 deletions

View File

@@ -1073,7 +1073,7 @@ BUILT_IN_COMMAND(kickban)
} }
} }
if (!count && !isme(spec)) if (!count && !isme(spec))
userhostbase(spec, userhost_ban, 1, "%s %s %s", chan->channel, spec, command ? (!strcmp(command, "FUCK") ? "FUCK": set_ignore ? "BKI":empty_string):empty_string); userhostbase(spec, userhost_ban, 1, "%s %s", chan->channel, command ? (!strcmp(command, "FUCK") ? "FUCK": set_ignore ? "BKI":empty_string):empty_string);
reset_display_target(); reset_display_target();
} }
@@ -1116,7 +1116,7 @@ BUILT_IN_COMMAND(ban)
if (strchr(spec, '!') && strchr(spec, '@')) if (strchr(spec, '!') && strchr(spec, '@'))
send_to_server("MODE %s +b %s", chan->channel, spec); send_to_server("MODE %s +b %s", chan->channel, spec);
else else
userhostbase(spec, userhost_ban, 1, "%s %s", chan->channel, spec); userhostbase(spec, userhost_ban, 1, "%s", chan->channel);
} }
} }

View File

@@ -1343,7 +1343,7 @@ char *new_str;
send_to_server("KILL %s :%s", to, new_str); send_to_server("KILL %s :%s", to, new_str);
break; break;
case KBOOT: case KBOOT:
userhostbase(to, userhost_ban, 1, "%s %s %s", get_current_channel_by_refnum(0), to, empty_string); userhostbase(to, userhost_ban, 1, "%s", get_current_channel_by_refnum(0));
case KICK: case KICK:
send_to_server("KICK %s %s :%s", get_current_channel_by_refnum(0), to, new_str); send_to_server("KICK %s %s :%s", get_current_channel_by_refnum(0), to, new_str);
break; break;