mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 21:17:00 +01:00
2f782a6652
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From a3a148361baafd41e539bb5601ea9ad255df43a4 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 08f8d80965..011e40458e 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
|
@@ -121,9 +121,16 @@ public class CraftChunk implements Chunk {
|
|
|
|
@Override
|
|
public BlockState[] getTileEntities() {
|
|
+ // Paper start
|
|
+ return getTileEntities(true);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public BlockState[] getTileEntities(boolean useSnapshot) {
|
|
if (!isLoaded()) {
|
|
getWorld().getChunkAt(x, z); // Transient load for this tick
|
|
}
|
|
+ // Paper end
|
|
int index = 0;
|
|
net.minecraft.server.Chunk chunk = getHandle();
|
|
|
|
@@ -135,7 +142,7 @@ public class CraftChunk implements Chunk {
|
|
}
|
|
|
|
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;
|
|
--
|
|
2.21.0
|
|
|