diff --git a/Changelog b/Changelog index 855d7b3..685de3a 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,7 @@ [Changes 1.2.2] +* Fix /KB so that it kicks-then-bans as intended (reported by profiler). (caf) + * Fix $functioncall() scripting function (reported by |Rain|). (caf) * Ensure close_server() clears the internal command queues for the right diff --git a/source/banlist.c b/source/banlist.c index 52deded..1d2e25f 100644 --- a/source/banlist.c +++ b/source/banlist.c @@ -1002,9 +1002,9 @@ BUILT_IN_COMMAND(kickban) set_display_target(chan->channel, LOG_KICK); if (command) { - if (!strstr(command, "KB")) + if (strstr(command, "KB")) kick_first = 1; - set_ignore = (command[strlen(command)-1] == 'I') ? 1 : 0; + set_ignore = (command[strlen(command)-1] == 'I'); } if (!spec && !(spec = new_next_arg(args, &args))) { diff --git a/source/commands.c b/source/commands.c index 593033c..cfe37d3 100644 --- a/source/commands.c +++ b/source/commands.c @@ -248,7 +248,7 @@ IrcCommand irc_command[] = { "BHELP", "BHELP", chelp, 0, "%Y<%nhelp%W|%nindex%W|%nother%Y>%n\n - BitchX help command" }, #endif { "BIND", NULL, bindcmd, 0, "- Command to bind a key to a function" }, - { "BK", NULL, kickban, SERVERREQ, "%Y<%Cnick%Y>%n %R[%nreason%R]%n\n- Deops, bans and kicks %Y<%Cnick%Y>%n for %R[%nreason%R]%n" }, + { "BK", "BK", kickban, SERVERREQ, "%Y<%Cnick%Y>%n %R[%nreason%R]%n\n- Deops, bans and kicks %Y<%Cnick%Y>%n for %R[%nreason%R]%n" }, { "BKI", "BKI", kickban, SERVERREQ, "%Y<%Cnick%Y>%n %R[%nreason%R]%n\n- Deops, bans, kicks and ignores %Y<%Cnick%Y>%n for %R[%nreason%R]%n" }, { "BLESS", NULL, blesscmd, 0, scripting_command }, { "BREAK", NULL, breakcmd, 0, NULL },