Paper/patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch

67 lines
2.6 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 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
2022-03-01 06:43:03 +01:00
index 404bd3389aaa75ca23f04d23ecea9093443c3976..f3c67a815c570beb14136905cbf5aa4046ee8394 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
2021-11-23 16:04:41 +01:00
@@ -4,8 +4,10 @@ import com.google.common.base.Preconditions;
2021-06-11 14:02:28 +02:00
import com.google.common.base.Predicates;
2021-11-23 16:04:41 +01:00
import com.mojang.serialization.Codec;
2021-06-11 14:02:28 +02:00
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;
2022-03-01 06:43:03 +01:00
@@ -176,6 +178,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()) {
this.getWorld().getChunkAt(x, z); // Transient load for this tick
}
2022-03-01 06:43:03 +01:00
@@ -190,7 +199,29 @@ public class CraftChunk implements Chunk {
2021-06-11 14:02:28 +02:00
}
BlockPos position = (BlockPos) obj;
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<Block> 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<BlockState> 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));
+ }
2021-06-13 01:45:00 +02:00
+ // Paper end
2021-06-11 14:02:28 +02:00
}
return entities;