From d977b4d2d16fb18b33113eb22a603a4d808a2061 Mon Sep 17 00:00:00 2001
From: Daniel Ceregatti <Daniel.Ceregatti@PolicyMap.com>
Date: Sat, 22 Jun 2024 10:28:11 -0700
Subject: [PATCH 1/2] Downstream merge.

---
 files/custom/README.md        | 11 +++++++++++
 files/mods/2289456201/map.env |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/files/custom/README.md b/files/custom/README.md
index 8c5b3c8..df56471 100644
--- a/files/custom/README.md
+++ b/files/custom/README.md
@@ -106,6 +106,17 @@ cp -a /files/custom/starting-gear /profiles/custom/
 
 Restart the server.
 
+### No personal light
+
+The personal light is usually configured using the `disablePersonalLight` setting in [serverDZ.cfg](../serverDZ.cfg), but if a cfggameplay.json file is present, which is the default being employed for this project, that setting must be overridden there. To configure the personal light:
+
+```shell
+mkdir -p /profiles/custom
+cp -a /files/custom/no-personal-light /profiles/custom
+```
+
+Restart the server.
+
 ### References
 
 [BI DayZ Wiki - Spawning Gear Configuration](https://community.bistudio.com/wiki/DayZ:Spawning_Gear_Configuration)
diff --git a/files/mods/2289456201/map.env b/files/mods/2289456201/map.env
index 5544bb0..0b0aebb 100644
--- a/files/mods/2289456201/map.env
+++ b/files/mods/2289456201/map.env
@@ -4,5 +4,5 @@ set -eE
 
 MAP="Namalsk"
 DIR="Namalsk-Server/Mission Files"
-REPO="https://github.com/SumrakDZN/${DIR}/hardcore.namalsk"
+REPO="https://github.com/SumrakDZN/Namalsk-Server.git"
 MPDIR="hardcore.namalsk"

From 269f62cd72dab18a1414ce42ba953844c4ab4869 Mon Sep 17 00:00:00 2001
From: Daniel Ceregatti <Daniel.Ceregatti@PolicyMap.com>
Date: Sat, 22 Jun 2024 12:49:00 -0700
Subject: [PATCH 2/2] Fix lack of STEAM_PORT in env. This was an oversight from
 a bad merge.

---
 server/bin/dz | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/bin/dz b/server/bin/dz
index 99c0edf..d5b556a 100755
--- a/server/bin/dz
+++ b/server/bin/dz
@@ -414,7 +414,10 @@ start(){
 	echo ${parameters} > /tmp/parameters
 	# Add the steam port from the environment
 	cp -a "${SERVER_CFG_SAVE}" "${SERVER_CFG_DST}"
-	sed -e "s,^steamQueryPort.*,steamQueryPort = ${STEAM_PORT};," -i "${SERVER_CFG_DST}"
+	if [[ ${STEAM_PORT} != "" ]]
+	then
+		sed -e "s,^steamQueryPort.*,steamQueryPort = ${STEAM_PORT};," -i "${SERVER_CFG_DST}"
+	fi
 	./DayZServer "${mod_command_line}" ${parameters}
 	EXIT_CODE=$?
 	printf "\n[ ${yellow}DayZ${default} ] Server exited. Exit code: ${EXIT_CODE}\n"