Add the server id to the Server class.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / protocolinterface.cpp

diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index e54a528d99254e42464e5a848e8d2a8b2951911f..28b2c8f160706e853b5dcf9e116543df44c029cb 100644 (file)
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -65,7 +65,7 @@ bool SpanningTreeProtocolInterface::SendEncapsulatedData(const std::string& targ
                        return false;
 
                // Use the SID of the target in the message instead of the server name
-               encap.push(server->GetID()).push(cmd).insert(params).Unicast(server->ServerUser);
+               encap.push(server->GetId()).push(cmd).insert(params).Unicast(server->ServerUser);
        }
 
        return true;
@@ -111,13 +111,14 @@ void SpanningTreeProtocolInterface::SendMessage(Channel* target, char status, co
 {
        const char* cmd = (msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
        CUList exempt_list;
-       Utils->SendChannelMessage(ServerInstance->Config->GetSID(), target, text, status, exempt_list, cmd);
+       ClientProtocol::TagMap tags;
+       Utils->SendChannelMessage(ServerInstance->FakeClient, target, text, status, tags, exempt_list, cmd);
 }
 
 void SpanningTreeProtocolInterface::SendMessage(User* target, const std::string& text, MessageType msgtype)
 {
        CmdBuilder p(msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
-       p.push_back(target->uuid);
+       p.push(target->uuid);
        p.push_last(text);
        p.Unicast(target);
 }