From 1540f7475f4439a029f881eaa1efe747ee79da14 Mon Sep 17 00:00:00 2001
From: Daniel De Graaf
Date: Sat, 2 Oct 2010 16:27:19 -0400
Subject: Remove some unneeded complexity from spanningtree

---
 src/modules/m_spanningtree/protocolinterface.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/modules/m_spanningtree/protocolinterface.cpp')

diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index 5bc26014b..97a394c2e 100644
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -48,8 +48,7 @@ void SpanningTreeProtocolInterface::GetServerList(ProtoServerList &sl)
 		ps.servername = i->second->GetName();
 		TreeServer* s = i->second->GetParent();
 		ps.parentname = s ? s->GetName() : "";
-		ps.usercount = i->second->GetUserCount();
-		ps.opercount = i->second->GetOperCount();
+		ps.usercount = i->second->UserCount;
 		ps.gecos = i->second->GetDesc();
 		ps.latencyms = i->second->rtt;
 		sl.push_back(ps);
@@ -149,14 +148,12 @@ void SpanningTreeProtocolInterface::SendChannel(Channel* target, char status, co
 	std::string cname = target->name;
 	if (status)
 		cname = status + cname;
-	TreeServerList list;
+	TreeSocketSet list;
 	CUList exempt_list;
 	Utils->GetListOfServersForChannel(target,list,status,exempt_list);
-	for (TreeServerList::iterator i = list.begin(); i != list.end(); i++)
+	for (TreeSocketSet::iterator i = list.begin(); i != list.end(); i++)
 	{
-		TreeSocket* Sock = i->second->GetSocket();
-		if (Sock)
-			Sock->WriteLine(text);
+		(**i).WriteLine(text);
 	}
 }
 
-- 
cgit v1.3.1-10-gc9f91