summaryrefslogtreecommitdiff
path: root/modules/commands/cs_set_peace.cpp
diff options
context:
space:
mode:
authorlethality <lethality@anope.org>2012-10-05 15:15:50 +0100
committerlethality <lethality@anope.org>2012-10-05 15:15:50 +0100
commit94fc2ba9c927f8950d81e38ef6b962ee5af022df (patch)
tree0e2ebe2df3ed41e5c7c10aba46bab236d3e11b75 /modules/commands/cs_set_peace.cpp
parent2f87b8e430f5082708d7229b92c10b20f9e98fdf (diff)
parenteff61c7a9708013f9617282c4f327bbe2b1bfb79 (diff)
Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'modules/commands/cs_set_peace.cpp')
-rw-r--r--modules/commands/cs_set_peace.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/commands/cs_set_peace.cpp b/modules/commands/cs_set_peace.cpp
index 977c3a095..889a0c6ae 100644
--- a/modules/commands/cs_set_peace.cpp
+++ b/modules/commands/cs_set_peace.cpp
@@ -30,8 +30,12 @@ class CommandCSSetPeace : public Command
source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
return;
}
+ EventReturn MOD_RESULT;
+ FOREACH_RESULT(I_OnSetChannelOption, OnSetChannelOption(source, this, ci, params[1]));
+ if (MOD_RESULT == EVENT_STOP)
+ return;
- if (source.permission.empty() && !source.AccessFor(ci).HasPriv("SET"))
+ if (MOD_RESULT != EVENT_ALLOW && source.permission.empty() && !source.AccessFor(ci).HasPriv("SET"))
{
source.Reply(ACCESS_DENIED);
return;