Send SVSNICKs during nick collision to prevent servers that do not fully implement...

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

diff --git a/src/modules/m_spanningtree/ping.cpp b/src/modules/m_spanningtree/ping.cpp
index a4a188665b445058d7420cb1c7dc0e71e6967499..92201a422384a7ce37cc04f7f508649b0bb95ccf 100644 (file)
--- a/src/modules/m_spanningtree/ping.cpp
+++ b/src/modules/m_spanningtree/ping.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -15,7 +15,6 @@
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "transport.h"
 #include "socketengine.h"
@@ -34,13 +33,13 @@ bool TreeSocket::LocalPing(const std::string &prefix, std::deque<std::string> &p
        if (params.size() == 1)
        {
                std::string stufftobounce = params[0];
-               this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" PONG "+stufftobounce);
+               this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" PONG "+stufftobounce);
                return true;
        }
        else
        {
                std::string forwardto = params[1];
-               if (forwardto == this->Instance->Config->ServerName || forwardto == this->Instance->Config->GetSID())
+               if (forwardto == this->ServerInstance->Config->ServerName || forwardto == this->ServerInstance->Config->GetSID())
                {
                        // this is a ping for us, send back PONG to the requesting server
                        params[1] = params[0];