diff --git a/Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch
index b69e0060d4..72fdfe496d 100644
--- a/Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch
@@ -1,14 +1,14 @@
-From 6395e81edac4eea5070533ea467d974a01f2eeae Mon Sep 17 00:00:00 2001
+From 208cc8250ed7e383da5a75b28da1ec254dbc6393 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 6c9c0f2b7..9717c40f4 100644
+index 5e92f0ddb4..3bd5ddba68 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1894,20 +1894,44 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1901,20 +1901,44 @@ public abstract class EntityHuman extends EntityLiving {
  
      }
  
@@ -58,7 +58,7 @@ index 6c9c0f2b7..9717c40f4 100644
      @Override
      public abstract boolean isSpectator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 66cd2db1e..a1397d142 100644
+index 66cd2db1ea..a1397d1427 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -665,6 +665,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -95,5 +95,5 @@ index 66cd2db1e..a1397d142 100644
      public boolean discoverRecipe(NamespacedKey recipe) {
          return discoverRecipes(Arrays.asList(recipe)) != 0;
 -- 
-2.25.0.windows.1
+2.25.0
 
diff --git a/Spigot-Server-Patches/0234-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0234-PlayerReadyArrowEvent.patch
index c2d0f9513b..2b0cc5f21e 100644
--- a/Spigot-Server-Patches/0234-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0234-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From 73b674eb1c10159d3350d650a4e0d34530df1505 Mon Sep 17 00:00:00 2001
+From a357c5059ef997e144535886449cf34ea30c8ae4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:12:53 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
@@ -7,10 +7,10 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 2b7c0a29d..4280dacdc 100644
+index 1d3c7ce488..4721c288ba 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -2150,6 +2150,17 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -2157,6 +2157,17 @@ public abstract class EntityHuman extends EntityLiving {
          return (EntitySize) EntityHuman.b.getOrDefault(entitypose, EntityHuman.bp);
      }
  
@@ -28,7 +28,7 @@ index 2b7c0a29d..4280dacdc 100644
      @Override
      public ItemStack f(ItemStack itemstack) {
          if (!(itemstack.getItem() instanceof ItemProjectileWeapon)) {
-@@ -2166,7 +2177,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -2173,7 +2184,7 @@ public abstract class EntityHuman extends EntityLiving {
                  for (int i = 0; i < this.inventory.getSize(); ++i) {
                      ItemStack itemstack2 = this.inventory.getItem(i);
  
@@ -38,5 +38,5 @@ index 2b7c0a29d..4280dacdc 100644
                      }
                  }
 -- 
-2.25.0.windows.1
+2.25.0
 
diff --git a/Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch
index 4a010d5adc..cbc3776d6d 100644
--- a/Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,14 +1,14 @@
-From 73bfa29e41de09537d20e58dfe80c3644abff261 Mon Sep 17 00:00:00 2001
+From 198291c913a117bd81a0494db8761ec597bccd4f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 1f3513874..d6df01868 100644
+index 36748ccb73..308ac18f7e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -2116,14 +2116,17 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -2123,14 +2123,17 @@ public abstract class EntityHuman extends EntityLiving {
          this.datawatcher.set(EntityHuman.bt, nbttagcompound);
      }
  
@@ -27,7 +27,7 @@ index 1f3513874..d6df01868 100644
          this.aB = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c1f392716..352ef3669 100644
+index c1f3927164..352ef3669d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1937,6 +1937,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -52,5 +52,5 @@ index c1f392716..352ef3669 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.25.0.windows.1
+2.25.0
 
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 596b0b2d07..e911c70f85 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 596b0b2d0742570834818056842d43d0b957b354
+Subproject commit e911c70f855e7785f79ffb8b428a12d0e8c31fec