diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-02-25 16:52:30 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-02-25 16:52:30 +0100 |
| commit | 1a3c9fea07ae1e27bdee6ddfa408789daf815203 (patch) | |
| tree | 519aa3a3ffdf2d2f1f39646fb2d900a86bc119cd /src | |
| parent | 913986218216976c7a4ca01eac15b4beec5fd51b (diff) | |
cmd_kill Remove now needless check that prevented KILLing the same user twice
Diffstat (limited to 'src')
| -rw-r--r-- | src/commands/cmd_kill.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
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<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(); } |