Skip to content

Commit

Permalink
more
Browse files Browse the repository at this point in the history
  • Loading branch information
uRyanxD committed Mar 4, 2025
1 parent 3f5202b commit 434de56
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions scripts/applyPatches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 434de56

Please sign in to comment.