From 76b9fbb874590a58c4e536f5be17a9bd4d7fc1dd Mon Sep 17 00:00:00 2001
From: Incoming <Mewchu11@cox.net>
Date: Mon, 23 Feb 2015 23:34:17 -0500
Subject: [PATCH] popcaphotfix: misused a max that could have rendered the hard
 popcap useless

---
 code/modules/mob/new_player/new_player.dm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index d228a9df1b7..3f81826c816 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -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