From fa8b2cf08c205d06baa689aa232113814c666822 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 29 Aug 2021 13:05:22 +0100 Subject: [PATCH] Fixed leaderboard bug --- .../main/kotlin/com/willfp/ecoskills/commands/CommandTop.kt | 5 +---- .../kotlin/com/willfp/ecoskills/data/LeaderboardHandler.kt | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandTop.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandTop.kt index 1234f28..e7fcc83 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandTop.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandTop.kt @@ -6,7 +6,6 @@ import com.willfp.eco.core.command.impl.Subcommand import com.willfp.eco.util.StringUtils import com.willfp.ecoskills.data.LeaderboardHandler import com.willfp.ecoskills.getTotalSkillLevel -import org.bukkit.Bukkit import org.bukkit.command.CommandSender import org.bukkit.entity.Player @@ -21,11 +20,9 @@ class CommandTop(plugin: EcoPlugin) : override fun getHandler(): CommandHandler { return CommandHandler { sender: CommandSender, args: List -> val page = args.firstOrNull()?.toIntOrNull() ?: 1 - Bukkit.getLogger().info("page raw $page") - val top = LeaderboardHandler.getPage(page) - val messages = plugin.langYml.getStrings("top", false) + val messages = plugin.langYml.getStrings("top", false).toMutableList() val lines = mutableListOf() val useDisplayName = plugin.configYml.getBool("commands.top.use-display-name") diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/data/LeaderboardHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/data/LeaderboardHandler.kt index e062e59..8fbe956 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/data/LeaderboardHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/data/LeaderboardHandler.kt @@ -14,10 +14,9 @@ class LeaderboardHandler { fun getPage(page: Int): MutableMap { val maxPage = ceil(sortedLeaderboard.size / 10.0).toInt() val finalPage = max(1, min(page, maxPage)) - Bukkit.getLogger().info("page final $finalPage") val startIndex = (finalPage - 1) * 10 - val endIndex = min(startIndex + 9, sortedLeaderboard.size - 1) + val endIndex = min(startIndex + 10, sortedLeaderboard.size - 1) val players = sortedLeaderboard.subList(startIndex, endIndex) val withRank = mutableMapOf()