PaperMC/nms-patches/ItemFishingRod.patch

38 lines
2.1 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- 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() {
2017-05-14 04:00:00 +02:00
@@ -20,7 +22,7 @@
2016-02-29 22:32:46 +01:00
entityhuman.a(enumhand);
2017-05-14 04:00:00 +02:00
world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.J, SoundCategory.NEUTRAL, 1.0F, 0.4F / (ItemFishingRod.j.nextFloat() * 0.4F + 0.8F));
} else {
2017-05-14 04:00:00 +02:00
- world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.L, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemFishingRod.j.nextFloat() * 0.4F + 0.8F));
+ // world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.L, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemFishingRod.j.nextFloat() * 0.4F + 0.8F)); // CraftBukkit - moved down
2015-02-26 23:41:06 +01:00
if (!world.isClientSide) {
2016-11-17 02:41:03 +01:00
EntityFishingHook entityfishinghook = new EntityFishingHook(world, entityhuman);
2016-12-20 21:00:00 +01:00
int j = EnchantmentManager.c(itemstack);
2017-05-14 04:00:00 +02:00
@@ -35,6 +37,17 @@
entityfishinghook.c(k);
2016-12-20 21:00:00 +01:00
}
+ // CraftBukkit start
2016-11-17 02:41:03 +01:00
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), null, (org.bukkit.entity.Fish) entityfishinghook.getBukkitEntity(), PlayerFishEvent.State.FISHING);
+ world.getServer().getPluginManager().callEvent(playerFishEvent);
+
+ if (playerFishEvent.isCancelled()) {
+ entityhuman.hookedFish = null;
+ return new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack);
+ }
2017-05-14 04:00:00 +02:00
+ world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.L, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemFishingRod.j.nextFloat() * 0.4F + 0.8F));
2016-11-17 02:41:03 +01:00
+ // CraftBukkit end
2016-12-20 21:00:00 +01:00
+
2016-11-17 02:41:03 +01:00
world.addEntity(entityfishinghook);
}
2016-12-20 21:00:00 +01:00