X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fround_handler.qc;h=af69e8e9e55d30a826f56d4bb6d78c384435ff39;hb=0f0e69c6625fc4db17559e2e47f2fdaed8298076;hp=8715a4deaa56cee9abe8d74bd4a4f4dfa8817125;hpb=02a0bd5bf9eefad8c97b93c8a1c2ea47b3c1f553;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index 8715a4dea..af69e8e9e 100644
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -33,7 +33,7 @@ void round_handler_Think()
 			if(f == 0)
 			{
 				self.cnt = 0;
-				self.round_endtime = time + self.round_timelimit;
+				self.round_endtime = (self.round_timelimit) ? time + self.round_timelimit : 0;
 				self.nextthink = time;
 				if(self.roundStart)
 					self.roundStart();
@@ -67,7 +67,7 @@ void round_handler_Init(float the_delay, float the_count, float the_round_timeli
 	round_handler.delay = (the_delay > 0) ? the_delay : 0;
 	round_handler.count = fabs(floor(the_count));
 	round_handler.cnt = round_handler.count + 1;
-	round_handler.round_timelimit = max(10, the_round_timelimit);
+	round_handler.round_timelimit = (the_round_timelimit > 0) ? the_round_timelimit : 0;
 }
 
 // NOTE: this is only needed because if round_handler spawns at time 1