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.
69 Zeilen
4.2 KiB
Diff
69 Zeilen
4.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: JRoy <joshroy126@gmail.com>
|
|
Date: Wed, 7 Oct 2020 12:04:01 -0400
|
|
Subject: [PATCH] Add EntityLoadCrossbowEvent
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
|
|
index 710181cf04563f06690eee5b46a5a0d84844ac29..52c40eafc77e50a6fd21b9a7a250cea501f11690 100644
|
|
--- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
|
|
@@ -89,7 +89,14 @@ public class CrossbowItem extends ProjectileWeaponItem {
|
|
public boolean releaseUsing(ItemStack stack, Level world, LivingEntity user, int remainingUseTicks) {
|
|
int i = this.getUseDuration(stack, user) - remainingUseTicks;
|
|
float f = getPowerForTime(i, stack, user);
|
|
- if (f >= 1.0F && !isCharged(stack) && tryLoadProjectiles(user, stack)) {
|
|
+ // Paper start - Add EntityLoadCrossbowEvent
|
|
+ if (f >= 1.0F && !isCharged(stack)) {
|
|
+ final io.papermc.paper.event.entity.EntityLoadCrossbowEvent event = new io.papermc.paper.event.entity.EntityLoadCrossbowEvent(user.getBukkitLivingEntity(), stack.asBukkitMirror(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(user.getUsedItemHand()));
|
|
+ if (!event.callEvent() || !tryLoadProjectiles(user, stack, event.shouldConsumeItem()) || !event.shouldConsumeItem()) {
|
|
+ if (user instanceof ServerPlayer player) player.containerMenu.sendAllDataToRemote();
|
|
+ return false;
|
|
+ }
|
|
+ // Paper end - Add EntityLoadCrossbowEvent
|
|
CrossbowItem.ChargingSounds chargingSounds = this.getChargingSounds(stack);
|
|
chargingSounds.end()
|
|
.ifPresent(
|
|
@@ -110,8 +117,14 @@ public class CrossbowItem extends ProjectileWeaponItem {
|
|
}
|
|
}
|
|
|
|
- private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack crossbow) {
|
|
- List<ItemStack> list = draw(crossbow, shooter.getProjectile(crossbow), shooter);
|
|
+ @io.papermc.paper.annotation.DoNotUse // Paper - Add EntityLoadCrossbowEvent
|
|
+ private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack crossbow) {
|
|
+ // Paper start - Add EntityLoadCrossbowEvent
|
|
+ return CrossbowItem.tryLoadProjectiles(shooter, crossbow, true);
|
|
+ }
|
|
+ private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack crossbow, boolean consume) {
|
|
+ List<ItemStack> list = draw(crossbow, shooter.getProjectile(crossbow), shooter, consume);
|
|
+ // Paper end - Add EntityLoadCrossbowEvent
|
|
if (!list.isEmpty()) {
|
|
crossbow.set(DataComponents.CHARGED_PROJECTILES, ChargedProjectiles.of(list));
|
|
return true;
|
|
diff --git a/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java b/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
|
|
index a7d0ac6513fd888e222b3128afc1a227ea91f1d2..78ba170a83f8c026bd110eae494c52577182ed61 100644
|
|
--- a/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
|
|
@@ -109,6 +109,11 @@ public abstract class ProjectileWeaponItem extends Item {
|
|
}
|
|
|
|
protected static List<ItemStack> draw(ItemStack stack, ItemStack projectileStack, LivingEntity shooter) {
|
|
+ // Paper start
|
|
+ return draw(stack, projectileStack, shooter, true);
|
|
+ }
|
|
+ protected static List<ItemStack> draw(ItemStack stack, ItemStack projectileStack, LivingEntity shooter, boolean consume) {
|
|
+ // Paper end
|
|
if (projectileStack.isEmpty()) {
|
|
return List.of();
|
|
} else {
|
|
@@ -128,7 +133,7 @@ public abstract class ProjectileWeaponItem extends Item {
|
|
ItemStack itemstack2 = projectileStack.copy();
|
|
|
|
for (int k = 0; k < j; ++k) {
|
|
- ItemStack itemstack3 = ProjectileWeaponItem.useAmmo(stack, k == 0 ? projectileStack : itemstack2, shooter, k > 0);
|
|
+ ItemStack itemstack3 = ProjectileWeaponItem.useAmmo(stack, k == 0 ? projectileStack : itemstack2, shooter, k > 0 || !consume); // Paper
|
|
|
|
if (!itemstack3.isEmpty()) {
|
|
list.add(itemstack3);
|