mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-07-05 08:14:19 +00:00
For legacy CURSEFORGE, write ops/whitelist files in final directory (#2654)
This commit is contained in:
@@ -203,11 +203,6 @@ if [[ ${INIT_MEMORY} || ${MAX_MEMORY} ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
function copyFilesForCurseForge() {
|
function copyFilesForCurseForge() {
|
||||||
# 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" ] && [ -e /data/server-icon.png ]; then
|
if [ ! -e "${FTB_DIR}/server-icon.png" ] && [ -e /data/server-icon.png ]; then
|
||||||
cp -f /data/server-icon.png "${FTB_DIR}/"
|
cp -f /data/server-icon.png "${FTB_DIR}/"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -22,6 +22,11 @@ elif [[ -v OVERRIDE_WHITELIST ]] && isTrue "${OVERRIDE_WHITELIST}"; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
sharedArgs=(--version="$VERSION")
|
sharedArgs=(--version="$VERSION")
|
||||||
|
if [[ ${FTB_DIR:-} ]]; then
|
||||||
|
sharedArgs+=(--output-directory="$FTB_DIR")
|
||||||
|
else
|
||||||
|
sharedArgs+=(--output-directory=/data)
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -v OPS_FILE ]]; then
|
if [[ -v OPS_FILE ]]; then
|
||||||
existing="$EXISTING_OPS_FILE"
|
existing="$EXISTING_OPS_FILE"
|
||||||
|
|||||||
Reference in New Issue
Block a user