From dcc45717b9841fd14538c138c1a7409060dc9b07 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 5 Mar 2016 15:46:56 +1100 Subject: [PATCH] SPIGOT-1751: Add missed PlayerFishEvent for FAILED_ATTEMPT --- nms-patches/EntityFishingHook.patch | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nms-patches/EntityFishingHook.patch b/nms-patches/EntityFishingHook.patch index 952bba1da8..855c7e6f83 100644 --- a/nms-patches/EntityFishingHook.patch +++ b/nms-patches/EntityFishingHook.patch @@ -77,7 +77,7 @@ double d0 = this.owner.locX - this.locX; double d1 = this.owner.locY - this.locY; double d2 = this.owner.locZ - this.locZ; -@@ -410,13 +445,25 @@ +@@ -410,15 +445,36 @@ entityitem.motY = d1 * d4 + (double) MathHelper.sqrt(d3) * 0.08D; entityitem.motZ = d2 * d4; this.world.addEntity(entityitem); @@ -103,4 +103,15 @@ + // CraftBukkit end i = 2; } ++ // CraftBukkit start ++ if (i == 0) { ++ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) this.owner.getBukkitEntity(), null, (Fish) this.getBukkitEntity(), PlayerFishEvent.State.FAILED_ATTEMPT); ++ this.world.getServer().getPluginManager().callEvent(playerFishEvent); ++ if (playerFishEvent.isCancelled()) { ++ return 0; ++ } ++ } ++ // CraftBukkit end + this.die(); + this.owner.hookedFish = null;