2014-11-29 00:02:15 +01:00
|
|
|
--- ../work/decompile-8eb82bde//net/minecraft/server/ItemFishingRod.java 2014-11-28 17:43:43.229707432 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/ItemFishingRod.java 2014-11-28 17:38:22.000000000 +0000
|
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() {
|
|
|
|
|
@@ -15,9 +17,18 @@
|
|
|
|
|
itemstack.damage(i, entityhuman);
|
|
|
|
|
entityhuman.bv();
|
|
|
|
|
} else {
|
|
|
|
|
- world.makeSound(entityhuman, "random.bow", 0.5F, 0.4F / (ItemFishingRod.g.nextFloat() * 0.4F + 0.8F));
|
|
|
|
|
+ // 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 itemstack;
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
+ world.makeSound(entityhuman, "random.bow", 0.5F, 0.4F / (g.nextFloat() * 0.4F + 0.8F));
|
|
|
|
|
if (!world.isStatic) {
|
|
|
|
|
- world.addEntity(new EntityFishingHook(world, entityhuman));
|
|
|
|
|
+ world.addEntity(hook); // CraftBukkit - moved creation up
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
entityhuman.bv();
|
