TakeV/Paper
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
Paper/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch

50 lines
1.3 KiB
Diff
Raw Normal View History

Update upstream & fix some chunk related issues (#2177) * 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
2019-06-14 02:27:40 +00:00
From a9222d3c4350c8a74f59350de1232146f4b4630b Mon Sep 17 00:00:00 2001
Provide E/TE/Chunk count stat methods Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections.
2017-01-07 20:27:46 +00:00
From: Aikar <aikar@aikar.co>
Date: Sat, 7 Jan 2017 15:23:03 -0500
Subject: [PATCH] Provide E/TE/Chunk count stat methods
Provides counts without the ineffeciency of using .getEntities().size()
which creates copy of the collections.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
Updated Upstream (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 CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason
2019-06-06 15:36:57 +00:00
index ac7ef3c8b..d1d64fb60 100644
Provide E/TE/Chunk count stat methods Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections.
2017-01-07 20:27:46 +00:00
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
Update Upstream
2019-05-06 02:58:04 +00:00
@@ -38,6 +38,33 @@ import org.jetbrains.annotations.Nullable;
Provide E/TE/Chunk count stat methods Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections.
2017-01-07 20:27:46 +00:00
*/
public interface World extends PluginMessageRecipient, Metadatable {
+ // Paper start
Enforce Sync Chunk Unloads Unloading Chunks async is extremely dangerous. This will force it to main the same way we handle async chunk loads.
2017-01-07 21:08:16 +00:00
+ /**
+ * @return The amount of Entities in this world
+ */
Provide E/TE/Chunk count stat methods Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections.
2017-01-07 20:27:46 +00:00
+ int getEntityCount();
Enforce Sync Chunk Unloads Unloading Chunks async is extremely dangerous. This will force it to main the same way we handle async chunk loads.
2017-01-07 21:08:16 +00:00
+
+ /**
+ * @return The amount of Tile Entities in this world
+ */
Provide E/TE/Chunk count stat methods Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections.
2017-01-07 20:27:46 +00:00
+ int getTileEntityCount();
Enforce Sync Chunk Unloads Unloading Chunks async is extremely dangerous. This will force it to main the same way we handle async chunk loads.
2017-01-07 21:08:16 +00:00
+
+ /**
+ * @return The amount of Tickable Tile Entities in this world
+ */
Provide E/TE/Chunk count stat methods Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections.
2017-01-07 20:27:46 +00:00
+ int getTickableTileEntityCount();
Enforce Sync Chunk Unloads Unloading Chunks async is extremely dangerous. This will force it to main the same way we handle async chunk loads.
2017-01-07 21:08:16 +00:00
+
+ /**
+ * @return The amount of Chunks in this world
+ */
Provide E/TE/Chunk count stat methods Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections.
2017-01-07 20:27:46 +00:00
+ int getChunkCount();
Add World.getPlayerCount
2017-01-13 12:00:33 +00:00
+
+ /**
+ * @return The amount of Players in this world
+ */
+ int getPlayerCount();
Provide E/TE/Chunk count stat methods Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections.
2017-01-07 20:27:46 +00:00
+ // Paper end
+
/**
* Gets the {@link Block} at the given coordinates
*
--
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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 Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes: 8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep 8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals 39a287b7 Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
2019-03-20 00:28:15 +00:00
2.21.0
Provide E/TE/Chunk count stat methods Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections.
2017-01-07 20:27:46 +00:00
Reference in a new issue Copy permalink