m_spanningtree Assign an id to new Memberships

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

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index b3480eb55404bcc726c3187ce81f18bab7f9eeb0..43fa0f296ec6cb5811a9cd69a56b1e3e77c56720 100644 (file)
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -33,19 +33,11 @@ CmdResult CommandSVSNick::Handle(User* user, std::vector<std::string>& parameter
                if (isdigit(nick[0]))
                        nick = u->uuid;
 
-               // Don't update the TS if the nick is exactly the same
-               if (u->nick == nick)
-                       return CMD_FAILURE;
-
                time_t NickTS = ConvToInt(parameters[2]);
                if (NickTS <= 0)
                        return CMD_FAILURE;
 
-               ModuleSpanningTree* st = (ModuleSpanningTree*)(Module*)creator;
-               st->KeepNickTS = true;
-               u->age = NickTS;
-
-               if (!u->ForceNickChange(nick))
+               if (!u->ForceNickChange(nick, NickTS))
                {
                        /* buh. UID them */
                        if (!u->ForceNickChange(u->uuid))
@@ -53,8 +45,6 @@ CmdResult CommandSVSNick::Handle(User* user, std::vector<std::string>& parameter
                                ServerInstance->Users->QuitUser(u, "Nickname collision");
                        }
                }
-
-               st->KeepNickTS = false;
        }
 
        return CMD_SUCCESS;