Merge branch 'TimePath/issues/1971' into 'master'

Fix #1971 "Backtrace on stormkeep"

Closes #1971

See merge request xonotic/xonotic-data.pk3dir!547

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 1130b6a4e5dd349abdf935a81039e0334c22c443..487ab1fc533821590ab49c18fdeffb7cf24dd686 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -360,7 +360,7 @@ void SV_OnEntityPreSpawnFunction(entity this)
        }
        return;
 LABEL(cleanup)
-    builtin_remove(this);
+    delete(this);
 }
 
 void WarpZone_PostInitialize_Callback()