upgpkg: minecraft-server 1.17.1-2

Do not lock the minecraft server session if an administrator is
connected to the console. Instead, re-introduce the admin check in the
idle-server daemon to verify whether it is safe to shut down the server.

Resolves #12.

upgpkg: cuberite 1.12.2c0_094cd61-3
upgpkg: cuberite-bin 1.12.2b258-3
upgpkg: papermc 1.17.1+b100-3
upgpkg: spigot 1.17.1+b131-3

3 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 584b39df5b2c..204d9bca58fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -39,6 +39,6 @@ pkgbase = spigot
 	sha512sums = eac1deb53fa9d522af272fa2d9093b98e7d51aa4c0730471e5c575752733500b84a06bc19d1fe83b4c48e41b7f0e11efb23881bfadce4a40d2bfed7cbe5a5bf7
 	sha512sums = f3b3005a8ee643cb7d8fa24a3d1141604157efd2147d07aa7f839b070370cbed66ccf3c34317181e9601f2aadb5224002617226c99e36b677c0fc3de0b42d0d8
 	sha512sums = 2f5d71911c9ee7e7763d3300f335245a531a9e00d23e4d007ce76f4175dd7ecd9d8f0425af86a885797764690db64bfa558b49719f3d9d85a46df89443bcdf7b
-	sha512sums = a83df4c9f8b0908be692e72460d85c40ac7c341d5015f25978e81fb1eb22aec4c61974dacbb07425dbcebe763ad452c25017c949bc89748cd88a05a52ed85f38
+	sha512sums = a9180ce823ece83ffc8977a0205fe281980f0392c2376c493d5f4c429d7681c659d918dcded184f5f436710eba6183f3ac8a695cf9056bf517322899e9e057f2
 
 pkgname = spigot
diff --git a/PKGBUILD b/PKGBUILD
index 13c3df74f09c..886f1db27bb3 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,7 +33,7 @@ sha512sums=('eb2aad8f40fdcbbd34e1bedf2c81f11141f3f25f39571e8d7e7894a204b09b6d4d4
             'eac1deb53fa9d522af272fa2d9093b98e7d51aa4c0730471e5c575752733500b84a06bc19d1fe83b4c48e41b7f0e11efb23881bfadce4a40d2bfed7cbe5a5bf7'
             'f3b3005a8ee643cb7d8fa24a3d1141604157efd2147d07aa7f839b070370cbed66ccf3c34317181e9601f2aadb5224002617226c99e36b677c0fc3de0b42d0d8'
             '2f5d71911c9ee7e7763d3300f335245a531a9e00d23e4d007ce76f4175dd7ecd9d8f0425af86a885797764690db64bfa558b49719f3d9d85a46df89443bcdf7b'
-            'a83df4c9f8b0908be692e72460d85c40ac7c341d5015f25978e81fb1eb22aec4c61974dacbb07425dbcebe763ad452c25017c949bc89748cd88a05a52ed85f38')
+            'a9180ce823ece83ffc8977a0205fe281980f0392c2376c493d5f4c429d7681c659d918dcded184f5f436710eba6183f3ac8a695cf9056bf517322899e9e057f2')
 
 _game="spigot"
 _server_root="/srv/craftbukkit"
diff --git a/spigot.sh b/spigot.sh
index 1a47861384ab..41245a4e7fdb 100755
--- a/spigot.sh
+++ b/spigot.sh
@@ -122,7 +122,10 @@ idle_server_daemon() {
 		if socket_has_session "${SESSION_NAME}"; then
 			# Game server is up and running
 			# Check for active player
-			if SUDO_CMD="" is_player_online; then
+			if [[ -n "$(tmux -L "${SESSION_NAME}" list-clients -t "${SESSION_NAME}":0.0 2> /dev/null)" ]]; then
+				# An administrator is connected to the console, pause player checking
+				echo "An admin is connected to the console. Pause player checking."
+			elif SUDO_CMD="" is_player_online; then
 				# No player was seen on the server through list
 				no_player=$(( no_player + CHECK_PLAYER_TIME ))
 				# Stop the game server if no player was active for at least ${IDLE_IF_TIME}
@@ -417,9 +420,7 @@ server_command() {
 # Enter the tmux game session
 server_console() {
 	if socket_has_session "${SESSION_NAME}"; then
-		${SUDO_CMD} tmux -L "${SESSION_NAME}" wait-for -L "command_lock"
 		${SUDO_CMD} tmux -L "${SESSION_NAME}" attach -t "${SESSION_NAME}":0.0
-		${SUDO_CMD} tmux -L "${SESSION_NAME}" wait-for -U "command_lock"
 	else
 		echo "There is no ${SESSION_NAME} session to connect to."
 	fi