Paper/nms-patches/ItemFishingRod.patch

53 lines
2.8 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/ItemFishingRod.java
+++ b/net/minecraft/server/ItemFishingRod.java
2018-07-15 02:00:00 +02:00
@@ -1,9 +1,13 @@
package net.minecraft.server;
+import org.bukkit.event.player.PlayerFishEvent; // CraftBukkit
+
public class ItemFishingRod extends Item {
2018-07-15 02:00:00 +02:00
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 @@
2016-02-29 22:32:46 +01:00
entityhuman.a(enumhand);
2018-07-15 02:00:00 +02:00
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 {
2018-07-15 02:00:00 +02:00
- 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));
2015-02-26 23:41:06 +01:00
if (!world.isClientSide) {
2016-11-17 02:41:03 +01:00
EntityFishingHook entityfishinghook = new EntityFishingHook(world, entityhuman);
2016-12-20 21:00:00 +01:00
int j = EnchantmentManager.c(itemstack);
2018-07-15 02:00:00 +02:00
@@ -45,6 +51,17 @@
entityfishinghook.b(k);
2016-12-20 21:00:00 +01:00
}
+ // CraftBukkit start
2018-07-15 02:00:00 +02:00
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), null, (org.bukkit.entity.FishHook) entityfishinghook.getBukkitEntity(), PlayerFishEvent.State.FISHING);
2016-11-17 02:41:03 +01:00
+ world.getServer().getPluginManager().callEvent(playerFishEvent);
+
+ if (playerFishEvent.isCancelled()) {
+ entityhuman.hookedFish = null;
+ return new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack);
+ }
2018-07-15 02:00:00 +02:00
+ 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));
2016-11-17 02:41:03 +01:00
+ // CraftBukkit end
2016-12-20 21:00:00 +01:00
+
2016-11-17 02:41:03 +01:00
world.addEntity(entityfishinghook);
}
2016-12-20 21:00:00 +01:00