From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar 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 92a33a23764e8ca1e2e6b2b0feb6caca2a5dfc56..7bc1219523eeb0880493e6fb42692f1fdb30c110 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -4,8 +4,10 @@ import com.google.common.base.Preconditions; import com.google.common.base.Predicates; import com.mojang.serialization.Codec; import java.lang.ref.WeakReference; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.List; import java.util.Objects; import java.util.concurrent.locks.LockSupport; import java.util.function.BooleanSupplier; @@ -175,6 +177,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(x, z); // Transient load for this tick } @@ -189,7 +198,29 @@ public class CraftChunk implements Chunk { } BlockPos position = (BlockPos) obj; - 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 getTileEntities(Predicate blockPredicate, boolean useSnapshot) { + Preconditions.checkNotNull(blockPredicate, "blockPredicate"); + if (!isLoaded()) { + getWorld().getChunkAt(x, z); // Transient load for this tick + } + net.minecraft.world.level.chunk.LevelChunk chunk = getHandle(); + + List entities = new ArrayList<>(); + + for (BlockPos position : chunk.blockEntities.keySet()) { + Block block = worldServer.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()); + if (blockPredicate.test(block)) { + entities.add(block.getState(useSnapshot)); + } + // Paper end } return entities;