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.
45 Zeilen
1.7 KiB
Diff
45 Zeilen
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: FireInstall <kettnerl@hu-berlin.de>
|
|
Date: Sat, 20 Jan 2024 16:20:06 +0100
|
|
Subject: [PATCH] Expose LootTable of DecoratedPot
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDecoratedPot.java b/src/main/java/org/bukkit/craftbukkit/block/CraftDecoratedPot.java
|
|
index 6e0258d4d6a07e0f471640a9edda0adf7ef6cd9e..47cc3ec5ccd3bb51a08b3f179cb29030948b8c11 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftDecoratedPot.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftDecoratedPot.java
|
|
@@ -43,6 +43,33 @@ public class CraftDecoratedPot extends CraftBlockEntityState<DecoratedPotBlockEn
|
|
return new CraftInventoryDecoratedPot(this.getTileEntity());
|
|
}
|
|
|
|
+ // Paper start - expose loot table
|
|
+ @Override
|
|
+ public void setLootTable(final org.bukkit.loot.LootTable table) {
|
|
+ this.setLootTable(table, this.getSeed());
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setLootTable(org.bukkit.loot.LootTable table, long seed) {
|
|
+ this.getSnapshot().setLootTable(org.bukkit.craftbukkit.CraftLootTable.bukkitToMinecraft(table), seed);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public org.bukkit.loot.LootTable getLootTable() {
|
|
+ return org.bukkit.craftbukkit.CraftLootTable.minecraftToBukkit(this.getSnapshot().getLootTable());
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setSeed(final long seed) {
|
|
+ this.getSnapshot().setLootTableSeed(seed);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public long getSeed() {
|
|
+ return this.getSnapshot().getLootTableSeed();
|
|
+ }
|
|
+ // Paper end - expose loot table
|
|
+
|
|
@Override
|
|
public void setSherd(Side face, Material sherd) {
|
|
Preconditions.checkArgument(face != null, "face must not be null");
|