X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fnickcollide.cpp;h=62e43a0b1d9e141e6b31899623365e746c086dcb;hb=a8b146419b2aae36da25b7202292528efd3158a9;hp=39490e953b28d3684376712b3ab23d5a106a98e7;hpb=b14ebbccf08ec34a73e1ba271e67da80d9fe805c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp index 39490e953..62e43a0b1 100644 --- a/src/modules/m_spanningtree/nickcollide.cpp +++ b/src/modules/m_spanningtree/nickcollide.cpp @@ -23,6 +23,7 @@ #include "treesocket.h" #include "treeserver.h" #include "utils.h" +#include "commandbuilder.h" /* * Yes, this function looks a little ugly. @@ -105,10 +106,10 @@ int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remot * Local-side nick needs to change. Just in case we are hub, and * this "local" nick is actually behind us, send an SAVE out. */ - parameterlist params; + CmdBuilder params("SAVE"); params.push_back(u->uuid); params.push_back(ConvToStr(u->age)); - this->DoOneToMany(ServerInstance->Config->GetSID(),"SAVE",params); + params.Broadcast(); u->ForceNickChange(u->uuid); @@ -123,7 +124,7 @@ int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remot * the UID or halt the propagation of the nick change command, * so other servers don't need to see the SAVE */ - TreeSocket* sock = server->GetRoute()->GetSocket(); + TreeSocket* sock = server->GetSocket(); sock->WriteLine(":"+ServerInstance->Config->GetSID()+" SAVE "+remoteuid+" "+ ConvToStr(remotets)); if (remote) @@ -138,4 +139,3 @@ int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remot return 3; } -