From 2eb0505a16cf5b70076bab2de494ef92b7e991d9 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Thu, 3 Jul 2014 12:36:14 +0200 Subject: User::ChangeNick() cannot fail if the new nick is the uuid, document this and rely on it --- src/modules/m_spanningtree/save.cpp | 7 +------ src/modules/m_spanningtree/svsnick.cpp | 5 +---- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/modules/m_spanningtree/save.cpp b/src/modules/m_spanningtree/save.cpp index dd9e866a9..75fdd478c 100644 --- a/src/modules/m_spanningtree/save.cpp +++ b/src/modules/m_spanningtree/save.cpp @@ -35,12 +35,7 @@ CmdResult CommandSave::Handle(User* user, std::vector& params) time_t ts = atol(params[1].c_str()); if (u->age == ts) - { - if (!u->ChangeNick(u->uuid)) - { - ServerInstance->Users->QuitUser(u, "Nickname collision"); - } - } + u->ChangeNick(u->uuid); return CMD_SUCCESS; } diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp index de1331640..8689f71ac 100644 --- a/src/modules/m_spanningtree/svsnick.cpp +++ b/src/modules/m_spanningtree/svsnick.cpp @@ -40,10 +40,7 @@ CmdResult CommandSVSNick::Handle(User* user, std::vector& parameter if (!u->ChangeNick(nick, NickTS)) { /* buh. UID them */ - if (!u->ChangeNick(u->uuid)) - { - ServerInstance->Users->QuitUser(u, "Nickname collision"); - } + u->ChangeNick(u->uuid); } } -- cgit v1.2.3