This should probably be tested, but makes a whole lot more sense like this (users...

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

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index b2aa8d475e58a2d1f7358b6211f929dd8c79112a..c99402af07b1ca8b1a8f7c28f26c7189b8649b1e 100644 (file)
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -363,7 +363,14 @@ bool TreeSocket::ProcessLine(std::string &line)
                        }
                        else if (command == "MAP")
                        {
-                               return Utils->Creator->HandleMap(prefix, params);
+                               User* user = Instance->FindNick(prefix);
+                               if (user)
+                               {
+                                       const char* ptrs[127];
+                                       for (size_t n = 0; (n < params.size()) && (n < 127); ++n)
+                                               ptrs[n] = params[n].c_str();
+                                       return Utils->Creator->HandleMap(ptrs, params.size(), user);
+                               }
                        }
                        else if (command == "SERVER")
                        {
@@ -445,11 +452,12 @@ bool TreeSocket::ProcessLine(std::string &line)
                        {
                                if (params.size() == 3)
                                {
+                                       TreeServer* pf = Utils->FindServer(prefix);
                                        User* user = this->Instance->FindNick(params[1]);
                                        Channel* chan = this->Instance->FindChan(params[0]);
-                                       if (user && chan)
+                                       if (pf && user && chan)
                                        {
-                                               if (!chan->ServerKickUser(user, params[2].c_str(), false))
+                                               if (!chan->ServerKickUser(user, params[2].c_str(), false, pf->GetName().c_str()))
                                                        /* Yikes, the channels gone! */
                                                        delete chan;
                                        }