X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fnick.cpp;h=9e290e07f15448b1cba81233ea62985634032f01;hb=eef45dbfb90f951f3048038aea3ff68b5c157f6d;hp=43b713e14d0e96dfd8057237147f25dfb50332db;hpb=76030cb8afcce53885f0bd3c5c63d5536eaa3019;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/nick.cpp b/src/modules/m_spanningtree/nick.cpp
index 43b713e14..9e290e07f 100644
--- a/src/modules/m_spanningtree/nick.cpp
+++ b/src/modules/m_spanningtree/nick.cpp
@@ -30,13 +30,13 @@
 #include "commands.h"
 #include "treeserver.h"
 
-CmdResult CommandNick::HandleRemote(RemoteUser* user, std::vector<std::string>& params)
+CmdResult CommandNick::HandleRemote(::RemoteUser* user, std::vector<std::string>& params)
 {
 	if ((isdigit(params[0][0])) && (params[0] != user->uuid))
 		throw ProtocolException("Attempted to change nick to an invalid or non-matching UUID");
 
 	// Timestamp of the new nick
-	const time_t newts = ServerCommand::ExtractTS(params[1]);
+	time_t newts = ServerCommand::ExtractTS(params[1]);
 
 	/*
 	 * On nick messages, check that the nick doesn't already exist here.
@@ -47,12 +47,14 @@ CmdResult CommandNick::HandleRemote(RemoteUser* user, std::vector<std::string>&
 	{
 		// 'x' is the already existing user using the same nick as params[0]
 		// 'user' is the user trying to change nick to the in use nick
-		bool they_change = Utils->DoCollision(x, TreeServer::Get(user), newts, user->ident, user->GetIPString(), user->uuid);
+		bool they_change = Utils->DoCollision(x, TreeServer::Get(user), newts, user->ident, user->GetIPString(), user->uuid, "NICK");
 		if (they_change)
 		{
 			// Remote client lost, or both lost, rewrite this nick change as a change to uuid before
 			// calling ChangeNick() and forwarding the message
 			params[0] = user->uuid;
+			params[1] = ConvToStr(CommandSave::SavedTimestamp);
+			newts = CommandSave::SavedTimestamp;
 		}
 	}