summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2013-05-10 11:22:53 -0400
committerAdam <Adam@anope.org>2013-05-10 16:17:24 -0400
commit9384a4f0880ef3ecbf7718256dd25e50f818b905 (patch)
tree2b47c8a7f8d599dbbaaf8864733beb556ca7df92
parent4d62c673fac9f166d6a7a53acda1780358110153 (diff)
Fix ChannelMode::CanSet
-rw-r--r--modules/pseudoclients/chanserv.cpp2
-rw-r--r--src/modes.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/pseudoclients/chanserv.cpp b/modules/pseudoclients/chanserv.cpp
index 9dc5abf0c..db5e16146 100644
--- a/modules/pseudoclients/chanserv.cpp
+++ b/modules/pseudoclients/chanserv.cpp
@@ -344,7 +344,7 @@ class ChanServCore : public Module
EventReturn OnCanSet(User *u, const ChannelMode *cm) anope_override
{
if (Config->GetModule(this)->Get<const Anope::string>("nomlock").find(cm->mchar) != Anope::string::npos
- || Config->GetModule(this)->Get<const Anope::string>("require", "r").find(cm->mchar) || Anope::string::npos)
+ || Config->GetModule(this)->Get<const Anope::string>("require", "r").find(cm->mchar) != Anope::string::npos)
return EVENT_STOP;
return EVENT_CONTINUE;
}
diff --git a/src/modes.cpp b/src/modes.cpp
index 1238df17d..651fbafd9 100644
--- a/src/modes.cpp
+++ b/src/modes.cpp
@@ -120,7 +120,7 @@ bool ChannelMode::CanSet(User *u) const
{
EventReturn MOD_RESULT;
FOREACH_RESULT(I_OnCanSet, OnCanSet(u, this));
- return MOD_RESULT == EVENT_ALLOW;
+ return MOD_RESULT != EVENT_STOP;
}
ChannelModeList::ChannelModeList(const Anope::string &cm, char mch) : ChannelMode(cm, mch)