X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=91c9f3ca88fd27475e605ebecaf48a1a3ed338c4;hb=02497bfa999da26c19a92d8620c35bb97f1da711;hp=eff5371199110a59d14f4ebd398506b38c5b14b1;hpb=b9e11915a976daaf790ebc763aff56e19fd49e0f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index eff537119..91c9f3ca8 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -50,12 +50,8 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
 	{
 		// User that the incoming user is colliding with is not fully registered, we force nick change the
 		// unregistered user to their uuid and tell them what happened
-		collideswith->WriteFrom(collideswith, "NICK %s", collideswith->uuid.c_str());
-		collideswith->WriteNumeric(ERR_NICKNAMEINUSE, collideswith->nick, "Nickname overruled.");
-
-		// Clear the bit before calling User::ChangeNick() to make it NOT run the OnUserPostNick() hook
-		collideswith->registered &= ~REG_NICK;
-		collideswith->ChangeNick(collideswith->uuid);
+		LocalUser* const localuser = static_cast<LocalUser*>(collideswith);
+		localuser->OverruleNick();
 	}
 	else if (collideswith)
 	{
@@ -98,7 +94,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
 		if (!mh)
 			throw ProtocolException("Unrecognised mode '" + std::string(1, *v) + "'");
 
-		if (mh->GetNumParams(true))
+		if (mh->NeedsParam(true))
 		{
 			if (paramptr >= params.size() - 1)
 				throw ProtocolException("Out of parameters while processing modes");
@@ -166,6 +162,6 @@ CommandUID::Builder::Builder(User* user)
 	push(user->ident);
 	push(user->GetIPString());
 	push_int(user->signon);
-	push('+').push_raw(user->FormatModes(true));
+	push(user->GetModeLetters(true));
 	push_last(user->fullname);
 }