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_override.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 60aa866d9..b0022b207 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -188,9 +188,9 @@ class ModuleOverride
 		return MOD_RES_PASSTHRU;
 	}
 
-	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 (user->IsOper())
+		if (user->IsOper() && !override)
 		{
 			if (chan)
 			{
-- 
cgit v1.3.1-10-gc9f91