Skip to content

Commit bb32b05

Browse files
authored
Call ProjectileHitEvent for entity hits (#11652)
A simple bugfix replacing a new vanilla call to Projectile#hitTargetOrDeflectSelf with the bukkit replacement to call the event.
1 parent 6051dac commit bb32b05

File tree

1 file changed

+22
-0
lines changed

1 file changed

+22
-0
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Bjarne Koll <git@lynxplay.dev>
3+
Date: Sat, 23 Nov 2024 22:48:26 +0100
4+
Subject: [PATCH] Call ProjectileHitEvent for entity hits
5+
6+
A simple bugfix replacing a new vanilla call to
7+
Projectile#hitTargetOrDeflectSelf with the bukkit replacement to call
8+
the event.
9+
10+
diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
11+
index accc246f441c8bf5e1a755cfc0db8f97c0c01c6b..571f0699772eecbe02d71845da82a142321f2142 100644
12+
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
13+
+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
14+
@@ -309,7 +309,7 @@ public abstract class AbstractArrow extends Projectile {
15+
continue;
16+
}
17+
18+
- ProjectileDeflection projectiledeflection = this.hitTargetOrDeflectSelf(movingobjectpositionentity);
19+
+ ProjectileDeflection projectiledeflection = this.preHitTargetOrDeflectSelf(movingobjectpositionentity); // Paper - also call projectile hit event
20+
21+
this.hasImpulse = true;
22+
if (this.getPierceLevel() > 0 && projectiledeflection == ProjectileDeflection.NONE) {

0 commit comments

Comments
 (0)