diff --git a/server/.idea/gradle.xml b/server/.idea/gradle.xml index 05e52194ddf..a5c3ae14628 100644 --- a/server/.idea/gradle.xml +++ b/server/.idea/gradle.xml @@ -11,7 +11,6 @@ - diff --git a/server/.idea/misc.xml b/server/.idea/misc.xml index 20cd4f70c34..b7544bd1ff4 100644 --- a/server/.idea/misc.xml +++ b/server/.idea/misc.xml @@ -1,5 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16,20 +54,4 @@ - - - - - 1.8 - - - - - - - \ No newline at end of file diff --git a/server/build.gradle b/server/build.gradle index 6d7f77128c1..cf1b229e00a 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -43,7 +43,7 @@ jar { manifest { attributes("Implementation-Title": "Gradle", "Implementation-Version": version, - "Class-Path": "kotlin-runtime-1.0.3.jar kotlin-stdlib-1.0.3.jar netty-all-4.1.2.Final.jar protokot-runtime.jar", + "Class-Path": "kotlin-runtime-1.0.3.jar kotlin-stdlib-1.0.3.jar netty-all-4.1.2.Final.jar protokot-runtime.jar async-http-client-2.0.0-RC9.jar", "Main-Class": "ServerMainKt") } diff --git a/server/src/main/java/DebugClInterface.kt b/server/src/main/java/DebugClInterface.kt index 3feab032994..fac79c3bdf0 100644 --- a/server/src/main/java/DebugClInterface.kt +++ b/server/src/main/java/DebugClInterface.kt @@ -1,6 +1,7 @@ import Exceptions.InactiveCarException import algorithm.AbstractAlgorithm import algorithm.RoomBypassingAlgorithm +import algorithm.RoomModel import car.client.CarClient import car.client.Client import io.netty.buffer.Unpooled @@ -68,7 +69,7 @@ object DebugClInterface { "pos" -> { val tmp = algorithmImpl if (tmp is RoomBypassingAlgorithm) { - println("points: ${tmp.points}") + println("walls: ${RoomModel.walls}") println("x: ${tmp.carX} y: ${tmp.carY} angle:${tmp.carAngle}") } } diff --git a/server/src/main/java/car/client/Client.kt b/server/src/main/java/car/client/Client.kt index bfa76837453..973f5a6f3ef 100644 --- a/server/src/main/java/car/client/Client.kt +++ b/server/src/main/java/car/client/Client.kt @@ -19,6 +19,7 @@ object Client { private val timeout = 5 * 60 * 60 * 1000 fun shutDownClient() { + client.close() group.shutdownGracefully() }