From 0b6b0442cbf669715b72aeb8451cc1c6b6aebc54 Mon Sep 17 00:00:00 2001 From: brain Date: Sun, 25 Feb 2007 00:27:03 +0000 Subject: Ensure that simplemodes are sent first (jilles requested this) git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6611 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/treesocket1.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index 81fbda871..a376b5cb1 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -1256,6 +1256,8 @@ void TreeSocket::SendFJoins(TreeServer* Current, chanrec* c) modes.append("+"); } + buffer.append(":").append(this->Instance->Config->ServerName).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(c->ChanModes(true)).append("\r\n"); + int linesize = 1; for (BanList::iterator b = c->bans.begin(); b != c->bans.end(); b++) { @@ -1276,11 +1278,10 @@ void TreeSocket::SendFJoins(TreeServer* Current, chanrec* c) linesize = 1; } } - buffer.append(":").append(this->Instance->Config->ServerName).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(c->ChanModes(true)); /* Only send these if there are any */ if (!modes.empty()) - buffer.append("\r\n").append(":").append(this->Instance->Config->ServerName).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params); + buffer.append(":").append(this->Instance->Config->ServerName).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params); this->WriteLine(buffer); } -- cgit v1.2.3