mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-10 12:02:36 +01:00
173 lines
8.7 KiB
Diff
173 lines
8.7 KiB
Diff
--- a/net/minecraft/world/entity/projectile/EntityFishingHook.java
|
|
+++ b/net/minecraft/world/entity/projectile/EntityFishingHook.java
|
|
@@ -46,6 +46,12 @@
|
|
import net.minecraft.world.phys.Vec3D;
|
|
import org.slf4j.Logger;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.entity.FishHook;
|
|
+import org.bukkit.event.player.PlayerFishEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class EntityFishingHook extends IProjectile {
|
|
|
|
private static final Logger LOGGER = LogUtils.getLogger();
|
|
@@ -67,6 +73,18 @@
|
|
private final int luck;
|
|
private final int lureSpeed;
|
|
|
|
+ // CraftBukkit start - Extra variables to enable modification of fishing wait time, values are minecraft defaults
|
|
+ public int minWaitTime = 100;
|
|
+ public int maxWaitTime = 600;
|
|
+ public int minLureTime = 20;
|
|
+ public int maxLureTime = 80;
|
|
+ public float minLureAngle = 0.0F;
|
|
+ public float maxLureAngle = 360.0F;
|
|
+ public boolean applyLure = true;
|
|
+ public boolean rainInfluenced = true;
|
|
+ public boolean skyInfluenced = true;
|
|
+ // CraftBukkit end
|
|
+
|
|
private EntityFishingHook(EntityTypes<? extends EntityFishingHook> entitytypes, World world, int i, int j) {
|
|
super(entitytypes, world);
|
|
this.syncronizedRandom = RandomSource.create();
|
|
@@ -261,7 +279,7 @@
|
|
private void checkCollision() {
|
|
MovingObjectPosition movingobjectposition = ProjectileHelper.getHitResult(this, this::canHitEntity);
|
|
|
|
- this.onHit(movingobjectposition);
|
|
+ this.preOnHit(movingobjectposition); // CraftBukkit - projectile hit event
|
|
}
|
|
|
|
@Override
|
|
@@ -294,11 +312,11 @@
|
|
int i = 1;
|
|
BlockPosition blockposition1 = blockposition.above();
|
|
|
|
- if (this.random.nextFloat() < 0.25F && this.level.isRainingAt(blockposition1)) {
|
|
+ if (this.rainInfluenced && this.random.nextFloat() < 0.25F && this.level.isRainingAt(blockposition1)) { // CraftBukkit
|
|
++i;
|
|
}
|
|
|
|
- if (this.random.nextFloat() < 0.5F && !this.level.canSeeSky(blockposition1)) {
|
|
+ if (this.skyInfluenced && this.random.nextFloat() < 0.5F && !this.level.canSeeSky(blockposition1)) { // CraftBukkit
|
|
--i;
|
|
}
|
|
|
|
@@ -308,6 +326,10 @@
|
|
this.timeUntilLured = 0;
|
|
this.timeUntilHooked = 0;
|
|
this.getEntityData().set(EntityFishingHook.DATA_BITING, false);
|
|
+ // CraftBukkit start
|
|
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) this.getPlayerOwner().getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.FAILED_ATTEMPT);
|
|
+ this.level.getCraftServer().getPluginManager().callEvent(playerFishEvent);
|
|
+ // CraftBukkit end
|
|
}
|
|
} else {
|
|
float f;
|
|
@@ -341,6 +363,13 @@
|
|
worldserver.sendParticles(Particles.FISHING, d0, d1, d2, 0, (double) (-f4), 0.01D, (double) f3, 1.0D);
|
|
}
|
|
} else {
|
|
+ // CraftBukkit start
|
|
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) this.getPlayerOwner().getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.BITE);
|
|
+ this.level.getCraftServer().getPluginManager().callEvent(playerFishEvent);
|
|
+ if (playerFishEvent.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.playSound(SoundEffects.FISHING_BOBBER_SPLASH, 0.25F, 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.4F);
|
|
double d3 = this.getY() + 0.5D;
|
|
|
|
@@ -373,12 +402,16 @@
|
|
}
|
|
|
|
if (this.timeUntilLured <= 0) {
|
|
- this.fishAngle = MathHelper.nextFloat(this.random, 0.0F, 360.0F);
|
|
- this.timeUntilHooked = MathHelper.nextInt(this.random, 20, 80);
|
|
+ // CraftBukkit start - logic to modify fishing wait time, lure time, and lure angle
|
|
+ this.fishAngle = MathHelper.nextFloat(this.random, this.minLureAngle, this.maxLureAngle);
|
|
+ this.timeUntilHooked = MathHelper.nextInt(this.random, this.minLureTime, this.maxLureTime);
|
|
+ // CraftBukkit end
|
|
}
|
|
} else {
|
|
- this.timeUntilLured = MathHelper.nextInt(this.random, 100, 600);
|
|
- this.timeUntilLured -= this.lureSpeed * 20 * 5;
|
|
+ // CraftBukkit start - logic to modify fishing wait time
|
|
+ this.timeUntilLured = MathHelper.nextInt(this.random, this.minWaitTime, this.maxWaitTime);
|
|
+ this.timeUntilLured -= (this.applyLure) ? this.lureSpeed * 20 * 5 : 0;
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|
|
@@ -445,6 +478,14 @@
|
|
int i = 0;
|
|
|
|
if (this.hookedIn != null) {
|
|
+ // CraftBukkit start
|
|
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), this.hookedIn.getBukkitEntity(), (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.CAUGHT_ENTITY);
|
|
+ this.level.getCraftServer().getPluginManager().callEvent(playerFishEvent);
|
|
+
|
|
+ if (playerFishEvent.isCancelled()) {
|
|
+ return 0;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.pullEntity(this.hookedIn);
|
|
CriterionTriggers.FISHING_ROD_HOOKED.trigger((EntityPlayer) entityhuman, itemstack, this, Collections.emptyList());
|
|
this.level.broadcastEntityEvent(this, (byte) 31);
|
|
@@ -460,6 +501,15 @@
|
|
while (iterator.hasNext()) {
|
|
ItemStack itemstack1 = (ItemStack) iterator.next();
|
|
EntityItem entityitem = new EntityItem(this.level, this.getX(), this.getY(), this.getZ(), itemstack1);
|
|
+ // CraftBukkit start
|
|
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), entityitem.getBukkitEntity(), (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.CAUGHT_FISH);
|
|
+ playerFishEvent.setExpToDrop(this.random.nextInt(6) + 1);
|
|
+ this.level.getCraftServer().getPluginManager().callEvent(playerFishEvent);
|
|
+
|
|
+ if (playerFishEvent.isCancelled()) {
|
|
+ return 0;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
double d0 = entityhuman.getX() - this.getX();
|
|
double d1 = entityhuman.getY() - this.getY();
|
|
double d2 = entityhuman.getZ() - this.getZ();
|
|
@@ -467,7 +517,11 @@
|
|
|
|
entityitem.setDeltaMovement(d0 * 0.1D, d1 * 0.1D + Math.sqrt(Math.sqrt(d0 * d0 + d1 * d1 + d2 * d2)) * 0.08D, d2 * 0.1D);
|
|
this.level.addFreshEntity(entityitem);
|
|
- entityhuman.level.addFreshEntity(new EntityExperienceOrb(entityhuman.level, entityhuman.getX(), entityhuman.getY() + 0.5D, entityhuman.getZ() + 0.5D, this.random.nextInt(6) + 1));
|
|
+ // CraftBukkit start - this.random.nextInt(6) + 1 -> playerFishEvent.getExpToDrop()
|
|
+ if (playerFishEvent.getExpToDrop() > 0) {
|
|
+ entityhuman.level.addFreshEntity(new EntityExperienceOrb(entityhuman.level, entityhuman.getX(), entityhuman.getY() + 0.5D, entityhuman.getZ() + 0.5D, playerFishEvent.getExpToDrop()));
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (itemstack1.is(TagsItem.FISHES)) {
|
|
entityhuman.awardStat(StatisticList.FISH_CAUGHT, 1);
|
|
}
|
|
@@ -477,8 +531,25 @@
|
|
}
|
|
|
|
if (this.onGround) {
|
|
+ // CraftBukkit start
|
|
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.IN_GROUND);
|
|
+ this.level.getCraftServer().getPluginManager().callEvent(playerFishEvent);
|
|
+
|
|
+ if (playerFishEvent.isCancelled()) {
|
|
+ return 0;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
i = 2;
|
|
}
|
|
+ // CraftBukkit start
|
|
+ if (i == 0) {
|
|
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.REEL_IN);
|
|
+ this.level.getCraftServer().getPluginManager().callEvent(playerFishEvent);
|
|
+ if (playerFishEvent.isCancelled()) {
|
|
+ return 0;
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
|
|
this.discard();
|
|
return i;
|