mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 19:15:32 +01:00
31 lines
1.4 KiB
Diff
31 lines
1.4 KiB
Diff
--- 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.j.nextFloat() * 0.4F + 0.8F));
|
|
if (!world.isClientSide) {
|
|
- world.addEntity(new EntityFishingHook(world, entityhuman));
|
|
+ world.addEntity(hook); // CraftBukkit - moved creation up
|
|
}
|
|
|
|
entityhuman.a(enumhand);
|