X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=15ee4e7f8371e90bf828df43fa7b00171129ac7b;hb=a8b146419b2aae36da25b7202292528efd3158a9;hp=b9010d3302770c1a918b8294409ba56e67be9c7f;hpb=c202dea024542b9c6c6b771bb9a3a081d9eacdc5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index b9010d330..15ee4e7f8 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -36,11 +36,6 @@ class ModuleNoNickChange : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(nn);
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_VENDOR);
@@ -58,7 +53,7 @@ class ModuleNoNickChange : public Module
 
 		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
 		{
-			Channel* curr = *i;
+			Channel* curr = (*i)->chan;
 
 			ModResult res = ServerInstance->OnCheckExemption(user,curr,"nonick");
 
@@ -70,8 +65,8 @@ class ModuleNoNickChange : public Module
 
 			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());
+				user->WriteNumeric(ERR_CANTCHANGENICK, ":Can't change nickname while on %s (+N is set)",
+					curr->name.c_str());
 				return MOD_RES_DENY;
 			}
 		}