2019-05-09 09:20:01 +02:00
|
|
|
From 2c7c11780055e40e42eae8b6d6a5ab2f578bc92a Mon Sep 17 00:00:00 2001
|
2017-01-07 21:27:46 +01:00
|
|
|
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.
|
|
|
|
|
2019-05-09 09:20:01 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
|
|
index ff75bb3c6..5ed0fbe5a 100644
|
|
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
|
|
@@ -51,7 +51,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
|
|
|
|
public class WorldServer extends World {
|
|
|
|
|
|
|
|
private static final Logger LOGGER = LogManager.getLogger();
|
|
|
|
- private final List<Entity> globalEntityList = Lists.newArrayList();
|
|
|
|
+ public final List<Entity> globalEntityList = Lists.newArrayList(); // Paper - private -> public
|
|
|
|
public final Int2ObjectMap<Entity> entitiesById = new Int2ObjectLinkedOpenHashMap();
|
|
|
|
private final Map<UUID, Entity> entitiesByUUID = Maps.newHashMap();
|
|
|
|
private final Queue<Entity> entitiesToAdd = Queues.newArrayDeque();
|
2017-01-07 21:27:46 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2019-05-09 09:20:01 +02:00
|
|
|
index b8de76007..c79b0f42a 100644
|
2017-01-07 21:27:46 +01:00
|
|
|
--- 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;
|
2017-01-07 21:27:46 +01:00
|
|
|
|
|
|
|
+ // Paper start - Provide fast information methods
|
2019-05-06 05:53:47 +02:00
|
|
|
+ // TODO review these changes
|
2017-01-07 21:27:46 +01:00
|
|
|
+ public int getEntityCount() {
|
2019-05-09 09:20:01 +02:00
|
|
|
+ return world.globalEntityList.size();
|
2017-01-07 21:27:46 +01:00
|
|
|
+ }
|
|
|
|
+ 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;
|
2017-01-07 21:27:46 +01:00
|
|
|
+ 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;
|
|
|
|
+ }
|
2017-01-07 21:27:46 +01:00
|
|
|
+ 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-07 21:27:46 +01:00
|
|
|
+ }
|
2017-01-13 13:00:33 +01:00
|
|
|
+ public int getPlayerCount() {
|
|
|
|
+ return world.players.size();
|
|
|
|
+ }
|
2017-01-07 21:27:46 +01:00
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
private static final Random rand = new Random();
|
|
|
|
|
|
|
|
public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
|
|
|
|
--
|
2019-04-22 23:36:14 +02:00
|
|
|
2.21.0
|
2017-01-07 21:27:46 +01:00
|
|
|
|