Implement Command::RegisterService()

diff --git a/include/ctables.h b/include/ctables.h
index abf65f56127122f2e742b76592b3b65fdd8f23fe..bc4226ea93b5c7b73165fc748086c25195fd74ec 100644 (file)
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -218,6 +218,10 @@ class CoreExport Command : public CommandBase
         */
        virtual CmdResult Handle(const std::vector<std::string>& parameters, User* user) = 0;
 
+       /** Register this object in the CommandParser
+        */
+       void RegisterService() CXX11_OVERRIDE;
+
        /** Destructor
         * Removes this command from the command parser
         */

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 7998d9cc3a982f0f71732a2f7dfe4af2b831e9f3..c123353b0a96b94da8c6ded03762afdc7c92be3e 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -379,6 +379,12 @@ Command::~Command()
        ServerInstance->Parser.RemoveCommand(this);
 }
 
+void Command::RegisterService()
+{
+       if (!ServerInstance->Parser.AddCommand(this))
+               throw ModuleException("Command already exists: " + name);
+}
+
 void CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user)
 {
        if (buffer.empty())

diff --git a/src/modules.cpp b/src/modules.cpp
index 3ff8aad145f3aec69cfb973617e6bd418822f95d..d28657ca8359d1256b9e9224e221080a5a651dc4 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -556,10 +556,6 @@ void ModuleManager::AddService(ServiceProvider& item)
 {
        switch (item.service)
        {
-               case SERVICE_COMMAND:
-                       if (!ServerInstance->Parser.AddCommand(static_cast<Command*>(&item)))
-                               throw ModuleException("Command "+std::string(item.name)+" already exists.");
-                       return;
                case SERVICE_MODE:
                {
                        ModeHandler* mh = static_cast<ModeHandler*>(&item);