Fix an inconsistency with applying ITEM_FLAG_MUTATORBLOCKED

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / main.qc

diff --git a/qcsrc/server/main.qc b/qcsrc/server/main.qc
index 9ce1ec14093ea57772039ee5bafa0f368684ccae..2b29422b8969362356b6a552106158c9b881d0e7 100644 (file)
--- a/qcsrc/server/main.qc
+++ b/qcsrc/server/main.qc
@@ -331,8 +331,8 @@ void StartFrame()
        CreatureFrame_All();
        CheckRules_World();
 
-       if (warmup_stage && !game_stopped && warmup_limit > 0 && time >= warmup_limit) {
-               ReadyRestart();
+       if (warmup_stage && !game_stopped && warmup_limit > 0 && time - game_starttime >= warmup_limit) {
+               ReadyRestart(true);
                return;
        }
 
@@ -415,7 +415,7 @@ string GetField_fullspawndata(entity e, string f, ...)
 
        if (!e.fullspawndata)
        {
-               LOG_WARNF("^1EDICT %s (classname %s) has no fullspawndata, engine lacks support?", ftos(num_for_edict(e)), e.classname);
+               //LOG_WARNF("^1EDICT %s (classname %s) has no fullspawndata, engine lacks support?", ftos(num_for_edict(e)), e.classname);
                return v;
        }