mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-03 02:20:51 +02:00
56 lines
2.3 KiB
Diff
56 lines
2.3 KiB
Diff
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 Tile Entities from a chunk without snapshots
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
|
index df02963faaf8f514f4175d394e67d2df10c8a3ea..593cfd68dc0f3679c684b6a1d2036419d4f3bc0c 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
|
@@ -127,6 +127,13 @@ public class CraftChunk implements Chunk {
|
|
|
|
@Override
|
|
public BlockState[] getTileEntities() {
|
|
+ // Paper start
|
|
+ return getTileEntities(true);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public BlockState[] getTileEntities(boolean useSnapshot) {
|
|
+ // Paper end
|
|
if (!this.isLoaded()) {
|
|
this.getWorld().getChunkAt(this.x, this.z); // Transient load for this tick
|
|
}
|
|
@@ -136,7 +143,29 @@ public class CraftChunk implements Chunk {
|
|
BlockState[] entities = new BlockState[chunk.blockEntities.size()];
|
|
|
|
for (BlockPos position : chunk.blockEntities.keySet()) {
|
|
- 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);
|
|
+ }
|
|
+
|
|
+ return entities;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Collection<BlockState> getTileEntities(Predicate<Block> blockPredicate, boolean useSnapshot) {
|
|
+ Preconditions.checkNotNull(blockPredicate, "blockPredicate");
|
|
+ if (!this.isLoaded()) {
|
|
+ this.getWorld().getChunkAt(this.x, this.z); // Transient load for this tick
|
|
+ }
|
|
+ ChunkAccess chunk = this.getHandle(ChunkStatus.FULL);
|
|
+
|
|
+ java.util.List<BlockState> entities = new java.util.ArrayList<>();
|
|
+
|
|
+ for (BlockPos position : chunk.blockEntities.keySet()) {
|
|
+ Block block = this.worldServer.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ());
|
|
+ if (blockPredicate.test(block)) {
|
|
+ entities.add(block.getState(useSnapshot));
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
|
|
return entities;
|