diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/commands/ns_set.cpp | 4 | ||||
| -rw-r--r-- | modules/protocol/inspircd20.cpp | 9 | ||||
| -rw-r--r-- | modules/pseudoclients/nickserv.cpp | 7 |
3 files changed, 8 insertions, 12 deletions
diff --git a/modules/commands/ns_set.cpp b/modules/commands/ns_set.cpp index e8e7c335c..589529d61 100644 --- a/modules/commands/ns_set.cpp +++ b/modules/commands/ns_set.cpp @@ -1107,13 +1107,13 @@ class CommandNSSASetNoexpire : public Command if (param.equals_ci("ON")) { - Log(LOG_ADMIN, source, this) << "to enable noexpire for " << na->nc->display; + Log(LOG_ADMIN, source, this) << "to enable noexpire for " << na->nick << " (" << na->nc->display << ")"; na->Extend<bool>("NS_NO_EXPIRE"); source.Reply(_("Nick %s \002will not\002 expire."), na->nick.c_str()); } else if (param.equals_ci("OFF")) { - Log(LOG_ADMIN, source, this) << "to disable noexpire for " << na->nc->display; + Log(LOG_ADMIN, source, this) << "to disable noexpire for " << na->nick << " (" << na->nc->display << ")"; na->Shrink<bool>("NS_NO_EXPIRE"); source.Reply(_("Nick %s \002will\002 expire."), na->nick.c_str()); } diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp index d95f09591..be17818a4 100644 --- a/modules/protocol/inspircd20.cpp +++ b/modules/protocol/inspircd20.cpp @@ -1055,15 +1055,6 @@ class ProtoInspIRCd20 : public Module return EVENT_CONTINUE; } - - EventReturn OnChannelModeUnset(Channel *c, MessageSource &setter, ChannelMode *mode, const Anope::string ¶m) anope_override - { - if ((setter.GetUser() && setter.GetUser()->server == Me) || setter.GetServer() == Me || !setter.GetServer()) - if (mode->name == "OPERPREFIX") - c->SetMode(c->ci->WhoSends(), mode, param, false); - - return EVENT_CONTINUE; - } }; MODULE_INIT(ProtoInspIRCd20) 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<NickServCollide *>::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; |