From 15da00ff7048dadea20bc824b33b30f192549674 Mon Sep 17 00:00:00 2001
From: rtxa <usertxa@gmail.com>
Date: Tue, 3 Sep 2024 14:30:09 -0300
Subject: [PATCH] Fix server always restarting in TDM mode #30

Fixed server always restarting in TDM mode, regardless of what was set in startup_server.cfg. This happens because the startup_server.cfg is being executed before AG CVars are even registered. Now we reload the .cfg to solve this.
---
 valve/addons/amxmodx/scripting/agmodx.sma | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/valve/addons/amxmodx/scripting/agmodx.sma b/valve/addons/amxmodx/scripting/agmodx.sma
index 64abb1d..f7b63d2 100644
--- a/valve/addons/amxmodx/scripting/agmodx.sma
+++ b/valve/addons/amxmodx/scripting/agmodx.sma
@@ -366,6 +366,12 @@ public plugin_precache() {
 	gCvarMatchRunning = create_cvar("sv_ag_match_running", "0");
 	set_pcvar_string(gCvarMatchRunning, "0");
 	
+	if (!IsPluginFirstLoad()) {
+		// startup_server.cfg is executed before AG CVars are registered, so we need to reload the .cfg to reflect changes.
+		LoadStartupServerCfg();
+		set_localinfo("ag_first_load", "1");
+	}
+
 	new fwPreConfig, fwPostConfig, fwReturnTemp;
 	
 	fwPreConfig = CreateMultiForward("agmodx_pre_config", ET_IGNORE);
@@ -484,6 +490,23 @@ public plugin_init() {
 	BanGamemodeEnts();
 }
 
+bool:IsPluginFirstLoad() {
+	new isPluginFirstLoad[2];
+	get_localinfo("ag_first_load", isPluginFirstLoad, charsmax(isPluginFirstLoad));
+	return isPluginFirstLoad[0] ? true : false;
+}
+
+// TODO: allow to load startup_server.cfg from subfolders to match BHL behaviour
+LoadStartupServerCfg() {
+	new serverCfg[256];
+	get_cvar_string("servercfgfile", serverCfg, charsmax(serverCfg));
+	if (!serverCfg[0]) {
+		return;
+	}
+	server_cmd("exec startup_%s", serverCfg); // no need to add .cfg at the end
+	server_exec();
+}
+
 public FwChargersUse() {
 	if (get_pcvar_bool(gCvarBanChargers))
 		return HAM_SUPERCEDE;