From b16e16ac1bae4ac5494778b4b8a7009febb58137 Mon Sep 17 00:00:00 2001 From: danieldg Date: Fri, 23 Oct 2009 22:47:39 +0000 Subject: Make User::uuid and User::server const git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11962 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/encap.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/modules/m_spanningtree/encap.cpp') diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp index 175257b0a..e854df2f4 100644 --- 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 ¶ms) +void TreeSocket::Encap(User* who, parameterlist ¶ms) { if (params.size() > 1) { if (InspIRCd::Match(ServerInstance->Config->GetSID(), params[0])) { - User* who = 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 ¶ms) 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; } -- cgit v1.2.3