m_spanningtree Remove SpanningTreeUtilities* fields and parameters

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

diff --git a/src/modules/m_spanningtree/save.cpp b/src/modules/m_spanningtree/save.cpp
index de9cb73165c0f87b72244433001b3adff289e1fe..42d909be7b03b0e62774979e30cb4ae12b3a2e8c 100644 (file)
--- a/src/modules/m_spanningtree/save.cpp
+++ b/src/modules/m_spanningtree/save.cpp
@@ -18,17 +18,10 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
-#include "socketengine.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 */
-
 /**
  * SAVE command - force nick change to UID on timestamp match
  */
@@ -40,11 +33,11 @@ bool TreeSocket::ForceNick(const std::string &prefix, parameterlist &params)
        User* u = ServerInstance->FindNick(params[0]);
        time_t ts = atol(params[1].c_str());
 
-       if (u && u->age == ts)
+       if ((u) && (!IS_SERVER(u)) && (u->age == ts))
        {
                Utils->DoOneToAllButSender(prefix,"SAVE",params,prefix);
 
-               if (!u->ForceNickChange(u->uuid.c_str()))
+               if (!u->ForceNickChange(u->uuid))
                {
                        ServerInstance->Users->QuitUser(u, "Nickname collision");
                }