diff options
| author |  Attila Molnar | 2014-07-26 16:19:18 +0200 |
|---|---|---|
| committer | Attila Molnar | 2014-07-26 16:19:18 +0200 |
| commit | ac7e37c8542159fa0efa48b43c9ab346762f1638 (patch) | |
| tree | 8df332e38b9f2b1eb79159d19388de1f74a20e86 /src/modules/m_spanningtree/nick.cpp | |
| parent | m_spanningtree Warn instead of sending SAVE if we change the nick of a non-lo... (diff) | |
m_spanningtree Set the TS of the uuid nick to the same value on collision
Diffstat (limited to 'src/modules/m_spanningtree/nick.cpp')
| -rw-r--r-- | src/modules/m_spanningtree/nick.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/m_spanningtree/nick.cpp b/src/modules/m_spanningtree/nick.cpp index 43b713e14..9496c2874 100644 --- a/src/modules/m_spanningtree/nick.cpp +++ b/src/modules/m_spanningtree/nick.cpp @@ -36,7 +36,7 @@ CmdResult CommandNick::HandleRemote(RemoteUser* user, std::vector<std::string>& throw ProtocolException("Attempted to change nick to an invalid or non-matching UUID"); // Timestamp of the new nick - const time_t newts = ServerCommand::ExtractTS(params[1]); + time_t newts = ServerCommand::ExtractTS(params[1]); /* * On nick messages, check that the nick doesn't already exist here. @@ -53,6 +53,8 @@ CmdResult CommandNick::HandleRemote(RemoteUser* user, std::vector<std::string>& // Remote client lost, or both lost, rewrite this nick change as a change to uuid before // calling ChangeNick() and forwarding the message params[0] = user->uuid; + params[1] = ConvToStr(CommandSave::SavedTimestamp); + newts = CommandSave::SavedTimestamp; } } |