Annotations

[user/henk/code/inspircd.git] / src / cmd_kill.cpp

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index fa294ad9ef25ce3fe07bb7aa7435074852c941df..dfcf99590e0600b13729820de1919f7e6adc8362 100644 (file)
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -19,7 +19,14 @@
 #include "modules.h"
 #include "commands/cmd_kill.h"
 
-void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
+
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_kill(Instance);
+}
+
+CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 {
        userrec *u = ServerInstance->FindNick(parameters[0]);
        char killreason[MAXBUF];
@@ -35,7 +42,7 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
                if (MOD_RESULT)
                {
                        ServerInstance->Log(DEBUG, "A module prevented the kill with result %d", MOD_RESULT);
-                       return;
+                       return CMD_FAILURE;
                }
 
                if (!IS_LOCAL(u))
@@ -59,6 +66,11 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
                                u->PurgeEmptyChannels();
                        }
 
+                       if (u == user)
+                       {
+                               FOREACH_MOD(I_OnPostCommand,OnPostCommand("KILL", parameters, pcnt, user, CMD_SUCCESS));
+                               return CMD_USER_DELETED;
+                       }
                        DELETE(u);
                }
                else
@@ -74,6 +86,9 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
        else
        {
                user->WriteServ( "401 %s %s :No such nick/channel", user->nick, parameters[0]);
+               return CMD_FAILURE;
        }
+
+       return CMD_SUCCESS;
 }