Skip to content

fix: bug in connection finding process #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tillhfm merged 2 commits into from
Jan 11, 2025
Merged

fix: bug in connection finding process #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dded6e
fix: bug in connection finding process
tillhfm Jan 10, 2025
62bbe5e
refactor: optimize target connection finding process
tillhfm Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...shared/src/main/kotlin/app/simplecloud/plugin/connection/shared/ServerConnectionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ class ServerConnectionPlugin<P>(

private fun getConnectionAndName(player: P, targetConnections: List<TargetConnectionConfig>, fromServerName: String = ""): Pair<ConnectionAndTargetConfig, String>? {
val possibleConnections = getPossibleServerConnections(player)
val possibleConnectionsWithTarget = possibleConnections.map { possibleConnection ->
val targetConfig= targetConnections
.filter { fromServerName.isBlank() || matchesTargetConnection(it, fromServerName) }
.firstOrNull { possibleConnection.name == it.name } ?: return null
val filteredTargetConnections = targetConnections.asSequence()
.filter { fromServerName.isBlank() || matchesTargetConnection(it, fromServerName) }
val possibleConnectionsWithTarget = possibleConnections.asSequence().mapNotNull { possibleConnection ->
val targetConfig = filteredTargetConnections
.firstOrNull { possibleConnection.name == it.name } ?: return@mapNotNull null
ConnectionAndTargetConfig(possibleConnection, targetConfig)
}

Expand Down