twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-07-26 09:42:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Expose arrow velocity in EntityShootBowEvent for mobs (#12688)

Browse Source
This commit is contained in:
Lulu13022002
2025-06-25 22:11:18 +02:00
committed by GitHub
parent aa6cd74c03
commit c9e89f49b0
2 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
paper-server/patches/sources/net/minecraft/world/entity/monster/AbstractSkeleton.java.patch
View File

@@ -43,23 +43,36 @@
if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) { if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
LocalDate localDate = LocalDate.now(); LocalDate localDate = LocalDate.now();
int i = localDate.get(ChronoField.DAY_OF_MONTH); int i = localDate.get(ChronoField.DAY_OF_MONTH);
@@ -196,9 +_,19 @@ @@ -188,7 +_,8 @@
@Override
public void performRangedAttack(LivingEntity target, float distanceFactor) {
- ItemStack itemInHand = this.getItemInHand(ProjectileUtil.getWeaponHoldingHand(this, Items.BOW));
+ net.minecraft.world.InteractionHand hand = ProjectileUtil.getWeaponHoldingHand(this, Items.BOW); // Paper - call EntityShootBowEvent
+ ItemStack itemInHand = this.getItemInHand(hand); // Paper - call EntityShootBowEvent
ItemStack projectile = this.getProjectile(itemInHand);
AbstractArrow arrow = this.getArrow(projectile, distanceFactor, itemInHand);
double d = target.getX() - this.getX();
@@ -196,9 +_,21 @@
double d2 = target.getZ() - this.getZ(); double d2 = target.getZ() - this.getZ();
double squareRoot = Math.sqrt(d * d + d2 * d2); double squareRoot = Math.sqrt(d * d + d2 * d2);
if (this.level() instanceof ServerLevel serverLevel) { if (this.level() instanceof ServerLevel serverLevel) {
+ // CraftBukkit start - Projectile.spawnProjectileUsingShoot(
+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), arrow.getPickupItem(), arrow, net.minecraft.world.InteractionHand.MAIN_HAND, distanceFactor, true); // Paper - improve entity shoot bow event, add arrow stack to event + Projectile.Delayed<AbstractArrow> delayedEntity = Projectile.spawnProjectileUsingShootDelayed( // Paper - delayed
arrow, serverLevel, projectile, d, d1 + squareRoot * 0.2F, d2, 1.6F, 14 - serverLevel.getDifficulty().getId() * 4
);
+
+ // Paper start - call EntityShootBowEvent
+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, itemInHand, arrow.getPickupItem(), arrow, hand, distanceFactor, true);
+ if (event.isCancelled()) { + if (event.isCancelled()) {
+ event.getProjectile().remove(); + event.getProjectile().remove();
+ return; + return;
+ } + }
+ +
+ if (event.getProjectile() == arrow.getBukkitEntity()) { + if (event.getProjectile() == arrow.getBukkitEntity()) {
+ // CraftBukkit end + delayedEntity.spawn();
Projectile.spawnProjectileUsingShoot( + }
arrow, serverLevel, projectile, d, d1 + squareRoot * 0.2F, d2, 1.6F, 14 - serverLevel.getDifficulty().getId() * 4 + // Paper end - call EntityShootBowEvent
);
+ } // CraftBukkit
} }
this.playSound(SoundEvents.SKELETON_SHOOT, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F)); this.playSound(SoundEvents.SKELETON_SHOOT, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F));

27
paper-server/patches/sources/net/minecraft/world/entity/monster/Illusioner.java.patch
View File

@@ -1,22 +1,35 @@
--- a/net/minecraft/world/entity/monster/Illusioner.java --- a/net/minecraft/world/entity/monster/Illusioner.java
+++ b/net/minecraft/world/entity/monster/Illusioner.java +++ b/net/minecraft/world/entity/monster/Illusioner.java
@@ -180,9 +_,19 @@ @@ -172,7 +_,8 @@
@Override
public void performRangedAttack(LivingEntity target, float distanceFactor) {
- ItemStack itemInHand = this.getItemInHand(ProjectileUtil.getWeaponHoldingHand(this, Items.BOW));
+ net.minecraft.world.InteractionHand hand = ProjectileUtil.getWeaponHoldingHand(this, Items.BOW); // Paper - call EntityShootBowEvent
+ ItemStack itemInHand = this.getItemInHand(hand); // Paper - call EntityShootBowEvent
ItemStack projectile = this.getProjectile(itemInHand);
AbstractArrow mobArrow = ProjectileUtil.getMobArrow(this, projectile, distanceFactor, itemInHand);
double d = target.getX() - this.getX();
@@ -180,9 +_,21 @@
double d2 = target.getZ() - this.getZ(); double d2 = target.getZ() - this.getZ();
double squareRoot = Math.sqrt(d * d + d2 * d2); double squareRoot = Math.sqrt(d * d + d2 * d2);
if (this.level() instanceof ServerLevel serverLevel) { if (this.level() instanceof ServerLevel serverLevel) {
+ // Paper start - EntityShootBowEvent - Projectile.spawnProjectileUsingShoot(
+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), mobArrow.getPickupItem(), mobArrow, target.getUsedItemHand(), distanceFactor, true); + Projectile.Delayed<AbstractArrow> delayedEntity = Projectile.spawnProjectileUsingShootDelayed( // Paper - delayed
mobArrow, serverLevel, projectile, d, d1 + squareRoot * 0.2F, d2, 1.6F, 14 - serverLevel.getDifficulty().getId() * 4
);
+
+ // Paper start - call EntityShootBowEvent
+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, itemInHand, mobArrow.getPickupItem(), mobArrow, hand, distanceFactor, true);
+ if (event.isCancelled()) { + if (event.isCancelled()) {
+ event.getProjectile().remove(); + event.getProjectile().remove();
+ return; + return;
+ } + }
+ +
+ if (event.getProjectile() == mobArrow.getBukkitEntity()) { + if (event.getProjectile() == mobArrow.getBukkitEntity()) {
Projectile.spawnProjectileUsingShoot( + delayedEntity.spawn();
mobArrow, serverLevel, projectile, d, d1 + squareRoot * 0.2F, d2, 1.6F, 14 - serverLevel.getDifficulty().getId() * 4
);
+ } + }
+ // Paper end - EntityShootBowEvent + // Paper end - call EntityShootBowEvent
} }
this.playSound(SoundEvents.SKELETON_SHOOT, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F)); this.playSound(SoundEvents.SKELETON_SHOOT, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F));