summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_spanningtree/save.cpp7
-rw-r--r--src/modules/m_spanningtree/svsnick.cpp5
2 files changed, 2 insertions, 10 deletions
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<std::string>& 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<std::string>& parameter
if (!u->ChangeNick(nick, NickTS))
{
/* buh. UID them */
- if (!u->ChangeNick(u->uuid))
- {
- ServerInstance->Users->QuitUser(u, "Nickname collision");
- }
+ u->ChangeNick(u->uuid);
}
}