summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-07-25 12:16:49 +0200
committerAttila Molnar <attilamolnar@hush.com>2014-07-25 12:16:49 +0200
commite056c5381efaccbd9dce705d30c0d697f9922823 (patch)
tree9d32e49d4a3f4bb9515383f787ba23bbffd487c1 /src/modules
parentbabce517d1d9a82b13365a17e15237470daf5ced (diff)
m_spanningtree Update nick overrule on UID code to make sense on master
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/m_spanningtree/uid.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index ac9041ecc..4d8f82203 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -50,11 +50,11 @@ 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(433, "%s %s :Nickname overruled.", collideswith->nick.c_str(), collideswith->nick.c_str());
+ collideswith->WriteNumeric(ERR_NICKNAMEINUSE, "%s :Nickname overruled.", collideswith->nick.c_str());
// Clear the bit before calling User::ChangeNick() to make it NOT run the OnUserPostNick() hook
collideswith->registered &= ~REG_NICK;
- collideswith->ChangeNick(collideswith->uuid, true);
+ collideswith->ChangeNick(collideswith->uuid);
}
else if (collideswith)
{