diff options
| -rw-r--r-- | src/modules/m_nonotice.cpp | 5 | ||||
| -rw-r--r-- | src/modules/m_services_account.cpp | 16 |
2 files changed, 2 insertions, 19 deletions
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp index d95ea8b8a..c5b9f3a1c 100644 --- a/src/modules/m_nonotice.cpp +++ b/src/modules/m_nonotice.cpp @@ -59,11 +59,6 @@ class ModuleNoNotice : public Module Channel* c = (Channel*)dest; if (!c->GetExtBanStatus(user, 'T').check(!c->IsModeSet('T'))) { - if (ServerInstance->ULine(user->server)) - { - // ulines are exempt. - return MOD_RES_PASSTHRU; - } res = ServerInstance->OnCheckExemption(user,c,"nonotice"); if (res == MOD_RES_ALLOW) return MOD_RES_PASSTHRU; diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 50e2c76a6..cb3f089c6 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -37,7 +37,7 @@ class Channel_r : public ModeHandler ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { // only a u-lined server may add or remove the +r mode. - if (!IS_LOCAL(source) || ServerInstance->ULine(source->server)) + if (!IS_LOCAL(source)) { // Only change the mode if it's not redundant if ((adding != channel->IsModeSet('r'))) @@ -64,7 +64,7 @@ class User_r : public ModeHandler ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - if (!IS_LOCAL(source) || ServerInstance->ULine(source->server)) + if (!IS_LOCAL(source)) { if ((adding != dest->IsModeSet('r'))) { @@ -171,12 +171,6 @@ class ModuleServicesAccount : public Module std::string *account = accountname.get(user); bool is_registered = account && !account->empty(); - if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server))) - { - // user is ulined, can speak regardless - return MOD_RES_PASSTHRU; - } - if (target_type == TYPE_CHANNEL) { Channel* c = (Channel*)dest; @@ -255,12 +249,6 @@ class ModuleServicesAccount : public Module if (chan) { - if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server))) - { - // user is ulined, won't be stopped from joining - return MOD_RES_PASSTHRU; - } - if (chan->IsModeSet('R')) { if (!is_registered) |