aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0691-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0691-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch')
-rw-r--r--patches/server/0691-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/patches/server/0691-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0691-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
new file mode 100644
index 0000000000..2d524b390b
--- /dev/null
+++ b/patches/server/0691-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sat, 19 Feb 2022 19:05:59 -0800
+Subject: [PATCH] Fix cancelling ProjectileHitEvent for piercing arrows
+
+Piercing arrows search for multiple entities inside a while
+loop that is checking the projectile entity's removed state.
+If the hit event is cancelled on the first entity, the event will
+be called over and over again inside that while loop until the event
+is not cancelled. The solution here, is to make use of an
+already-existing field on AbstractArrow for tracking entities hit by
+piercing arrows to avoid duplicate damage being applied.
+
+== AT ==
+protected net.minecraft.world.entity.projectile.Projectile hitCancelled
+
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
+index 8e8258333e181491b2d5b61ebdb80de36e8179a9..fc5913910f5614cd3e10cd9c1aa482a4b70ac260 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
+@@ -305,6 +305,19 @@ public abstract class AbstractArrow extends Projectile {
+ }
+ }
+
++ // Paper start - Fix cancelling ProjectileHitEvent for piercing arrows
++ @Override
++ public ProjectileDeflection preHitTargetOrDeflectSelf(HitResult hitResult) {
++ if (hitResult instanceof EntityHitResult entityHitResult && this.hitCancelled && this.getPierceLevel() > 0) {
++ if (this.piercingIgnoreEntityIds == null) {
++ this.piercingIgnoreEntityIds = new IntOpenHashSet(5);
++ }
++ this.piercingIgnoreEntityIds.add(entityHitResult.getEntity().getId());
++ }
++ return super.preHitTargetOrDeflectSelf(hitResult);
++ }
++ // Paper end - Fix cancelling ProjectileHitEvent for piercing arrows
++
+ @Override
+ protected double getDefaultGravity() {
+ return 0.05D;