OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-31 00:20:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Ability to get block entities from a chunk without snapshots

Browse source
This commit is contained in:
Aikar 2018-08-15 01:16:34 -04:00
parent d178f73bb8
commit 584836a2e4
1 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
paper-server/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
View file

@ -174,6 +174,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
}
@ -183,7 +190,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<? super 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;