From 4589c7c0c63ffae47308e43b75cf729061b54952 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 5 Jan 2020 08:52:00 -0800
Subject: [PATCH 1/2] Update IsBanned.dm

---
 code/modules/admin/IsBanned.dm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index 839292871c..55d9cf382b 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -16,8 +16,16 @@
 	if (text2num(computer_id) == 2147483647) //this cid causes stickybans to go haywire
 		log_access("Failed Login (invalid cid): [key] [address]-[computer_id]")
 		return list("reason"="invalid login data", "desc"="Error: Could not check ban status, Please try again. Error message: Your computer provided an invalid Computer ID.)")
-	var/admin = 0
+
+	if (type == "world")
+		return ..() //shunt world topic banchecks to purely to byond's internal ban system
+
 	var/ckey = ckey(key)
+	var/client/C = GLOB.directory[ckey]
+	if (C && ckey == C.ckey && computer_id == C.computer_id && address == C.address)
+		return //don't recheck connected clients.
+
+	var/admin = FALSE
 	if(GLOB.admin_datums[ckey] || GLOB.deadmins[ckey])
 		admin = 1
 

From a8a5ff819dec4140e743fb0e1cfd72aa05292a12 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 5 Jan 2020 10:06:09 -0800
Subject: [PATCH 2/2] Update IsBanned.dm

---
 code/modules/admin/IsBanned.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index 55d9cf382b..03670009f8 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -134,7 +134,6 @@
 			bannedckey = ban["ckey"]
 
 		var/newmatch = FALSE
-		var/client/C = GLOB.directory[ckey]
 		var/cachedban = SSstickyban.cache[bannedckey]
 
 		//rogue ban in the process of being reverted.