diff options
| author |  Sadie Powell | 2021-06-18 11:18:06 +0100 |
|---|---|---|
| committer | Sadie Powell | 2021-06-18 11:18:06 +0100 |
| commit | 3b5425e6e0776daf0632f4e86057486b60794e2c (patch) | |
| tree | 5c8de35b7c477bb4f7302a7315d2d292c05fbf36 /src | |
| parent | Fix joinflood applying the bootwait timeout to rehashes. (diff) | |
Fix joinflood overwriting the bootwait timer on split.
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/m_joinflood.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index a196c5731..05f9f0f0e 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -167,7 +167,7 @@ class ModuleJoinFlood void OnServerSplit(const Server* server, bool error) CXX11_OVERRIDE { if (splitwait) - ignoreuntil = ServerInstance->Time() + splitwait; + ignoreuntil = std::max<time_t>(ignoreuntil, ServerInstance->Time() + splitwait); } ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE |