Remove now needless User::ForceNickChange()

[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 6490626afb4ba0e1e44abcc556fad0cc34aac75f..de13316401697670a997ee84dec96f3949f46675 100644 (file)
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -20,9 +20,10 @@
 
 #include "inspircd.h"
 
+#include "main.h"
 #include "commands.h"
 
-CmdResult CommandSVSNick::Handle(const std::vector<std::string>& parameters, User *user)
+CmdResult CommandSVSNick::Handle(User* user, std::vector<std::string>& parameters)
 {
        User* u = ServerInstance->FindNick(parameters[0]);
 
@@ -32,17 +33,18 @@ CmdResult CommandSVSNick::Handle(const std::vector<std::string>& parameters, Use
                if (isdigit(nick[0]))
                        nick = u->uuid;
 
-               if (!u->ForceNickChange(nick))
+               time_t NickTS = ConvToInt(parameters[2]);
+               if (NickTS <= 0)
+                       return CMD_FAILURE;
+
+               if (!u->ChangeNick(nick, NickTS))
                {
                        /* buh. UID them */
-                       if (!u->ForceNickChange(u->uuid))
+                       if (!u->ChangeNick(u->uuid))
                        {
                                ServerInstance->Users->QuitUser(u, "Nickname collision");
-                               return CMD_SUCCESS;
                        }
                }
-
-               u->age = ConvToInt(parameters[2]);
        }
 
        return CMD_SUCCESS;