diff options
| -rw-r--r-- | modules/pseudoclients/nickserv.cpp | 12 | ||||
| -rw-r--r-- | src/users.cpp | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 6700dce48..c57039bee 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -378,8 +378,14 @@ class NickServCore : public Module, public NickServService for (user_map::const_iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it) { User *u = it->second; - if (u->server == s && !u->IsIdentified()) - this->Validate(u); + + if (u->server == s) + { + if (u->HasMode("REGISTERED") && !u->IsIdentified(true)) + u->RemoveMode(NickServ, "REGISTERED"); + if (!u->IsIdentified()) + this->Validate(u); + } } } @@ -409,7 +415,7 @@ class NickServCore : public Module, public NickServService void OnUserModeSet(const MessageSource &setter, User *u, const Anope::string &mname) anope_override { - if (mname == "REGISTERED" && !u->IsIdentified()) + if (u->server->IsSynced() && mname == "REGISTERED" && !u->IsIdentified(true)) u->RemoveMode(NickServ, mname); } diff --git a/src/users.cpp b/src/users.cpp index f44a6f62d..3c99b46e6 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -367,7 +367,7 @@ bool User::IsIdentified(bool check_nick) const { if (check_nick && this->nc) { - NickAlias *na = NickAlias::Find(this->nc->display); + NickAlias *na = NickAlias::Find(this->nick); return na && *na->nc == *this->nc; } |