]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
cmd_kill Remove now needless check that prevented KILLing the same user twice
authorAttila Molnar <attilamolnar@hush.com>
Tue, 25 Feb 2014 15:52:30 +0000 (16:52 +0100)
committerAttila Molnar <attilamolnar@hush.com>
Tue, 25 Feb 2014 15:52:30 +0000 (16:52 +0100)
src/commands/cmd_kill.cpp

index 6ed4eb3311b86f868193bacc72a15a205219481c..f4120e76333c4d3575ed99e64f8027e18bf1ad70 100644 (file)
@@ -147,18 +147,13 @@ CmdResult CommandKill::Handle (const std::vector<std::string>& parameters, User
                        }
 
                        ServerInstance->Logs->Log("KILL", LOG_DEFAULT, "LOCAL KILL: %s :%s!%s!%s (%s)", u->nick.c_str(), ServerInstance->Config->ServerName.c_str(), user->dhost.c_str(), user->nick.c_str(), parameters[1].c_str());
-                       /* Bug #419, make sure this message can only occur once even in the case of multiple KILL messages crossing the network, and change to show
-                        * hidekillsserver as source if possible
-                        */
-                       if (!u->quitting)
-                       {
-                               u->Write(":%s KILL %s :%s!%s!%s (%s)", ServerInstance->Config->HideKillsServer.empty() ? user->GetFullHost().c_str() : ServerInstance->Config->HideKillsServer.c_str(),
-                                               u->nick.c_str(),
-                                               ServerInstance->Config->ServerName.c_str(),
-                                               user->dhost.c_str(),
-                                               ServerInstance->Config->HideKillsServer.empty() ? user->nick.c_str() : ServerInstance->Config->HideKillsServer.c_str(),
-                                               parameters[1].c_str());
-                       }
+
+                       u->Write(":%s KILL %s :%s!%s!%s (%s)", ServerInstance->Config->HideKillsServer.empty() ? user->GetFullHost().c_str() : ServerInstance->Config->HideKillsServer.c_str(),
+                                       u->nick.c_str(),
+                                       ServerInstance->Config->ServerName.c_str(),
+                                       user->dhost.c_str(),
+                                       ServerInstance->Config->HideKillsServer.empty() ? user->nick.c_str() : ServerInstance->Config->HideKillsServer.c_str(),
+                                       parameters[1].c_str());
 
                        this->lastuuid.clear();
                }