mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-08-20 06:03:18 +00:00
Fix ARM64 Crash with Meowice flags (#3498)
This commit is contained in:
@@ -396,7 +396,7 @@ be configured by setting `LEVEL_TYPE` to [an expected type listed here](https://
|
|||||||
|
|
||||||
For some of the level types, `GENERATOR_SETTINGS` can be used to further customize the world generation.
|
For some of the level types, `GENERATOR_SETTINGS` can be used to further customize the world generation.
|
||||||
|
|
||||||
To configure the `GENERATOR_SEETINGS` you need to add the appropriate `GeneratorOptions` JSON configuration. In the case of a superflat world, you may omit the `flat_world_options`.
|
To configure the `GENERATOR_SETTINGS` you need to add the appropriate `GeneratorOptions` JSON configuration. In the case of a superflat world, you may omit the `flat_world_options`.
|
||||||
|
|
||||||
The layers are applied from -64 and up and are added in the order of the list
|
The layers are applied from -64 and up and are added in the order of the list
|
||||||
|
|
||||||
|
|||||||
@@ -65,4 +65,4 @@ fi
|
|||||||
export LEVEL
|
export LEVEL
|
||||||
|
|
||||||
export FAMILY=LIMBO
|
export FAMILY=LIMBO
|
||||||
exec ${SCRIPTS:-/}start-setupWorld $@
|
exec ${SCRIPTS:-/}start-setupWorld "$@"
|
||||||
|
|||||||
@@ -16,4 +16,4 @@ fi
|
|||||||
export SERVER
|
export SERVER
|
||||||
export FAMILY=LIMBO
|
export FAMILY=LIMBO
|
||||||
|
|
||||||
exec ${SCRIPTS:-/}start-setupMounts $@
|
exec ${SCRIPTS:-/}start-setupMounts "$@"
|
||||||
|
|||||||
+15
-9
@@ -253,14 +253,8 @@ if isTrue "${USE_MEOWICE_FLAGS}"; then
|
|||||||
-XX:+RewriteBytecodes
|
-XX:+RewriteBytecodes
|
||||||
-XX:+RewriteFrequentPairs
|
-XX:+RewriteFrequentPairs
|
||||||
-XX:+UseFPUForSpilling
|
-XX:+UseFPUForSpilling
|
||||||
-XX:+UseFastStosb
|
|
||||||
-XX:+UseNewLongLShift
|
|
||||||
-XX:+UseVectorCmov
|
-XX:+UseVectorCmov
|
||||||
-XX:+UseXMMForArrayCopy
|
-XX:+UseXMMForArrayCopy
|
||||||
-XX:+UseXmmI2D
|
|
||||||
-XX:+UseXmmI2F
|
|
||||||
-XX:+UseXmmLoadAndClearUpper
|
|
||||||
-XX:+UseXmmRegToRegMoveAll
|
|
||||||
-XX:+EliminateLocks
|
-XX:+EliminateLocks
|
||||||
-XX:+DoEscapeAnalysis
|
-XX:+DoEscapeAnalysis
|
||||||
-XX:+AlignVector
|
-XX:+AlignVector
|
||||||
@@ -269,13 +263,25 @@ if isTrue "${USE_MEOWICE_FLAGS}"; then
|
|||||||
-XX:+UseCharacterCompareIntrinsics
|
-XX:+UseCharacterCompareIntrinsics
|
||||||
-XX:+UseCopySignIntrinsic
|
-XX:+UseCopySignIntrinsic
|
||||||
-XX:+UseVectorStubs
|
-XX:+UseVectorStubs
|
||||||
-XX:UseAVX=2
|
|
||||||
-XX:UseSSE=4
|
|
||||||
"
|
"
|
||||||
|
if [[ $(arch) == "x86_64" ]]; then
|
||||||
|
JVM_XX_OPTS="${JVM_XX_OPTS}
|
||||||
|
-XX:+UseFastStosb
|
||||||
|
-XX:+UseNewLongLShift
|
||||||
|
-XX:+UseXmmI2D
|
||||||
|
-XX:+UseXmmI2F
|
||||||
|
-XX:+UseXmmLoadAndClearUpper
|
||||||
|
-XX:+UseXmmRegToRegMoveAll
|
||||||
|
-XX:UseAVX=2
|
||||||
|
-XX:UseSSE=4
|
||||||
|
"
|
||||||
|
else
|
||||||
|
log "cpu not x86_64, disabling architecture specific flags"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if isTrue "${USE_MEOWICE_GRAALVM_FLAGS}"; then
|
if isTrue "${USE_MEOWICE_GRAALVM_FLAGS}"; then
|
||||||
if [[ $java_major_version -lt 25 ]]; then
|
if [[ $java_major_version -gt 23 ]]; then
|
||||||
log "Java 24 or higher detected, using modified GraalVM flags"
|
log "Java 24 or higher detected, using modified GraalVM flags"
|
||||||
JVM_XX_OPTS="${JVM_XX_OPTS}
|
JVM_XX_OPTS="${JVM_XX_OPTS}
|
||||||
-XX:+UseFastJNIAccessors
|
-XX:+UseFastJNIAccessors
|
||||||
|
|||||||
Reference in New Issue
Block a user