aboutsummaryrefslogtreecommitdiffstats
path: root/src/channels.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2020-11-30 18:47:19 +0000
committerGravatar Sadie Powell2020-11-30 18:47:19 +0000
commitfbb7675c663cb71ff618ec7fe94e00da619d8025 (patch)
tree597bee2f2003621db8e2e438eaae18064ab238ae /src/channels.cpp
parentRename ChanMax to MaxChannel for consistency with the other limits. (diff)
downloadinspircd++-fbb7675c663cb71ff618ec7fe94e00da619d8025.tar.gz
inspircd++-fbb7675c663cb71ff618ec7fe94e00da619d8025.tar.bz2
inspircd++-fbb7675c663cb71ff618ec7fe94e00da619d8025.zip
Move ban checking to core_channel.
Diffstat (limited to 'src/channels.cpp')
-rw-r--r--src/channels.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index 151bc62ba..4fe1d1e56 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -232,20 +232,6 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
// describing the situation, so we may stop here without sending anything
if (MOD_RESULT == MOD_RES_DENY)
return NULL;
-
- // If no module returned MOD_RES_DENY or MOD_RES_ALLOW (which is the case
- // most of the time) then proceed to check channel bans.
- //
- // If a module explicitly allowed the join (by returning MOD_RES_ALLOW),
- // then this entire section is skipped
- if (MOD_RESULT == MOD_RES_PASSTHRU)
- {
- if (chan->IsBanned(user))
- {
- user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (you're banned)");
- return NULL;
- }
- }
}
}