From daf6482472411b6a81a1d76e73afcbbee3678911 Mon Sep 17 00:00:00 2001 From: Jawa_Juice <67296752+Jawa-Juice@users.noreply.github.com> Date: Thu, 8 Apr 2021 21:54:29 -0400 Subject: [PATCH 1/3] Add option for Flare flags --- start-minecraftFinalSetup | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/start-minecraftFinalSetup b/start-minecraftFinalSetup index 13a6a5b00bb..392c5f89ba8 100644 --- a/start-minecraftFinalSetup +++ b/start-minecraftFinalSetup @@ -144,6 +144,13 @@ if isTrue "${USE_LARGE_PAGES}"; then " fi +if isTrue "${USE_FLARE_FLAGS}"; then + JVM_XX_OPTS="${JVM_XX_OPTS} + -XX:+UnlockDiagnosticVMOptions + -XX:+DebugNonSafepoints + " +fi + if isTrue "${DEBUG_MEMORY}"; then log "Memory usage and availability (in MB)" uname -a From 26a20b180b22efa88a8dd11664839f978624a3b4 Mon Sep 17 00:00:00 2001 From: Jawa_Juice <67296752+Jawa-Juice@users.noreply.github.com> Date: Thu, 8 Apr 2021 22:01:11 -0400 Subject: [PATCH 2/3] Add option for Flare flags --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index b3861fed364..723a65a58d8 100644 --- a/README.md +++ b/README.md @@ -327,6 +327,10 @@ An [Airplane](https://github.com/TECHNOVE/Airplane) server, which is a fork of T > **NOTE** only Java 8 and 11 are supported +Extra variables: +- `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded +- `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the [Flare](https://blog.airplane.gg/flare) profiler + ## Running a Purpur server A [Purpur](https://purpur.pl3x.net/) server, which is "a fork of Paper, Tuinity, Airplane with the goal of providing new and interesting configuration options". @@ -338,6 +342,7 @@ A [Purpur](https://purpur.pl3x.net/) server, which is "a fork of Paper, Tuinity, Extra variables: - `PURPUR_BUILD=LATEST` : set a specific Purpur build to use - `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded +- `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the [Flare](https://blog.airplane.gg/flare) profiler ## Running a Yatopia server @@ -350,6 +355,7 @@ A [Yatopia](https://github.com/YatopiaMC/Yatopia) server, which is a "blazing fa Extra variables: - `RELEASE=stable` : set to `stable` or `latest` - `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded +- `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the [Flare](https://blog.airplane.gg/flare) profiler ## Running a Magma server From 49bb58e80f80587540d54262877d0c3265dd33a4 Mon Sep 17 00:00:00 2001 From: Jawa_Juice <67296752+Jawa-Juice@users.noreply.github.com> Date: Fri, 9 Apr 2021 11:45:03 -0400 Subject: [PATCH 3/3] Switch to isTrue logic --- start-deployAirplane | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start-deployAirplane b/start-deployAirplane index 69a4a6fd053..a5664d64f3b 100644 --- a/start-deployAirplane +++ b/start-deployAirplane @@ -19,7 +19,7 @@ fi export SERVER=airplane-${VANILLA_VERSION}-jdk${JAVA_VER}.jar -if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then +if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then downloadUrl="https://dl.airplane.gg/latest/Airplane-JDK${JAVA_VER}/launcher-airplane.jar" log "Downloading Airplane from $downloadUrl ..." curl -fsSL -o "$SERVER" "$downloadUrl"