Make kill hiding work properly locally

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7130 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 2 insertions, 3 deletions

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index 82ca97440..77fcfaa23 100644
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -69,15 +69,14 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 			 *  There used to be a WriteCommonExcept() of the QUIT here. It seems to be unnecessary with QuitUser() right below, so it's gone.
 			 *  If it explodes painfully, put it back!
 			 */
-
-			userrec::QuitUser(ServerInstance, u, killreason);
 		}
 		else
 		{
 			// local kill
 			ServerInstance->SNO->WriteToSnoMask('k',"Local Kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
 			ServerInstance->Log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]);
-			user->WriteTo(u, "KILL %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]);
+			user->WriteTo(u, "KILL %s :%s!%s!%s (%s)", *ServerInstance->Config->HideKillsServer ? ServerInstance->Config->HideKillsServer : u->nick,
+					ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]);
 		}
 
 		// send the quit out