Skip to content

Commit 1a92bf8

Browse files
refactor: simplify getSeenServers by using toMutableObjectList, ensure base server is included in the result
1 parent f808c82 commit 1a92bf8

File tree

1 file changed

+7
-4
lines changed
  • surf-tab-velocity/src/main/kotlin/dev/slne/surf/tab/velocity/service

1 file changed

+7
-4
lines changed

surf-tab-velocity/src/main/kotlin/dev/slne/surf/tab/velocity/service/TablistService.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package dev.slne.surf.tab.velocity.service
33
import com.velocitypowered.api.proxy.Player
44
import com.velocitypowered.api.proxy.server.RegisteredServer
55
import dev.slne.surf.surfapi.core.api.util.mutableObject2ObjectMapOf
6+
import dev.slne.surf.surfapi.core.api.util.toMutableObjectList
67
import dev.slne.surf.tab.api.entry.TabEntry
78
import dev.slne.surf.tab.api.entry.TabGameMode
89
import dev.slne.surf.tab.velocity.hook.LuckPermsHook
@@ -43,11 +44,13 @@ class VelocityTablistService {
4344

4445
fun getSeenServers(base: RegisteredServer): List<RegisteredServer> {
4546
val groups = tablistConfig.groups.map { it.toTabGroup() }
46-
47-
return groups
47+
val servers = groups
4848
.filter { base in it.getServers() }
49-
.flatMap { it.getServers() }
50-
.distinct()
49+
.flatMap { it.getServers() }.distinct().toMutableObjectList()
50+
51+
servers.add(base)
52+
53+
return servers
5154
}
5255

5356
fun createEntry(target: Player) = TabEntry(

0 commit comments

Comments
 (0)