From ac7e37c8542159fa0efa48b43c9ab346762f1638 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Sat, 26 Jul 2014 16:19:18 +0200 Subject: m_spanningtree Set the TS of the uuid nick to the same value on collision --- src/modules/m_spanningtree/nick.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/modules/m_spanningtree/nick.cpp') 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& 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& // 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; } } -- cgit v1.3.1-10-gc9f91