Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

Bukkit-Patches/0007-Add-Arrow-API.patch

@@ -1,20 +1,17 @@
-From c076b0297466b1be8c4c9c6a622e7f0e30a4300f Mon Sep 17 00:00:00 2001
+From 3368da5f94185d954c7937a2cf3df8f53adeb118 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:08:24 +1000
 Subject: [PATCH] Add Arrow API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
-index 26d3473..676fe2b 100644
+index e49eef0..e7a32f7 100644
 --- a/src/main/java/org/bukkit/entity/Arrow.java
 +++ b/src/main/java/org/bukkit/entity/Arrow.java
-@@ -3,4 +3,22 @@ package org.bukkit.entity;
- /**
-  * Represents an arrow.
-  */
--public interface Arrow extends Projectile {}
-+public interface Arrow extends Projectile
-+{
+@@ -39,4 +39,20 @@ public interface Arrow extends Projectile {
+      * @param critical whether or not it should be critical
+      */
+     public void setCritical(boolean critical);
 +
 +    public class Spigot extends Entity.Spigot
 +    {
@@ -31,7 +28,7 @@ index 26d3473..676fe2b 100644
 +    }
 +
 +    Spigot spigot();
-+}
+ }
 -- 
-1.8.3.2
+1.8.4.msysgit.0