Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Fish (Hook) entity to PlayerFishEvent. Adds BUKKIT-1025

Browse Source
This commit is contained in:
Andre LeBlanc
2013-03-13 01:34:01 -04:00
committed by Kane Y
parent ddec7117ee
commit 83e0e0770a
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minecraft/server/ItemFishingRod.java
View File

@@ -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();