X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_kill.cpp;h=d0de52b8d18eba2a80ac49165712f1a90ee3fbd4;hb=b844d1cbbe79585facc69b9247baa8427cff0b62;hp=fb5dba24595accf55f62c0e95d2b8574ee85f3b1;hpb=a1f682a211c3a073143d4ece7a2ea915a5ff089b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index fb5dba245..d0de52b8d 100644
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -38,18 +35,12 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 	char killreason[MAXBUF];
 	int MOD_RESULT = 0;
 
-	ServerInstance->Log(DEBUG,"kill: %s %s", parameters[0], parameters[1]);
-
 	if (u)
 	{
-		ServerInstance->Log(DEBUG, "into kill mechanism");
 		FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1]));
 
 		if (MOD_RESULT)
-		{
-			ServerInstance->Log(DEBUG, "A module prevented the kill with result %d", MOD_RESULT);
 			return CMD_FAILURE;
-		}
 
 		if (!IS_LOCAL(u))
 		{
@@ -59,13 +50,10 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 			u->WriteCommonExcept("QUIT :%s", killreason);
 			FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason));
 			
-			user_hash::iterator iter = ServerInstance->clientlist.find(u->nick);
+			user_hash::iterator iter = ServerInstance->clientlist->find(u->nick);
 
-			if (iter != ServerInstance->clientlist.end())
-			{
-				ServerInstance->Log(DEBUG,"deleting user hash value %d", iter->second);
-				ServerInstance->clientlist.erase(iter);
-			}
+			if (iter != ServerInstance->clientlist->end())
+				ServerInstance->clientlist->erase(iter);
 
 			if (u->registered == REG_ALL)
 			{
@@ -88,6 +76,9 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 			ServerInstance->SNO->WriteToSnoMask('k',"Local Kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
 			snprintf(killreason,MAXQUIT,"Killed (%s (%s))", user->nick, parameters[1]);
 			userrec::QuitUser(ServerInstance, u, killreason);
+
+			if (u == user)
+				return CMD_USER_DELETED;
 		}
 	}
 	else