From 0dded6e9b3f4dd22ab9a64928c00516293424452 Mon Sep 17 00:00:00 2001 From: Till Hoffmann Date: Fri, 10 Jan 2025 19:29:11 +0100 Subject: [PATCH 1/2] fix: bug in connection finding process --- .../plugin/connection/shared/ServerConnectionPlugin.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connection-shared/src/main/kotlin/app/simplecloud/plugin/connection/shared/ServerConnectionPlugin.kt b/connection-shared/src/main/kotlin/app/simplecloud/plugin/connection/shared/ServerConnectionPlugin.kt index 9ed5b0d..3e4dc81 100644 --- a/connection-shared/src/main/kotlin/app/simplecloud/plugin/connection/shared/ServerConnectionPlugin.kt +++ b/connection-shared/src/main/kotlin/app/simplecloud/plugin/connection/shared/ServerConnectionPlugin.kt @@ -37,10 +37,10 @@ class ServerConnectionPlugin

( private fun getConnectionAndName(player: P, targetConnections: List, fromServerName: String = ""): Pair? { val possibleConnections = getPossibleServerConnections(player) - val possibleConnectionsWithTarget = possibleConnections.map { possibleConnection -> + val possibleConnectionsWithTarget = possibleConnections.mapNotNull { possibleConnection -> val targetConfig= targetConnections .filter { fromServerName.isBlank() || matchesTargetConnection(it, fromServerName) } - .firstOrNull { possibleConnection.name == it.name } ?: return null + .firstOrNull { possibleConnection.name == it.name } ?: return@mapNotNull null ConnectionAndTargetConfig(possibleConnection, targetConfig) } From 62bbe5e4c47494a47802218a2cb0ab58f5808bca Mon Sep 17 00:00:00 2001 From: Till Hoffmann Date: Sat, 11 Jan 2025 18:14:04 +0100 Subject: [PATCH 2/2] refactor: optimize target connection finding process --- .../plugin/connection/shared/ServerConnectionPlugin.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/connection-shared/src/main/kotlin/app/simplecloud/plugin/connection/shared/ServerConnectionPlugin.kt b/connection-shared/src/main/kotlin/app/simplecloud/plugin/connection/shared/ServerConnectionPlugin.kt index 3e4dc81..5d87c1c 100644 --- a/connection-shared/src/main/kotlin/app/simplecloud/plugin/connection/shared/ServerConnectionPlugin.kt +++ b/connection-shared/src/main/kotlin/app/simplecloud/plugin/connection/shared/ServerConnectionPlugin.kt @@ -37,9 +37,10 @@ class ServerConnectionPlugin

( private fun getConnectionAndName(player: P, targetConnections: List, fromServerName: String = ""): Pair? { val possibleConnections = getPossibleServerConnections(player) - val possibleConnectionsWithTarget = possibleConnections.mapNotNull { possibleConnection -> - val targetConfig= targetConnections - .filter { fromServerName.isBlank() || matchesTargetConnection(it, fromServerName) } + 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) }