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_services_account.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index cdef9ec04..4f9f08c00 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -294,8 +294,11 @@ class ModuleServicesAccount
 		return HandleMessage(user, target);
 	}
 
-	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;
+
 		std::string *account = accountname.Get(user);
 		bool is_registered = account && !account->empty();
 
-- 
cgit v1.3.1-10-gc9f91