Skip to content

Commit a527f12

Browse files
committed
a
1 parent 6cb5415 commit a527f12

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

scripts/applyPatches.sh

+11-9
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,15 @@ elif [ ! -d "base/Paper/PaperSpigot-Server" ]; then
110110
exit 1
111111
fi
112112

113-
# Apply PandaSpigot
114-
(
115-
applyPatch "base/Paper/PaperSpigot-API" PandaSpigot-API HEAD patches/api &&
116-
applyPatch "base/Paper/PaperSpigot-Server" PandaSpigot-Server HEAD patches/server
117-
cd "$basedir"
118-
) || (
119-
echo "Failed to apply PandaSpigot Patches"
120-
exit 1
121-
) || exit 1
113+
if [ "$2" != "--setup" ]; then
114+
# Apply PandaSpigot
115+
(
116+
applyPatch "base/Paper/PaperSpigot-API" PandaSpigot-API HEAD patches/api &&
117+
applyPatch "base/Paper/PaperSpigot-Server" PandaSpigot-Server HEAD patches/server
118+
cd "$basedir"
119+
) || (
120+
echo "Failed to apply PandaSpigot Patches"
121+
exit 1
122+
) || exit 1
123+
fi
122124
) || exit 1

scripts/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ if [ "$2" == "--setup" ] || [ "$2" == "--jar" ]; then
1313
./scripts/decompile.sh "$basedir"
1414
./scripts/init.sh "$basedir"
1515
fi
16+
./scripts/applyPatches.sh "$basedir" "$2"
1617

1718
if [ "$2" == "--jar" ]; then
18-
./scripts/applyPatches.sh "$basedir" "$2"
1919
./gradlew build && ./scripts/paperclip.sh "$basedir"
2020
fi
2121
) || exit 1

0 commit comments

Comments
 (0)