From b4685e06d45336e7ce7cb138f8261ac120a2d6d3 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 25 Jan 2019 03:27:13 +0000
Subject: Remove all 2.0 config compatibility code.

---
 src/channels.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/channels.cpp')

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)
-- 
cgit v1.3.1-10-gc9f91