mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 04:31:58 +01:00
f09fed894f
--- work/Bukkit Submodule work/Bukkit 6a4242cb..337955e3: > SPIGOT-5468: Improve Beehive TileEntity API > #473: Add an API for passing the heightmap to getHighestBlockAt* method --- work/CraftBukkit Submodule work/CraftBukkit 807a677e..708be695: > SPIGOT-5468: Improve Beehive TileEntity API > #624: Add an API for passing the heightmap to getHighestBlockAt* method > MC-135989, SPIGOT-5564: Don't kick players for flight while riptiding This deprecates the Paper getHighestBlockAt HeightMap APIs now that Bukkit has added their own. These methods will stick around long enough for people to migrate. Their API is pretty much the same as ours, migration should be quick and easy.
64 lines
2.2 KiB
Diff
64 lines
2.2 KiB
Diff
From 5400af4052dd232cf9e2be9e1a6d73f9db1de5f9 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 5b03ff709..a41b32ddc 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -274,6 +274,48 @@ public class CraftWorld implements World {
|
|
private int waterAnimalSpawn = -1;
|
|
private int ambientSpawn = -1;
|
|
|
|
+ // Paper start - Provide fast information methods
|
|
+ public int getEntityCount() {
|
|
+ int ret = 0;
|
|
+ for (net.minecraft.server.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 (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() {
|
|
+ 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) {
|
|
--
|
|
2.25.0
|
|
|