1 files changed, 8 insertions, 16 deletions

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 4f5e5941c..7bd2c43b2 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -44,16 +44,16 @@ class CommandNicklock : public Command
 
 		if ((!target) || (target->registered != REG_ALL))
 		{
-			user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
+			user->WriteNotice("*** No such nickname: '" + parameters[0] + "'");
 			return CMD_FAILURE;
 		}
 
 		/* Do local sanity checks and bails */
 		if (IS_LOCAL(user))
 		{
-			if (!ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax))
+			if (!ServerInstance->IsNick(parameters[1]))
 			{
-				user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
+				user->WriteNotice("*** Invalid nickname '" + parameters[1] + "'");
 				return CMD_FAILURE;
 			}
 
@@ -66,7 +66,7 @@ class CommandNicklock : public Command
 			locked.set(target, 1);
 
 			std::string oldnick = target->nick;
-			if (target->ForceNickChange(parameters[1].c_str()))
+			if (target->ForceNickChange(parameters[1]))
 				ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used NICKLOCK to change and hold "+oldnick+" to "+parameters[1]);
 			else
 			{
@@ -107,7 +107,7 @@ class CommandNickunlock : public Command
 
 		if (!target)
 		{
-			user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
+			user->WriteNotice("*** No such nickname: '" + parameters[0] + "'");
 			return CMD_FAILURE;
 		}
 
@@ -139,7 +139,6 @@ class CommandNickunlock : public Command
 	}
 };
 
-
 class ModuleNickLock : public Module
 {
 	LocalIntExt locked;
@@ -151,7 +150,7 @@ class ModuleNickLock : public Module
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules->AddService(cmd1);
 		ServerInstance->Modules->AddService(cmd2);
@@ -159,23 +158,16 @@ class ModuleNickLock : public Module
 		ServerInstance->Modules->Attach(I_OnUserPreNick, this);
 	}
 
-	~ModuleNickLock()
-	{
-	}
-
-	Version GetVersion()
+	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);
 	}
 
-	ModResult OnUserPreNick(User* user, const std::string &newnick)
+	ModResult OnUserPreNick(User* user, const std::string &newnick) CXX11_OVERRIDE
 	{
 		if (!IS_LOCAL(user))
 			return MOD_RES_PASSTHRU;
 
-		if (ServerInstance->NICKForced.get(user)) /* Allow forced nick changes */
-			return MOD_RES_PASSTHRU;
-
 		if (locked.get(user))
 		{
 			user->WriteNumeric(447, "%s :You cannot change your nickname (your nick is locked)",user->nick.c_str());