From 15221d0edb85b0dcf28851106abae3648b851b14 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Fri, 25 May 2018 12:30:42 +0300 Subject: [PATCH] Fixed Chunk load calculation on Sponge --- .../plan/system/tasks/server/SpongeTPSCountTimer.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/SpongeTPSCountTimer.java b/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/SpongeTPSCountTimer.java index f19301d6a..8824c69a3 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/SpongeTPSCountTimer.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/SpongeTPSCountTimer.java @@ -8,12 +8,10 @@ import com.djrapitops.plan.system.tasks.TPSCountTimer; import com.djrapitops.plan.utilities.analysis.MathUtils; import com.djrapitops.plugin.api.utility.log.Log; import org.spongepowered.api.Sponge; -import org.spongepowered.api.world.Chunk; import org.spongepowered.api.world.World; import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; -import java.util.Iterator; public class SpongeTPSCountTimer extends TPSCountTimer { @@ -62,7 +60,7 @@ public class SpongeTPSCountTimer extends TPSCountTimer { double tps = Sponge.getGame().getServer().getTicksPerSecond(); int playersOnline = ServerInfo.getServerProperties().getOnlinePlayers(); latestPlayersOnline = playersOnline; - int loadedChunks = -1; + int loadedChunks = getLoadedChunks(); int entityCount = getEntityCount(); return TPSBuilder.get() @@ -82,14 +80,9 @@ public class SpongeTPSCountTimer extends TPSCountTimer { * @return amount of loaded chunks */ private int getLoadedChunks() { - // DISABLED - int loaded = 0; for (World world : Sponge.getGame().getServer().getWorlds()) { - Iterator iterator = world.getLoadedChunks().iterator(); - while (iterator.hasNext()) { - loaded++; - } + loaded += world.getLoadedChunks().spliterator().estimateSize(); } return loaded; }