Remove NULL checks from various Channel functions

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

diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index d1c0f6e9257ad6c256bdff05128fa434a08eae80..0d36ca8aeb309c45ea6ade6be6d5db1b48fb5a3f 100644 (file)
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -39,7 +39,7 @@ class CommandSakick : public Command
                Channel* channel = ServerInstance->FindChan(parameters[0]);
                const char* reason = "";
 
-               if (dest && channel)
+               if ((dest) && (dest->registered == REG_ALL) && (channel))
                {
                        if (parameters.size() > 2)
                        {
@@ -68,7 +68,7 @@ class CommandSakick : public Command
                                if (n && n->HasUser(dest))
                                {
                                        /* Sort-of-bug: If the command was issued remotely, this message won't be sent */
-                                       user->WriteServ("NOTICE %s :*** Unable to kick %s from %s", user->nick.c_str(), dest->nick.c_str(), parameters[0].c_str());
+                                       user->WriteNotice("*** Unable to kick " + dest->nick + " from " + parameters[0]);
                                        return CMD_FAILURE;
                                }
                        }
@@ -83,7 +83,7 @@ class CommandSakick : public Command
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick.c_str());
+                       user->WriteNotice("*** Invalid nickname or channel");
                }
 
                return CMD_FAILURE;
@@ -107,21 +107,15 @@ class ModuleSakick : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
        }
 
-       virtual ~ModuleSakick()
-       {
-       }
-
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides a SAKICK command", VF_OPTCOMMON|VF_VENDOR);
        }
-
 };
 
 MODULE_INIT(ModuleSakick)
-