diff --git a/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
index d09e3d79d..c8dba0b77 100644
--- a/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 5603a3746..fcbfcd6a9 100644
+index 94b1602a4..f95b2c573 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@@ -17,9 +17,9 @@ index 5603a3746..fcbfcd6a9 100644
      public EntityArmorStand(World world) {
          super(world);
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
-     public boolean cS() {
-         return false;
+         return this.yaw;
      }
+     // CraftBukkit end
 +
 +    // Paper start
 +    @Override
diff --git a/Spigot-Server-Patches/Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/Do-not-let-armorstands-drown.patch
index 1822b9e0d..f2745d122 100644
--- a/Spigot-Server-Patches/Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/Do-not-let-armorstands-drown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index fcbfcd6a9..7899324ed 100644
+index f95b2c573..798711d2d 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 9ab758c7b..b8f84f375 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 9ab758c7b608854ec658450227c2a17e51845de5
+Subproject commit b8f84f375b2c82aa9448c4492cf7a8146cb077aa