Skip to content

Commit 4ea98ed

Browse files
committed
revert: fix scoreboard creation happening async
1 parent 3106ea1 commit 4ea98ed

1 file changed

Lines changed: 23 additions & 25 deletions

File tree

src/main/kotlin/dev/boecker/cherrycave/slpf/SimpleLuckPermsFormatter.kt

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ class SimpleLuckPermsFormatter : JavaPlugin(), Listener {
4444

4545
override fun onEnable() {
4646
luckPerms = loadLuckPerms() ?: error("Unable to load the LuckPerms API")
47-
Bukkit.getPluginManager()
47+
server.pluginManager
4848
.registerEvents(this, this)
4949

5050
val update = Consumer<Any> {
51-
Bukkit.getOnlinePlayers().forEach {
51+
server.onlinePlayers.forEach {
5252
it.updateScoreboard()
5353
it.updatePrefixes()
5454
}
@@ -73,30 +73,28 @@ class SimpleLuckPermsFormatter : JavaPlugin(), Listener {
7373
}
7474

7575
private fun Player.updateScoreboard() {
76-
server.scheduler.runTask(this@SimpleLuckPermsFormatter) { _ ->
77-
scoreboard = Bukkit.getScoreboardManager().newScoreboard
78-
scoreboard.teams.forEach {
79-
it.unregister()
80-
}
81-
if (disableFormatting) return@runTask
82-
luckPerms.groupManager.loadedGroups
83-
.sortedByDescending { it.weight.orElse(0) }
84-
.forEachIndexed { index, group ->
85-
val team =
86-
scoreboard.registerNewTeam(getFormattedWeight(group.weight.orElse(index)) + group.name)
87-
team.prefix(
88-
miniMessage.deserialize(group.cachedData.metaData.prefix ?: "")
89-
)
90-
team.suffix(
91-
miniMessage.deserialize(group.cachedData.metaData.suffix ?: "")
92-
)
93-
team.color(
94-
NamedTextColor.NAMES.value(
95-
group.cachedData.metaData.getMetaValue("color")?.lowercase() ?: "gray"
96-
)
97-
)
98-
}
76+
if (disableFormatting) return
77+
scoreboard = Bukkit.getScoreboardManager().newScoreboard
78+
scoreboard.teams.forEach {
79+
it.unregister()
9980
}
81+
luckPerms.groupManager.loadedGroups
82+
.sortedByDescending { it.weight.orElse(0) }
83+
.forEachIndexed { index, group ->
84+
val team =
85+
scoreboard.registerNewTeam(getFormattedWeight(group.weight.orElse(index)) + group.name)
86+
team.prefix(
87+
miniMessage.deserialize(group.cachedData.metaData.prefix ?: "")
88+
)
89+
team.suffix(
90+
miniMessage.deserialize(group.cachedData.metaData.suffix ?: "")
91+
)
92+
team.color(
93+
NamedTextColor.NAMES.value(
94+
group.cachedData.metaData.getMetaValue("color")?.lowercase() ?: "gray"
95+
)
96+
)
97+
}
10098
}
10199

102100
private fun loadLuckPerms(): LuckPerms? {

0 commit comments

Comments
 (0)