summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/modules/m_nonicks.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 6328e5ee2..579441c89 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -37,12 +37,15 @@ class ModuleNoNickChange : public Module
if (user->chans[i].channel != NULL)
{
chanrec* curr = user->chans[i].channel;
- if ((curr->IsCustomModeSet('N')) && (user->chans[i].uc_modes < STATUS_HOP))
+ if (curr->IsCustomModeSet('N'))
{
- // don't allow the nickchange, theyre on at least one channel with +N set
- // and theyre not a (H)OP on the channel
- WriteServ(user->fd,"447 %s :Can't change nickname while on %s (+N is set)",user->nick,curr->name);
- return 1;
+ if (!strchr(user->modes,'o'))
+ {
+ // don't allow the nickchange, theyre on at least one channel with +N set
+ // and theyre not an oper
+ WriteServ(user->fd,"447 %s :Can't change nickname while on %s (+N is set)",user->nick,curr->name);
+ return 1;
+ }
}
}
}