From 1d41c026ca1bbc9661d7aa408cb4e2eda72f32b2 Mon Sep 17 00:00:00 2001
From: skoglol <33292112+kriskog@users.noreply.github.com>
Date: Sat, 16 Nov 2019 18:35:07 +0100
Subject: [PATCH] Fixed some dynamic bugs (#47763)

---
 code/game/gamemodes/dynamic/dynamic.dm                   | 2 +-
 code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm | 6 +++---
 config/admins.txt                                        | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm
index 51c6ed0bd0d..47350cd2935 100644
--- a/code/game/gamemodes/dynamic/dynamic.dm
+++ b/code/game/gamemodes/dynamic/dynamic.dm
@@ -531,7 +531,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 	if(!rule.repeatable)
 		if(rule.ruletype == "Latejoin")
 			latejoin_rules = remove_from_list(latejoin_rules, rule.type)
-		else if(rule.type == "Midround")
+		else if(rule.ruletype == "Midround")
 			midround_rules = remove_from_list(midround_rules, rule.type)
 
 	addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_midround_latejoin_rule, rule), rule.delay)
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
index 7f538a460fb..67bf38b8942 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
@@ -68,9 +68,9 @@
 	if (!forced)
 		var/job_check = 0
 		if (enemy_roles.len > 0)
-			for (var/mob/M in living_players)
-				if (M.stat == DEAD)
-					continue // Dead players cannot count as opponents
+			for (var/mob/M in mode.current_players[CURRENT_LIVING_PLAYERS])
+				if (M.stat == DEAD || !M.client)
+					continue // Dead/disconnected players cannot count as opponents
 				if (M.mind && M.mind.assigned_role && (M.mind.assigned_role in enemy_roles) && (!(M in candidates) || (M.mind.assigned_role in restricted_roles)))
 					job_check++ // Checking for "enemies" (such as sec officers). To be counters, they must either not be candidates to that rule, or have a job that restricts them from it
 
diff --git a/config/admins.txt b/config/admins.txt
index d854774f434..9b20a5edb41 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -137,3 +137,4 @@ shizcalev = Game Master
 NicBR = Game Master
 LoserWasTaken = Game Master
 Fikou = Game Master
+Skoglol = Game Master