From 1a3c9fea07ae1e27bdee6ddfa408789daf815203 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Tue, 25 Feb 2014 16:52:30 +0100 Subject: cmd_kill Remove now needless check that prevented KILLing the same user twice --- src/commands/cmd_kill.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'src/commands') diff --git a/src/commands/cmd_kill.cpp b/src/commands/cmd_kill.cpp index 6ed4eb331..f4120e763 100644 --- a/src/commands/cmd_kill.cpp +++ b/src/commands/cmd_kill.cpp @@ -147,18 +147,13 @@ CmdResult CommandKill::Handle (const std::vector& 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(); } -- cgit v1.2.3