Skip to content

Commit 961bc7f

Browse files
authored
Remove Java 8 warning and 5 second delay (#2711)
1 parent e33f87f commit 961bc7f

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

scripts/start-configuration

-5
Original file line numberDiff line numberDiff line change
@@ -225,17 +225,14 @@ case "${TYPE^^}" in
225225
;;
226226

227227
CUSTOM)
228-
evaluateJavaCompatibilityForForge
229228
exec "${SCRIPTS:-/}start-deployCustom" "$@"
230229
;;
231230

232231
MAGMA)
233-
evaluateJavaCompatibilityForForge
234232
exec "${SCRIPTS:-/}start-deployMagma" "$@"
235233
;;
236234

237235
MAGMA_MAINTAINED)
238-
evaluateJavaCompatibilityForForge
239236
exec "${SCRIPTS:-/}start-deployMagmaMaintained" "$@"
240237
;;
241238

@@ -244,12 +241,10 @@ case "${TYPE^^}" in
244241
;;
245242

246243
MOHIST)
247-
evaluateJavaCompatibilityForForge
248244
exec "${SCRIPTS:-/}start-deployMohist" "$@"
249245
;;
250246

251247
CATSERVER)
252-
evaluateJavaCompatibilityForForge
253248
exec "${SCRIPTS:-/}start-deployCatserver" "$@"
254249
;;
255250

scripts/start-utils

-11
Original file line numberDiff line numberDiff line change
@@ -253,17 +253,6 @@ function isType() {
253253
return 1
254254
}
255255

256-
function evaluateJavaCompatibilityForForge() {
257-
javaRelease=$(mc-image-helper java-release)
258-
if versionLessThan 1.18 && (( javaRelease > 8 )); then
259-
log "**********************************************************************"
260-
log "WARNING: Some mods and modpacks may require Java 8."
261-
log " Please use itzg/minecraft-server:java8"
262-
log "**********************************************************************"
263-
sleep 5
264-
fi
265-
}
266-
267256
function extract() {
268257
src=${1?}
269258
destDir=${2?}

0 commit comments

Comments
 (0)