diff options
| author | Andre LeBlanc <andre@norcode.com> | 2013-03-13 01:34:01 -0400 |
|---|---|---|
| committer | Kane Y <kanepyork@gmail.com> | 2013-03-20 15:58:37 -0700 |
| commit | 83e0e0770a4053c40a1febf26946e345a49a2898 (patch) | |
| tree | d866a92291c4076e5f5e640f0b1d23197e717b53 /src/main/java/net/minecraft/server/ItemFishingRod.java | |
| parent | ddec7117eedaccd04202326bec23c3837b57f9eb (diff) | |
| download | craftbukkit-83e0e0770a4053c40a1febf26946e345a49a2898.tar craftbukkit-83e0e0770a4053c40a1febf26946e345a49a2898.tar.gz craftbukkit-83e0e0770a4053c40a1febf26946e345a49a2898.tar.lz craftbukkit-83e0e0770a4053c40a1febf26946e345a49a2898.tar.xz craftbukkit-83e0e0770a4053c40a1febf26946e345a49a2898.zip | |
Add Fish (Hook) entity to PlayerFishEvent. Adds BUKKIT-1025
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemFishingRod.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/ItemFishingRod.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/ItemFishingRod.java b/src/main/java/net/minecraft/server/ItemFishingRod.java index eb91ce57..550a3c42 100644 --- a/src/main/java/net/minecraft/server/ItemFishingRod.java +++ b/src/main/java/net/minecraft/server/ItemFishingRod.java @@ -1,6 +1,9 @@ package net.minecraft.server; -import org.bukkit.event.player.PlayerFishEvent; // CraftBukkit +// CraftBukkit start +import org.bukkit.event.player.PlayerFishEvent; +import org.bukkit.entity.Fish; +// CraftBukkit end public class ItemFishingRod extends Item { @@ -19,7 +22,8 @@ public class ItemFishingRod extends Item { entityhuman.bK(); } else { // CraftBukkit start - PlayerFishEvent playerFishEvent = new PlayerFishEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), null, PlayerFishEvent.State.FISHING); + EntityFishingHook hook = new EntityFishingHook(world, entityhuman); + PlayerFishEvent playerFishEvent = new PlayerFishEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), null, (Fish) hook.getBukkitEntity(), PlayerFishEvent.State.FISHING); world.getServer().getPluginManager().callEvent(playerFishEvent); if (playerFishEvent.isCancelled()) { @@ -29,7 +33,7 @@ public class ItemFishingRod extends Item { world.makeSound(entityhuman, "random.bow", 0.5F, 0.4F / (e.nextFloat() * 0.4F + 0.8F)); if (!world.isStatic) { - world.addEntity(new EntityFishingHook(world, entityhuman)); + world.addEntity(hook); // CraftBukkit - moved creation up } entityhuman.bK(); |