Update to Minecraft 1.8

For more information please see http://www.spigotmc.org/

1 files changed, 31 insertions, 0 deletions

diff --git a/nms-patches/ItemFishingRod.patch b/nms-patches/ItemFishingRod.patch
new file mode 100644
index 00000000..564c24b4
--- /dev/null
+++ b/nms-patches/ItemFishingRod.patch
@@ -0,0 +1,31 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/ItemFishingRod.java	2014-11-27 08:59:46.781421494 +1100
++++ src/main/java/net/minecraft/server/ItemFishingRod.java	2014-11-27 08:42:10.168850880 +1100
+@@ -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();