From 621bafb4f257da547a0e5837ad4400833fcee345 Mon Sep 17 00:00:00 2001
From: Niklas Gerstner <Krymonota@users.noreply.github.com>
Date: Tue, 31 Dec 2024 15:46:33 +0100
Subject: [PATCH] Download `paper.yml` and `bukkit.yml` (#3217)

---
 scripts/start-deployPaper | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/start-deployPaper b/scripts/start-deployPaper
index cb594f0b..0c889176 100755
--- a/scripts/start-deployPaper
+++ b/scripts/start-deployPaper
@@ -42,10 +42,17 @@ else
   applyResultsFile ${resultsFile}
 fi
 
-# Download default configs to allow for consistent patching
-DOWNLOAD_DEFAULT_CONFIGS=$(buildDownloadList "$PAPER_CONFIG_DEFAULTS_REPO" "$VERSION" paper-global.yml paper-world-defaults.yml)
-export DOWNLOAD_DEFAULT_CONFIGS
-DOWNLOAD_DEFAULTS=$(buildDownloadList "$PAPER_CONFIG_DEFAULTS_REPO" "$VERSION" spigot.yml)
+defaultTopLevelConfigs="bukkit.yml spigot.yml"
+if versionLessThan 1.19; then
+  defaultTopLevelConfigs+=" paper.yml"
+else
+  # Download default configs to allow for consistent patching
+  DOWNLOAD_DEFAULT_CONFIGS=$(buildDownloadList "$PAPER_CONFIG_DEFAULTS_REPO" "$VERSION" paper-global.yml paper-world-defaults.yml)
+  export DOWNLOAD_DEFAULT_CONFIGS
+fi
+
+# Download top-level configs to allow for consistent patching
+DOWNLOAD_DEFAULTS=$(buildDownloadList "$PAPER_CONFIG_DEFAULTS_REPO" "$VERSION" $defaultTopLevelConfigs)
 export DOWNLOAD_DEFAULTS
 
 # Normalize on Spigot for downstream operations