X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Fsvsnick.cpp;h=b2cd67128ec624512b5bd00017f868b809df15fb;hb=2d4a319d961e3f9e6aa9f7926f9ed320d72de8da;hp=82bcd1ff0597288d12b32bf87b7cdcfe5794789c;hpb=a3f89e772514aca9aa4615ebe1656010111fc455;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index 82bcd1ff0..b2cd67128 100644
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -23,12 +23,9 @@
 #include "m_spanningtree/main.h"
 #include "m_spanningtree/utils.h"
 #include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
 #include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
+/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
 /** Because Andy insists that services-compatible servers must
  * implement SVSNICK and SVSJOIN, that's exactly what we do :p
@@ -52,9 +49,9 @@ bool TreeSocket::ForceNick(const std::string &prefix, std::deque<std::string> &p
 			if (!u->ForceNickChange(params[1].c_str()))
 			{
 				/* buh. UID them */
-				if (!u->ForceNickChange(u->uuid))
+				if (!u->ForceNickChange(u->uuid.c_str()))
 				{
-					User::QuitUser(this->Instance, u, "Nickname collision");
+					this->Instance->Users->QuitUser(u, "Nickname collision");
 					return true;
 				}
 			}