From f2aa0e23035d3faa719747f85271d63affc7d160 Mon Sep 17 00:00:00 2001
From: Niklas Gerstner <12609161+Krymonota@users.noreply.github.com>
Date: Tue, 31 Dec 2024 08:26:31 +0100
Subject: [PATCH 1/2] Download `paper.yml` if version is older than 1.19

Paper introduced the new configs `paper-global.yml` and `paper-world-defaults.yml` in Paper 1.19: https://forums.papermc.io/threads/paper-1-19.344/

So we will download `paper.yml` for versions older than 1.19, and `paper-global.yml` and `paper-world-defaults.yml` for 1.19 and newer.
---
 scripts/start-deployPaper | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/start-deployPaper b/scripts/start-deployPaper
index cb594f0b822..c552e195590 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="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

From 4c08f52db8ac919f9b13a446292b564a492a38fe Mon Sep 17 00:00:00 2001
From: Niklas Gerstner <12609161+Krymonota@users.noreply.github.com>
Date: Tue, 31 Dec 2024 08:26:52 +0100
Subject: [PATCH 2/2] Download `bukkit.yml`

---
 scripts/start-deployPaper | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/start-deployPaper b/scripts/start-deployPaper
index c552e195590..0c8891767b4 100755
--- a/scripts/start-deployPaper
+++ b/scripts/start-deployPaper
@@ -42,7 +42,7 @@ else
   applyResultsFile ${resultsFile}
 fi
 
-defaultTopLevelConfigs="spigot.yml"
+defaultTopLevelConfigs="bukkit.yml spigot.yml"
 if versionLessThan 1.19; then
   defaultTopLevelConfigs+=" paper.yml"
 else