Removed need for server kicks to be managed in here

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2837 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index b15c1c1de8b51d6e1b19bfac6c70fbbd2cb39cdc..6a28e2140978217e13f1c68b9c473c27042043f6 100644 (file)
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -2029,26 +2029,6 @@ class TreeSocket : public InspSocket
                                {
                                        return this->ForceTopic(prefix,params);
                                }
-                               else if ((command == "KICK") && (!Srv->FindNick(prefix)))
-                               {
-                                       /* Server kick */
-                                       userrec* who = Srv->FindNick(params[1]);
-                                       chanrec* where = Srv->FindChannel(params[0]);
-                                       server_kick_channel(who, where, (char*)params[2].c_str(), false);
-                                        std::string sourceserv = this->myhost;
-                                        if (this->InboundServerName != "")
-                                        {
-                                               sourceserv = this->InboundServerName;
-                                        }
-                                       if (IsServer(prefix))
-                                       {
-                                               return DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
-                                       }
-                                       else
-                                       {
-                                               return true;
-                                       }
-                               }
                                else if (command == "REHASH")
                                {
                                        return this->RemoteRehash(prefix,params);
@@ -3074,16 +3054,8 @@ class ModuleSpanningTree : public Module
 
        virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason)
        {
-               if (!source)
-               {
-                       /* Server kick (ugh) */
-                       std::deque<std::string> params;
-                       params.push_back(chan->name);
-                       params.push_back(user->nick);
-                       params.push_back(":"+reason);
-                       DoOneToMany(Srv->GetServerName(),"KICK",params);
-               }
-               else if (source->fd > -1)
+               /* No need to handle server kicks here */
+               if ((source) && (source->fd > -1))
                {
                        std::deque<std::string> params;
                        params.push_back(chan->name);