3 files changed, 7 insertions, 1 deletions
diff --git a/games/minecraft-server/files/minecraft-server.in b/games/minecraft-server/files/minecraft-server.in
index 44e8dfab8f5a..907ff1806c7d 100644
--- a/games/minecraft-server/files/minecraft-server.in
+++ b/games/minecraft-server/files/minecraft-server.in
@@ -5,5 +5,6 @@ if [ "$(id -u)" != "0" ]; then
 	exit 1
 fi
 
+export JAVA_VERSION=17
 cd %%PREFIX%%/minecraft-server
-su -m mcserver -c "java $(cat %%PREFIX%%/etc/minecraft-server/java-args.txt) -jar server.jar nogui"
+su -m mcserver -c "%%LOCALBASE%%/bin/java $(cat %%PREFIX%%/etc/minecraft-server/java-args.txt) -jar server.jar nogui"
diff --git a/games/minecraft-server/files/minecraft.in b/games/minecraft-server/files/minecraft.in
index 4745899af7e1..6eeaf0d09cae 100644
--- a/games/minecraft-server/files/minecraft.in
+++ b/games/minecraft-server/files/minecraft.in
@@ -28,6 +28,8 @@ console_cmd="${name}_console"
 status_cmd="${name}_status"
 kill_cmd="${name}_kill"
 
+export JAVA_VERSION=17
+
 is_running()
 {
 	pgrep -qu mcserver java
diff --git a/games/minecraft-server/files/pkg-deinstall.in b/games/minecraft-server/files/pkg-deinstall.in
index 786763611306..12946b6a016a 100644
--- a/games/minecraft-server/files/pkg-deinstall.in
+++ b/games/minecraft-server/files/pkg-deinstall.in
@@ -4,6 +4,9 @@ if [ "$2" != "POST-DEINSTALL" ]; then
     exit 0
 fi
 
+find "%%PREFIX%%/minecraft-server/libraries" -type d -empty -delete
+find "%%PREFIX%%/minecraft-server/versions" -type d -empty -delete
+
 echo
 echo "NOTE: The game world has not been deleted. It is still in"
 echo "/var/db/minecraft-server. If it is no longer required, it will"