diff options
author | Gordian Edenhofer | 2021-08-28 19:12:54 +0200 |
---|---|---|
committer | Gordian Edenhofer | 2021-08-28 19:12:54 +0200 |
commit | 0bd53f87c9941bc2d1fd209e72f262221dff1ef6 (patch) | |
tree | 47084f275db6b9e5afdbdd3b86874440e0dd0e9d | |
parent | ad447e0980225c70a33a2165c37b572d7e97072d (diff) | |
download | aur-0bd53f87c9941bc2d1fd209e72f262221dff1ef6.tar.gz |
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
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 4 | ||||
-rwxr-xr-x | papermc.sh | 7 |
3 files changed, 8 insertions, 7 deletions
@@ -6,7 +6,7 @@ pkgbase = papermc install = papermc.install arch = any license = custom - depends = java-runtime-headless>=8 + depends = java-runtime-headless>=16 depends = tmux depends = sudo depends = bash @@ -31,7 +31,7 @@ pkgbase = papermc sha512sums = 51c5345155e8640d4f1eaef0c8cfb890ae46063f2d4e7a0fe181ad4c8ff7b96fea88b0f9fc74031d589dfd61602f37b440f183ca1859835930fe69d37508cd42 sha512sums = f29c4044d9e3cc5ab137c21f7e62399b36d7e1f777d5558a39f7b4a01de75bdf2de0b8678e424accc03934ca7db9ebb6a22c78c8c4497759287dd55e1c3eb456 sha512sums = fe268d7380f881229100700b1d4f4897904a630aa65b0b06bba08be5d5918f208d497e01fc5306deecd5d93a78cfdb7e9c7f1c3b910b3a414ce9af186a05224d - sha512sums = bb0633de2da12b0f9e8c9ba29ef61c91785e9e6fb65f7712d60cf99d2045a38321073b78d7a7e1b34078e5627acbe42e8f3ad7164bbf6eef27dbbb3c5d41d748 + sha512sums = 4166db2684f41594128e25f036337f550f87697c7573d5c46e504c1deb994ef88a0f1b47527aa7e7e44d7cf03a1fcaa431d36293a29e9714bca60d5850be4f2d sha512sums = c40cba5dfbf5af5d206cd42fa2b43f2321b481f83ab79c9ce4eaa76f204abab48ff2d8b8526a1a3d82636be97f18596d4343b0efc72a7082642e4af8d1b561c5 sha512sums = 115fe7213d7edd0e3159607a31b28edb6e6b3bd1d454d516973e38c8cf0b803275c2c4e59b29e2260561270d931c71bad134046535e5add309e0a8d055cde0ff sha512sums = 8621db1c6355b4467081ae1860a78a910c1ab3e50c8b1d71a70d701cca46131933c5d8d1352d42e0d79f75bd40e73e4fc825b9fb5be80326ef65c115244aa9df @@ -10,7 +10,7 @@ pkgdesc="Next generation of Minecraft server, compatible with Spigot plugins and arch=('any') url="https://papermc.io/" license=('custom') -depends=('java-runtime-headless>=8' 'tmux' 'sudo' 'bash' 'awk' 'sed') +depends=('java-runtime-headless>=16' 'tmux' 'sudo' 'bash' 'awk' 'sed') optdepends=("tar: needed in order to create world backups" "netcat: required in order to suspend an idle server") conflicts=('papermc-git') @@ -31,7 +31,7 @@ sha512sums=('34366f0d5e116c011e2ff2dba884b3c5dda6444e0fb28115bc5e12ee839551a77ad '51c5345155e8640d4f1eaef0c8cfb890ae46063f2d4e7a0fe181ad4c8ff7b96fea88b0f9fc74031d589dfd61602f37b440f183ca1859835930fe69d37508cd42' 'f29c4044d9e3cc5ab137c21f7e62399b36d7e1f777d5558a39f7b4a01de75bdf2de0b8678e424accc03934ca7db9ebb6a22c78c8c4497759287dd55e1c3eb456' 'fe268d7380f881229100700b1d4f4897904a630aa65b0b06bba08be5d5918f208d497e01fc5306deecd5d93a78cfdb7e9c7f1c3b910b3a414ce9af186a05224d' - 'bb0633de2da12b0f9e8c9ba29ef61c91785e9e6fb65f7712d60cf99d2045a38321073b78d7a7e1b34078e5627acbe42e8f3ad7164bbf6eef27dbbb3c5d41d748' + '4166db2684f41594128e25f036337f550f87697c7573d5c46e504c1deb994ef88a0f1b47527aa7e7e44d7cf03a1fcaa431d36293a29e9714bca60d5850be4f2d' 'c40cba5dfbf5af5d206cd42fa2b43f2321b481f83ab79c9ce4eaa76f204abab48ff2d8b8526a1a3d82636be97f18596d4343b0efc72a7082642e4af8d1b561c5' '115fe7213d7edd0e3159607a31b28edb6e6b3bd1d454d516973e38c8cf0b803275c2c4e59b29e2260561270d931c71bad134046535e5add309e0a8d055cde0ff' '8621db1c6355b4467081ae1860a78a910c1ab3e50c8b1d71a70d701cca46131933c5d8d1352d42e0d79f75bd40e73e4fc825b9fb5be80326ef65c115244aa9df') diff --git a/papermc.sh b/papermc.sh index cfc90446ac2d..4edfeec09aa4 100755 --- a/papermc.sh +++ b/papermc.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 |