summaryrefslogtreecommitdiff
path: root/src/channels.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/channels.cpp')
-rw-r--r--src/channels.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index fe0e0600b..072634253 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -727,11 +727,7 @@ bool Channel::Kick(BotInfo *bi, User *u, const char *reason, ...)
vsnprintf(buf, BUFSIZE - 1, reason, args);
va_end(args);
- /* May not kick ulines */
- if (u->server->IsULined())
- return false;
-
- /* Do not kick protected clients */
+ /* Do not kick protected clients or Ulines */
if (u->IsProtected())
return false;
@@ -863,9 +859,6 @@ bool Channel::CheckKick(User *user)
/* We don't enforce services restrictions on clients on ulined services
* as this will likely lead to kick/rejoin floods. ~ Viper */
- if (user->server->IsULined())
- return false;
-
if (user->IsProtected())
return false;