aboutsummaryrefslogtreecommitdiff
path: root/src/modules/m_denychans.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2021-05-23 01:53:34 +0100
committerGravatar Sadie Powell2021-05-23 01:58:34 +0100
commitee1325cf9ddcb47b2d2c1b79093e0fa5a38b75c7 (patch)
tree8ede088cbb9a89f2f10d194d6c094b84db61fc06 /src/modules/m_denychans.cpp
parentRefactor the population of exceptions in delayjoin. (diff)
Fire OnUserPreJoin regardless of whether the join is an override.
Diffstat (limited to 'src/modules/m_denychans.cpp')
-rw-r--r--src/modules/m_denychans.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index c316a9da4..9e7454c0e 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -144,8 +144,11 @@ class ModuleDenyChannels : public Module
goodchannels.swap(goodchans);
}
- 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 (!override)
+ return MOD_RES_PASSTHRU;
+
for (const auto& badchan : badchannels)
{
// If the channel does not match the current entry we have nothing else to do.