diff --git a/Bukkit b/Bukkit
index 650ae8fbe3..58b2aab474 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 650ae8fbe37371aaabb503fee614ec7e3193635d
+Subproject commit 58b2aab4746e91a03e5f67b9f8b864ca0d21aaba
diff --git a/CraftBukkit b/CraftBukkit
index 0619f0eb3b..6026dad124 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 0619f0eb3b3d7271c830e4a4be9b8c292037ecd7
+Subproject commit 6026dad12479bef92ca7a51ca2f9009207843e82
diff --git a/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index d3ce56753d..7cef667d6f 100644
--- a/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,18 +1,17 @@
-From 1cb67a39c970d8d631acce5e5b4c0a1ddb295c13 Mon Sep 17 00:00:00 2001
+From ca4d78a633276a1f29f24fda9e851d2b1f8a77df Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 46347b9..56c837b 100644
+index 3582d2f..aacad19 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -366,4 +366,20 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
-      * @return whether the operation was successful
+@@ -381,4 +381,20 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
       */
-     public boolean setLeashHolder(Entity holder);
-+
+     public void setGliding(boolean gliding);
+ 
 +    // Paper start
 +    /**
 +     * Get the number of arrows stuck in this entity
@@ -28,6 +27,7 @@ index 46347b9..56c837b 100644
 +     */
 +    void setArrowsStuck(int arrows);
 +    // Paper end
++
  }
 -- 
 2.7.2