X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=0ff1298c118729fd23187ea09a6ba7336d6efce5;hb=6cfd6ad816d597a88abcbe6c6dc9d3e507aa539c;hp=0532a70e24099bb2388e814a1766b7bb11d0cc6e;hpb=23a98c8fe1f255fe5f20c26c726da817d2796c9a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index 0532a70e2..0ff1298c1 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -261,15 +261,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 	if (IS_LOCAL(user) && !override)
 	{
 		// 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->MyClass && user->MyClass->maxchans)
 		{
 			if (user->HasPrivPermission("channels/high-join-limit"))
 			{
@@ -281,7 +273,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool
 			}
 			else
 			{
-				if (user->chans.size() >= Instance->Config->MaxChans)
+				if (user->chans.size() >= user->MyClass->maxchans)
 				{
 					user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn);
 					return NULL;