From 690d09f58d125fcde22a031335d0a1d6af37b954 Mon Sep 17 00:00:00 2001
From: vaperion <vaperion@riseup.net>
Date: Sat, 31 Dec 2022 15:37:47 +0100
Subject: Fix NPE in profiler when Chunk#getTileEntities returns null
---
.../src/main/java/me/lucko/spark/bukkit/BukkitWorldInfoProvider.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'spark-bukkit/src/main/java/me/lucko')
diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitWorldInfoProvider.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitWorldInfoProvider.java
index 8f876cf..8a4c0e4 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitWorldInfoProvider.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitWorldInfoProvider.java
@@ -27,6 +27,7 @@ import me.lucko.spark.common.platform.world.WorldInfoProvider;
import org.bukkit.Chunk;
import org.bukkit.Server;
import org.bukkit.World;
+import org.bukkit.block.BlockState;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
@@ -71,7 +72,8 @@ public class BukkitWorldInfoProvider implements WorldInfoProvider {
entities += world.getEntities().size();
Chunk[] chunksArray = world.getLoadedChunks();
for (Chunk chunk : chunksArray) {
- tileEntities += chunk.getTileEntities().length;
+ BlockState[] tileEntitiesArray = chunk.getTileEntities();
+ tileEntities += tileEntitiesArray != null ? tileEntitiesArray.length : 0;
}
chunks += chunksArray.length;
}
--
cgit