From 46270f6bd5dfe08582c5b91a1364119f083b49c0 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sun, 13 Jan 2019 22:22:27 -0600
Subject: [PATCH] mc: ensure JVM_DD_OPTS works for FTB also For #281

---
 minecraft-server/start-minecraftFinalSetup | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/minecraft-server/start-minecraftFinalSetup b/minecraft-server/start-minecraftFinalSetup
index f0466650..e49f0189 100755
--- a/minecraft-server/start-minecraftFinalSetup
+++ b/minecraft-server/start-minecraftFinalSetup
@@ -74,6 +74,14 @@ fi
 # put these prior JVM_OPTS at the end to give any memory settings there higher precedence
 echo "Setting initial memory to ${INIT_MEMORY:=${MEMORY}} and max to ${MAX_MEMORY:=${MEMORY}}"
 
+expandedDOpts=
+if [ -n "$JVM_DD_OPTS" ]; then
+      for dopt in $JVM_DD_OPTS
+      do
+          expandedDOpts="${expandedDOpts} -D${dopt/:/=}"
+      done
+fi
+
 if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
     if [ ! -e ${FTB_DIR}/ops.json -a -e /data/ops.txt ]; then
       cp -f /data/ops.txt ${FTB_DIR}/
@@ -88,7 +96,7 @@ if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
     cat > ${FTB_DIR}/settings-local.sh <<EOF
 export MIN_RAM="${INIT_MEMORY}"
 export MAX_RAM="${MAX_MEMORY}"
-export JAVA_PARAMETERS="-Xms${INIT_MEMORY}"
+export JAVA_PARAMETERS="-Xms${INIT_MEMORY} $expandedDOpts"
 EOF
 
     cd ${FTB_DIR}
@@ -100,13 +108,6 @@ else
     bootstrapArgs="--bootstrap /data/bootstrap.txt"
   fi
   
-  if [ -n "$JVM_DD_OPTS" ]; then
-        for dopt in $JVM_DD_OPTS
-        do
-            JVM_OPTS="${JVM_OPTS} -D${dopt/:/=}"
-        done
-  fi
-
   JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
-  exec mc-server-runner ${bootstrapArgs} java $JVM_XX_OPTS $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS
+  exec mc-server-runner ${bootstrapArgs} java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $SERVER "$@" $EXTRA_ARGS
 fi