diff --git a/Spigot-Server-Patches/Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 777f149c91..af566cd19a 100644
--- a/Spigot-Server-Patches/Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -9,8 +9,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 @@ -0,0 +0,0 @@ public class CraftFishHook extends CraftProjectile implements FishHook {
-         Validate.isTrue(chance >= 0 && chance <= 1, "The bite chance must be between 0 and 1.");
-         this.biteChance = chance;
+     public HookState getState() {
+         return HookState.values()[getHandle().hookState.ordinal()];
      }
 +
 +    // Paper start
@@ -22,5 +22,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +    }
 +    // Paper end
-+
  }
diff --git a/work/Bukkit b/work/Bukkit
index b94b766f22..e70a125f4f 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit b94b766f2285a5b55720a8aa72605e2e64b0330a
+Subproject commit e70a125f4f4fe1c22d8d225dfa606155e7348ac9
diff --git a/work/CraftBukkit b/work/CraftBukkit
index b5eb2f57ce..0bad58f1e2 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit b5eb2f57cedffe7ff3d0fc540fecc7d006729721
+Subproject commit 0bad58f1e28412140342f422bced8d8403837843