X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fclientcommands.qc;h=226269d41b3605bc87f8e6a9ab417efa0b21621f;hb=9df92eba777ae4365b46b0eb61fe315d91ed9388;hp=adaf36f16415dc860c2b746dfc5d42074e98a856;hpb=ed108d0c82c1fa93948eb39f5ded6427dbd99027;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index adaf36f16..226269d41 100644
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -218,7 +218,7 @@ void SV_ParseClientCommand(string s) {
 		if(!g_arena)
 		if (self.classname != "player" && !lockteams)
 		{
-			if(isJoinAllowed()) {
+			if(nJoinAllowed(1)) {
 				self.classname = "player";
 				if(g_ca)
 					self.caplayer = 1;
@@ -261,7 +261,7 @@ void SV_ParseClientCommand(string s) {
 		if not(self.flags & FL_CLIENT)
 			return;
 
-		if((inWarmupStage && 0 >= g_warmup_limit) // with unlimited warmup players have to be able to restart
+		if((inWarmupStage)
 		   || autocvar_sv_ready_restart || g_race_qualifying == 2)
 		{
 			if(!readyrestart_happened || autocvar_sv_ready_restart_repeatable)