2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/ItemFishingRod.java
|
|
|
|
+++ b/net/minecraft/server/ItemFishingRod.java
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -1,5 +1,7 @@
|
|
|
|
package net.minecraft.server;
|
|
|
|
|
|
|
|
+import org.bukkit.event.player.PlayerFishEvent; // CraftBukkit
|
|
|
|
+
|
|
|
|
public class ItemFishingRod extends Item {
|
|
|
|
|
|
|
|
public ItemFishingRod() {
|
2016-12-20 21:00:00 +01:00
|
|
|
@@ -19,7 +21,6 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
itemstack.damage(i, entityhuman);
|
2016-02-29 22:32:46 +01:00
|
|
|
entityhuman.a(enumhand);
|
2014-11-25 22:32:16 +01:00
|
|
|
} else {
|
2016-11-17 02:41:03 +01:00
|
|
|
- world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.I, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemFishingRod.j.nextFloat() * 0.4F + 0.8F));
|
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);
|
|
|
|
@@ -34,6 +35,17 @@
|
|
|
|
entityfishinghook.b(k);
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // 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);
|
|
|
|
+ }
|
|
|
|
+ world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.I, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemFishingRod.j.nextFloat() * 0.4F + 0.8F));
|
|
|
|
+ // 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
|
|
|
|