From c1906e51ba3c8a4429977fc30fa7135aa66c0bc0 Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Sat, 17 Jun 2023 00:55:47 -0400
Subject: [PATCH] Move $TMUX_SESSION out of vars to script

---
 instance/vars.example | 1 -
 mcserver              | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 instance/vars.example

diff --git a/instance/vars.example b/instance/vars.example
old mode 100644
new mode 100755
index de1731c..6fbb89a
--- a/instance/vars.example
+++ b/instance/vars.example
@@ -1,4 +1,3 @@
-TMUX_SESSION=mcserver
 JAVA_PARAMS="-Dlog4j2.formatMsgNoLookups=true -Xmx1024M -Xms1024M"
 JAVA=java
 SERVER=server.jar
diff --git a/mcserver b/mcserver
index 0f759b0..70dd96e 100755
--- a/mcserver
+++ b/mcserver
@@ -43,6 +43,9 @@ if ! [[ -e ./vars ]] ; then
 fi
 source ./vars
 
+# override value defined in vars for compatibility with old servers
+TMUX_SESSION=mcserver-"$instance"
+
 case "$cmd" in
 	stop) tmux send-keys -t "$TMUX_SESSION" -l "$code_clear" 'stop' "$code_send" ;;
 	command) tmux send-keys -t "$TMUX_SESSION" -l "$code_clear" "$*" "$code_send" ;;