mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-17 10:41:41 +01:00
Fix applyPatches.sh not correctly pulling bukkit updates
Conflicts: applyPatches.sh
This commit is contained in:
parent
04dbeb4bf1
commit
a0fb646609
1 changed files with 4 additions and 1 deletions
|
@ -40,7 +40,10 @@ function applyPatch {
|
|||
echo
|
||||
echo "Applying SpigotMC patches to CraftBukkit and Bukkit"
|
||||
echo
|
||||
applyPatch Bukkit Spigot-API origin/master && applyPatch CraftBukkit Spigot-Server origin/patched
|
||||
cd ../Bukkit
|
||||
hash=$(git rev-parse HEAD)
|
||||
git branch -f spigot "$hash"
|
||||
applyPatch Bukkit Spigot-API origin/spigot && applyPatch CraftBukkit Spigot-Server origin/patched
|
||||
echo
|
||||
echo "Applying PaperSpigot patches to Spigot-Server and Spigot-API"
|
||||
echo
|
||||
|
|
Loading…
Add table
Reference in a new issue