From f981c5b6fa7d126aa893305a26d26879a4d31623 Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Sat, 17 Jun 2023 01:54:13 -0400
Subject: [PATCH] Wait for stop so systemd doesn't force kill it

---
 mcserver | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/mcserver b/mcserver
index 5569c74..d8a03ff 100755
--- a/mcserver
+++ b/mcserver
@@ -46,8 +46,17 @@ source ./vars
 # override value defined in vars for compatibility with old servers
 TMUX_SESSION=mcserver-"$instance"
 
+_stop_and_wait () {
+	tmux send-keys -t "$TMUX_SESSION" -l "$code_clear" 'stop' "$code_send"
+	echo Waiting for session to exit...
+	while tmux has-session -t "$TMUX_SESSION" ; do
+		sleep 1
+	done
+}
+
+
 case "$cmd" in
-	stop) tmux send-keys -t "$TMUX_SESSION" -l "$code_clear" 'stop' "$code_send" ;;
+	stop) _stop_and_wait ;;
 	command) tmux send-keys -t "$TMUX_SESSION" -l "$code_clear" "$*" "$code_send" ;;
 	start|*) tmux new-window -t $TMUX_SESSION: "./start.sh" || tmux new-session -d -s $TMUX_SESSION "./start.sh";;
 esac