Fix ENCAP stripping, was incorrectly checking for " CHGHOST" and similar commands

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

diff --git a/src/modules/m_spanningtree/save.cpp b/src/modules/m_spanningtree/save.cpp
index 9969fdca713bcfc85b253b2311e55cc2135064a3..7a95ca27c724aadc3d6209eec3a010b44babe29d 100644 (file)
--- a/src/modules/m_spanningtree/save.cpp
+++ b/src/modules/m_spanningtree/save.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,7 +14,6 @@
 #include "inspircd.h"
 #include "socket.h"
 #include "xline.h"
-#include "../transport.h"
 #include "socketengine.h"
 
 #include "main.h"
@@ -32,7 +31,7 @@ bool TreeSocket::ForceNick(const std::string &prefix, parameterlist &params)
        if (params.size() < 2)
                return true;
 
-       User* u = this->ServerInstance->FindNick(params[0]);
+       User* u = ServerInstance->FindNick(params[0]);
        time_t ts = atol(params[1].c_str());
 
        if (u && u->age == ts)
@@ -41,7 +40,7 @@ bool TreeSocket::ForceNick(const std::string &prefix, parameterlist &params)
 
                if (!u->ForceNickChange(u->uuid.c_str()))
                {
-                       this->ServerInstance->Users->QuitUser(u, "Nickname collision");
+                       ServerInstance->Users->QuitUser(u, "Nickname collision");
                }
        }