diff --git a/README.md b/README.md index 286aeb6b2e6..21a4532cdce 100644 --- a/README.md +++ b/README.md @@ -425,18 +425,6 @@ If you have attached a host directory to the `/data` volume, then you can instal [You can also auto-download plugins using `SPIGET_RESOURCES`.](#auto-downloading-spigotmcbukkitpapermc-plugins) -### Running an Airplane server - -An [Airplane](https://airplane.gg) server, which is "a stable, optimized, well supported 1.17 Paper fork." - - -e TYPE=AIRPLANE - -> NOTE: The `VERSION` variable is used to select an Airplane type to download. The available options are "LATEST" and "PURPUR", both 1.17.1. Airplane does not support 1.18 -- use Paper/Pufferfish/Purpur. - -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 built-in [Flare](https://blog.airplane.gg/flare) profiler - ### Running a Pufferfish server A [Pufferfish](https://github.com/pufferfish-gg/Pufferfish) server, which is "a highly optimized Paper fork designed for large servers requiring both maximum performance, stability, and "enterprise" features." @@ -452,7 +440,7 @@ Extra variables: ### Running a Purpur server -A [Purpur](https://purpur.pl3x.net/) server, which is "drop-in replacement for Paper servers designed for configurability, new fun and exciting gameplay features, and performance built on top of Airplane." +A [Purpur](https://purpurmc.org/) server, which is "a drop-in replacement for Paper servers designed for configurability and new, fun, exciting gameplay features." -e TYPE=PURPUR @@ -1561,7 +1549,7 @@ To enable the JVM flags required to fully support the [Flare profiling suite](ht -e USE_FLARE_FLAGS=true -Flare is built-in to Airplane/Pufferfish/Purpur, and is available in [plugin form](https://github.com/TECHNOVE/FlarePlugin) for other server types. +Flare is built-in to Pufferfish/Purpur, and is available in [plugin form](https://github.com/TECHNOVE/FlarePlugin) for other server types. ### Enable support for optimized SIMD operations diff --git a/scripts/start-configuration b/scripts/start-configuration index db6f2e62f88..ea6a5137df0 100755 --- a/scripts/start-configuration +++ b/scripts/start-configuration @@ -227,10 +227,6 @@ case "${TYPE^^}" in exec "${SCRIPTS:-/}start-deployPurpur" "$@" ;; - AIRPLANE) - exec "${SCRIPTS:-/}start-deployAirplane" "$@" - ;; - PUFFERFISH) exec "${SCRIPTS:-/}start-deployPufferfish" "$@" ;; diff --git a/scripts/start-deployAirplane b/scripts/start-deployAirplane deleted file mode 100755 index 99366cce9a6..00000000000 --- a/scripts/start-deployAirplane +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -. ${SCRIPTS:-/}start-utils -set -euo pipefail -isDebugging && set -x - -IFS=$'\n\t' - -if [ "${VERSION}" != "LATEST" ] && [ "${VERSION}" != "PURPUR" ] ; then - log "ERROR: Airplane server type only supports VERSION=LATEST, VERSION=PURPUR." - exit 1 -fi - -: ${AIRPLANE_TYPE:=airplane} - -if [ "${VERSION}" = "LATEST" ] ; then - AIRPLANE_TYPE="airplane" -fi - -if [ "${VERSION}" = "PURPUR" ]; then - AIRPLANE_TYPE="airplanepurpur" -fi - -log "Using ${AIRPLANE_TYPE} 1.17.1 (1.18 unsupported - use Paper/Pufferfish/Purpur for newer versions)" - -export SERVER=${AIRPLANE_TYPE}-1.17.1.jar - -log "Removing old Airplane versions ..." -shopt -s nullglob -for f in airplane*.jar; do - [[ $f != $SERVER ]] && rm $f -done - -if [ ! -f "$SERVER" ] || isTrue "${FORCE_REDOWNLOAD:-false}"; then - downloadUrl="https://airplane.gg/dl/launcher-${AIRPLANE_TYPE}1.17.1.jar" - log "Downloading Airplane from $downloadUrl ..." - if ! get -o "$SERVER" "$downloadUrl"; then - log "ERROR: failed to download from $downloadUrl (status=$?)" - exit 3 - fi -fi - -# Normalize on Spigot for later operations -export FAMILY=SPIGOT - -exec "${SCRIPTS:-/}start-spiget" "$@"