diff options
| -rw-r--r-- | modules/commands/os_set.cpp | 2 | ||||
| -rw-r--r-- | modules/pseudoclients/operserv.cpp | 8 | ||||
| -rw-r--r-- | src/xline.cpp | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/modules/commands/os_set.cpp b/modules/commands/os_set.cpp index f30d3723e..b51745aa7 100644 --- a/modules/commands/os_set.cpp +++ b/modules/commands/os_set.cpp @@ -16,7 +16,7 @@ class CommandOSSet : public Command private: void DoList(CommandSource &source) { - Log(LOG_ADMIN, source, this); + Log(LOG_ADMIN, source, this) << "LIST"; Anope::string index; diff --git a/modules/pseudoclients/operserv.cpp b/modules/pseudoclients/operserv.cpp index 1b21fc4eb..e10a8f39b 100644 --- a/modules/pseudoclients/operserv.cpp +++ b/modules/pseudoclients/operserv.cpp @@ -132,12 +132,16 @@ class SNLineManager : public XLineManager void Send(User *u, XLine *x) anope_override { - IRCD->SendSGLine(u, x); + if (IRCD->CanSNLine) + IRCD->SendSGLine(u, x); + else + u->Kill(Config->GetClient("OperServ"), "SNLined: " + x->reason); } void SendDel(XLine *x) anope_override { - IRCD->SendSGLineDel(x); + if (IRCD->CanSNLine) + IRCD->SendSGLineDel(x); } bool Check(User *u, const XLine *x) anope_override diff --git a/src/xline.cpp b/src/xline.cpp index d6d5ad8e5..ea7fc1e73 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -213,13 +213,8 @@ void XLineManager::CheckAll(User *u) { XLineManager *xlm = *it; - XLine *x = xlm->CheckAllXLines(u); - - if (x) - { - xlm->OnMatch(u, x); + if (xlm->CheckAllXLines(u)) break; - } } } |