From 587aaefcc49252bcd5ea7ea2af75be9a280ce07b Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sun, 27 Mar 2016 20:48:50 -0500
Subject: [PATCH] Update upstream B/CB/Spigot and rebuild

---
 Bukkit                                                     | 2 +-
 CraftBukkit                                                | 2 +-
 Spigot                                                     | 2 +-
 ...-methods-for-working-with-arrows-stuck-in-living-.patch | 7 +++----
 ...-methods-for-working-with-arrows-stuck-in-living-.patch | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Bukkit b/Bukkit
index 67b9a6f66b..21df80186f 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 67b9a6f66b74a8df1977067ef2bbf45274da1bdf
+Subproject commit 21df80186f60e6f13ac9191c9f604a76b1b0b9d5
diff --git a/CraftBukkit b/CraftBukkit
index 1ea1adc10f..15222c84b4 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 1ea1adc10f3f068f3d67f472469443fd732d8d2c
+Subproject commit 15222c84b49f572175787202ac82cb8efe640477
diff --git a/Spigot b/Spigot
index 53e65c99d2..2038f4a1ee 160000
--- a/Spigot
+++ b/Spigot
@@ -1 +1 @@
-Subproject commit 53e65c99d236cba48e641458aca98993fd11d7bd
+Subproject commit 2038f4a1ee03c4152ac216589a008bcdd099cd67
diff --git a/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
index b06e5e37e0..1307a1b8a3 100644
--- a/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -9,15 +9,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
-      * @return true if the entity has AI, otherwise false.
+      * @return collision status
       */
-     boolean hasAI();
+     boolean isCollidable();
 +
 +    // Paper start
-+
 +    /**
 +     * Get the number of arrows stuck in this entity
-+     * * @return Number of arrows stuck
++     * @return Number of arrows stuck
 +     */
 +    int getArrowsStuck();
 +
diff --git a/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
index f79ec384b7..b91c35ed50 100644
--- a/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -26,8 +26,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     public boolean hasAI() {
-         return (this.getHandle() instanceof EntityInsentient) ? !((EntityInsentient) this.getHandle()).cR() : false; // PAIL: rename
+     public boolean isCollidable() {
+         return getHandle().collides;
      }
 +
 +    // Paper start