X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsvsnick.cpp;h=d66a6b6598d5573e9c091b0787e785e252b5de45;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=a734dc8ed8e84bb1945b7e5b7ca54bc40c02b6fb;hpb=87b1461e2a4710a38b32186c2582da9fe9bb3804;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index a734dc8ed..d66a6b659 100644
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -1,7 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -41,7 +45,7 @@ CmdResult CommandSVSNick::Handle(User* user, Params& parameters)
 		// 4. SVSNICK arrives
 		// 5. Attila_ gets his nick changed to Guest12345 unnecessarily
 		//
-		// In this case when the SVSNICK is processed the target has already changed his nick to something
+		// In this case when the SVSNICK is processed the target has already changed their nick to something
 		// which isn't protected, so changing the nick again to a Guest nick is not desired.
 		// However, if the expected nick TS parameter is present in the SVSNICK then the nick change in step 5
 		// won't happen because the timestamps won't match.
@@ -63,6 +67,7 @@ CmdResult CommandSVSNick::Handle(User* user, Params& parameters)
 		if (!u->ChangeNick(nick, NickTS))
 		{
 			// Changing to 'nick' failed (it may already be in use), change to the uuid
+			u->WriteNumeric(RPL_SAVENICK, u->uuid, "Your nickname is in use by an older user on a new server.");
 			u->ChangeNick(u->uuid);
 		}
 	}