From 799d45af99caff4fa1bd3234e258caeb2a47464f Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Wed, 20 Mar 2019 14:41:48 -0700 Subject: [PATCH 1/2] Exempts current players from the extreme pop cap This will exempt anybody who was once joined into the round, this means people who were assigned at round start or latejoined. even if they died, got gibbed, suicided, or ghosted. This does not exempt people who observed from lobby. --- code/modules/admin/IsBanned.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index 33535397f5b..7971edc1c59 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -61,7 +61,7 @@ hard_popcap = 0 popcap_value = GLOB.clients.len - if(popcap_value >= extreme_popcap && (!hard_popcap || living_player_count() >= hard_popcap)) + if(popcap_value >= extreme_popcap && (!hard_popcap || living_player_count() >= hard_popcap) && !joined_player_list.Find(ckey)) log_access("Failed Login: [key] - Population cap reached") return list("reason"="popcap", "desc"= "\nReason: [CONFIG_GET(string/extreme_popcap_message)]") From 050554dda65bca756b7726c5ff9ceb3f1d9bab6e Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Wed, 20 Mar 2019 15:20:05 -0700 Subject: [PATCH 2/2] Update IsBanned.dm --- code/modules/admin/IsBanned.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index 7971edc1c59..7a3681c1ce3 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -61,7 +61,7 @@ hard_popcap = 0 popcap_value = GLOB.clients.len - if(popcap_value >= extreme_popcap && (!hard_popcap || living_player_count() >= hard_popcap) && !joined_player_list.Find(ckey)) + if(popcap_value >= extreme_popcap && (!hard_popcap || living_player_count() >= hard_popcap) && !GLOB.joined_player_list.Find(ckey)) log_access("Failed Login: [key] - Population cap reached") return list("reason"="popcap", "desc"= "\nReason: [CONFIG_GET(string/extreme_popcap_message)]")