pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-02 16:13:12 +02:00
Code Activity

Fixed it so halfops can not be marked as forcibly deopped, fixes us sometimes undoing all modes by some halfops

Browse Source 
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2787 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Adam-
2010-02-09 05:27:08 +00:00
parent 2cfcf3c512
commit dd198b89c0
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/channels.c
+11 -4
View File
@@ -262,9 +262,9 @@ void chan_set_modes(const char *source, Channel * chan, int ac, char **av,
if (add) {
chan_set_user_status(chan, user, cum->status);
/* If this does +o, remove any DEOPPED flag */
if (cum->status & CUS_OP)
chan_remove_user_status(chan, user, CUS_DEOPPED);
/* If this does +o or +h, remove any DEOPPED flag */
if (cum->status & CUS_OP || cum->status & CUS_HALFOP)
chan_remove_user_status(chan, user, CUS_DEOPPED);
} else {
chan_remove_user_status(chan, user, cum->status);
}
@@ -1512,6 +1512,8 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes)
strcat(modebuf, "h");
strcat(userbuf, " ");
strcat(userbuf, GET_USER(user));
/* Halfops are ops too, having a halfop with CUS_DEOPPED is not good - Adam */
rem_modes |= CUS_DEOPPED;
} else {
add_modes &= ~CUS_HALFOP;
}
@@ -1543,12 +1545,17 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes)
strcat(modebuf, "o");
strcat(userbuf, " ");
strcat(userbuf, GET_USER(user));
add_modes |= CUS_DEOPPED;
/* Do not mark a user as deopped if they are halfopd - Adam */
if (!(add_modes & CUS_HALFOP) && !(status & CUS_HALFOP))
add_modes |= CUS_DEOPPED;
}
if (rem_modes & CUS_HALFOP) {
strcat(modebuf, "h");
strcat(userbuf, " ");
strcat(userbuf, GET_USER(user));
/* Do not mark a user as deopped if they are opped - Adam */
if (!(add_modes & CUS_OP) && !(status & CUS_OP))
add_modes |= CUS_DEOPPED;
}
}
version.log
+2 -1
View File
@@ -9,10 +9,11 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="3"
VERSION_EXTRA="-svn"
VERSION_BUILD="2774"
VERSION_BUILD="2787"
# $Log$ # Changes since 1.8.3 Release
#Revision 2787 - Fixed it so halfops can not be marked as forcibly deopped, fixes us sometimes undoing all modes by some halfops
#Revision 2774 - Bump Changes versions to 1.8-SVN & credit for tr.l
# Leading up to 1.8.3 Release