diff options
| author |  Sadie Powell | 2019-12-08 17:38:47 +0000 |
|---|---|---|
| committer | Sadie Powell | 2019-12-08 17:47:07 +0000 |
| commit | 034dad6ab0df48172a70de70a9d0de4a9092112e (patch) | |
| tree | 0e852f3554dbce37d8e2e360fa099148155e8cab /src/modules/m_nonicks.cpp | |
| parent | Move the nationalchars locale files to the docs directory. (diff) | |
| parent | Clean up the initialisation of the InspIRCd class. (diff) | |
| download | inspircd++-034dad6ab0df48172a70de70a9d0de4a9092112e.tar.gz inspircd++-034dad6ab0df48172a70de70a9d0de4a9092112e.tar.bz2 inspircd++-034dad6ab0df48172a70de70a9d0de4a9092112e.zip | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_nonicks.cpp')
| -rw-r--r-- | src/modules/m_nonicks.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp index 194c326d7..f0efd771a 100644 --- a/src/modules/m_nonicks.cpp +++ b/src/modules/m_nonicks.cpp @@ -50,17 +50,17 @@ class ModuleNoNickChange : public Module Channel* curr = (*i)->chan; ModResult res = CheckExemption::Call(exemptionprov, user, curr, "nonick"); - if (res == MOD_RES_ALLOW) continue; if (user->HasPrivPermission("channels/ignore-nonicks")) continue; - if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet(nn))) + bool modeset = curr->IsModeSet(nn); + if (!curr->GetExtBanStatus(user, 'N').check(!modeset)) { - user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Cannot change nickname while on %s (+N is set)", - curr->name.c_str())); + user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Can't change nickname while on %s (%s)", + curr->name.c_str(), modeset ? "+N is set" : "you're extbanned")); return MOD_RES_DENY; } } |