Fixes found by removing User inheritance from StreamSocket

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

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 7b85a49d0ae163e0535148a5f49819a4d252e9d6..e854df2f4740a3f7d0e90756408c40ac236600c7 100644 (file)
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -23,16 +23,12 @@
 
 
 /** ENCAP */
-bool TreeSocket::Encap(const std::string &prefix, parameterlist &params)
+void TreeSocket::Encap(User* who, parameterlist &params)
 {
        if (params.size() > 1)
        {
                if (InspIRCd::Match(ServerInstance->Config->GetSID(), params[0]))
                {
-                       User* who = this->ServerInstance->FindUUID(prefix);
-                       if (!who)
-                               who = Utils->ServerUser;
-
                        parameterlist plist(params.begin() + 2, params.end());
                        ServerInstance->CallCommandHandler(params[1].c_str(), plist, who);
                        // discard return value, ENCAP shall succeed even if the command does not exist
@@ -42,11 +38,10 @@ bool TreeSocket::Encap(const std::string &prefix, parameterlist &params)
 
                if (params[0].find('*') != std::string::npos)
                {
-                       Utils->DoOneToAllButSender(prefix, "ENCAP", params, prefix);
+                       Utils->DoOneToAllButSender(who->server, "ENCAP", params, who->server);
                }
                else
-                       Utils->DoOneToOne(prefix, "ENCAP", params, params[0]);
+                       Utils->DoOneToOne(who->server, "ENCAP", params, params[0]);
        }
-       return true;
 }