From ee1325cf9ddcb47b2d2c1b79093e0fa5a38b75c7 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sun, 23 May 2021 01:53:34 +0100
Subject: Fire OnUserPreJoin regardless of whether the join is an override.

---
 src/modules/m_cban.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/modules/m_cban.cpp')

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 43b6742fd..869a5a5e6 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -191,10 +191,12 @@ class ModuleCBan : public Module, public Stats::EventListener
 		return MOD_RES_DENY;
 	}
 
-	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
 	{
-		XLine *rl = ServerInstance->XLines->MatchesLine("CBAN", cname);
+		if (override)
+			return MOD_RES_PASSTHRU;
 
+		XLine *rl = ServerInstance->XLines->MatchesLine("CBAN", cname);
 		if (rl)
 		{
 			// Channel is banned.
-- 
cgit v1.3.1-10-gc9f91