m_spanningtree Add TreeSocket::SendServerInfo() that sends all additional data about...

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

diff --git a/src/modules/m_spanningtree/nick.cpp b/src/modules/m_spanningtree/nick.cpp
index eb6c9396ff9a460c86bae90a6d39e6b9bafefbea..73390163241fdd95ed4eb97607aec2528ae620b8 100644 (file)
--- a/src/modules/m_spanningtree/nick.cpp
+++ b/src/modules/m_spanningtree/nick.cpp
@@ -33,10 +33,10 @@
 CmdResult CommandNick::HandleRemote(RemoteUser* user, std::vector<std::string>& params)
 {
        if ((isdigit(params[0][0])) && (params[0] != user->uuid))
-               return CMD_INVALID;
+               throw ProtocolException("Attempted to change nick to an invalid or non-matching UUID");
 
        /* Update timestamp on user when they change nicks */
-       user->age = ConvToInt(params[1]);
+       const time_t newts = ConvToInt(params[1]);
 
        /*
         * On nick messages, check that the nick doesn't already exist here.
@@ -46,7 +46,7 @@ CmdResult CommandNick::HandleRemote(RemoteUser* user, std::vector<std::string>&
        if ((x) && (x != user))
        {
                /* x is local, who is remote */
-               int collideret = Utils->DoCollision(x, TreeServer::Get(user), user->age, user->ident, user->GetIPString(), user->uuid);
+               int collideret = Utils->DoCollision(x, TreeServer::Get(user), newts, user->ident, user->GetIPString(), user->uuid);
                if (collideret != 1)
                {
                        /*
@@ -57,6 +57,6 @@ CmdResult CommandNick::HandleRemote(RemoteUser* user, std::vector<std::string>&
                        return CMD_FAILURE;
                }
        }
-       user->ForceNickChange(params[0]);
+       user->ForceNickChange(params[0], newts);
        return CMD_SUCCESS;
 }