diff options
Diffstat (limited to 'src/channels.cpp')
| -rw-r--r-- | src/channels.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index e5fd7265e..4b56527c9 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -179,10 +179,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co if (user->IsOper()) { unsigned int opermaxchans = ConvToNum<unsigned int>(user->oper->getConfig("maxchans")); - // If not set, use 2.0's <channels:opers>, if that's not set either, use limit from CC - if (!opermaxchans && user->HasPrivPermission("channels/high-join-limit")) - opermaxchans = ServerInstance->Config->OperMaxChans; - if (opermaxchans) + if (opermaxchans > maxchans) maxchans = opermaxchans; } if (user->chans.size() >= maxchans) |