X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsvsnick.cpp;h=43fa0f296ec6cb5811a9cd69a56b1e3e77c56720;hb=c8f92d97c2cd92a07bbb76b96a67cd089c7e3407;hp=6490626afb4ba0e1e44abcc556fad0cc34aac75f;hpb=3ce33ee0e6bc0b8fbe2a564a37e02d2e56510b06;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index 6490626af..43fa0f296 100644
--- 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->ForceNickChange(nick, NickTS))
 		{
 			/* buh. UID them */
 			if (!u->ForceNickChange(u->uuid))
 			{
 				ServerInstance->Users->QuitUser(u, "Nickname collision");
-				return CMD_SUCCESS;
 			}
 		}
-
-		u->age = ConvToInt(parameters[2]);
 	}
 
 	return CMD_SUCCESS;