From 7f82d3098c840d1a3b63076638beef30dabbc0b9 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sun, 4 Mar 2018 19:01:31 -0600 Subject: [PATCH] [mc] For FTB skip ops and white-list when not configured Fixes #203 --- minecraft-server/start-minecraftFinalSetup | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/minecraft-server/start-minecraftFinalSetup b/minecraft-server/start-minecraftFinalSetup index a353249f..34a3bd6e 100755 --- a/minecraft-server/start-minecraftFinalSetup +++ b/minecraft-server/start-minecraftFinalSetup @@ -77,12 +77,12 @@ echo "Setting initial memory to ${INIT_MEMORY:-${MEMORY}} and max to ${MAX_MEMOR JVM_OPTS="-Xms${INIT_MEMORY:-${MEMORY}} -Xmx${MAX_MEMORY:-${MEMORY}} ${JVM_OPTS}" if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then - if [ ! -e ${FTB_DIR}/ops.json ]; then + 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 ]; then - cp -f ${FTB_DIR}/white-list.txt ${FTB_DIR}/ + if [ ! -e ${FTB_DIR}/whitelist.json -a -e /data/white-list.txt ]; then + cp -f /data/white-list.txt ${FTB_DIR}/ fi if [ ! -e ${FTB_DIR}/eula.txt ]; then