summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorattilamolnar <attilamolnar@hush.com>2012-11-19 04:41:41 +0100
committerattilamolnar <attilamolnar@hush.com>2012-11-19 18:32:45 +0100
commit77e325c3e09229c4ee976ea1ed9ea8383de02de3 (patch)
tree50d9edb549c8dc134b663494be37236c61247e88
parentd31e6e1f3e9a52e23134525b26912f0ebd4f27c0 (diff)
m_nokicks Remove u-line check, OnUserPreKick doesn't run in that case
-rw-r--r--src/modules/m_nokicks.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 58e6fbea1..0d380facd 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -53,17 +53,9 @@ class ModuleNoKicks : public Module
{
if (!memb->chan->GetExtBanStatus(source, 'Q').check(!memb->chan->IsModeSet('Q')))
{
- if ((ServerInstance->ULine(source->nick.c_str())) || ServerInstance->ULine(source->server))
- {
- // ulines can still kick with +Q in place
- return MOD_RES_PASSTHRU;
- }
- else
- {
- // nobody else can (not even opers with override, and founders)
- source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Can't kick user %s from channel (+Q set)",source->nick.c_str(), memb->chan->name.c_str(), memb->user->nick.c_str());
- return MOD_RES_DENY;
- }
+ // Can't kick with Q in place, not even opers with override, and founders
+ source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Can't kick user %s from channel (+Q set)",source->nick.c_str(), memb->chan->name.c_str(), memb->user->nick.c_str());
+ return MOD_RES_DENY;
}
return MOD_RES_PASSTHRU;
}