2021-06-12 11:01:04 +02:00
|
|
|
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/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
2024-04-24 03:25:14 +02:00
|
|
|
index b2b0dea688df220a06abd458ac47aae3d67a7797..e78f39ce95e587b84afccae0e4635171370b7323 100644
|
2021-06-12 11:01:04 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
2024-04-24 03:25:14 +02:00
|
|
|
@@ -113,7 +113,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
2021-06-12 11:01:04 +02:00
|
|
|
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();
|
2024-01-22 19:01:10 +01:00
|
|
|
+ public final List<TickingBlockEntity> blockEntityTickers = Lists.newArrayList(); // Paper - public
|
2022-06-07 22:12:48 +02:00
|
|
|
protected final NeighborUpdater neighborUpdater;
|
2021-06-12 11:01:04 +02:00
|
|
|
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
|
2024-04-24 03:25:14 +02:00
|
|
|
index c793bae3d7c6da5014862c98b08fc3fa2374866d..b42d482defda5a91f4e625308d5fec8c8369e5fb 100644
|
2021-06-12 11:01:04 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2024-04-06 21:53:39 +02:00
|
|
|
@@ -164,6 +164,56 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2022-02-15 11:30:58 +01:00
|
|
|
private final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftWorld.DATA_TYPE_REGISTRY);
|
2021-09-23 23:07:44 +02:00
|
|
|
private net.kyori.adventure.pointer.Pointers adventure$pointers; // Paper - implement pointers
|
2021-06-12 11:01:04 +02:00
|
|
|
|
|
|
|
+ // 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;
|
2022-10-24 21:43:46 +02:00
|
|
|
+ for (ChunkHolder playerchunk : io.papermc.paper.chunk.system.ChunkSystem.getVisibleChunkHolders(this.world)) {
|
2021-06-12 11:01:04 +02:00
|
|
|
+ net.minecraft.world.level.chunk.LevelChunk chunk = playerchunk.getTickingChunk();
|
|
|
|
+ if (chunk == null) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ size += chunk.blockEntities.size();
|
|
|
|
+ }
|
|
|
|
+ return size;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int getTickableTileEntityCount() {
|
2024-01-22 19:01:10 +01:00
|
|
|
+ return world.blockEntityTickers.size();
|
2021-06-12 11:01:04 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int getChunkCount() {
|
|
|
|
+ int ret = 0;
|
|
|
|
+
|
2022-10-24 21:43:46 +02:00
|
|
|
+ for (ChunkHolder chunkHolder : io.papermc.paper.chunk.system.ChunkSystem.getVisibleChunkHolders(this.world)) {
|
2021-06-12 11:01:04 +02:00
|
|
|
+ if (chunkHolder.getTickingChunk() != null) {
|
|
|
|
+ ++ret;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return ret;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int getPlayerCount() {
|
2021-06-12 21:30:37 +02:00
|
|
|
+ return world.players().size();
|
2021-06-12 11:01:04 +02:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
private static final Random rand = new Random();
|
|
|
|
|
2021-08-25 09:59:26 +02:00
|
|
|
public CraftWorld(ServerLevel world, ChunkGenerator gen, BiomeProvider biomeProvider, Environment env) {
|