bool TreeSocket::RemoteKill(const std::string &prefix, std::deque<std::string> ¶ms)
-{
+{
if (params.size() != 2)
return true;
if (who)
{
- /* Prepend kill source, if we don't have one */
+ /* Prepend kill source, if we don't have one */
if (*(params[1].c_str()) != '[')
{
- params[1] = "[" + prefix + "] Killed (" + params[1] +")";
+ TreeServer* ts = Utils->FindServer(prefix);
+ params[1] = "[" + (ts ? ts->GetName() : prefix) + "] Killed (" + params[1] +")";
}
std::string reason = params[1];
params[1] = ":" + params[1];
Utils->DoOneToAllButSender(prefix,"KILL",params,prefix);
// NOTE: This is safe with kill hiding on, as RemoteKill is only reached if we have a server prefix.
// in short this is not executed for USERS.
- who->Write(":%s KILL %s :%s (%s)", prefix.c_str(), who->nick, prefix.c_str(), reason.c_str());
+ who->Write(":%s KILL %s :%s (%s)", prefix.c_str(), who->nick.c_str(), prefix.c_str(), reason.c_str());
this->Instance->Users->QuitUser(who, reason);
}
return true;