X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=43e49e2b97dc2efa5c35b4f5b7d5e8a16e9ad105;hb=2df56b811b362dbf5a05a0bc7b0eee5ee4d77a40;hp=7405c714969ad015fdd1980292eb9de64b89e55a;hpb=a82061b65b849ab65692d125b3e35f0929815733;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 7405c7149..43e49e2b9 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -64,13 +64,13 @@ class ModuleNoNickChange : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 
 	virtual void On005Numeric(std::string &output)
 	{
-		ServerInstance->AddExtBanChar("n");
+		ServerInstance->AddExtBanChar('N');
 	}
 
 	virtual int OnUserPreNick(User* user, const std::string &newnick)
@@ -85,16 +85,10 @@ class ModuleNoNickChange : public Module
 		{
 			Channel* curr = i->first;
 
-			if (curr->IsModeSet('N'))
-			{
-				if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
-					continue;
-
-				user->WriteNumeric(ERR_CANTCHANGENICK, "%s :Can't change nickname while on %s (+N is set)", user->nick.c_str(), curr->name.c_str());
-				return 1;
-			}
+			if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
+				continue;
 
-			if (curr->IsExtBanned(user, 'N'))
+			if (curr->IsModeSet('N') || curr->IsExtBanned(user, 'N'))
 			{
 				user->WriteNumeric(ERR_CANTCHANGENICK, "%s :Can't change nickname while on %s (+N is set)", user->nick.c_str(), curr->name.c_str());
 				return 1;