Paper/nms-patches/EntityFishingHook.patch

118 lines
6.2 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityFishingHook.java
+++ b/net/minecraft/server/EntityFishingHook.java
2019-04-23 04:00:00 +02:00
@@ -4,6 +4,11 @@
2016-02-29 22:32:46 +01:00
import java.util.Iterator;
import java.util.List;
2019-04-23 04:00:00 +02:00
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.entity.Player;
2018-07-15 02:00:00 +02:00
+import org.bukkit.entity.FishHook;
+import org.bukkit.event.player.PlayerFishEvent;
+// CraftBukkit end
2016-11-17 02:41:03 +01:00
public class EntityFishingHook extends Entity {
2019-12-10 23:00:00 +01:00
@@ -204,6 +209,7 @@
2019-04-23 04:00:00 +02:00
}, RayTrace.BlockCollisionOption.COLLIDER, true);
2019-04-23 04:00:00 +02:00
if (movingobjectposition.getType() != MovingObjectPosition.EnumMovingObjectType.MISS) {
2020-02-02 01:18:17 +01:00
+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); // CraftBukkit - Call event
2019-04-23 04:00:00 +02:00
if (movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.ENTITY) {
this.hooked = ((MovingObjectPositionEntity) movingobjectposition).getEntity();
this.n();
2019-12-10 23:00:00 +01:00
@@ -236,6 +242,10 @@
if (this.ao <= 0) {
this.ap = 0;
this.aq = 0;
2016-11-17 02:41:03 +01:00
+ // CraftBukkit start
2018-07-15 02:00:00 +02:00
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) this.owner.getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.FAILED_ATTEMPT);
2016-11-17 02:41:03 +01:00
+ this.world.getServer().getPluginManager().callEvent(playerFishEvent);
+ // CraftBukkit end
} else {
2019-04-23 04:00:00 +02:00
this.setMot(this.getMot().add(0.0D, -0.2D * (double) this.random.nextFloat() * (double) this.random.nextFloat(), 0.0D));
2016-11-17 02:41:03 +01:00
}
2019-12-10 23:00:00 +01:00
@@ -271,6 +281,13 @@
2019-04-23 04:00:00 +02:00
worldserver.a(Particles.FISHING, d0, d1, d2, 0, (double) (-f4), 0.01D, (double) f3, 1.0D);
2016-11-17 02:41:03 +01:00
}
} else {
+ // CraftBukkit start
2018-07-15 02:00:00 +02:00
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) this.owner.getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.BITE);
2016-11-17 02:41:03 +01:00
+ this.world.getServer().getPluginManager().callEvent(playerFishEvent);
+ if (playerFishEvent.isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
Vec3D vec3d = this.getMot();
this.setMot(vec3d.x, (double) (-0.4F * MathHelper.a(this.random, 0.6F, 1.0F)), vec3d.z);
2019-12-10 23:00:00 +01:00
@@ -327,6 +344,14 @@
int i = 0;
if (this.hooked != null) {
+ // CraftBukkit start
2018-07-15 02:00:00 +02:00
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) this.owner.getBukkitEntity(), this.hooked.getBukkitEntity(), (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.CAUGHT_ENTITY);
+ this.world.getServer().getPluginManager().callEvent(playerFishEvent);
+
+ if (playerFishEvent.isCancelled()) {
+ return 0;
+ }
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
this.reel();
2018-07-15 02:00:00 +02:00
CriterionTriggers.D.a((EntityPlayer) this.owner, itemstack, this, Collections.emptyList());
this.world.broadcastEntityEffect(this, (byte) 31);
2019-12-10 23:00:00 +01:00
@@ -342,6 +367,15 @@
2016-02-29 22:32:46 +01:00
while (iterator.hasNext()) {
2018-07-15 02:00:00 +02:00
ItemStack itemstack1 = (ItemStack) iterator.next();
2019-12-10 23:00:00 +01:00
EntityItem entityitem = new EntityItem(this.world, this.locX(), this.locY(), this.locZ(), itemstack1);
2016-02-29 22:32:46 +01:00
+ // CraftBukkit start
2018-07-15 02:00:00 +02:00
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) this.owner.getBukkitEntity(), entityitem.getBukkitEntity(), (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.CAUGHT_FISH);
2016-02-29 22:32:46 +01:00
+ playerFishEvent.setExpToDrop(this.random.nextInt(6) + 1);
+ this.world.getServer().getPluginManager().callEvent(playerFishEvent);
+
2016-02-29 22:32:46 +01:00
+ if (playerFishEvent.isCancelled()) {
+ return 0;
+ }
+ // CraftBukkit end
2019-12-10 23:00:00 +01:00
double d0 = this.owner.locX() - this.locX();
double d1 = this.owner.locY() - this.locY();
double d2 = this.owner.locZ() - this.locZ();
@@ -349,7 +383,11 @@
2019-04-23 04:00:00 +02:00
entityitem.setMot(d0 * 0.1D, d1 * 0.1D + Math.sqrt(Math.sqrt(d0 * d0 + d1 * d1 + d2 * d2)) * 0.08D, d2 * 0.1D);
2016-02-29 22:32:46 +01:00
this.world.addEntity(entityitem);
2019-12-10 23:00:00 +01:00
- this.owner.world.addEntity(new EntityExperienceOrb(this.owner.world, this.owner.locX(), this.owner.locY() + 0.5D, this.owner.locZ() + 0.5D, this.random.nextInt(6) + 1));
2016-02-29 22:32:46 +01:00
+ // CraftBukkit start - this.random.nextInt(6) + 1 -> playerFishEvent.getExpToDrop()
+ if (playerFishEvent.getExpToDrop() > 0) {
2019-12-10 23:00:00 +01:00
+ this.owner.world.addEntity(new EntityExperienceOrb(this.owner.world, this.owner.locX(), this.owner.locY() + 0.5D, this.owner.locZ() + 0.5D, playerFishEvent.getExpToDrop()));
2016-02-29 22:32:46 +01:00
+ }
2016-11-17 02:41:03 +01:00
+ // CraftBukkit end
2018-08-26 04:00:00 +02:00
if (itemstack1.getItem().a(TagsItem.FISHES)) {
2018-07-15 02:00:00 +02:00
this.owner.a(StatisticList.FISH_CAUGHT, 1);
}
2019-12-10 23:00:00 +01:00
@@ -359,8 +397,25 @@
}
2016-02-29 22:32:46 +01:00
if (this.isInGround) {
+ // CraftBukkit start
2018-07-15 02:00:00 +02:00
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) this.owner.getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.IN_GROUND);
+ this.world.getServer().getPluginManager().callEvent(playerFishEvent);
+
+ if (playerFishEvent.isCancelled()) {
+ return 0;
+ }
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
i = 2;
}
+ // CraftBukkit start
+ if (i == 0) {
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) this.owner.getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.REEL_IN);
+ this.world.getServer().getPluginManager().callEvent(playerFishEvent);
+ if (playerFishEvent.isCancelled()) {
+ return 0;
+ }
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
this.die();
2016-11-17 02:41:03 +01:00
return i;