From b46300a32dc310b63b8bfd131021548a4f310674 Mon Sep 17 00:00:00 2001
From: JeremyStarTM <jeremystartm@staropensource.de>
Date: Sat, 20 Apr 2024 16:46:20 +0200
Subject: [PATCH] Fix shutdown behaviour

---
 config.example.env |  4 ----
 docker-compose.yml |  2 +-
 entrypoint.sh      | 28 +---------------------------
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/config.example.env b/config.example.env
index 0b49615..f5f9df3 100644
--- a/config.example.env
+++ b/config.example.env
@@ -22,10 +22,6 @@ MCSD_SAFEMODE=false
 # Removes all log files on startup (restarts are not affected)
 MCSD_CLEAN_LOGS=true
 
-# AUTO_RESTART
-## Restarts the server automatically if it exits
-MCSD_AUTO_RESTART=true
-
 #################
 # Memory limits #
 #################
diff --git a/docker-compose.yml b/docker-compose.yml
index 209721c..a28dbae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
  mcsd:
   build: .
   container_name: mcsd
-  restart: no
+  restart: unless-stopped
   stop_grace_period: 120s
   volumes:
    - ./server:/data
diff --git a/entrypoint.sh b/entrypoint.sh
index 4d12625..20f4ed4 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -168,14 +168,7 @@ function run() {
   cd /data||exit 69
   # We want to use ${ARGS} without using parenthesis
   # shellcheck disable=SC2086
-  "/usr/lib/jvm/java-${MCSD_JAVA_VERSION}-openjdk/bin/java" ${FLAGS} -jar "/data/server.jar" ${ARGS} &
-  # Set server pid
-  export "CHILDPID=${!}"
-  # Setup trap
-  trap kill_server SIGTERM
-  trap kill_server SIGINT
-  # Wait for server to end
-  wait
+  exec "/usr/lib/jvm/java-${MCSD_JAVA_VERSION}-openjdk/bin/java" ${FLAGS} -jar "/data/server.jar" ${ARGS} &
 }
 
 # Need I say more?
@@ -187,26 +180,7 @@ function main() {
   clean_logs
   compile_args
   compile_flags
-  # Run server once
   run
-  # Restart server if enabled
-  if [ "${SHUTDOWN}" == "true" ]; then
-    echo ":: Ending execution (SHUTDOWN=true)"
-    exit 0
-  fi
-  case "${MCSD_AUTO_RESTART}" in
-    "true")
-      echo ":: Restarting server"
-      run
-      ;;
-    "false")
-      echo ":: Ending execution (MCSD_AUTO_RESTART=false)"
-      exit 0
-      ;;
-    *)
-      internal_error "\$MCSD_AUTO_RESTART has invalid value"
-      ;;
-  esac
 }
 
 main