Tweaked nick collision code

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

1 files changed, 6 insertions, 2 deletions

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 5eab7ca34..9484c282b 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -629,8 +629,12 @@ 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);
-			this->WriteLine(":"+Srv->GetServerName()+" KILL "+tempnick+" :Nickname collision");
-			return true;
+			if (iter->second->age > age)
+			{
+				// ours is older than theirs, ours stays. Ignore their NICK, send KILL.
+				this->WriteLine(":"+Srv->GetServerName()+" KILL "+tempnick+" :Nickname collision");
+				return true;
+			}
 		}
 
 		clientlist[tempnick] = new userrec();