62 lines
2.3 KiB
Diff
62 lines
2.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 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 b50ed67714fea93fc6708f2680ae909f403deb00..29f5311260d0d5ee321db94031ffc3ed528d6b02 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
@@ -282,6 +282,48 @@ public class CraftWorld implements World {
|
||
|
|
private int waterAmbientSpawn = -1;
|
||
|
|
private int ambientSpawn = -1;
|
||
|
|
|
||
|
|
+ // Paper start - Provide fast information methods
|
||
|
|
+ public int getEntityCount() {
|
||
|
|
+ int ret = 0;
|
||
|
|
+ for (net.minecraft.world.entity.Entity entity : world.entitiesById.values()) {
|
||
|
|
+ if (entity.isChunkLoaded()) {
|
||
|
|
+ ++ret;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ return ret;
|
||
|
|
+ }
|
||
|
|
+ public int getTileEntityCount() {
|
||
|
|
+ // We don't use the full world tile entity list, so we must iterate chunks
|
||
|
|
+ Long2ObjectLinkedOpenHashMap<PlayerChunk> chunks = world.getChunkProvider().playerChunkMap.visibleChunks;
|
||
|
|
+ int size = 0;
|
||
|
|
+ for (PlayerChunk playerchunk : chunks.values()) {
|
||
|
|
+ net.minecraft.world.level.chunk.Chunk chunk = playerchunk.getChunk();
|
||
|
|
+ if (chunk == null) {
|
||
|
|
+ continue;
|
||
|
|
+ }
|
||
|
|
+ size += chunk.tileEntities.size();
|
||
|
|
+ }
|
||
|
|
+ return size;
|
||
|
|
+ }
|
||
|
|
+ public int getTickableTileEntityCount() {
|
||
|
|
+ return world.tileEntityListTick.size();
|
||
|
|
+ }
|
||
|
|
+ public int getChunkCount() {
|
||
|
|
+ int ret = 0;
|
||
|
|
+
|
||
|
|
+ for (PlayerChunk chunkHolder : world.getChunkProvider().playerChunkMap.visibleChunks.values()) {
|
||
|
|
+ if (chunkHolder.getChunk() != null) {
|
||
|
|
+ ++ret;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return ret;
|
||
|
|
+ }
|
||
|
|
+ public int getPlayerCount() {
|
||
|
|
+ return world.players.size();
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
private static final Random rand = new Random();
|
||
|
|
|
||
|
|
public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
|