X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ffjoin.cpp;h=28a922c0f56de341f52d7c8141d112dda27b87e1;hb=97c0e6b4c4e304a1c4e764fc06a7e2663a41743d;hp=9fe0afbc06bf328ced09984b805c23c598ea3231;hpb=63bdb9171f19deb8483de0a521ed7a712543382d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index 9fe0afbc0..28a922c0f 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -123,7 +123,7 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
 			modelist.push_back(params[idx]);
 		}
 
-		this->ServerInstance->SendMode(modelist, this->ServerInstance->FakeClient);
+		this->ServerInstance->SendMode(modelist, Utils->ServerUser);
 	}
 
 	/* Now, process every 'modes,nick' pair */
@@ -187,11 +187,9 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
 
 		while (modestack.GetStackedLine(stackresult))
 		{
-			for (size_t j = 0; j < stackresult.size(); j++)
-			{
-				mode_junk.push_back(stackresult[j]);
-			}
-			ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
+			mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
+			ServerInstance->SendMode(mode_junk, Utils->ServerUser);
+			mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
 		}
 	}
 
@@ -226,10 +224,9 @@ bool TreeSocket::RemoveStatus(const std::string &prefix, std::deque<std::string>
 
 		while (stack.GetStackedLine(stackresult))
 		{
-			for (size_t j = 0; j < stackresult.size(); j++)
-				mode_junk.push_back(stackresult[j]);
-
-			ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
+			mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
+			ServerInstance->SendMode(mode_junk, Utils->ServerUser);
+			mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
 		}
 	}
 	return true;