Paper/Spigot-Server-Patches/0143-Provide-E-TE-Chunk-count-stat-methods.patch

52 lines
1.9 KiB
Diff
Raw Normal View History

From a84f1fdd229f23f78b2bb5b09bc5ca4bd677daa6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index bddfc796db..6f8c2a1d2b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2019-05-06 05:53:47 +02:00
@@ -265,6 +265,35 @@ public class CraftWorld implements World {
2019-04-27 08:26:04 +02:00
private int waterAnimalSpawn = -1;
private int ambientSpawn = -1;
+ // Paper start - Provide fast information methods
2019-05-06 05:53:47 +02:00
+ // TODO review these changes
+ public int getEntityCount() {
+ return world.entitiesById.size();
+ }
+ public int getTileEntityCount() {
+ // We don't use the full world tile entity list, so we must iterate chunks
2019-05-06 05:53:47 +02:00
+ Long2ObjectLinkedOpenHashMap<PlayerChunk> chunks = world.getChunkProvider().playerChunkMap.visibleChunks;
+ int size = 0;
2019-05-06 05:53:47 +02:00
+ for (net.minecraft.server.PlayerChunk playerchunk : chunks.values()) {
+ net.minecraft.server.Chunk chunk = playerchunk.getChunk();
+ if (chunk == null) {
+ continue;
+ }
+ size += chunk.tileEntities.size();
+ }
+ return size;
+ }
+ public int getTickableTileEntityCount() {
+ return world.tileEntityListTick.size();
+ }
+ public int getChunkCount() {
2019-05-06 05:53:47 +02:00
+ return world.getChunkProvider().playerChunkMap.visibleChunks.size();
+ }
2017-01-13 13:00:33 +01:00
+ public int getPlayerCount() {
+ return world.players.size();
+ }
+ // Paper end
+
private static final Random rand = new Random();
public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
--
2.21.0