Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

[user/henk/code/inspircd.git] / src / commands / cmd_kick.cpp

diff --git a/src/commands/cmd_kick.cpp b/src/commands/cmd_kick.cpp
index 3c5fb00527ae8e94d73e72b6f16cb8a35e4c2c1a..c497dd459e205202a1e0f23f6b014c1d810d6d86 100644 (file)
--- a/src/commands/cmd_kick.cpp
+++ b/src/commands/cmd_kick.cpp
@@ -56,9 +56,9 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
        else
                u = ServerInstance->FindNick(parameters[1]);
 
-       if (!u || !c)
+       if ((!u) || (!c) || (u->registered != REG_ALL))
        {
-               user->WriteServ( "401 %s %s :No such nick/channel", user->nick.c_str(), u ? parameters[0].c_str() : parameters[1].c_str());
+               user->WriteServ( "401 %s %s :No such nick/channel", user->nick.c_str(), c ? parameters[1].c_str() : parameters[0].c_str());
                return CMD_FAILURE;
        }