Paper/patches/server/0233-Ability-to-get-block-entities-from-a-chunk-without-s.patch

56 lines
2.3 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 15 Aug 2018 01:16:34 -0400
Subject: [PATCH] Ability to get block entities from a chunk without snapshots
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
index 491416754e1c5e8c2b345b57f45289906c7932ba..e38643853220cabeac6c30912a9ae4bc1c018d5f 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
@@ -171,6 +171,13 @@ public class CraftChunk implements Chunk {
2021-06-11 14:02:28 +02:00
@Override
public BlockState[] getTileEntities() {
+ // Paper start
+ return getTileEntities(true);
+ }
+
+ @Override
+ public BlockState[] getTileEntities(boolean useSnapshot) {
+ // Paper end
2021-06-13 01:45:00 +02:00
if (!this.isLoaded()) {
2023-10-27 01:34:58 +02:00
this.getWorld().getChunkAt(this.x, this.z); // Transient load for this tick
2021-06-13 01:45:00 +02:00
}
@@ -180,7 +187,29 @@ public class CraftChunk implements Chunk {
BlockState[] entities = new BlockState[chunk.blockEntities.size()];
2021-06-11 14:02:28 +02:00
for (BlockPos position : chunk.blockEntities.keySet()) {
2021-06-13 01:45:00 +02:00
- entities[index++] = this.worldServer.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()).getState();
+ // Paper start
+ entities[index++] = this.worldServer.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()).getState(useSnapshot);
2021-06-11 14:02:28 +02:00
+ }
+
+ return entities;
+ }
+
+ @Override
+ public Collection<BlockState> getTileEntities(Predicate<? super Block> blockPredicate, boolean useSnapshot) {
2021-06-11 14:02:28 +02:00
+ Preconditions.checkNotNull(blockPredicate, "blockPredicate");
+ if (!this.isLoaded()) {
+ this.getWorld().getChunkAt(this.x, this.z); // Transient load for this tick
2021-06-11 14:02:28 +02:00
+ }
+ ChunkAccess chunk = this.getHandle(ChunkStatus.FULL);
2021-06-11 14:02:28 +02:00
+
+ java.util.List<BlockState> entities = new java.util.ArrayList<>();
2021-06-11 14:02:28 +02:00
+
+ for (BlockPos position : chunk.blockEntities.keySet()) {
+ Block block = this.worldServer.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ());
2021-06-11 14:02:28 +02:00
+ if (blockPredicate.test(block)) {
+ entities.add(block.getState(useSnapshot));
+ }
2021-06-13 01:45:00 +02:00
+ // Paper end
2021-06-11 14:02:28 +02:00
}
return entities;