Fix module unmapping with culled Module objects

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

diff --git a/src/modules/m_spanningtree/override_time.cpp b/src/modules/m_spanningtree/override_time.cpp
index 8f5f3aa7f911dc3a48882d0752d1fa8b5bcab594..b3384720edf6606a8ca54d4502511d12e365f118 100644 (file)
--- a/src/modules/m_spanningtree/override_time.cpp
+++ b/src/modules/m_spanningtree/override_time.cpp
@@ -14,20 +14,17 @@
 /* $ModDesc: Provides a spanning tree server link protocol */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
-int ModuleSpanningTree::HandleTime(const std::vector<std::string>& parameters, User* user)
+ModResult ModuleSpanningTree::HandleTime(const std::vector<std::string>& parameters, User* user)
 {
        if ((IS_LOCAL(user)) && (parameters.size() > 0))
        {
@@ -36,9 +33,9 @@ int ModuleSpanningTree::HandleTime(const std::vector<std::string>& parameters, U
                {
                        // we dont' override for local server
                        if (found == Utils->TreeRoot)
-                               return 0;
+                               return MOD_RES_PASSTHRU;
 
-                       std::deque<std::string> params;
+                       parameterlist params;
                        params.push_back(found->GetName());
                        params.push_back(user->uuid);
                        Utils->DoOneToOne(ServerInstance->Config->GetSID(),"TIME",params,found->GetName());
@@ -48,6 +45,6 @@ int ModuleSpanningTree::HandleTime(const std::vector<std::string>& parameters, U
                        user->WriteNumeric(ERR_NOSUCHSERVER, "%s %s :No such server",user->nick.c_str(),parameters[0].c_str());
                }
        }
-       return 1;
+       return MOD_RES_DENY;
 }