From 65491ca84d18aafa4c1241f526d488897605f1e0 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 24 Jan 2015 01:00:49 +0000
Subject: [PATCH] Fix applyPatches.sh not correctly pulling bukkit updates

Conflicts:
	applyPatches.sh
---
 applyPatches.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/applyPatches.sh b/applyPatches.sh
index 51797acf8..589a0cc9a 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