Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0029-Implement-Arrow-API.patch

@@ -1,14 +1,14 @@
-From c2c024a52073c2ad367c4a5428604c88432a4404 Mon Sep 17 00:00:00 2001
+From a20bd8901bb291e21f5dbb4f64b3f34267c00baa Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:16:05 +1000
 Subject: [PATCH] Implement Arrow API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-index a386001..236384f 100644
+index 328c73f..839b88e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-@@ -44,6 +44,17 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
+@@ -75,6 +75,17 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
      // Spigot start
      private final Arrow.Spigot spigot = new Arrow.Spigot()
      {
@@ -27,5 +27,5 @@ index a386001..236384f 100644
  
      public Arrow.Spigot spigot()
 -- 
-1.8.3.2
+1.8.4.msysgit.0