m_spanningtree Remove unused SpanningTreeUtilities::DoOneToOne() overload accepting...

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

diff --git a/src/modules/m_spanningtree/svsjoin.cpp b/src/modules/m_spanningtree/svsjoin.cpp
index 552e08dd37fc53bfec859f353c4fdb413ccfa0a4..98443409aa8abd3068207bcf9cef39a1eaf1fed6 100644 (file)
--- a/src/modules/m_spanningtree/svsjoin.cpp
+++ b/src/modules/m_spanningtree/svsjoin.cpp
@@ -36,7 +36,19 @@ CmdResult CommandSVSJoin::Handle(User* user, std::vector<std::string>& parameter
        /* only join if it's local, otherwise just pass it on! */
        LocalUser* localuser = IS_LOCAL(u);
        if (localuser)
-               Channel::JoinUser(localuser, parameters[1]);
+       {
+               bool override = false;
+               std::string key;
+               if (parameters.size() >= 3)
+               {
+                       key = parameters[2];
+                       if (key.empty())
+                               override = true;
+               }
+
+               Channel::JoinUser(localuser, parameters[1], override, key);
+       }
+
        return CMD_SUCCESS;
 }