dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
41 Zeilen
2.0 KiB
Diff
41 Zeilen
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
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 57ebb96707748e90810dc07471f9769f1317df9d..10d30304c8c89b1f2a55be8529035311d1424e44 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
|
@@ -329,6 +329,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;
|