Skip to content
This repository was archived by the owner on Oct 27, 2025. It is now read-only.

Commit cb46266

Browse files
committed
everything is broken :l
1 parent a02b352 commit cb46266

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

src/jvmMain/kotlin/Server.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ import org.jetbrains.annotations.ApiStatus
9191
import java.io.File
9292
import java.io.FileReader
9393
import java.io.IOException
94-
import java.net.InetAddress
95-
import java.net.InetSocketAddress
9694
import java.net.UnknownHostException
9795
import java.nio.ByteBuffer
9896
import java.nio.ByteOrder
@@ -515,8 +513,6 @@ class Server internal constructor(
515513
this.start()
516514
}
517515

518-
val enabledNetworkEncryption: Boolean = settings.networkSettings.encryption
519-
520516
private fun loadLevels() {
521517
val file = File(this.dataPath + "/worlds")
522518
if (!file.isDirectory) throw RuntimeException("worlds isn't directory")

src/jvmMain/kotlin/network/connection/BedrockSession.kt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,12 @@ class BedrockSession(val peer: BedrockPeer, val subClientId: Int) : Loggable {
7575
.onExit(Action { this.onSessionStartSuccess() })
7676
.permit(SessionState.Login, SessionState.Login)
7777

78-
cfg.configure(SessionState.Login).onEntry(Action {
79-
this.packetHandler = (
80-
LoginHandler(
81-
this
82-
) { info: PlayerInfo? ->
83-
this.info = info
84-
})
85-
})
78+
cfg.configure(SessionState.Login)
79+
.onEntry(Action { this.packetHandler = LoginHandler(this) { this.info = it } })
8680
.onExit(Action { this.onServerLoginSuccess() })
8781
.permitIf(
8882
SessionState.Encryption, SessionState.Encryption
89-
) { Server.instance.enabledNetworkEncryption }
83+
) { Server.instance.settings.networkSettings.encryption }
9084
.permit(SessionState.ResourcePack, SessionState.ResourcePack)
9185

9286
cfg.configure(SessionState.Encryption)

src/jvmMain/kotlin/network/process/handler/LoginHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class LoginHandler(session: BedrockSession, private val consumer: Consumer<Playe
165165
return
166166
}
167167

168-
if (server.enabledNetworkEncryption) {
168+
if (server.settings.networkSettings.encryption) {
169169
this.enableEncryption(chainData)
170170
} else {
171171
session.machine.fire(SessionState.ResourcePack)

0 commit comments

Comments
 (0)