Mirror
/
docker-minecraft-server
mirror of https://github.com/itzg/docker-minecraft-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Java 8 warning and 5 second delay (#2711)

This commit is contained in:
Geoff Bourne 2024-03-11 18:51:01 -05:00 committed by GitHub
parent e33f87f841
commit 961bc7fdbf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/start-configuration
View File

@ -225,17 +225,14 @@ case "${TYPE^^}" in
;; ;;
CUSTOM) CUSTOM)
evaluateJavaCompatibilityForForge
exec "${SCRIPTS:-/}start-deployCustom" "$@" exec "${SCRIPTS:-/}start-deployCustom" "$@"
;; ;;
MAGMA) MAGMA)
evaluateJavaCompatibilityForForge
exec "${SCRIPTS:-/}start-deployMagma" "$@" exec "${SCRIPTS:-/}start-deployMagma" "$@"
;; ;;
MAGMA_MAINTAINED) MAGMA_MAINTAINED)
evaluateJavaCompatibilityForForge
exec "${SCRIPTS:-/}start-deployMagmaMaintained" "$@" exec "${SCRIPTS:-/}start-deployMagmaMaintained" "$@"
;; ;;
@ -244,12 +241,10 @@ case "${TYPE^^}" in
;; ;;
MOHIST) MOHIST)
evaluateJavaCompatibilityForForge
exec "${SCRIPTS:-/}start-deployMohist" "$@" exec "${SCRIPTS:-/}start-deployMohist" "$@"
;; ;;
CATSERVER) CATSERVER)
evaluateJavaCompatibilityForForge
exec "${SCRIPTS:-/}start-deployCatserver" "$@" exec "${SCRIPTS:-/}start-deployCatserver" "$@"
;; ;;

11
scripts/start-utils
View File

@ -253,17 +253,6 @@ function isType() {
return 1 return 1
} }
function evaluateJavaCompatibilityForForge() {
javaRelease=$(mc-image-helper java-release)
if versionLessThan 1.18 && (( javaRelease > 8 )); then
log "**********************************************************************"
log "WARNING: Some mods and modpacks may require Java 8."
log " Please use itzg/minecraft-server:java8"
log "**********************************************************************"
sleep 5
fi
}
function extract() { function extract() {
src=${1?} src=${1?}
destDir=${2?} destDir=${2?}