From 637562df58846e1565f9a98484a5cd1a7bc3db78 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Fri, 22 Jan 2021 21:23:36 -0800 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: e70a125f #571: Expand the FishHook API CraftBukkit Changes: 0bad58f1 #783: Expand the FishHook API 3636fb51 SPIGOT-6318: Fix smoke effect directions --- ...emove-FishingHook-reference-on-Craft-Entity-removal.patch | 5 ++--- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) 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