diff options
| -rw-r--r-- | src/modules/m_spanningtree/main.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/main.h | 5 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/svsnick.cpp | 9 |
3 files changed, 0 insertions, 16 deletions
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 43a3ec2cc..0dc680ca0 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -38,7 +38,6 @@ ModuleSpanningTree::ModuleSpanningTree() : rconnect(this), rsquit(this), map(this) , commands(NULL), DNS(this, "DNS") - , KeepNickTS(false) { } @@ -588,7 +587,6 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick) params.push_back(user->nick); params.push_back(ConvToStr(user->age)); params.Broadcast(); - this->KeepNickTS = false; } else if (!loopCall && user->nick == user->uuid) { diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h index 12667aebf..513e86a2f 100644 --- a/src/modules/m_spanningtree/main.h +++ b/src/modules/m_spanningtree/main.h @@ -77,11 +77,6 @@ class ModuleSpanningTree : public Module */ bool SplitInProgress; - /** If true OnUserPostNick() won't update the nick TS before sending the NICK, - * used when handling SVSNICK. - */ - bool KeepNickTS; - /** Constructor */ ModuleSpanningTree(); diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp index 01b83dc2c..43fa0f296 100644 --- a/src/modules/m_spanningtree/svsnick.cpp +++ b/src/modules/m_spanningtree/svsnick.cpp @@ -33,17 +33,10 @@ CmdResult CommandSVSNick::Handle(User* user, std::vector<std::string>& parameter if (isdigit(nick[0])) nick = u->uuid; - // Don't update the TS if the nick is exactly the same - if (u->nick == nick) - return CMD_FAILURE; - time_t NickTS = ConvToInt(parameters[2]); if (NickTS <= 0) return CMD_FAILURE; - ModuleSpanningTree* st = (ModuleSpanningTree*)(Module*)creator; - st->KeepNickTS = true; - if (!u->ForceNickChange(nick, NickTS)) { /* buh. UID them */ @@ -52,8 +45,6 @@ CmdResult CommandSVSNick::Handle(User* user, std::vector<std::string>& parameter ServerInstance->Users->QuitUser(u, "Nickname collision"); } } - - st->KeepNickTS = false; } return CMD_SUCCESS; |