From 6266a7e3cc8462cde60e4b0c47c28e9fa72ae514 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 6 Mar 2021 16:04:31 -0600
Subject: [PATCH] Shifted PATH-fix earlier in startup

---
 start-configuration       | 5 +++++
 start-minecraftFinalSetup | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/start-configuration b/start-configuration
index 64c9148a..d40852df 100644
--- a/start-configuration
+++ b/start-configuration
@@ -54,6 +54,11 @@ if [[ $RCON_PASSWORD_FILE ]]; then
     log ""
 fi
 
+if ! which java > /dev/null; then
+  log "Fixing PATH to include java"
+  PATH="${PATH}:/usr/bin"
+fi
+
 export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
 
 case "X$VERSION" in
diff --git a/start-minecraftFinalSetup b/start-minecraftFinalSetup
index 39cd8a42..3d0f7c75 100644
--- a/start-minecraftFinalSetup
+++ b/start-minecraftFinalSetup
@@ -167,11 +167,6 @@ 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