Fix connecting to a tModLoader server behind the proxy

Cybermaxke · Cybermaxke · commit 1a81aa750c97 · 2024-09-27T17:06:35.000+02:00
Signed-off-by: Seppe Volkaerts &lt;seppevolkaerts@hotmail.com&gt;
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  kotlin("jvm") version "2.0.0"
+  kotlin("jvm") version "2.0.20"
   kotlin("plugin.serialization") version "2.0.0"
   id("org.cadixdev.licenser") version "0.6.1"
 }
diff --git a/proxy/src/main/kotlin/org/lanternpowered/terre/impl/network/backend/ServerInitConnectionHandler.kt b/proxy/src/main/kotlin/org/lanternpowered/terre/impl/network/backend/ServerInitConnectionHandler.kt
@@ -58,8 +58,8 @@ internal class ServerInitConnectionHandler(
   private var syncModNetIdsPacket: ModDataPacket? = null
 
   override fun initialize() {
+    connection.protocol = versionedProtocol.protocol
     val version = versionedProtocol.version
-    connection.protocol = ServerInitProtocol
     connection.send(ConnectionRequestPacket(ProtocolVersions.toString(version)))
     debug { "Send server connection request to ${connection.remoteAddress} with $version" }
   }
diff --git a/proxy/src/main/kotlin/org/lanternpowered/terre/impl/network/backend/ServerInitProtocol.kt b/proxy/src/main/kotlin/org/lanternpowered/terre/impl/network/backend/ServerInitProtocol.kt

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- kotlin("jvm") version "2.0.0"`
	`2`	`+ kotlin("jvm") version "2.0.20"`
`3`	`3`	`kotlin("plugin.serialization") version "2.0.0"`
`4`	`4`	`id("org.cadixdev.licenser") version "0.6.1"`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ internal class ServerInitConnectionHandler(`
`58`	`58`	`private var syncModNetIdsPacket: ModDataPacket? = null`
`59`	`59`
`60`	`60`	`override fun initialize() {`
	`61`	`+ connection.protocol = versionedProtocol.protocol`
`61`	`62`	`val version = versionedProtocol.version`
`62`		`- connection.protocol = ServerInitProtocol`
`63`	`63`	`connection.send(ConnectionRequestPacket(ProtocolVersions.toString(version)))`
`64`	`64`	`debug { "Send server connection request to ${connection.remoteAddress} with $version" }`
`65`	`65`	`}`