Lets fix it right this time (and annoy ol with more tweaks)

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

1 files changed, 11 insertions, 15 deletions

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index cf69bc8f1..a70cb4976 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -2345,27 +2345,23 @@ class TreeSocket : public InspSocket
 				{
 					return this->Time(prefix,params);
 				}
-				else if (command == "KICK")
+				else if ((command == "KICK") && (IsServer(prefix)))
 				{
 					std::string sourceserv = this->myhost;
-					userrec* source = Srv->FindNick(prefix);
-					if (!source)
+					if (params.size() == 3)
 					{
-						if (params.size() == 3)
+						userrec* user = Srv->FindNick(params[1]);
+						chanrec* chan = Srv->FindChannel(params[0]);
+						if (user && chan)
 						{
-							userrec* user = Srv->FindNick(params[1]);
-							chanrec* chan = Srv->FindChannel(params[0]);
-							if (user && chan)
-							{
-								server_kick_channel(user,chan,(char*)params[2].c_str(),false);
-							}
+							server_kick_channel(user,chan,(char*)params[2].c_str(),false);
 						}
-						if (this->InboundServerName != "")
-						{
-							sourceserv = this->InboundServerName;
-						}
-						return DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
 					}
+					if (this->InboundServerName != "")
+					{
+						sourceserv = this->InboundServerName;
+					}
+					return DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
 				}
 				else if (command == "SVSJOIN")
 				{