diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-01-05 14:27:30 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-01-05 14:27:30 +0100 |
| commit | 2f181fef775da4a686a892c06af843dddfb7950a (patch) | |
| tree | 320dcd7e0bc34312898487af31fa228d83729dce | |
| parent | 8acee01804e96f80bb980137738764573780a642 (diff) | |
Remove useless ULine() checks
| -rw-r--r-- | src/mode.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_filter.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_servprotect.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mode.cpp b/src/mode.cpp index bdf0400b7..162793369 100644 --- 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 a1ef828da..bcfb9cf45 100644 --- 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 1eb969fc9..7610992a0 100644 --- 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 */ |