2020-04-02 21:07:06 +00:00
|
|
|
From 3857606d6edee62ac7bd5527964aabfa335a94eb Mon Sep 17 00:00:00 2001
|
2018-08-15 05:20:40 +00:00
|
|
|
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
|
2020-04-02 21:07:06 +00:00
|
|
|
index 2995237994..91f2066b12 100644
|
2018-08-15 05:20:40 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
2019-12-13 14:08:40 +00:00
|
|
|
@@ -127,9 +127,16 @@ public class CraftChunk implements Chunk {
|
2018-08-15 05:20:40 +00:00
|
|
|
|
2019-05-06 02:58:04 +00:00
|
|
|
@Override
|
2018-08-15 05:20:40 +00:00
|
|
|
public BlockState[] getTileEntities() {
|
2019-05-26 01:56:30 +00:00
|
|
|
+ // Paper start
|
2018-08-15 05:20:40 +00:00
|
|
|
+ return getTileEntities(true);
|
|
|
|
+ }
|
2019-05-26 01:56:30 +00:00
|
|
|
+
|
2019-05-06 02:58:04 +00:00
|
|
|
+ @Override
|
2018-08-15 05:20:40 +00:00
|
|
|
+ public BlockState[] getTileEntities(boolean useSnapshot) {
|
2019-05-26 01:56:30 +00:00
|
|
|
if (!isLoaded()) {
|
|
|
|
getWorld().getChunkAt(x, z); // Transient load for this tick
|
|
|
|
}
|
2018-08-15 05:20:40 +00:00
|
|
|
+ // Paper end
|
|
|
|
int index = 0;
|
|
|
|
net.minecraft.server.Chunk chunk = getHandle();
|
|
|
|
|
2019-12-13 14:08:40 +00:00
|
|
|
@@ -141,7 +148,7 @@ public class CraftChunk implements Chunk {
|
2018-08-15 05:20:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
BlockPosition position = (BlockPosition) obj;
|
|
|
|
- entities[index++] = worldServer.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()).getState();
|
|
|
|
+ entities[index++] = worldServer.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()).getState(useSnapshot); // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
return entities;
|
|
|
|
--
|
2020-03-15 20:03:36 +00:00
|
|
|
2.25.1
|
2018-08-15 05:20:40 +00:00
|
|
|
|