mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 06:24:06 +01:00
53 lines
2.8 KiB
Diff
53 lines
2.8 KiB
Diff
--- a/net/minecraft/server/ItemFishingRod.java
|
|
+++ b/net/minecraft/server/ItemFishingRod.java
|
|
@@ -1,9 +1,13 @@
|
|
package net.minecraft.server;
|
|
|
|
+import org.bukkit.event.player.PlayerFishEvent; // CraftBukkit
|
|
+
|
|
public class ItemFishingRod extends Item {
|
|
|
|
public ItemFishingRod(Item.Info item_info) {
|
|
super(item_info);
|
|
+ // CraftBukkit start - obfuscator went a little crazy
|
|
+ /*
|
|
this.a(new MinecraftKey("cast"), (itemstack, world, entityliving) -> {
|
|
if (entityliving == null) {
|
|
return 0.0F;
|
|
@@ -18,6 +22,8 @@
|
|
return (flag || flag1) && entityliving instanceof EntityHuman && ((EntityHuman) entityliving).hookedFish != null ? 1.0F : 0.0F;
|
|
}
|
|
});
|
|
+ */
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
public InteractionResultWrapper<ItemStack> a(World world, EntityHuman entityhuman, EnumHand enumhand) {
|
|
@@ -30,7 +36,7 @@
|
|
entityhuman.a(enumhand);
|
|
world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_FISHING_BOBBER_RETRIEVE, SoundCategory.NEUTRAL, 1.0F, 0.4F / (ItemFishingRod.k.nextFloat() * 0.4F + 0.8F));
|
|
} else {
|
|
- world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_FISHING_BOBBER_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemFishingRod.k.nextFloat() * 0.4F + 0.8F));
|
|
+ // world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_FISHING_BOBBER_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemFishingRod.k.nextFloat() * 0.4F + 0.8F));
|
|
if (!world.isClientSide) {
|
|
EntityFishingHook entityfishinghook = new EntityFishingHook(world, entityhuman);
|
|
int j = EnchantmentManager.c(itemstack);
|
|
@@ -45,6 +51,17 @@
|
|
entityfishinghook.b(k);
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), null, (org.bukkit.entity.FishHook) entityfishinghook.getBukkitEntity(), PlayerFishEvent.State.FISHING);
|
|
+ world.getServer().getPluginManager().callEvent(playerFishEvent);
|
|
+
|
|
+ if (playerFishEvent.isCancelled()) {
|
|
+ entityhuman.hookedFish = null;
|
|
+ return new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack);
|
|
+ }
|
|
+ world.a((EntityHuman) null, entityhuman.locX, entityhuman.locY, entityhuman.locZ, SoundEffects.ENTITY_FISHING_BOBBER_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemFishingRod.k.nextFloat() * 0.4F + 0.8F));
|
|
+ // CraftBukkit end
|
|
+
|
|
world.addEntity(entityfishinghook);
|
|
}
|
|
|