geforkt von Mirrors/Paper
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.
40 Zeilen
1.8 KiB
Diff
40 Zeilen
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: okx-code <okx@okx.sh>
|
|
Date: Sat, 17 Aug 2024 13:02:45 +0100
|
|
Subject: [PATCH] Add enchantment seed update API
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
|
|
index b7300052f3c3d496ea41b681a2d5d5b554e67c63..50a735dd97daab4fb9579f922a4c63de60204f29 100644
|
|
--- a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
|
|
+++ b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
|
|
@@ -399,4 +399,10 @@ public class EnchantmentMenu extends AbstractContainerMenu {
|
|
return this.bukkitEntity;
|
|
}
|
|
// CraftBukkit end
|
|
+
|
|
+ // Paper start - add enchantment seed update API
|
|
+ public void setEnchantmentSeed(int seed) {
|
|
+ this.enchantmentSeed.set(seed);
|
|
+ }
|
|
+ // Paper end - add enchantment seed update API
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftEnchantmentView.java b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftEnchantmentView.java
|
|
index 17f0ce8fcb6d44579d88cfcf01de40485b0037dc..abe709ab9002b30a996e46779843969c984c9be9 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftEnchantmentView.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftEnchantmentView.java
|
|
@@ -26,6 +26,13 @@ public class CraftEnchantmentView extends CraftInventoryView<EnchantmentMenu, En
|
|
return this.container.getEnchantmentSeed();
|
|
}
|
|
|
|
+ // Paper start - add enchantment seed update API
|
|
+ @Override
|
|
+ public void setEnchantmentSeed(int seed) {
|
|
+ this.container.setEnchantmentSeed(seed);
|
|
+ }
|
|
+ // Paper end - add enchantment seed update API
|
|
+
|
|
@NotNull
|
|
@Override
|
|
public EnchantmentOffer[] getOffers() {
|