X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsvspart.cpp;h=b966da2820297ec58b16749849f2135160ddb362;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=7edc720af4a9e4c53b816f7e3f618deb52398019;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/svspart.cpp b/src/modules/m_spanningtree/svspart.cpp
index 7edc720af..b966da282 100644
--- a/src/modules/m_spanningtree/svspart.cpp
+++ b/src/modules/m_spanningtree/svspart.cpp
@@ -19,34 +19,30 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
-#include "socketengine.h"
 
-#include "main.h"
-#include "utils.h"
-#include "treeserver.h"
 #include "commands.h"
 
 CmdResult CommandSVSPart::Handle(const std::vector<std::string>& parameters, User *user)
 {
-	std::string reason = "Services forced part";
+	User* u = ServerInstance->FindUUID(parameters[0]);
+	if (!u)
+		return CMD_FAILURE;
 
-	if (parameters.size() == 3)
-		reason = parameters[2];
-
-	User* u = ServerInstance->FindNick(parameters[0]);
 	Channel* c = ServerInstance->FindChan(parameters[1]);
+	if (!c)
+		return CMD_FAILURE;
 
-	if (u && IS_LOCAL(u))
+	if (IS_LOCAL(u))
+	{
+		std::string reason = (parameters.size() == 3) ? parameters[2] : "Services forced part";
 		c->PartUser(u, reason);
-
+	}
 	return CMD_SUCCESS;
 }
 
 RouteDescriptor CommandSVSPart::GetRouting(User* user, const std::vector<std::string>& parameters)
 {
-	User* u = ServerInstance->FindNick(parameters[0]);
+	User* u = ServerInstance->FindUUID(parameters[0]);
 	if (u)
 		return ROUTE_OPT_UCAST(u->server);
 	return ROUTE_LOCALONLY;