diff options
| author | Zach Brown <[email protected]> | 2014-11-27 17:17:45 -0800 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2014-11-28 15:01:21 -0600 |
| commit | de86706b708cb35162282bdbc5e62da075a02d85 (patch) | |
| tree | 3ccf9dae50c94184d4226204f0e6ae4ffd303df5 /applyPatches.sh | |
| parent | 4100c7f70310aaced4226baa19a8097543f822f1 (diff) | |
| download | Paper-de86706b708cb35162282bdbc5e62da075a02d85.tar.gz Paper-de86706b708cb35162282bdbc5e62da075a02d85.zip | |
Update PaperSpigot to Minecraft 1.8
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 df1518c3fc..fa5c3d0e08 100755 --- a/applyPatches.sh +++ b/applyPatches.sh @@ -8,6 +8,8 @@ function applyPatch { what=$1 target=$2 cd "$basedir/$what" + git fetch + git reset --hard origin/patched git branch -f upstream >/dev/null cd "$basedir" @@ -33,6 +35,7 @@ function applyPatch { echo " Patches applied cleanly to $target" fi } + echo echo "Applying SpigotMC patches to CraftBukkit and Bukkit" echo @@ -40,4 +43,4 @@ applyPatch Bukkit Spigot-API && applyPatch CraftBukkit Spigot-Server echo echo "Applying PaperSpigot patches to Spigot-Server and Spigot-API" echo -applyPatch Spigot-API PaperSpigot-API && applyPatch Spigot-Server PaperSpigot-Server
\ No newline at end of file +applyPatch Spigot-API PaperSpigot-API && applyPatch Spigot-Server PaperSpigot-Server |