summaryrefslogtreecommitdiffstats
path: root/nms-patches/ItemFishingRod.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/ItemFishingRod.patch')
-rw-r--r--nms-patches/ItemFishingRod.patch13
1 files changed, 6 insertions, 7 deletions
diff --git a/nms-patches/ItemFishingRod.patch b/nms-patches/ItemFishingRod.patch
index a1e4b44c..fca43b25 100644
--- a/nms-patches/ItemFishingRod.patch
+++ b/nms-patches/ItemFishingRod.patch
@@ -1,5 +1,5 @@
---- ../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
+--- /home/matt/mc-dev-private//net/minecraft/server/ItemFishingRod.java 2015-02-26 22:40:22.819608137 +0000
++++ src/main/java/net/minecraft/server/ItemFishingRod.java 2015-02-26 22:40:22.819608137 +0000
@@ -1,5 +1,7 @@
package net.minecraft.server;
@@ -10,9 +10,8 @@
public ItemFishingRod() {
@@ -15,9 +17,18 @@
itemstack.damage(i, entityhuman);
- entityhuman.bv();
+ entityhuman.bw();
} 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);
@@ -22,10 +21,10 @@
+ return itemstack;
+ }
+ // CraftBukkit end
-+ world.makeSound(entityhuman, "random.bow", 0.5F, 0.4F / (g.nextFloat() * 0.4F + 0.8F));
- if (!world.isStatic) {
+ world.makeSound(entityhuman, "random.bow", 0.5F, 0.4F / (ItemFishingRod.g.nextFloat() * 0.4F + 0.8F));
+ if (!world.isClientSide) {
- world.addEntity(new EntityFishingHook(world, entityhuman));
+ world.addEntity(hook); // CraftBukkit - moved creation up
}
- entityhuman.bv();
+ entityhuman.bw();