diff options
| author | Thinkofdeath <[email protected]> | 2015-01-24 01:00:49 +0000 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2015-01-25 02:02:27 -0600 |
| commit | 65491ca84d18aafa4c1241f526d488897605f1e0 (patch) | |
| tree | 3169d2c6a54662b9634c51383c3025d66c3e9ea6 /applyPatches.sh | |
| parent | 6776612919c9a354326f75d7ae05f02b92303556 (diff) | |
| download | Paper-65491ca84d18aafa4c1241f526d488897605f1e0.tar.gz Paper-65491ca84d18aafa4c1241f526d488897605f1e0.zip | |
Fix applyPatches.sh not correctly pulling bukkit updates
Conflicts:
applyPatches.sh
Diffstat (limited to 'applyPatches.sh')
| -rwxr-xr-x | applyPatches.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/applyPatches.sh b/applyPatches.sh index 51797acf8c..589a0cc9a7 100755 --- a/applyPatches.sh +++ b/applyPatches.sh @@ -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 |