From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 31 Mar 2016 11:55:37 +0000 (+1100)
Subject: Don't call sv_hook_gamestart if we want to restart
X-Git-Tag: xonotic-v0.8.2~978
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=06e8ab19931220a8853f2c2885e7e043c79e8cf2;p=xonotic%2Fxonotic-data.pk3dir.git

Don't call sv_hook_gamestart if we want to restart
---

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 24c81a276..5714393b7 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -584,9 +584,8 @@ spawnfunc(worldspawn)
 {
 	server_is_dedicated = boolean(stof(cvar_defstring("is_dedicated")));
 
+    bool wantrestart = false;
 	{
-		bool wantrestart = false;
-
 		if (!server_is_dedicated)
 		{
 			// force unloading of server pk3 files when starting a listen server
@@ -867,7 +866,7 @@ spawnfunc(worldspawn)
 
 	CheatInit();
 
-	localcmd("\n_sv_hook_gamestart ", GetGametype(), "\n");
+	if (!wantrestart) localcmd("\n_sv_hook_gamestart ", GetGametype(), "\n");
 
 	// fill sv_curl_serverpackages from .serverpackage files
 	if (autocvar_sv_curl_serverpackages_auto)