aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/m_spanningtree/nickcollide.cpp
diff options
context:
space:
mode:
authorGravatar Attila Molnar2014-07-26 16:19:18 +0200
committerGravatar Attila Molnar2014-07-26 16:19:18 +0200
commitac7e37c8542159fa0efa48b43c9ab346762f1638 (patch)
tree8df332e38b9f2b1eb79159d19388de1f74a20e86 /src/modules/m_spanningtree/nickcollide.cpp
parentm_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/nickcollide.cpp')
-rw-r--r--src/modules/m_spanningtree/nickcollide.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index a46e103e4..3401041aa 100644
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -24,6 +24,7 @@
#include "treeserver.h"
#include "utils.h"
#include "commandbuilder.h"
+#include "commands.h"
/*
* Yes, this function looks a little ugly.
@@ -107,7 +108,7 @@ bool SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remo
params.push_back(ConvToStr(u->age));
params.Broadcast();
- u->ChangeNick(u->uuid);
+ u->ChangeNick(u->uuid, CommandSave::SavedTimestamp);
}
if (bChangeRemote)
{