diff --git a/Bukkit b/Bukkit
index 67851e79b6..67b9a6f66b 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 67851e79b65efb980c2bd44a3560cff39540d370
+Subproject commit 67b9a6f66b74a8df1977067ef2bbf45274da1bdf
diff --git a/CraftBukkit b/CraftBukkit
index 6bf25cde7e..1ea1adc10f 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 6bf25cde7ecbaeb89bdfe18e7971669cec668646
+Subproject commit 1ea1adc10f3f068f3d67f472469443fd732d8d2c
diff --git a/Spigot b/Spigot
index 129f87a2c0..53e65c99d2 160000
--- a/Spigot
+++ b/Spigot
@@ -1 +1 @@
-Subproject commit 129f87a2c0ca73bea240b952d62e98ec59a1dc66
+Subproject commit 53e65c99d236cba48e641458aca98993fd11d7bd
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 ac6be742f7..b06e5e37e0 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,14 +9,15 @@ 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.
       */
-     public void setGliding(boolean gliding);
- 
+     boolean hasAI();
++
 +    // Paper start
++
 +    /**
 +     * Get the number of arrows stuck in this entity
-+     *
-+     * @return Number of arrows stuck
++     * * @return Number of arrows stuck
 +     */
 +    int getArrowsStuck();
 +
@@ -27,6 +28,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    void setArrowsStuck(int arrows);
 +    // Paper end
-+
  }
 --
\ No newline at end of file
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 bfb8f3d77d..f79ec384b7 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 AttributeInstance getAttribute(Attribute attribute) {
-         return getHandle().craftAttributes.getAttribute(attribute);
+     public boolean hasAI() {
+         return (this.getHandle() instanceof EntityInsentient) ? !((EntityInsentient) this.getHandle()).cR() : false; // PAIL: rename
      }
 +
 +    // Paper start