m_spanningtree Replace manual string building of outgoing commands with CmdBuilder...

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / nickcollide.cpp

diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index 62e43a0b1d9e141e6b31899623365e746c086dcb..e6bcb21b29cf6f36a0b8f8a7e83b345f8d98f5c7 100644 (file)
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -33,6 +33,9 @@
  */
 int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remotets, const std::string& remoteident, const std::string& remoteip, const std::string& remoteuid)
 {
+       // At this point we're sure that a collision happened, increment the counter regardless of who wins
+       ServerInstance->stats.Collisions++;
+
        /*
         * Under old protocol rules, we would have had to kill both clients.
         * Really, this sucks.
@@ -111,7 +114,7 @@ int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remot
                params.push_back(ConvToStr(u->age));
                params.Broadcast();
 
-               u->ForceNickChange(u->uuid);
+               u->ChangeNick(u->uuid);
 
                if (!bChangeRemote)
                        return 1;
@@ -125,12 +128,12 @@ int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remot
                 * so other servers don't need to see the SAVE
                 */
                TreeSocket* sock = server->GetSocket();
-               sock->WriteLine(":"+ServerInstance->Config->GetSID()+" SAVE "+remoteuid+" "+ ConvToStr(remotets));
+               sock->WriteLine(CmdBuilder("SAVE").push(remoteuid).push_int(remotets));
 
                if (remote)
                {
                        /* nick change collide. Force change their nick. */
-                       remote->ForceNickChange(remoteuid);
+                       remote->ChangeNick(remoteuid);
                }
 
                if (!bChangeLocal)