From fcfb1cd74cdd1aec8078b1745472e7a38e943604 Mon Sep 17 00:00:00 2001 From: jackguy80 <92624059+jackguy80@users.noreply.github.com> Date: Tue, 25 Feb 2025 00:15:46 +1030 Subject: [PATCH] 1863: use SLP for pre-1.7 servers. (#3336) --- files/auto/autopause-fcns.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/files/auto/autopause-fcns.sh b/files/auto/autopause-fcns.sh index fb2103ba..8824d47e 100644 --- a/files/auto/autopause-fcns.sh +++ b/files/auto/autopause-fcns.sh @@ -24,14 +24,20 @@ use_proxy() { fi } +use_server_list_ping() { + if versionLessThan 1.7; then + echo "--use-server-list-ping" + fi +} + mc_server_listening() { - mc-monitor status $(use_proxy) --host "${SERVER_HOST:-localhost}" --port "$SERVER_PORT" --timeout 10s >&/dev/null + mc-monitor status $(use_proxy) --host "${SERVER_HOST:-localhost}" --port "$SERVER_PORT" $(use_server_list_ping) --timeout 10s >&/dev/null } java_clients_connections() { local connections if java_running; then - if ! connections=$(mc-monitor status $(use_proxy) --host "${SERVER_HOST:-localhost}" --port "$SERVER_PORT" --show-player-count); then + if ! connections=$(mc-monitor status $(use_proxy) --host "${SERVER_HOST:-localhost}" --port "$SERVER_PORT" $(use_server_list_ping) --show-player-count); then # consider it a non-zero player count if the ping fails # otherwise a laggy server with players connected could get paused connections=1 @@ -44,4 +50,4 @@ java_clients_connections() { java_clients_connected() { (( $(java_clients_connections) > 0 )) -} \ No newline at end of file +}