Don't send an override notice if no modes were actually applied, thanks Ankit.

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

diff --git a/src/modules/m_spanningtree/delline.cpp b/src/modules/m_spanningtree/delline.cpp
index 13aa684df630dc15219ef5b45303cf7ed68c67a4..980573df47fd7f90e7f7e6a5ccddb85496eab997 100644 (file)
--- a/src/modules/m_spanningtree/delline.cpp
+++ b/src/modules/m_spanningtree/delline.cpp
@@ -26,14 +26,13 @@ bool TreeSocket::DelLine(const std::string &prefix, std::deque<std::string> &par
        if (params.size() < 2)
                return true;
 
-       Instance->Logs->Log("loltree", DEBUG, "DELLINE: %s %s", params[0].c_str(), params[1].c_str());
        std::string setter = "<unknown>";
 
-       User* user = Instance->FindNick(prefix);
+       User* user = ServerInstance->FindNick(prefix);
        if (user)
                setter = user->nick;
        else
-        {
+       {
                TreeServer* t = Utils->FindServer(prefix);
                if (t)
                        setter = t->GetName().c_str();
@@ -41,9 +40,9 @@ bool TreeSocket::DelLine(const std::string &prefix, std::deque<std::string> &par
 
 
        /* NOTE: No check needed on 'user', this function safely handles NULL */
-       if (Instance->XLines->DelLine(params[0].c_str(), params[1], user))
+       if (ServerInstance->XLines->DelLine(params[1].c_str(), params[0], user))
        {
-               this->Instance->SNO->WriteToSnoMask('x',"%s removed %s%s on %s.", setter.c_str(),
+               this->ServerInstance->SNO->WriteToSnoMask('x',"%s removed %s%s on %s.", setter.c_str(),
                                params[0].c_str(), params[0].length() == 1 ? "LINE" : "", params[1].c_str());
                Utils->DoOneToAllButSender(prefix,"DELLINE", params, prefix);
        }