From 7a21648683f36a80ca1173844c081b43b12a3514 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 20 Aug 2015 15:04:03 -0400 Subject: Only remove collide timers if the account matches on id --- modules/pseudoclients/nickserv.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index c51a15360..ee1049195 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -39,6 +39,11 @@ class NickServCollide : public Timer return u; } + NickAlias *GetNick() + { + return na; + } + void Tick(time_t t) anope_override { if (!u || !na) @@ -361,7 +366,7 @@ class NickServCore : public Module, public NickServService for (std::set::iterator it = collides.begin(); it != collides.end(); ++it) { NickServCollide *c = *it; - if (c->GetUser() == u) + if (c->GetUser() == u && c->GetNick() && c->GetNick()->nc == u->Account()) { delete c; break; -- cgit