X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fnetburst.cpp;h=61a5f66d23ab92a79240f2e285f4a43377ffeba8;hb=de69e28a4a1aea89e410b693bbbb67890ecb0bd3;hp=5f47c690b19a0d52d8bd07a182750c206fac3ef3;hpb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index 5f47c690b..61a5f66d2 100644
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -103,7 +103,7 @@ void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
 	for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
 	{
 		size_t ptrlen = 0;
-		std::string modestr = ServerInstance->Modes->ModeString(i->first, c, false);
+		std::string modestr = i->second->modes;
 
 		if ((curlen + modestr.length() + i->first->uuid.length() + 4) > 480)
 		{
@@ -220,12 +220,12 @@ void TreeSocket::SendChannelModes(TreeServer* Current)
 			this->WriteLine(data);
 		}
 
-		for(ExtensibleStore::const_iterator i = c->second->GetExtList().begin(); i != c->second->GetExtList().end(); i++)
+		for(Extensible::ExtensibleStore::const_iterator i = c->second->GetExtList().begin(); i != c->second->GetExtList().end(); i++)
 		{
 			ExtensionItem* item = i->first;
 			std::string value = item->serialize(FORMAT_NETWORK, c->second, i->second);
 			if (!value.empty())
-				Utils->Creator->ProtoSendMetaData(this, c->second, item->key, value);
+				Utils->Creator->ProtoSendMetaData(this, c->second, item->name, value);
 		}
 
 		FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(c->second,Utils->Creator,this));
@@ -259,7 +259,7 @@ void TreeSocket::SendUsers(TreeServer* Current)
 				this->WriteLine(data);
 				if (IS_OPER(u->second))
 				{
-					snprintf(data,MAXBUF,":%s OPERTYPE %s", u->second->uuid.c_str(), u->second->oper.c_str());
+					snprintf(data,MAXBUF,":%s OPERTYPE %s", u->second->uuid.c_str(), u->second->oper->name.c_str());
 					this->WriteLine(data);
 				}
 				if (IS_AWAY(u->second))
@@ -269,12 +269,12 @@ void TreeSocket::SendUsers(TreeServer* Current)
 				}
 			}
 
-			for(ExtensibleStore::const_iterator i = u->second->GetExtList().begin(); i != u->second->GetExtList().end(); i++)
+			for(Extensible::ExtensibleStore::const_iterator i = u->second->GetExtList().begin(); i != u->second->GetExtList().end(); i++)
 			{
 				ExtensionItem* item = i->first;
 				std::string value = item->serialize(FORMAT_NETWORK, u->second, i->second);
 				if (!value.empty())
-					Utils->Creator->ProtoSendMetaData(this, u->second, item->key, value);
+					Utils->Creator->ProtoSendMetaData(this, u->second, item->name, value);
 			}
 
 			FOREACH_MOD(I_OnSyncUser,OnSyncUser(u->second,Utils->Creator,this));