From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Wed, 30 Nov 2005 13:46:54 +0000 (+0000)
Subject: More collision fixes
X-Git-Tag: v2.0.23~9969
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=79d51f20eb6b96b2096751a636ad372e2380684f;p=user%2Fhenk%2Fcode%2Finspircd.git

More collision fixes


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2055 e03df62e-2008-0410-955e-edbf42e46eb7
---

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index ec34da6ed..faba676d9 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -562,12 +562,10 @@ class TreeSocket : public InspSocket
 		{
 			// nick collision
 			log(DEBUG,"Nick collision on %s!%s@%s: %lu %lu",tempnick,ident.c_str(),host.c_str(),(unsigned long)age,(unsigned long)iter->second->age);
-			if (age > iter->second->age)
-			{
-				Srv->QuitUser(iter->second,"Killed (Nickname collision from "+source+")");
-			}
+			this->WriteLine(":"+Srv->GetServerName()+" KILL "+tempnick+" :Nickname collision");
+			return true;
 		}
-		
+
 		clientlist[tempnick] = new userrec();
 		clientlist[tempnick]->fd = FD_MAGIC_NUMBER;
 		strlcpy(clientlist[tempnick]->nick, tempnick,NICKMAX);