X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsvsnick.cpp;h=43fa0f296ec6cb5811a9cd69a56b1e3e77c56720;hb=a8b146419b2aae36da25b7202292528efd3158a9;hp=59973202ddc06cc52a73a214648eeeaae45986dc;hpb=24fc55bbfd367bf2ef68230173ffe1cb58f744fa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index 59973202d..43fa0f296 100644
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -21,10 +21,9 @@
 #include "inspircd.h"
 
 #include "main.h"
-#include "utils.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]);
 
@@ -34,28 +33,18 @@ CmdResult CommandSVSNick::Handle(const std::vector<std::string>& parameters, Use
 		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.c_str()))
+		if (!u->ForceNickChange(nick, NickTS))
 		{
 			/* buh. UID them */
-			if (!u->ForceNickChange(u->uuid.c_str()))
+			if (!u->ForceNickChange(u->uuid))
 			{
 				ServerInstance->Users->QuitUser(u, "Nickname collision");
 			}
 		}
-
-		st->KeepNickTS = false;
 	}
 
 	return CMD_SUCCESS;