mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 11:44:19 +01:00
23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
--- a/net/minecraft/world/entity/monster/EntitySkeletonAbstract.java
|
|
+++ b/net/minecraft/world/entity/monster/EntitySkeletonAbstract.java
|
|
@@ -204,8 +204,19 @@
|
|
double d3 = Math.sqrt(d0 * d0 + d2 * d2);
|
|
|
|
entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - this.level().getDifficulty().getId() * 4));
|
|
+ // CraftBukkit start
|
|
+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), null, entityarrow, net.minecraft.world.EnumHand.MAIN_HAND, 0.8F, true);
|
|
+ if (event.isCancelled()) {
|
|
+ event.getProjectile().remove();
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if (event.getProjectile() == entityarrow.getBukkitEntity()) {
|
|
+ this.level().addFreshEntity(entityarrow);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.playSound(SoundEffects.SKELETON_SHOOT, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F));
|
|
- this.level().addFreshEntity(entityarrow);
|
|
+ // this.level().addFreshEntity(entityarrow); // CraftBukkit - moved up
|
|
}
|
|
|
|
protected EntityArrow getArrow(ItemStack itemstack, float f, @Nullable ItemStack itemstack1) {
|