From aec644dc3f81d8847d86cbc73ea6678e8ca54dcb Mon Sep 17 00:00:00 2001
From: Kaiede <user@biticus.net>
Date: Sat, 6 Jan 2024 07:55:14 -0800
Subject: [PATCH] Add SSH remote console support (#2576)

---
 Dockerfile              | 2 +-
 scripts/start-finalExec | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a5d46445..d63f3269 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,7 +44,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${MC_MONITOR_VERSION} --var app=mc-monitor --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG MC_SERVER_RUNNER_VERSION=1.9.1
+ARG MC_SERVER_RUNNER_VERSION=1.10.0
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
diff --git a/scripts/start-finalExec b/scripts/start-finalExec
index 8136dc39..e48ddb0d 100755
--- a/scripts/start-finalExec
+++ b/scripts/start-finalExec
@@ -236,6 +236,9 @@ mcServerRunnerArgs=(
 if [[ ${STOP_SERVER_ANNOUNCE_DELAY} ]]; then
   mcServerRunnerArgs+=(--stop-server-announce-delay "${STOP_SERVER_ANNOUNCE_DELAY}s")
 fi
+if isTrue "${ENABLE_SSH}"; then
+  mcServerRunnerArgs+=(--remote-console)
+fi
 
 if [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then
   copyFilesForCurseForge