X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sanick.cpp;h=6b870ba0549fe454d8850dd51f4392bd53458201;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=2d8e3cb1fb8cfae4c540c5ad8098953e2c6685e6;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 2d8e3cb1f..6b870ba05 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -30,6 +30,7 @@ class CommandSanick : public Command
  public:
 	CommandSanick(Module* Creator) : Command(Creator,"SANICK", 2)
 	{
+		allow_empty_last_param = false;
 		flags_needed = 'o'; Penalty = 0; syntax = "<nick> <new-nick>";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
@@ -47,13 +48,13 @@ class CommandSanick : public Command
 				return CMD_FAILURE;
 			}
 
-			if (!target)
+			if ((!target) || (target->registered != REG_ALL))
 			{
 				user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
 				return CMD_FAILURE;
 			}
 
-			if (!ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax))
+			if (!ServerInstance->IsNick(parameters[1], ServerInstance->Config->Limits.NickMax))
 			{
 				user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
 				return CMD_FAILURE;
@@ -95,18 +96,18 @@ class ModuleSanick : public Module
 	ModuleSanick()
 		: cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
 	}
 
-	virtual ~ModuleSanick()
+	void init()
 	{
+		ServerInstance->Modules->AddService(cmd);
 	}
 
 	virtual Version GetVersion()
 	{
 		return Version("Provides support for SANICK command", VF_OPTCOMMON | VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleSanick)
+