From 68b1abc6f75c3c61f72f205ba5fe59e699880d33 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 16 Apr 2011 04:37:57 -0400 Subject: Fixed botserv kicker logic --- src/botserv.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/botserv.cpp b/src/botserv.cpp index 0bf18da56..3268d85e1 100644 --- a/src/botserv.cpp +++ b/src/botserv.cpp @@ -109,15 +109,15 @@ void botchanmsgs(User *u, ChannelInfo *ci, const Anope::string &buf) * way. */ - bool Allow = false; - if (!ci->botflags.HasFlag(BS_DONTKICKOPS) && !ci->botflags.HasFlag(BS_DONTKICKVOICES)) - Allow = true; + bool Allow = true; + if (check_access(u, ci, CA_NOKICK)) + Allow = false; else if (ci->botflags.HasFlag(BS_DONTKICKOPS) && (ci->c->HasUserStatus(u, CMODE_HALFOP) || ci->c->HasUserStatus(u, CMODE_OP) || ci->c->HasUserStatus(u, CMODE_PROTECT) || ci->c->HasUserStatus(u, CMODE_OWNER))) - Allow = true; + Allow = false; else if (ci->botflags.HasFlag(BS_DONTKICKVOICES) && ci->c->HasUserStatus(u, CMODE_VOICE)) - Allow = true; + Allow = false; - if (!check_access(u, ci, CA_NOKICK) && Allow) + if (Allow) { /* Bolds kicker */ if (ci->botflags.HasFlag(BS_KICK_BOLDS) && realbuf.find(2) != Anope::string::npos) -- cgit