summaryrefslogtreecommitdiffstats
path: root/nms-patches/ItemFishingRod.patch
blob: 069214084449f86e931fb74f526d9b664312d325 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
--- a/net/minecraft/server/ItemFishingRod.java
+++ b/net/minecraft/server/ItemFishingRod.java
@@ -1,5 +1,7 @@
 package net.minecraft.server;
 
+import org.bukkit.event.player.PlayerFishEvent; // CraftBukkit
+
 public class ItemFishingRod extends Item {
 
     public ItemFishingRod() {
@@ -17,9 +19,18 @@
             itemstack.damage(i, entityhuman);
             entityhuman.a(enumhand);
         } else {
+            // CraftBukkit start
+            EntityFishingHook hook = new EntityFishingHook(world, entityhuman);
+            PlayerFishEvent playerFishEvent = new PlayerFishEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), null, (org.bukkit.entity.Fish) hook.getBukkitEntity(), PlayerFishEvent.State.FISHING);
+            world.getServer().getPluginManager().callEvent(playerFishEvent);
+
+            if (playerFishEvent.isCancelled()) {
+                return new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack);
+            }
+            // CraftBukkit end
             world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.H, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemFishingRod.i.nextFloat() * 0.4F + 0.8F));
             if (!world.isClientSide) {
-                world.addEntity(new EntityFishingHook(world, entityhuman));
+                world.addEntity(hook); // CraftBukkit - moved creation up
             }
 
             entityhuman.a(enumhand);