mirror of
https://github.com/anope/anope.git
synced 2026-07-05 01:13:12 +02:00
Properly track users who join channels using an exception
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2920 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
+2
-5
@@ -581,11 +581,8 @@ bool ChannelInfo::CheckKick(User *user)
|
||||
if (is_ulined(user->server->name))
|
||||
return false;
|
||||
|
||||
if (this->HasFlag(CI_SUSPENDED) || this->HasFlag(CI_FORBIDDEN))
|
||||
if (!is_oper(user) && (this->HasFlag(CI_SUSPENDED) || this->HasFlag(CI_FORBIDDEN)))
|
||||
{
|
||||
if (is_oper(user))
|
||||
return 0;
|
||||
|
||||
get_idealban(this, user, mask, sizeof(mask));
|
||||
reason = this->forbidreason ? this->forbidreason : getstring(user, CHAN_MAY_NOT_BE_USED);
|
||||
set_modes = true;
|
||||
@@ -598,7 +595,7 @@ bool ChannelInfo::CheckKick(User *user)
|
||||
nc = NULL;
|
||||
|
||||
if (!do_kick && ModeManager::FindChannelModeByName(CMODE_EXCEPT) && is_excepted(this, user) == 1)
|
||||
return true;
|
||||
return false;
|
||||
|
||||
for (unsigned j = 0; j < this->GetAkickCount(); ++j)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user