Paper/nms-patches/ItemFishingRod.patch

37 lines
2.4 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
2020-06-25 02:00:00 +02:00
@@ -1,5 +1,7 @@
package net.minecraft.server;
+import org.bukkit.event.player.PlayerFishEvent; // CraftBukkit
+
2020-06-25 02:00:00 +02:00
public class ItemFishingRod extends Item implements ItemVanishable {
2018-07-15 02:00:00 +02:00
public ItemFishingRod(Item.Info item_info) {
2020-06-25 02:00:00 +02:00
@@ -21,12 +23,23 @@
2019-12-10 23:00:00 +01:00
2020-06-25 02:00:00 +02:00
world.playSound((EntityHuman) null, entityhuman.locX(), entityhuman.locY(), entityhuman.locZ(), SoundEffects.ENTITY_FISHING_BOBBER_RETRIEVE, SoundCategory.NEUTRAL, 1.0F, 0.4F / (ItemFishingRod.RANDOM.nextFloat() * 0.4F + 0.8F));
} else {
2020-06-25 02:00:00 +02:00
- world.playSound((EntityHuman) null, entityhuman.locX(), entityhuman.locY(), entityhuman.locZ(), SoundEffects.ENTITY_FISHING_BOBBER_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemFishingRod.RANDOM.nextFloat() * 0.4F + 0.8F));
+ // world.playSound((EntityHuman) null, entityhuman.locX(), entityhuman.locY(), entityhuman.locZ(), SoundEffects.ENTITY_FISHING_BOBBER_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemFishingRod.RANDOM.nextFloat() * 0.4F + 0.8F));
2015-02-26 23:41:06 +01:00
if (!world.isClientSide) {
2019-04-23 04:00:00 +02:00
i = EnchantmentManager.c(itemstack);
int j = EnchantmentManager.b(itemstack);
2016-12-20 21:00:00 +01:00
2019-04-23 04:00:00 +02:00
- world.addEntity(new EntityFishingHook(entityhuman, world, j, i));
2016-12-20 21:00:00 +01:00
+ // CraftBukkit start
2019-04-23 04:00:00 +02:00
+ EntityFishingHook entityfishinghook = new EntityFishingHook(entityhuman, world, j, i);
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);
+ }
2020-06-25 02:00:00 +02:00
+ world.playSound((EntityHuman) null, entityhuman.locX(), entityhuman.locY(), entityhuman.locZ(), SoundEffects.ENTITY_FISHING_BOBBER_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (ItemFishingRod.RANDOM.nextFloat() * 0.4F + 0.8F));
2019-04-23 04:00:00 +02:00
+ world.addEntity(entityfishinghook);
2016-11-17 02:41:03 +01:00
+ // CraftBukkit end
}
2016-12-20 21:00:00 +01:00
2019-12-10 23:00:00 +01:00
entityhuman.b(StatisticList.ITEM_USED.b(this));