--- a/net/minecraft/world/entity/projectile/IProjectile.java +++ b/net/minecraft/world/entity/projectile/IProjectile.java @@ -30,6 +30,10 @@ import net.minecraft.world.phys.MovingObjectPositionEntity; import net.minecraft.world.phys.Vec3D; +// CraftBukkit start +import org.bukkit.projectiles.ProjectileSource; +// CraftBukkit end + public abstract class IProjectile extends Entity implements TraceableEntity { @Nullable @@ -41,6 +45,10 @@ @Nullable private Entity lastDeflectedBy; + // CraftBukkit start + private boolean hitCancelled = false; + // CraftBukkit end + IProjectile(EntityTypes entitytypes, World world) { super(entitytypes, world); } @@ -50,6 +58,7 @@ this.ownerUUID = entity.getUUID(); this.cachedOwner = entity; } + this.projectileSource = (entity != null && entity.getBukkitEntity() instanceof ProjectileSource) ? (ProjectileSource) entity.getBukkitEntity() : null; // CraftBukkit } @@ -177,6 +186,17 @@ this.setDeltaMovement(this.getDeltaMovement().add(vec3d.x, entity.onGround() ? 0.0D : vec3d.y, vec3d.z)); } + // CraftBukkit start - call projectile hit event + protected ProjectileDeflection preHitTargetOrDeflectSelf(MovingObjectPosition movingobjectposition) { + org.bukkit.event.entity.ProjectileHitEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); + this.hitCancelled = event != null && event.isCancelled(); + if (movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.BLOCK || !this.hitCancelled) { + return this.hitTargetOrDeflectSelf(movingobjectposition); + } + return ProjectileDeflection.NONE; + } + // CraftBukkit end + protected ProjectileDeflection hitTargetOrDeflectSelf(MovingObjectPosition movingobjectposition) { if (movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.ENTITY) { MovingObjectPositionEntity movingobjectpositionentity = (MovingObjectPositionEntity) movingobjectposition; @@ -237,6 +257,11 @@ protected void onHitEntity(MovingObjectPositionEntity movingobjectpositionentity) {} protected void onHitBlock(MovingObjectPositionBlock movingobjectpositionblock) { + // CraftBukkit start - cancellable hit event + if (hitCancelled) { + return; + } + // CraftBukkit end IBlockData iblockdata = this.level().getBlockState(movingobjectpositionblock.getBlockPos()); iblockdata.onProjectileHit(this.level(), iblockdata, movingobjectpositionblock, this);