diff --git a/init/msm b/init/msm index ab00d39..55e56b6 100755 --- a/init/msm +++ b/init/msm @@ -3251,7 +3251,7 @@ register_settings() { register_server_setting WORLDS_FLAG_INRAM "inram" register_server_setting RAM "1024" - register_server_setting INVOCATION "java -Xms{RAM}M -Xmx{RAM}M -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalPacing -XX:+AggressiveOpts -jar {JAR} nogui" + register_server_setting INVOCATION "java -Xms{RAM}M -Xmx{RAM}M -jar {JAR} nogui" register_server_setting STOP_DELAY "10" register_server_setting RESTART_DELAY "10" diff --git a/msm.conf b/msm.conf index 3306178..bec9db9 100644 --- a/msm.conf +++ b/msm.conf @@ -162,7 +162,7 @@ DEFAULT_RAM="1024" # # Hard coding values here (not using {MEMORY} and {JAR} tags) will prevent # servers from individually overriding those values. -DEFAULT_INVOCATION="java -Xms{RAM}M -Xmx{RAM}M -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalPacing -XX:+AggressiveOpts -jar {JAR} nogui" +DEFAULT_INVOCATION="java -Xms{RAM}M -Xmx{RAM}M -jar {JAR} nogui" # The default time to delay between warning players the server is stopping and diff --git a/test.sh b/test.sh index 7ef212b..0969a5b 100755 --- a/test.sh +++ b/test.sh @@ -48,7 +48,7 @@ setUp() { echo "DEBUG=\"true\"" >> "$MSM_CONF" echo "DEFAULT_USERNAME=\"${USERNAME}\"" >> "$MSM_CONF" echo "DEFAULT_SCREEN_NAME=\"msmtest-${SERVER_NAME}\"" >> "$MSM_CONF" - echo "DEFAULT_INVOCATION=\"java -Xmx${TEST_RAM}M -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalPacing -XX:+AggressiveOpts -jar {JAR} nogui\"" >> "$MSM_CONF" + echo "DEFAULT_INVOCATION=\"java -Xmx${TEST_RAM}M -jar {JAR} nogui\"" >> "$MSM_CONF" source $TEST_SCRIPT