mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-21 18:15:54 +01:00
8c5b837e05
Firstly, the old methods all routed to the CompletableFuture method. However, the CF method could not guarantee that if the caller was off-main that the future would be "completed" on-main. Since the callback methods used the CF one, this meant that the callback methods did not guarantee that the callbacks were to be called on the main thread. Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb) so that the methods with the callback are guaranteed to invoke the callback on the main thread. The CF behavior remains unchanged; it may still appear to complete on main if invoked off-main. Secondly, remove the scheduleOnMain invocation in the async chunk completion. This unnecessarily delays the callback by 1 tick. Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which will load chunks within an area. This method is provided as a helper as keeping all chunks loaded within an area can be complicated to implement for plugins (due to the lacking ticket API), and is already implemented internally anyways. Fourthly, remove the ticket addition that occured with getChunkAt and getChunkAtAsync. The ticket addition may delay the unloading of the chunk unnecessarily. It also fixes a very rare timing bug where the future/callback would be completed after the chunk unloads.
41 lines
2.0 KiB
Diff
41 lines
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 44bcb1117cfa4d66c500011489ae193a0d1e7d78..75cc3db39c974abab8510af4a633fc6812efc647 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
|
@@ -344,6 +344,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;
|