X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=2eb7f90e4cfeacaafa61c2b513c42c55a6679b0a;hb=f2cdf27dd9c45f91f4184b81ea3b9be7c5d88173;hp=8e4c631f2845b4e73466816db0048e044d1ea47d;hpb=19c695250f7504260b850f088d956d8a4099e73e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 8e4c631f2..2eb7f90e4 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -23,10 +23,7 @@
 #include "commands.h"
 
 #include "utils.h"
-#include "link.h"
-#include "treesocket.h"
 #include "treeserver.h"
-#include "resolvers.h"
 
 CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 {
@@ -65,7 +62,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 		 * Nick collision.
 		 */
 		int collide = sock->DoCollision(iter->second, age_t, params[5], params[6], params[0]);
-		ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG,"*** Collision on %s, collide=%d", params[2].c_str(), collide);
+		ServerInstance->Logs->Log("m_spanningtree", LOG_DEBUG, "*** Collision on %s, collide=%d", params[2].c_str(), collide);
 
 		if (collide != 1)
 		{
@@ -103,10 +100,12 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 
 	unsigned int paramptr = 9;
 
-	// Accept more '+' chars, for now
-	std::string::size_type pos = modestr.find_first_not_of('+');
-	for (std::string::const_iterator v = modestr.begin()+pos; v != modestr.end(); ++v)
+	for (std::string::const_iterator v = modestr.begin(); v != modestr.end(); ++v)
 	{
+		// Accept more '+' chars, for now
+		if (*v == '+')
+			continue;
+
 		/* For each mode thats set, find the mode handler and set it on the new user */
 		ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER);
 		if (!mh)
@@ -133,13 +132,13 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 		}
 		else
 			mh->OnModeChange(_new, _new, NULL, empty, true);
-		_new->SetMode(*v, true);
+		_new->SetMode(mh, true);
 	}
 
 	_new->SetClientIP(params[6].c_str());
 
 	ServerInstance->Users->AddGlobalClone(_new);
-	remoteserver->SetUserCount(1); // increment by 1
+	remoteserver->UserCount++;
 
 	bool dosend = true;