Change for reverse output of lists, most recent first, for bug #307. Also fix(Oms...

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

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index 82ca9744053889fa33aa85374ad7769a7d1153d3..77fcfaa23b39f960d0c8d489c3aeef67fcc35a7a 100644 (file)
--- 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