Send SVSNICKs during nick collision to prevent servers that do not fully implement...

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

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 749922c6277725c6e548f802dd4b61918c8a57ea..58a4a0e9df91d6403d474d24c4282e2b0e1f8fef 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -71,10 +71,10 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
                /*
                 * Nick collision.
                 */
-               ServerInstance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s", params[2].c_str());
                int collide = this->DoCollision(iter->second, age_t, params[5], params[8], params[0]);
+               ServerInstance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s, collide=%d", params[2].c_str(), collide);
 
-               if (collide == 2)
+               if (collide != 1)
                {
                        /* remote client changed, make sure we change their nick for the hash too */
                        params[2] = params[0];