6 files changed, 12 insertions, 33 deletions
diff --git a/modules/commands/cs_seen.cpp b/modules/commands/cs_seen.cpp
index 8f90e2f08..9e3cf4e1e 100644
--- a/modules/commands/cs_seen.cpp
+++ b/modules/commands/cs_seen.cpp
@@ -351,9 +351,9 @@ class CSSeen : public Module
 			purger.SetSecs(expiretimeout);
 	}
 
-	void OnUserConnect(Reference<User> &u, bool &exempt) anope_override
+	void OnUserConnect(User *u, bool &exempt) anope_override
 	{
-		if (u)
+		if (!u->Quitting())
 			UpdateUser(u, NEW, u->nick, "", "", "");
 	}
 
diff --git a/modules/commands/os_defcon.cpp b/modules/commands/os_defcon.cpp
index 1457a57dc..4bcf9de38 100644
--- a/modules/commands/os_defcon.cpp
+++ b/modules/commands/os_defcon.cpp
@@ -408,27 +408,6 @@ class OSDefcon : public Module
 		this->ParseModeString();
 	}
 
-	EventReturn OnUserConnect(User *u, bool &exempt)
-	{
-		if (!exempt && u->server->IsSynced() && DConfig.Check(DEFCON_AKILL_NEW_CLIENTS) && !u->server->IsULined())
-		{
-			if (DConfig.Check(DEFCON_AKILL_NEW_CLIENTS) && akills)
-			{
-				Log(OperServ, "operserv/defcon") << "DEFCON: adding akill for *@" << u->host;
-				XLine *x = new XLine("*@" + u->host, Config->OperServ, Anope::CurTime + DConfig.akillexpire, DConfig.akillreason, XLineManager::GenerateUID());
-				x->by = Config->OperServ;
-				akills->AddXLine(x);
-			}
-
-			if (DConfig.Check(DEFCON_NO_NEW_CLIENTS) || DConfig.Check(DEFCON_AKILL_NEW_CLIENTS))
-				u->Kill(Config->OperServ, DConfig.akillreason);
-
-			return EVENT_STOP;
-		}
-
-		return EVENT_CONTINUE;
-	}
-
 	EventReturn OnChannelModeSet(Channel *c, MessageSource &, ChannelModeName Name, const Anope::string &param) anope_override
 	{
 		ChannelMode *cm = ModeManager::FindChannelModeByName(Name);
@@ -501,9 +480,9 @@ class OSDefcon : public Module
 		return EVENT_CONTINUE;
 	}
 
-	void OnUserConnect(Reference<User> &u, bool &exempt) anope_override
+	void OnUserConnect(User *u, bool &exempt) anope_override
 	{
-		if (exempt || !u || !u->server->IsSynced() || u->server->IsULined())
+		if (exempt || !u->Quitting() || !u->server->IsSynced() || u->server->IsULined())
 			return;
 
 		if (DConfig.Check(DEFCON_AKILL_NEW_CLIENTS) && akills)
diff --git a/modules/commands/os_dns.cpp b/modules/commands/os_dns.cpp
index ab8e412be..606af2d52 100644
--- a/modules/commands/os_dns.cpp
+++ b/modules/commands/os_dns.cpp
@@ -719,9 +719,9 @@ class ModuleDNS : public Module
 		}
 	}
 
-	void OnUserConnect(Reference<User> &u, bool &exempt) anope_override
+	void OnUserConnect(User *u, bool &exempt) anope_override
 	{
-		if (u && u->server)
+		if (!u->Quitting() && u->server)
 		{
 			DNSServer *s = DNSServer::Find(u->server->GetName());
 			/* Check for user limit reached */
diff --git a/modules/commands/os_forbid.cpp b/modules/commands/os_forbid.cpp
index 50320cf1c..67115c195 100644
--- a/modules/commands/os_forbid.cpp
+++ b/modules/commands/os_forbid.cpp
@@ -252,9 +252,9 @@ class OSForbid : public Module
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
-	void OnUserConnect(Reference<User> &u, bool &exempt) anope_override
+	void OnUserConnect(User *u, bool &exempt) anope_override
 	{
-		if (!u || exempt)
+		if (u->Quitting() || exempt)
 			return;
 
 		this->OnUserNickChange(u, "");
diff --git a/modules/commands/os_news.cpp b/modules/commands/os_news.cpp
index eea480d13..8bcfb7db8 100644
--- a/modules/commands/os_news.cpp
+++ b/modules/commands/os_news.cpp
@@ -405,9 +405,9 @@ class OSNews : public Module
 			DisplayNews(u, NEWS_OPER);
 	}
 
-	void OnUserConnect(Reference<User> &user, bool &) anope_override
+	void OnUserConnect(User *user, bool &) anope_override
 	{
-		if (!user || !user->server->IsSynced())
+		if (user->Quitting() || !user->server->IsSynced())
 			return;
 
 		DisplayNews(user, NEWS_LOGON);
diff --git a/modules/commands/os_session.cpp b/modules/commands/os_session.cpp
index 27157d511..aeb9cebce 100644
--- a/modules/commands/os_session.cpp
+++ b/modules/commands/os_session.cpp
@@ -718,9 +718,9 @@ class OSSession : public Module
 		ModuleManager::SetPriority(this, PRIORITY_FIRST);
 	}
 
-	void OnUserConnect(Reference<User> &user, bool &exempt) anope_override
+	void OnUserConnect(User *user, bool &exempt) anope_override
 	{
-		if (user && Config->LimitSessions)
+		if (!user->Quitting() && Config->LimitSessions)
 			this->AddSession(user, exempt);
 	}