From 690d09f58d125fcde22a031335d0a1d6af37b954 Mon Sep 17 00:00:00 2001 From: vaperion 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') 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 From bcea61e5b221fd0c0ee6c2bc17c53473dc54c4fd Mon Sep 17 00:00:00 2001 From: vaperion Date: Sat, 31 Dec 2022 15:58:43 +0100 Subject: Exclude null chunks from the total chunk count --- .../java/me/lucko/spark/bukkit/BukkitWorldInfoProvider.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'spark-bukkit') 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 8a4c0e4..babb0bc 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 @@ -70,12 +70,21 @@ public class BukkitWorldInfoProvider implements WorldInfoProvider { chunks += world.getChunkCount(); } else { entities += world.getEntities().size(); + Chunk[] chunksArray = world.getLoadedChunks(); + int nullChunks = 0; + for (Chunk chunk : chunksArray) { + if (chunk == null) { + ++nullChunks; + continue; + } + BlockState[] tileEntitiesArray = chunk.getTileEntities(); tileEntities += tileEntitiesArray != null ? tileEntitiesArray.length : 0; } - chunks += chunksArray.length; + + chunks += chunksArray.length - nullChunks; } } -- cgit From 0f30d2983ec6ef487fd1966c1c22fa4a73e081f9 Mon Sep 17 00:00:00 2001 From: Luck Date: Tue, 7 Mar 2023 21:54:14 +0000 Subject: Don't use multi-release jar for websocket code --- spark-bukkit/build.gradle | 1 + 1 file changed, 1 insertion(+) (limited to 'spark-bukkit') diff --git a/spark-bukkit/build.gradle b/spark-bukkit/build.gradle index 92b65cc..1646bf2 100644 --- a/spark-bukkit/build.gradle +++ b/spark-bukkit/build.gradle @@ -37,6 +37,7 @@ shadowJar { relocate 'com.google.protobuf', 'me.lucko.spark.lib.protobuf' relocate 'org.objectweb.asm', 'me.lucko.spark.lib.asm' relocate 'one.profiler', 'me.lucko.spark.lib.asyncprofiler' + relocate 'me.lucko.bytesocks.client', 'me.lucko.spark.lib.bytesocks' exclude 'module-info.class' exclude 'META-INF/maven/**' -- cgit From 508df627ff03c04c82d4063b46417a62ad7e0797 Mon Sep 17 00:00:00 2001 From: Luck Date: Wed, 15 Mar 2023 18:39:25 +0000 Subject: Compile spark fabric/forge against MC 1.19.4 --- spark-bukkit/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spark-bukkit') diff --git a/spark-bukkit/build.gradle b/spark-bukkit/build.gradle index 1646bf2..4c33dfc 100644 --- a/spark-bukkit/build.gradle +++ b/spark-bukkit/build.gradle @@ -15,7 +15,7 @@ dependencies { } repositories { - maven { url 'https://papermc.io/repo/repository/maven-public/' } + maven { url "https://repo.papermc.io/repository/maven-public/" } } processResources { -- cgit