mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-18 20:53:09 +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.
83 lines
3.6 KiB
Diff
83 lines
3.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: JRoy <joshroy126@gmail.com>
|
|
Date: Wed, 26 Aug 2020 02:12:31 -0400
|
|
Subject: [PATCH] Add additional open container api to HumanEntity
|
|
|
|
== AT ==
|
|
public net/minecraft/world/level/block/state/BlockBehaviour getMenuProvider(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/MenuProvider;
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
|
index b2ab430392fc0f214ba8c5383e3f3ad5c548bda2..9022555db0df8c269fc039c895422cf36c08097e 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
|
@@ -471,6 +471,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
|
return this.getHandle().containerMenu.getBukkitView();
|
|
}
|
|
|
|
+ // Paper start - Add additional containers
|
|
+ @Override
|
|
+ public InventoryView openAnvil(Location location, boolean force) {
|
|
+ return this.openInventory(location, force, Material.ANVIL);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openCartographyTable(Location location, boolean force) {
|
|
+ return this.openInventory(location, force, Material.CARTOGRAPHY_TABLE);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openGrindstone(Location location, boolean force) {
|
|
+ return this.openInventory(location, force, Material.GRINDSTONE);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openLoom(Location location, boolean force) {
|
|
+ return this.openInventory(location, force, Material.LOOM);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openSmithingTable(Location location, boolean force) {
|
|
+ return this.openInventory(location, force, Material.SMITHING_TABLE);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openStonecutter(Location location, boolean force) {
|
|
+ return this.openInventory(location, force, Material.STONECUTTER);
|
|
+ }
|
|
+
|
|
+ private InventoryView openInventory(Location location, boolean force, Material material) {
|
|
+ org.spigotmc.AsyncCatcher.catchOp("open" + material);
|
|
+ if (location == null) {
|
|
+ location = this.getLocation();
|
|
+ }
|
|
+ if (!force) {
|
|
+ Block block = location.getBlock();
|
|
+ if (block.getType() != material) {
|
|
+ return null;
|
|
+ }
|
|
+ }
|
|
+ net.minecraft.world.level.block.Block block;
|
|
+ if (material == Material.ANVIL) {
|
|
+ block = Blocks.ANVIL;
|
|
+ } else if (material == Material.CARTOGRAPHY_TABLE) {
|
|
+ block = Blocks.CARTOGRAPHY_TABLE;
|
|
+ } else if (material == Material.GRINDSTONE) {
|
|
+ block = Blocks.GRINDSTONE;
|
|
+ } else if (material == Material.LOOM) {
|
|
+ block = Blocks.LOOM;
|
|
+ } else if (material == Material.SMITHING_TABLE) {
|
|
+ block = Blocks.SMITHING_TABLE;
|
|
+ } else if (material == Material.STONECUTTER) {
|
|
+ block = Blocks.STONECUTTER;
|
|
+ } else {
|
|
+ throw new IllegalArgumentException("Unsupported inventory type: " + material);
|
|
+ }
|
|
+ this.getHandle().openMenu(block.getMenuProvider(null, this.getHandle().level(), new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ())));
|
|
+ this.getHandle().containerMenu.checkReachable = !force;
|
|
+ return this.getHandle().containerMenu.getBukkitView();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public void closeInventory() {
|
|
// Paper start - Inventory close reason
|