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

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index b3480eb55..43fa0f296 100644
--- 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;