5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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 Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
From 70a70adf0677f59455399810bd75c9244acbda2b Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 15 Aug 2018 01:04:58 -0400
|
|
Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
|
|
index fe77e33ae..6d45a4213 100644
|
|
--- a/src/main/java/org/bukkit/Chunk.java
|
|
+++ b/src/main/java/org/bukkit/Chunk.java
|
|
@@ -99,13 +99,26 @@ public interface Chunk {
|
|
@NotNull
|
|
Entity[] getEntities();
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Get a list of all tile entities in the chunk.
|
|
+ *
|
|
+ * @return The tile entities.
|
|
+ */
|
|
+ @NotNull
|
|
+ default BlockState[] getTileEntities() {
|
|
+ return getTileEntities(true);
|
|
+ }
|
|
+
|
|
/**
|
|
* Get a list of all tile entities in the chunk.
|
|
*
|
|
+ * @param useSnapshot Take snapshots or direct references
|
|
* @return The tile entities.
|
|
*/
|
|
@NotNull
|
|
- BlockState[] getTileEntities();
|
|
+ BlockState[] getTileEntities(boolean useSnapshot);
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Checks if the chunk is loaded.
|
|
--
|
|
2.21.0
|
|
|