X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=3a9bec49ac8ea4a021dd8ff9857237a14d741882;hb=d15f34b027d08e43713c98d2a27756df27164c34;hp=73c444afec7b8637e0481ecb18ba133d01f471a1;hpb=c7809f1cf117eb207add4956bac3b3d9233101b3;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 73c444afe..3a9bec49a 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -151,6 +151,8 @@ float RedirectionThink(); entity SelectSpawnPoint (float anypoint); void StartFrame (void) { + execute_next_frame(); + remove = remove_unsafely; // not during spawning! serverprevtime = servertime; servertime = time; @@ -201,16 +203,13 @@ void StartFrame (void) skill = autocvar_skill; - Spawnqueue_Check(); - - // detect when the pre-game countdown (if any) has ended and the game has started game_delay = (time < game_starttime) ? TRUE : FALSE; if(game_delay_last == TRUE) if(game_delay == FALSE) if(autocvar_sv_eventlog) - GameLogEcho(":startdelay_ended"); + GameLogEcho(":startdelay_ended"); game_delay_last = game_delay; @@ -226,8 +225,6 @@ void StartFrame (void) CreatureFrame (); CheckRules_World (); - AuditTeams(); - RuneMatchGivePoints(); bot_serverframe();