mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 03:43:28 +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.
74 lines
4.3 KiB
Diff
74 lines
4.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: SoSeDiK <mrsosedik@gmail.com>
|
|
Date: Wed, 1 May 2024 08:22:13 +0300
|
|
Subject: [PATCH] More Chest Block API
|
|
|
|
== AT ==
|
|
public net.minecraft.world.level.block.ChestBlock isBlockedChestByBlock(Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
|
|
index b376f7d3b632d6aaea5c4d93382238074559d56a..ef0d469176ee74b6bb5f9e9cc508735145fda5b8 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
|
|
@@ -83,7 +83,7 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
|
|
PlayerEnderChestContainer playerEnderChestContainer = player.getEnderChestInventory();
|
|
if (playerEnderChestContainer != null && world.getBlockEntity(pos) instanceof EnderChestBlockEntity enderChestBlockEntity) {
|
|
BlockPos blockPos = pos.above();
|
|
- if (world.getBlockState(blockPos).isRedstoneConductor(world, blockPos)) {
|
|
+ if (world.getBlockState(blockPos).isRedstoneConductor(world, blockPos)) { // Paper - diff on change; make sure that EnderChest#isBlocked uses the same logic
|
|
return InteractionResult.SUCCESS;
|
|
} else {
|
|
if (world instanceof ServerLevel serverLevel) {
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
|
|
index 6e98a00d526b734992ce39b15768c5820dce4ca8..cc7bf4d39b834fba472bc163226a01a0cd4b6010 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
|
|
@@ -99,4 +99,29 @@ public class CraftChest extends CraftLootable<ChestBlockEntity> implements Chest
|
|
return getTileEntity().openersCounter.opened;
|
|
}
|
|
// Paper end - More Lidded Block API
|
|
+
|
|
+ // Paper start - More Chest Block API
|
|
+ @Override
|
|
+ public boolean isBlocked() {
|
|
+ // Method mimics vanilla logic in ChestBlock and DoubleBlockCombiner when trying to open chest's container
|
|
+ if (!isPlaced()) {
|
|
+ return false;
|
|
+ }
|
|
+ net.minecraft.world.level.LevelAccessor world = getWorldHandle();
|
|
+ if (ChestBlock.isChestBlockedAt(world, getPosition())) {
|
|
+ return true;
|
|
+ }
|
|
+ if (ChestBlock.getBlockType(this.data) == net.minecraft.world.level.block.DoubleBlockCombiner.BlockType.SINGLE) {
|
|
+ return false;
|
|
+ }
|
|
+ net.minecraft.core.Direction direction = ChestBlock.getConnectedDirection(this.data);
|
|
+ net.minecraft.core.BlockPos neighbourBlockPos = getPosition().relative(direction);
|
|
+ BlockState neighbourBlockState = world.getBlockStateIfLoaded(neighbourBlockPos);
|
|
+ return neighbourBlockState != null
|
|
+ && neighbourBlockState.is(this.data.getBlock())
|
|
+ && ChestBlock.getBlockType(neighbourBlockState) != net.minecraft.world.level.block.DoubleBlockCombiner.BlockType.SINGLE
|
|
+ && ChestBlock.getConnectedDirection(neighbourBlockState) == direction.getOpposite()
|
|
+ && ChestBlock.isChestBlockedAt(world, neighbourBlockPos);
|
|
+ }
|
|
+ // Paper end - More Chest Block API
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
|
|
index b64adbba3e52d32d439e64a243cb74f3fbca2ce3..f45ee675a10729845bf376fa95e648b23b9aac12 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
|
|
@@ -58,4 +58,13 @@ public class CraftEnderChest extends CraftBlockEntityState<EnderChestBlockEntity
|
|
return getTileEntity().openersCounter.opened;
|
|
}
|
|
// Paper end - More Lidded Block API
|
|
+
|
|
+ // Paper start - More Chest Block API
|
|
+ @Override
|
|
+ public boolean isBlocked() {
|
|
+ // Uses the same logic as EnderChestBlock's check for opening container
|
|
+ final net.minecraft.core.BlockPos abovePos = this.getPosition().above();
|
|
+ return this.isPlaced() && this.getWorldHandle().getBlockState(abovePos).isRedstoneConductor(this.getWorldHandle(), abovePos);
|
|
+ }
|
|
+ // Paper end - More Chest Block API
|
|
}
|