cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

If both the extreme and hard caps are active, extreme popcap applies to connected players, not living players. (#43181)

Browse Source 
* If both the extreme and hard caps are active, extreme popcap applies to connected players, not living players.

I also have it using the connected players, and not the living players, if the amount of living players can not increase (queue active, entering disabled, round hasn't started, etc).
I also have it allowing the connection if the hard cap is active but has not been hit.

* Redundant if check

* So it occurs to me that IsBanned() gets called by byond on connected players sometimes.
This commit is contained in:
Kyle Spier-Swenson
2019-03-21 09:09:11 +13:00
committed by oranges
parent 549d5645c4
commit bf52e95723
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/IsBanned.dm
+18 -6
View File
@@ -24,9 +24,12 @@
if(GLOB.admin_datums[ckey] || GLOB.deadmins[ckey])
admin = TRUE
var/client/C = GLOB.directory[ckey]
//Whitelist
if(CONFIG_GET(flag/usewhitelist))
if(!real_bans_only && !C && CONFIG_GET(flag/usewhitelist))
if(!check_whitelist(ckey))
if (admin)
log_admin("The admin [key] has been allowed to bypass the whitelist")
@@ -38,7 +41,7 @@
return list("reason"="whitelist", "desc" = "\nReason: You are not on the white list for this server")
//Guest Checking
if(!real_bans_only && IsGuestKey(key))
if(!real_bans_only && !C && IsGuestKey(key))
if (CONFIG_GET(flag/guest_ban))
log_access("Failed Login: [key] - Guests not allowed")
return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.")
@@ -48,9 +51,19 @@
//Population Cap Checking
var/extreme_popcap = CONFIG_GET(number/extreme_popcap)
if(!real_bans_only && extreme_popcap && living_player_count() >= extreme_popcap && !admin)
log_access("Failed Login: [key] - Population cap reached")
return list("reason"="popcap", "desc"= "\nReason: [CONFIG_GET(string/extreme_popcap_message)]")
if(!real_bans_only && !C && extreme_popcap && !admin)
var/hard_popcap = CONFIG_GET(number/hard_popcap)
var/popcap_value = living_player_count()
if (hard_popcap)
popcap_value = GLOB.clients.len
if (!GLOB.enter_allowed || length(SSticker.queued_players) || !SSticker.HasRoundStarted())
hard_popcap = 0
popcap_value = GLOB.clients.len
if(popcap_value >= extreme_popcap && (!hard_popcap || living_player_count() >= hard_popcap))
log_access("Failed Login: [key] - Population cap reached")
return list("reason"="popcap", "desc"= "\nReason: [CONFIG_GET(string/extreme_popcap_message)]")
if(CONFIG_GET(flag/sql_enabled))
if(!SSdbcore.Connect())
@@ -96,7 +109,6 @@
bannedckey = ban["ckey"]
var/newmatch = FALSE
var/client/C = GLOB.directory[ckey]
var/list/cachedban = SSstickyban.cache[bannedckey]
//rogue ban in the process of being reverted.
if (cachedban && (cachedban["reverting"] || cachedban["timeout"]))