From dd9e56a88e5c13da9ed5d81f7054a6b7f24cfe97 Mon Sep 17 00:00:00 2001 From: brain Date: Sun, 4 Dec 2005 13:29:40 +0000 Subject: More complicated merges git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2137 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/modules/m_spanningtree.cpp') diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index fa5a0479f..6ab7a5953 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -689,12 +689,6 @@ class TreeSocket : public InspSocket // temporarily (until end of burst) we auto-replace occurances of the old nick with the new nick AddFJoinReplacement(tempnick,nick); } - else - { - // the other end will be changing our nick to the guest nick. - // Pause and wait for their FNICK. - SyncPaused = true; - } } clientlist[tempnick] = new userrec(); @@ -878,7 +872,6 @@ class TreeSocket : public InspSocket Srv->ChangeUserNick(u,newnick); DoOneToAllButSender(prefix,"FNICK",params,prefix); } - SyncPaused = false; return true; } @@ -971,7 +964,7 @@ class TreeSocket : public InspSocket params[3] = ":" + params[3]; DoOneToAllButSender(TreeRoot->GetName(),"SERVER",params,servername); this->DoBurst(Node); - this->SendChannelModes(s); + this->SendChannelModes(Node); this->WriteLine("ENDBURST"); return true; } @@ -1136,7 +1129,7 @@ class TreeSocket : public InspSocket // one server must wait till the other servers list of synched users // before starting, so we have time to resolve collisions this->DoBurst(Node); - this->SendChannelModes(s); + this->SendChannelModes(Node); this->WriteLine("ENDBURST"); } else if (command == "ERROR") -- cgit v1.2.3