m_spanningtree Remove remains of the KeepNickTS workaround

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / servercommand.h

diff --git a/src/modules/m_spanningtree/servercommand.h b/src/modules/m_spanningtree/servercommand.h
index 2fa96423280740f9f903ee7070b6dd704917d0b5..156b405e4f74f82b3aa3be10cdc16d3ed85a14ac 100644 (file)
--- a/src/modules/m_spanningtree/servercommand.h
+++ b/src/modules/m_spanningtree/servercommand.h
@@ -20,8 +20,7 @@
 #pragma once
 
 #include "utils.h"
-
-class TreeServer;
+#include "treeserver.h"
 
 /** Base class for server-to-server commands that may have a (remote) user source or server source.
  */
@@ -45,12 +44,12 @@ class UserOnlyServerCommand : public ServerCommand
                : ServerCommand(Creator, Name, MinPara, MaxPara) { }
 
        CmdResult Handle(User* user, std::vector<std::string>& parameters)
-    {
-       RemoteUser* remoteuser = IS_REMOTE(user);
+       {
+               RemoteUser* remoteuser = IS_REMOTE(user);
                if (!remoteuser)
                        return CMD_INVALID;
                return static_cast<T*>(this)->HandleRemote(remoteuser, parameters);
-    }
+       }
 };
 
 /** Base class for server-to-server command handlers which are only valid if their source is a server.
@@ -64,12 +63,12 @@ class ServerOnlyServerCommand : public ServerCommand
                : ServerCommand(Creator, Name, MinPara, MaxPara) { }
 
        CmdResult Handle(User* user, std::vector<std::string>& parameters)
-    {
+       {
                if (!IS_SERVER(user))
                        return CMD_INVALID;
-               TreeServer* server = Utils->FindServer(user->server);
+               TreeServer* server = TreeServer::Get(user);
                return static_cast<T*>(this)->HandleServer(server, parameters);
-    }
+       }
 };
 
 class ServerCommandManager