summaryrefslogtreecommitdiff
path: root/src/channels.cpp
diff options
context:
space:
mode:
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-04-20 13:29:58 +0000
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-04-20 13:29:58 +0000
commit828f256a9bd8278540bf4beede36c485e2c3e86f (patch)
tree1b3c70d8c4363ca083c4b378f0459a8bbb9b3445 /src/channels.cpp
parent2d7ac3a99bd7eba9b01165acde224dcc1e9cc46e (diff)
Use loopCall to protect OnUserKick rather than the triggerevents hack
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11321 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/channels.cpp')
-rw-r--r--src/channels.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index 99b118d0d..c1a5a59a3 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -592,7 +592,7 @@ long Channel::PartUser(User *user, std::string &reason)
return this->GetUserCounter();
}
-long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents, const char* servername)
+long Channel::ServerKickUser(User* user, const char* reason, const char* servername)
{
bool silent = false;
@@ -611,10 +611,7 @@ long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents,
if (servername == NULL || *ServerInstance->Config->HideWhoisServer)
servername = ServerInstance->Config->ServerName;
- if (triggerevents)
- {
- FOREACH_MOD(I_OnUserKick,OnUserKick(NULL, user, this, reason, silent));
- }
+ FOREACH_MOD(I_OnUserKick,OnUserKick(NULL, user, this, reason, silent));
UCListIter i = user->chans.find(this);
if (i != user->chans.end())