diff options
| author |  Sadie Powell | 2021-05-23 01:53:34 +0100 |
|---|---|---|
| committer | Sadie Powell | 2021-05-23 01:58:34 +0100 |
| commit | ee1325cf9ddcb47b2d2c1b79093e0fa5a38b75c7 (patch) | |
| tree | 8ede088cbb9a89f2f10d194d6c094b84db61fc06 /src/modules/m_kicknorejoin.cpp | |
| parent | Refactor the population of exceptions in delayjoin. (diff) | |
| download | inspircd++-ee1325cf9ddcb47b2d2c1b79093e0fa5a38b75c7.tar.gz inspircd++-ee1325cf9ddcb47b2d2c1b79093e0fa5a38b75c7.tar.bz2 inspircd++-ee1325cf9ddcb47b2d2c1b79093e0fa5a38b75c7.zip | |
Fire OnUserPreJoin regardless of whether the join is an override.
Diffstat (limited to 'src/modules/m_kicknorejoin.cpp')
| -rw-r--r-- | src/modules/m_kicknorejoin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 78a5031e4..321ad7659 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -138,9 +138,9 @@ public: { } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven, bool override) override { - if (chan) + if (!override && chan) { const KickRejoinData* data = kr.ext.Get(chan); if ((data) && !invapi->IsInvited(user, chan) && (!data->canjoin(user))) |