From 0cfdb4b874a03f79e51a339616dc1b5ea4aa19d3 Mon Sep 17 00:00:00 2001
From: eddy <edwin3296@gmail.com>
Date: Sat, 1 Jun 2024 05:40:55 +0000
Subject: [PATCH 1/2] Write java launch options to variables.txt

---
 scripts/start-finalExec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/start-finalExec b/scripts/start-finalExec
index 92284f5dd6d..69b18d3e37d 100755
--- a/scripts/start-finalExec
+++ b/scripts/start-finalExec
@@ -285,6 +285,9 @@ EOF
   if isTrue "${EXEC_DIRECTLY:-false}"; then
     "${finalArgs[@]}"
   else
+    JVM_ARGS="${JVM_XX_OPTS} ${JVM_OPTS} $expandedDOpts"
+    JVM_ARGS=${JVM_ARGS//$'\n'/}
+    sed -i "s~JAVA_ARGS=.*~JAVA_ARGS=\"${JVM_ARGS}\"~" "${FTB_DIR}/variables.txt"
     exec mc-server-runner "${mcServerRunnerArgs[@]}" "${finalArgs[@]}"
   fi
 elif [[ $SERVER =~ run.sh ]]; then

From aae49c1d2e8ad0657c14f1ac5e55cbb323f46435 Mon Sep 17 00:00:00 2001
From: eddy <edwin3296@gmail.com>
Date: Sat, 1 Jun 2024 15:53:24 +0000
Subject: [PATCH 2/2] Add conditional to check for variables.txt

---
 scripts/start-finalExec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/start-finalExec b/scripts/start-finalExec
index 69b18d3e37d..060c0ff0a2e 100755
--- a/scripts/start-finalExec
+++ b/scripts/start-finalExec
@@ -285,9 +285,11 @@ EOF
   if isTrue "${EXEC_DIRECTLY:-false}"; then
     "${finalArgs[@]}"
   else
-    JVM_ARGS="${JVM_XX_OPTS} ${JVM_OPTS} $expandedDOpts"
-    JVM_ARGS=${JVM_ARGS//$'\n'/}
-    sed -i "s~JAVA_ARGS=.*~JAVA_ARGS=\"${JVM_ARGS}\"~" "${FTB_DIR}/variables.txt"
+    if [ -f "${FTB_DIR}/variables.txt" ]; then
+        JVM_ARGS="${JVM_XX_OPTS} ${JVM_OPTS} $expandedDOpts"
+        JVM_ARGS=${JVM_ARGS//$'\n'/}
+        sed -i "s~JAVA_ARGS=.*~JAVA_ARGS=\"${JVM_ARGS}\"~" "${FTB_DIR}/variables.txt"
+    fi
     exec mc-server-runner "${mcServerRunnerArgs[@]}" "${finalArgs[@]}"
   fi
 elif [[ $SERVER =~ run.sh ]]; then