X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=b8d4ac4df3682c8bb1d6c951575070fc0281a86e;hb=0ada3aeb10294f9252c6b1d69b7d761c969ef12c;hp=6c4101bc5fe4b7e7df359d2c1b905dea3b53ca55;hpb=d24619c012b34d5a3d4cfb93e7bea3ff3d5721e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 6c4101bc5..b8d4ac4df 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -55,7 +55,7 @@ class CommandNicklock : public Command
 				return CMD_FAILURE;
 			}
 
-			user->WriteServ("947 %s %s :Nickname now locked.", user->nick.c_str(), parameters[1].c_str());
+			user->WriteNumeric(947, "%s :Nickname now locked.", parameters[1].c_str());
 		}
 
 		/* If we made it this far, extend the user */
@@ -148,13 +148,6 @@ class ModuleNickLock : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(cmd1);
-		ServerInstance->Modules->AddService(cmd2);
-		ServerInstance->Modules->AddService(locked);
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides the NICKLOCK command, allows an oper to change a users nick and lock them to it until they quit", VF_OPTCOMMON | VF_VENDOR);
@@ -167,7 +160,7 @@ class ModuleNickLock : public Module
 
 		if (locked.get(user))
 		{
-			user->WriteNumeric(447, "%s :You cannot change your nickname (your nick is locked)",user->nick.c_str());
+			user->WriteNumeric(ERR_CANTCHANGENICK, ":You cannot change your nickname (your nick is locked)");
 			return MOD_RES_DENY;
 		}
 		return MOD_RES_PASSTHRU;