twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-02 05:02:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 04dbeb4bf1
commit a0fb646609
1 changed files with 4 additions and 1 deletions
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