]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
More collision fixes
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Wed, 30 Nov 2005 13:46:54 +0000 (13:46 +0000)
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Wed, 30 Nov 2005 13:46:54 +0000 (13:46 +0000)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2055 e03df62e-2008-0410-955e-edbf42e46eb7

src/modules/m_spanningtree.cpp

index ec34da6ed222f0a362a50f7740fdb4d57a312136..faba676d95fcc077b7eb880de76616367733cfa9 100644 (file)
@@ -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);