From 434de56129f11eae58c8c861f2962ac6be067030 Mon Sep 17 00:00:00 2001 From: uRyanxD Date: Tue, 4 Mar 2025 17:15:31 -0300 Subject: [PATCH] more --- scripts/applyPatches.sh | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/scripts/applyPatches.sh b/scripts/applyPatches.sh index 1718c4e1..6288c53d 100755 --- a/scripts/applyPatches.sh +++ b/scripts/applyPatches.sh @@ -105,20 +105,22 @@ if [ "$2" == "--setup" ] || [ "$2" == "--jar" ]; then echo "Importing MC Dev" ./scripts/importmcdev.sh "$basedir" || exit 1 -elif [ ! -d "base/Paper/PaperSpigot-Server" ]; then - echo "Upstream directory does not exist. Did you forget to run 'panda setup'?" - exit 1 fi if [ "$2" != "--setup" ]; then - # Apply PandaSpigot - ( - applyPatch "base/Paper/PaperSpigot-API" PandaSpigot-API HEAD patches/api && - applyPatch "base/Paper/PaperSpigot-Server" PandaSpigot-Server HEAD patches/server - cd "$basedir" - ) || ( - echo "Failed to apply PandaSpigot Patches" + if [ ! -d "base/Paper/PaperSpigot-Server" ]; then + echo "Upstream directory does not exist. Did you forget to run 'panda setup'?" exit 1 - ) || exit 1 + else + # Apply PandaSpigot + ( + applyPatch "base/Paper/PaperSpigot-API" PandaSpigot-API HEAD patches/api && + applyPatch "base/Paper/PaperSpigot-Server" PandaSpigot-Server HEAD patches/server + cd "$basedir" + ) || ( + echo "Failed to apply PandaSpigot Patches" + exit 1 + ) || exit 1 + fi fi ) || exit 1