aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/m_spanningtree/treesocket2.cpp
diff options
context:
space:
mode:
authorGravatar w00t2007-08-28 13:13:57 +0000
committerGravatar w00t2007-08-28 13:13:57 +0000
commit95a8c258e2bc051e8605ee14d1643f3310221271 (patch)
tree493937a1dbf3fb53f14615919c5d822869416461 /src/modules/m_spanningtree/treesocket2.cpp
parentMove nickname collision logic into TreeSocket::DoCollision so that nickname c... (diff)
downloadinspircd++-95a8c258e2bc051e8605ee14d1643f3310221271.tar.gz
inspircd++-95a8c258e2bc051e8605ee14d1643f3310221271.tar.bz2
inspircd++-95a8c258e2bc051e8605ee14d1643f3310221271.zip
Handle nick change collision through the same rules nick introduction collision is handled. No code duplication, and now, no kills either.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7937 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_spanningtree/treesocket2.cpp')
-rw-r--r--src/modules/m_spanningtree/treesocket2.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 34cf318e3..9a52e63f2 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -1500,6 +1500,11 @@ bool TreeSocket::ProcessLine(std::string &line)
userrec* x = this->Instance->FindNick(params[0]);
if ((x) && (x != who))
{
+ /* x is local, who is remote */
+ this->DoCollision(x, who->age, who->ident, who->GetIPString(), who->uuid);
+ return true;
+/*
+Old nickname collision logic..
std::deque<std::string> p;
p.push_back(params[0]);
p.push_back(":Nickname collision ("+prefix+" -> "+params[0]+")");
@@ -1515,6 +1520,7 @@ bool TreeSocket::ProcessLine(std::string &line)
userrec::QuitUser(this->Instance,y,"Nickname collision");
}
return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
+*/
}
}
// its a user