Skip to content

Commit

Permalink
Check for oper max chans before user max chans, fixes code weirdness …
Browse files Browse the repository at this point in the history
…and bug #876.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11422 e03df62e-2008-0410-955e-edbf42e46eb7
  • Loading branch information
rburchell committed Jun 30, 2009
1 parent 149c343 commit c9fed3c
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions src/channels.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -262,14 +262,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"))
{
Expand Down

0 comments on commit c9fed3c

Please sign in to comment.