X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=ca25fe4a689938d2b09bed10e10cfcbf55f66043;hb=f73cbbafe1bbad627e359078988ce570fbf5d0d9;hp=8117b7ef9cf19237441762561af0911743c6863f;hpb=47f66dc6cf78dde18f8984e61a6fa9a822d1d781;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index 8117b7ef9..ca25fe4a6 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -2135,8 +2135,20 @@ class TreeSocket : public InspSocket userrec* x = Srv->FindNick(params[0]); if (x) { - this->WriteLine(":"+Srv->GetServerName()+" KILL "+params[0]+" :Nickname collision ("+prefix+" -> "+params[0]+")"); + std::deque p; + p.push_back(params[0]); + p.push_back("Nickname collision ("+prefix+" -> "+params[0]+")"); + DoOneToMany(Srv->GetServerName(),"KILL",p); + p.clear(); + p.push_back(prefix); + p.push_back("KILL "+prefix+" :Nickname collision"); + DoOneToMany(Srv->GetServerName(),"KILL",p); Srv->QuitUser(x,"Nickname collision ("+prefix+" -> "+params[0]+")"); + userrec* y = Srv->FindNick(prefix); + if (y) + { + Srv->QuitUser(y,"Nickname collision"); + } return DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params); } }