Merge branch 'owners-immune'

This commit is contained in:
Sam Dodrill 2014-01-17 05:09:16 -08:00
commit a3da200088
1 changed files with 2 additions and 2 deletions

View File

@ -327,10 +327,10 @@ can_kick_deop(struct membership *source, struct membership *target)
if(is_owner(source))
return 1;
if(is_admin(source) && is_admin(target))
return 1;
if(is_admin(source) && is_owner(target))
return 0;
if(is_admin(source) && is_admin(target))
return 1;
if(is_chanop(source) && is_owner(target))
return 0;
if(is_chanop(source) && is_admin(target))