diff options
| -rw-r--r-- | src/modules/m_cloaking.cpp | 9 | ||||
| -rw-r--r-- | src/users.cpp | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index 8021fcbd4..5b485704b 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -56,11 +56,11 @@ class CloakUser : public ModeHandler return MODEACTION_ALLOW; } - /* don't allow this user to spam modechanges */ - IS_LOCAL(dest)->CommandFloodPenalty += 5000; - if (adding && !dest->IsModeSet('x')) { + /* don't allow this user to spam modechanges */ + IS_LOCAL(dest)->CommandFloodPenalty += 5000; + std::string* cloak = ext.get(dest); if (!cloak) @@ -78,6 +78,9 @@ class CloakUser : public ModeHandler } else if (!adding && dest->IsModeSet('x')) { + /* don't allow this user to spam modechanges */ + IS_LOCAL(dest)->CommandFloodPenalty += 5000; + /* User is removing the mode, so restore their real host * and make it match the displayed one. */ diff --git a/src/users.cpp b/src/users.cpp index b188eaaed..f6010bf38 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -835,6 +835,8 @@ void LocalUser::FullConnect() this->GetServerPort(), this->nick.c_str(), this->ident.c_str(), this->host.c_str(), this->GetIPString(), this->fullname.c_str()); ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString()); ServerInstance->BanCache->AddHit(this->GetIPString(), "", ""); + // reset the flood penalty (which could have been raised due to things like auto +x) + CommandFloodPenalty = 0; } void User::InvalidateCache() |