X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsave.cpp;h=42d909be7b03b0e62774979e30cb4ae12b3a2e8c;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=de9cb73165c0f87b72244433001b3adff289e1fe;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/save.cpp b/src/modules/m_spanningtree/save.cpp
index de9cb7316..42d909be7 100644
--- 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");
 		}