Remove useless ULine() checks

diff --git a/src/mode.cpp b/src/mode.cpp
index bdf0400b7eb41af6d7bb12b66c233712f16c1871..1627933698889d01117b8e7aa1e322315c5426f9 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -370,7 +370,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User* user,
 
        bool SkipAccessChecks = false;
 
-       if (!IS_LOCAL(user) || ServerInstance->ULine(user->server) || MOD_RESULT == MOD_RES_ALLOW)
+       if (!IS_LOCAL(user) || MOD_RESULT == MOD_RES_ALLOW)
                SkipAccessChecks = true;
        else if (MOD_RESULT == MOD_RES_DENY)
                return;

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index a1ef828da044c1ecbe11f8a9bcb477c6f651016b..bcfb9cf45fa9c034b9afdd8e3fa6e0034d846f82 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -306,8 +306,8 @@ void ModuleFilter::FreeFilters()
 
 ModResult ModuleFilter::OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype)
 {
-       /* Leave ulines alone */
-       if ((ServerInstance->ULine(user->server)) || (!IS_LOCAL(user)))
+       // Leave remote users and servers alone
+       if (!IS_LOCAL(user))
                return MOD_RES_PASSTHRU;
 
        flags = (msgtype == MSG_PRIVMSG) ? FLAG_PRIVMSG : FLAG_NOTICE;

diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index 1eb969fc95dd87780d465ccb2a14835366a5c9a8..7610992a0530864548ab2e392c88989df206e4a3 100644 (file)
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -69,7 +69,7 @@ class ModuleServProtectMode : public Module
                /* Check that the mode is not a server mode, it is being removed, the user making the change is local, there is a parameter,
                 * and the user making the change is not a uline
                 */
-               if (!adding && chan && IS_LOCAL(user) && !param.empty() && !ServerInstance->ULine(user->server))
+               if (!adding && chan && IS_LOCAL(user) && !param.empty())
                {
                        /* Check if the parameter is a valid nick/uuid
                         */