diff --git a/patches/api/Adds-PlayerArmSwingEvent.patch b/patches/api/Adds-PlayerArmSwingEvent.patch
index abbd1ae530..996d15175a 100644
--- a/patches/api/Adds-PlayerArmSwingEvent.patch
+++ b/patches/api/Adds-PlayerArmSwingEvent.patch
@@ -23,7 +23,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    private final EquipmentSlot equipmentSlot;
 +
 +    public PlayerArmSwingEvent(@NotNull Player player, @NotNull EquipmentSlot equipmentSlot) {
-+        super(player, PlayerAnimationType.ARM_SWING);
++        super(player, equipmentSlot == EquipmentSlot.HAND ? PlayerAnimationType.ARM_SWING : PlayerAnimationType.OFF_ARM_SWING);
 +        this.equipmentSlot = equipmentSlot;
 +    }
 +
@@ -49,17 +49,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
   */
  public class PlayerAnimationEvent extends PlayerEvent implements Cancellable {
      private static final HandlerList handlers = new HandlerList();
-@@ -0,0 +0,0 @@ public class PlayerAnimationEvent extends PlayerEvent implements Cancellable {
-         animationType = playerAnimationType;
-     }
- 
-+    // Paper start - readd old constructor
-+    @Deprecated
-+    public PlayerAnimationEvent(@NotNull final Player player) {
-+        this(player, PlayerAnimationType.ARM_SWING);
-+    }
-+    // Paper end
-+
-     /**
-      * Get the type of this animation event
-      *
diff --git a/work/Bukkit b/work/Bukkit
index 45d9c73c34..c1d911a2b4 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 45d9c73c34736f64e2bbdf4227081be5d41dc093
+Subproject commit c1d911a2b4f2aaf85aa6cf9030230fe5940d49da
diff --git a/work/CraftBukkit b/work/CraftBukkit
index cc7edd6bc5..effea36a28 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit cc7edd6bc52f405818c8b995e576cfdcb537d88b
+Subproject commit effea36a28a3a0796a6ac0cc35609573c404e73c