cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

popcaphotfix: misused a max that could have rendered the hard popcap useless

Browse Source
This commit is contained in:
Incoming
2015-02-23 23:34:17 -05:00
parent b49a5a934c
commit 76b9fbb874
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/new_player.dm
+5 -1
View File
@@ -126,7 +126,11 @@
if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
usr << "<span class='danger'>The round is either not ready, or has already finished...</span>"
return
var/relevent_cap = max(config.hard_popcap, config.extreme_popcap)
var/relevent_cap
if(config.hard_popcap && config.extreme_popcap)
relevent_cap = min(config.hard_popcap, config.extreme_popcap)
else
relevent_cap = max(config.hard_popcap, config.extreme_popcap)
if(relevent_cap && living_player_count() >= relevent_cap && !(ckey(key) in admin_datums))
usr << "<span class='danger'>[config.hard_popcap_message]</span>"
return