Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[user/henk/code/inspircd.git] / src / modules / m_uninvite.cpp

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 873588c932b65e54ab5f96061da910f55f9cc9a5..ff392edc31efb35c9ef6870192a836f390c38b3d 100644 (file)
--- 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)
                        {
@@ -108,7 +113,7 @@ class ModuleUninvite : public Module
 
        void init()
        {
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
        }
 
        virtual ~ModuleUninvite()