2016-11-17 02:41:03 +01:00
|
|
|
--- a/net/minecraft/server/EntitySkeletonAbstract.java
|
|
|
|
|
+++ b/net/minecraft/server/EntitySkeletonAbstract.java
|
2020-06-25 02:00:00 +02:00
|
|
|
@@ -154,8 +154,19 @@
|
2016-11-17 02:41:03 +01:00
|
|
|
double d3 = (double) MathHelper.sqrt(d0 * d0 + d2 * d2);
|
|
|
|
|
|
|
|
|
|
entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - this.world.getDifficulty().a() * 4));
|
|
|
|
|
+ // CraftBukkit start
|
2020-08-31 10:39:12 +02:00
|
|
|
+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getItemInMainHand(), null, entityarrow, EnumHand.MAIN_HAND, 0.8F, true);
|
2016-11-17 02:41:03 +01:00
|
|
|
+ if (event.isCancelled()) {
|
|
|
|
|
+ event.getProjectile().remove();
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if (event.getProjectile() == entityarrow.getBukkitEntity()) {
|
|
|
|
|
+ world.addEntity(entityarrow);
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
2020-06-25 02:00:00 +02:00
|
|
|
this.playSound(SoundEffects.ENTITY_SKELETON_SHOOT, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F));
|
2016-11-17 02:41:03 +01:00
|
|
|
- this.world.addEntity(entityarrow);
|
|
|
|
|
+ // this.world.addEntity(entityarrow); // CraftBukkit - moved up
|
|
|
|
|
}
|
|
|
|
|
|
2019-04-23 04:00:00 +02:00
|
|
|
protected EntityArrow b(ItemStack itemstack, float f) {
|
