summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-02-14 11:52:06 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-02-14 11:52:06 +0000
commit988f8f2a5714744cde1247684aafb5b37024ac1c (patch)
tree6a4b6b41486a89e493dba844cc738ad5c0030140 /src
parente11f247c9c08e2ec0c0444c3d4b12990edbcdbbc (diff)
Hopefully fix behaviour of OnRawMode
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8931 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/mode.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mode.cpp b/src/mode.cpp
index 7b99eedb9..48777a7bf 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -309,7 +309,10 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
int MOD_RESULT = 0;
FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, *mode, "", true, 0));
if (MOD_RESULT == ACR_DENY)
+ {
+ mode++;
continue;
+ }
if (*mode == '+')
{
@@ -509,7 +512,7 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
int MOD_RESULT = 0;
FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, parameter, adding, 1));
if (MOD_RESULT == ACR_DENY)
- return;
+ continue;
bool had_parameter = !parameter.empty();
@@ -536,7 +539,7 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
int MOD_RESULT = 0;
FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, "", adding, 0));
if (MOD_RESULT == ACR_DENY)
- return;
+ continue;
/* Fix by brain: mode watchers not being called for parameterless modes */
for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)