Fix excessive snomask sending on fitler add/removal

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

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index 82bcd1ff0597288d12b32bf87b7cdcfe5794789c..14e078710e82a56ee3a9f8fb33d4d416648196b2 100644 (file)
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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"
@@ -23,12 +22,9 @@
 #include "m_spanningtree/main.h"
 #include "m_spanningtree/utils.h"
 #include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
 #include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
+/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
 /** Because Andy insists that services-compatible servers must
  * implement SVSNICK and SVSJOIN, that's exactly what we do :p
@@ -38,7 +34,7 @@ bool TreeSocket::ForceNick(const std::string &prefix, std::deque<std::string> &p
        if (params.size() < 3)
                return true;
 
-       User* u = this->Instance->FindNick(params[0]);
+       User* u = this->ServerInstance->FindNick(params[0]);
 
        if (u)
        {
@@ -52,9 +48,9 @@ bool TreeSocket::ForceNick(const std::string &prefix, std::deque<std::string> &p
                        if (!u->ForceNickChange(params[1].c_str()))
                        {
                                /* buh. UID them */
-                               if (!u->ForceNickChange(u->uuid))
+                               if (!u->ForceNickChange(u->uuid.c_str()))
                                {
-                                       User::QuitUser(this->Instance, u, "Nickname collision");
+                                       this->ServerInstance->Users->QuitUser(u, "Nickname collision");
                                        return true;
                                }
                        }