aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0123-Provide-E-TE-Chunk-count-stat-methods.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0123-Provide-E-TE-Chunk-count-stat-methods.patch')
-rw-r--r--patches/server/0123-Provide-E-TE-Chunk-count-stat-methods.patch82
1 files changed, 82 insertions, 0 deletions
diff --git a/patches/server/0123-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0123-Provide-E-TE-Chunk-count-stat-methods.patch
new file mode 100644
index 0000000000..f1025e5537
--- /dev/null
+++ b/patches/server/0123-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -0,0 +1,82 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Sat, 7 Jan 2017 15:24:46 -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/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+index 03b0720c6ebf1a876d56d18a941e0a06ed26dbf0..4fcbea7b8b12be10157da0c1f35c06e47c0334ad 100644
+--- a/src/main/java/net/minecraft/world/level/Level.java
++++ b/src/main/java/net/minecraft/world/level/Level.java
+@@ -114,7 +114,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+ public static final int TICKS_PER_DAY = 24000;
+ public static final int MAX_ENTITY_SPAWN_Y = 20000000;
+ public static final int MIN_ENTITY_SPAWN_Y = -20000000;
+- protected final List<TickingBlockEntity> blockEntityTickers = Lists.newArrayList();
++ public final List<TickingBlockEntity> blockEntityTickers = Lists.newArrayList(); // Paper - public
+ protected final NeighborUpdater neighborUpdater;
+ private final List<TickingBlockEntity> pendingBlockEntityTickers = Lists.newArrayList();
+ private boolean tickingBlockEntities;
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+index 4878a1b085a83dd4a8ffdc86250b8fb4fbac5192..1b7660a2d003bfb19ef80ba8066b6417f85328ec 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -164,6 +164,56 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+ private final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftWorld.DATA_TYPE_REGISTRY);
+ private net.kyori.adventure.pointer.Pointers adventure$pointers; // Paper - implement pointers
+
++ // Paper start - Provide fast information methods
++ @Override
++ public int getEntityCount() {
++ int ret = 0;
++ for (net.minecraft.world.entity.Entity entity : world.getEntities().getAll()) {
++ if (entity.isChunkLoaded()) {
++ ++ret;
++ }
++ }
++ return ret;
++ }
++
++ @Override
++ public int getTileEntityCount() {
++ // We don't use the full world tile entity list, so we must iterate chunks
++ int size = 0;
++ for (ChunkHolder playerchunk : ca.spottedleaf.moonrise.common.util.ChunkSystem.getVisibleChunkHolders(this.world)) {
++ net.minecraft.world.level.chunk.LevelChunk chunk = playerchunk.getTickingChunk();
++ if (chunk == null) {
++ continue;
++ }
++ size += chunk.blockEntities.size();
++ }
++ return size;
++ }
++
++ @Override
++ public int getTickableTileEntityCount() {
++ return world.blockEntityTickers.size();
++ }
++
++ @Override
++ public int getChunkCount() {
++ int ret = 0;
++
++ for (ChunkHolder chunkHolder : ca.spottedleaf.moonrise.common.util.ChunkSystem.getVisibleChunkHolders(this.world)) {
++ if (chunkHolder.getTickingChunk() != null) {
++ ++ret;
++ }
++ }
++
++ return ret;
++ }
++
++ @Override
++ public int getPlayerCount() {
++ return world.players().size();
++ }
++ // Paper end
++
+ private static final Random rand = new Random();
+
+ public CraftWorld(ServerLevel world, ChunkGenerator gen, BiomeProvider biomeProvider, Environment env) {