From 692087dd25b85f433c8f5348bca9dcb44d4bcf5b Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 18 Jul 2020 13:49:40 -0500
Subject: [PATCH] Ensured ops.txt and white-list.txt are always provided for
 CURSEFORGE/FTB type (#584)

---
 start-minecraftFinalSetup | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/start-minecraftFinalSetup b/start-minecraftFinalSetup
index 1d20da55..5b8af846 100644
--- a/start-minecraftFinalSetup
+++ b/start-minecraftFinalSetup
@@ -170,13 +170,10 @@ if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
 elif [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
     mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash"
 
-    if [ ! -e "${FTB_DIR}/ops.json" -a -e /data/ops.txt ]; then
-      cp -f /data/ops.txt ${FTB_DIR}/
-    fi
-
-    if [ ! -e "${FTB_DIR}/whitelist.json" -a -e /data/white-list.txt ]; then
-      cp -f /data/white-list.txt ${FTB_DIR}/
-    fi
+    # copy player modification files unconditionally since their
+    # processing into json is additive anyway
+    [ -f /data/ops.txt ] && cp -f /data/ops.txt ${FTB_DIR}/
+    [ -f /data/white-list.txt ] && cp -f /data/white-list.txt ${FTB_DIR}/
 
     if [ ! -e "${FTB_DIR}/server-icon.png" -a -e /data/server-icon.png ]; then
       cp -f /data/server-icon.png ${FTB_DIR}/