diff options
author | Adam <Adam@anope.org> | 2010-09-07 18:41:44 -0400 |
---|---|---|
committer | Adam <Adam@anope.org> | 2010-09-07 18:41:44 -0400 |
commit | bd94cbc25b27250872ba4e682cf7af36e16a2d25 (patch) | |
tree | 0ccdfe2e32e132b0f61c62e73fdad2595883bd2a /src/core/cs_xop.c | |
parent | 3a97d196f9744a75a715cf3bc8bd0d36683e4ece (diff) | |
parent | 22894e9e09bb0e3c76d866a9568d654d73920526 (diff) |
Merge branch '1.8' of git.sigterm.info:gitroot/anope/anope into 1.8
Diffstat (limited to 'src/core/cs_xop.c')
-rw-r--r-- | src/core/cs_xop.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c index 3183cec93..cc8a02625 100644 --- a/src/core/cs_xop.c +++ b/src/core/cs_xop.c @@ -97,11 +97,8 @@ int AnopeInit(int argc, char **argv) c = createCommand("AOP", do_aop, NULL, CHAN_HELP_AOP, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); - if (ircd->halfop) { - c = createCommand("HOP", do_hop, NULL, CHAN_HELP_HOP, -1, -1, -1, - -1); - moduleAddCommand(CHANSERV, c, MOD_UNIQUE); - } + c = createCommand("HOP", do_hop, NULL, CHAN_HELP_HOP, -1, -1, -1, -1); + moduleAddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("SOP", do_sop, NULL, CHAN_HELP_SOP, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); c = createCommand("VOP", do_vop, NULL, CHAN_HELP_VOP, -1, -1, -1, -1); @@ -150,7 +147,9 @@ int do_aop(User * u) int do_hop(User * u) { - return do_xop(u, "HOP", ACCESS_HOP, xop_msgs[3]); + if (ircd->halfop) + return do_xop(u, "HOP", ACCESS_HOP, xop_msgs[3]); + return MOD_CONT; } /*************************************************************************/ |