init

SPIKA-development · Aug 4, 2023 · 8596c28 · 8596c28
1 parent 3d69064
commit 8596c28
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/client/src/commonMain/kotlin/ui/waitingRoom.kt b/client/src/commonMain/kotlin/ui/waitingRoom.kt
@@ -71,7 +71,6 @@ suspend fun waitingRoom(room: UUID) {
                 scroll.horizontal.view.visible = false
                 scroll.scrollTopRatio = 1f
                 onEvent(PacketEvent) { event ->
-                    println("chat")
                     val packet = event.packet
                     if (packet !is ChatPacket) return@onEvent
                     val (username, message) = packet

diff --git a/client/src/commonMain/kotlin/websocket/websocket.kt b/client/src/commonMain/kotlin/websocket/websocket.kt
@@ -50,4 +50,4 @@ fun serverPacket(serverPacket: ServerPacket): PacketController<Any> = when(serve
     PLAYER_LEAVE -> packet<PlayerLeavePacket>()
 } as PacketController<Any>
 
-private inline fun <reified T : Any> packet() = packet<T> { { sceneContainer.dispatch(PacketEvent(it)) } }
+private inline fun <reified T : Any> packet() = packet<T> { sceneContainer.dispatch(PacketEvent(it)) }
diff --git a/server/src/main/kotlin/application/websocket.kt b/server/src/main/kotlin/application/websocket.kt
@@ -21,7 +21,7 @@ import java.util.*
 import kotlin.collections.LinkedHashSet
 
 val serverUUID = UUID.generateUUID()
-val connections: MutableSet<Connection> = Collections.synchronizedSet<Connection?>(LinkedHashSet())
+val connections: MutableSet<Connection> = Collections.synchronizedSet(LinkedHashSet())
 fun getPlayersByRoom(room: UUID) =
     connections.filter { runCatching { getPlayerBySession(it.session).room?.equals(room) }.getOrNull()?: false }
 
@@ -60,9 +60,6 @@ fun Application.configureWebsocket() {
 suspend fun serverPacket(websocket: DefaultWebSocketSession, session: UUID, clientPacket: ClientPacket): PacketController<Any> = when(clientPacket) {
     ClientPacket.GET_ROOM_NUMBER -> packet<UUID> {
         transaction { Room.find(Rooms.id eq it).first().name }
-    }
-    ClientPacket.LEAVE_ROOM -> packet {
-
     }
     ClientPacket.CHAT -> packet<String> { received ->
         val player = getPlayerBySession(session)

diff --git a/shared/src/commonMain/kotlin/network/Packets.kt b/shared/src/commonMain/kotlin/network/Packets.kt
@@ -4,7 +4,6 @@ import kotlinx.serialization.Serializable
 
 enum class ClientPacket {
     GET_ROOM_NUMBER,
-    LEAVE_ROOM,
     CHAT
 }