Fix PATH to include java when needed

CONFLICT (content): Merge conflict in Dockerfile

Dockerfile

@@ -1,10 +1,11 @@
-FROM adoptopenjdk:latest
+FROM ubuntu:18.04
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
 RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive \
   apt-get install -y \
+    openjdk-8-jre-headless \
     imagemagick \
     gosu \
     sudo \

start-configuration

@@ -94,10 +94,6 @@ case "${TYPE^^}" in
   ;;
 
   FORGE)
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
-    log "         since some mods require Java 8"
-    log "**********************************************************************"
     exec ${SCRIPTS:-/}start-deployForge "$@"
   ;;
 
@@ -109,11 +105,7 @@ case "${TYPE^^}" in
     exec ${SCRIPTS:-/}start-deployFTBA "$@"
   ;;
 
-  FTB|CURSEFORGE)
+  CURSEFORGE|FTB)
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
-    log "         since some mods require Java 8"
-    log "**********************************************************************"
     exec ${SCRIPTS:-/}start-deployCF "$@"
   ;;
 

start-minecraftFinalSetup

@@ -168,6 +168,11 @@ function copyFilesForCurseForge() {
   cp -f /data/eula.txt "${FTB_DIR}/"
 }
 
+if ! which java > /dev/null; then
+  log "Fixing PATH to include java"
+  PATH="${PATH}:/usr/bin"
+fi
+
 mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s"
 if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
     if isTrue ${DEBUG_EXEC}; then