summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mode.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mode.cpp b/src/mode.cpp
index e7ee1c3dc..35003de0e 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -496,6 +496,16 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
}
}
ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding);
+
+ if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter == ""))
+ {
+ /* The handler nuked the parameter and they are supposed to have one.
+ * We CANT continue now, even if they actually returned MODEACTION_ALLOW,
+ * so we bail to the next mode character.
+ */
+ continue;
+ }
+
if (ma == MODEACTION_ALLOW)
{
log(DEBUG,"ModeAction was allow");
@@ -598,16 +608,6 @@ void ModeParser::CleanMask(std::string &mask)
/* Has a ! but no @, it must be a nick!ident */
mask.append("@*");
}
-
- /* Check for dumb stuff like *@*!*
- * swap the two items over so that at least the n!u@h ordering
- * is correct even if the elements may not be
- */
- if (((pos_of_pling != std::string::npos) && (pos_of_at != std::string::npos)) && (pos_of_pling > pos_of_at))
- {
- mask.replace(pos_of_pling, 1, "@");
- mask.replace(pos_of_at, 1, "!");
- }
}
bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter)