diff --git a/Spigot-Server-Patches/0112-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0112-Remove-FishingHook-reference-on-Craft-Entity-removal.patch index 37cd3b996..c4df625ce 100644 --- a/Spigot-Server-Patches/0112-Remove-FishingHook-reference-on-Craft-Entity-removal.patch +++ b/Spigot-Server-Patches/0112-Remove-FishingHook-reference-on-Craft-Entity-removal.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Remove FishingHook reference on Craft Entity removal diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java -index bee31ee654b3b38ab88c9cb680deb69decff57ba..2e05fd8f52cd9f7afab5432c70e12bb30c48a027 100644 +index 42b306f1a341672996843a5e3dfa57ef32be48e9..385fa768cda07a61079476a7344d492f890e59e9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java -@@ -82,4 +82,15 @@ 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; +@@ -118,4 +118,14 @@ public class CraftFishHook extends CraftProjectile implements FishHook { + public HookState getState() { + return HookState.values()[getHandle().hookState.ordinal()]; } + + // Paper start @@ -22,5 +22,4 @@ index bee31ee654b3b38ab88c9cb680deb69decff57ba..2e05fd8f52cd9f7afab5432c70e12bb3 + } + } + // Paper end -+ } diff --git a/work/Bukkit b/work/Bukkit index b94b766f2..e70a125f4 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit b94b766f2285a5b55720a8aa72605e2e64b0330a +Subproject commit e70a125f4f4fe1c22d8d225dfa606155e7348ac9 diff --git a/work/CraftBukkit b/work/CraftBukkit index b5eb2f57c..0bad58f1e 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit b5eb2f57cedffe7ff3d0fc540fecc7d006729721 +Subproject commit 0bad58f1e28412140342f422bced8d8403837843