Merge pull request #569 from ShutterQuick/inspircd+asrootfix

[user/henk/code/inspircd.git] / src / modules / m_nonicks.cpp

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 58fe054b56f7e6b509801b33334831f6ddbf15a7..c9a9116e2d8311982b8a7f54f1e36f05df5f9728 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -61,10 +61,6 @@ class ModuleNoNickChange : public Module
                if (!IS_LOCAL(user))
                        return MOD_RES_PASSTHRU;
 
-               // Allow forced nick changes.
-               if (ServerInstance->NICKForced.get(user))
-                       return MOD_RES_PASSTHRU;
-
                for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
                {
                        Channel* curr = *i;
@@ -77,7 +73,7 @@ class ModuleNoNickChange : public Module
                        if (override && user->IsOper())
                                continue;
 
-                       if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet('N')))
+                       if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet(nn)))
                        {
                                user->WriteNumeric(ERR_CANTCHANGENICK, "%s :Can't change nickname while on %s (+N is set)",
                                        user->nick.c_str(), curr->name.c_str());