From 861faaa2857f5052ff46375dc0e30ea109c43460 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sun, 7 Feb 2021 17:52:42 -0600
Subject: [PATCH] Trimmed back some ENV defaults from Dockerfile

---
 Dockerfile                       | 6 +++---
 start-deployForge                | 2 +-
 start-deploySpongeVanilla        | 2 ++
 start-finalSetupServerProperties | 2 +-
 start-finalSetupWorld            | 3 +++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9cf2b045..c6d9c63c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -71,9 +71,9 @@ WORKDIR /data
 
 ENV UID=1000 GID=1000 \
   JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
-  TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= FABRICVERSION=LATEST LEVEL=world \
-  PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
-  LEVEL_TYPE=DEFAULT SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
+  TYPE=VANILLA VERSION=LATEST \
+  ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
+  SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
   ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
   AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
 
diff --git a/start-deployForge b/start-deployForge
index e58d885c..f6b273eb 100644
--- a/start-deployForge
+++ b/start-deployForge
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 . ${SCRIPTS:-/}start-utils
-
 export TYPE=FORGE
+: ${FORGEVERSION:=RECOMMENDED}
 
 if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
   norm=$VANILLA_VERSION
diff --git a/start-deploySpongeVanilla b/start-deploySpongeVanilla
index 199107cb..8c80b4d3 100644
--- a/start-deploySpongeVanilla
+++ b/start-deploySpongeVanilla
@@ -3,6 +3,8 @@
 . ${SCRIPTS:-/}start-utils
 
 export TYPE=spongevanilla
+: ${SPONGEBRANCH:=STABLE}
+: ${SPONGEVERSION:=}
 
 # Parse branch
 log "Choosing branch for Sponge"
diff --git a/start-finalSetupServerProperties b/start-finalSetupServerProperties
index d058cf95..08f19bef 100644
--- a/start-finalSetupServerProperties
+++ b/start-finalSetupServerProperties
@@ -69,7 +69,7 @@ function customizeServerProps {
   setServerProp "max-world-size" "$MAX_WORLD_SIZE"
   setServerProp "level-name" "$LEVEL"
   setServerProp "level-seed" "$SEED"
-  setServerProp "pvp" "$PVP"
+  setServerProp "pvp" "${PVP}"
   setServerProp "generator-settings" "$GENERATOR_SETTINGS"
   setServerProp "online-mode" "$ONLINE_MODE"
   setServerProp "allow-flight" "$ALLOW_FLIGHT"
diff --git a/start-finalSetupWorld b/start-finalSetupWorld
index 5d1bd79c..96537246 100644
--- a/start-finalSetupWorld
+++ b/start-finalSetupWorld
@@ -4,6 +4,9 @@
 set -e
 isDebugging && set -x
 
+: ${LEVEL:=world}
+export LEVEL
+
 if [ $TYPE = "FEED-THE-BEAST" ]; then
   worldDest=$FTB_DIR/$LEVEL
 else