summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/m_spanningtree.cpp25
1 files changed, 14 insertions, 11 deletions
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 0b1013a15..cf69bc8f1 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -2348,21 +2348,24 @@ class TreeSocket : public InspSocket
else if (command == "KICK")
{
std::string sourceserv = this->myhost;
- if (params.size() == 3)
+ userrec* source = Srv->FindNick(prefix);
+ if (!source)
{
- userrec* source = Srv->FindNick(prefix);
- userrec* user = Srv->FindNick(params[1]);
- chanrec* chan = Srv->FindChannel(params[0]);
- if (user && chan && !source)
+ if (params.size() == 3)
{
- server_kick_channel(user,chan,(char*)params[2].c_str(),false);
+ 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);
+ }
}
+ 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")
{