Change allocation of UserManager::clientlist to be physically part of the object...

[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 0d96167b9c2e8850e03a90fc6c5db381982a1493..f248b3860743880d0e2720d8c9852e0faac5ba5d 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -48,14 +48,13 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
                return CMD_INVALID;
 
        /* check for collision */
-       user_hash::iterator iter = ServerInstance->Users->clientlist->find(params[2]);
-
-       if (iter != ServerInstance->Users->clientlist->end())
+       User* collideswith = ServerInstance->FindNickOnly(params[2]);
+       if (collideswith)
        {
                /*
                 * Nick collision.
                 */
-               int collide = Utils->DoCollision(iter->second, remoteserver, age_t, params[5], params[6], params[0]);
+               int collide = Utils->DoCollision(collideswith, remoteserver, age_t, params[5], params[6], params[0]);
                ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "*** Collision on %s, collide=%d", params[2].c_str(), collide);
 
                if (collide != 1)
@@ -78,7 +77,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
                ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
                return CMD_INVALID;
        }
-       (*(ServerInstance->Users->clientlist))[params[2]] = _new;
+       ServerInstance->Users->clientlist[params[2]] = _new;
        _new->nick = params[2];
        _new->host = params[3];
        _new->dhost = params[4];