mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix applyPatches.sh not correctly pulling bukkit updates

Browse source 
Conflicts:
	applyPatches.sh
This commit is contained in:
Thinkofdeath 2015-01-24 01:00:49 +00:00 committed by Zach Brown
parent 6776612919
commit 65491ca84d
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
applyPatches.sh
View file

@ -40,7 +40,10 @@ function applyPatch {
echo echo
echo "Applying SpigotMC patches to CraftBukkit and Bukkit" echo "Applying SpigotMC patches to CraftBukkit and Bukkit"
echo 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
echo "Applying PaperSpigot patches to Spigot-Server and Spigot-API" echo "Applying PaperSpigot patches to Spigot-Server and Spigot-API"
echo echo