X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uninvite.cpp;h=ff392edc31efb35c9ef6870192a836f390c38b3d;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=9287589bb7f8823bb95b07bd082858806c4be718;hpb=3af1c39b2223c3511b52b6465ebb3366bf6edde4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 9287589bb..ff392edc3 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -37,10 +37,15 @@ class CommandUninvite : public Command
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		User* u = ServerInstance->FindNick(parameters[0]);
+		User* u;
+		if (IS_LOCAL(user))
+			u = ServerInstance->FindNickOnly(parameters[0]);
+		else
+			u = ServerInstance->FindNick(parameters[0]);
+
 		Channel* c = ServerInstance->FindChan(parameters[1]);
 
-		if ((!c) || (!u))
+		if ((!c) || (!u) || (u->registered != REG_ALL))
 		{
 			if (!c)
 			{
@@ -104,7 +109,11 @@ class ModuleUninvite : public Module
 
 	ModuleUninvite() : cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(cmd);
 	}
 
 	virtual ~ModuleUninvite()