Check for oper max chans before user max chans, fixes code weirdness and bug #876.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11422 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 0 insertions, 8 deletions

diff --git a/src/channels.cpp b/src/channels.cpp
index 0532a70e2..1ef761a66 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -263,14 +263,6 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 		// Checking MyClass exists because we *may* get here with NULL, not 100% sure.
 		if (user->MyClass && user->MyClass->GetMaxChans())
 		{
-			if (user->chans.size() >= user->MyClass->GetMaxChans())
-			{
-				user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
-				return NULL;
-			}
-		}
-		else
-		{
 			if (user->HasPrivPermission("channels/high-join-limit"))
 			{
 				if (user->chans.size() >= Instance->Config->OperMaxChans)