feat(ui): Implement countless feature using the SJWP #89
@@ -2,7 +2,7 @@ package logic.game
|
|||||||
|
|
||||||
import de.knockoutwhist.cards.{Hand, Suit}
|
import de.knockoutwhist.cards.{Hand, Suit}
|
||||||
import de.knockoutwhist.control.GameLogic
|
import de.knockoutwhist.control.GameLogic
|
||||||
import de.knockoutwhist.control.GameState.{InGame, Lobby, MainMenu}
|
import de.knockoutwhist.control.GameState.{Lobby, MainMenu}
|
||||||
|
Janis marked this conversation as resolved
Outdated
|
|||||||
import de.knockoutwhist.control.controllerBaseImpl.sublogic.util.{MatchUtil, PlayerUtil}
|
import de.knockoutwhist.control.controllerBaseImpl.sublogic.util.{MatchUtil, PlayerUtil}
|
||||||
import de.knockoutwhist.events.global.{GameStateChangeEvent, SessionClosed}
|
import de.knockoutwhist.events.global.{GameStateChangeEvent, SessionClosed}
|
||||||
import de.knockoutwhist.events.player.PlayerEvent
|
import de.knockoutwhist.events.player.PlayerEvent
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e
|
|||||||
canInteract = None
|
canInteract = None
|
||||||
}
|
}
|
||||||
|
|
||||||
def handleWebResponse(eventType: String, data: JsObject, user: User, gameLobby: GameLobby): Unit = {
|
def handleWebResponse(eventType: String, data: JsObject): Unit = {
|
||||||
|
Janis marked this conversation as resolved
Outdated
Janis
commented
Parameters are too much. Parameters are too much.
|
|||||||
lock.lock()
|
lock.lock()
|
||||||
val result = Try {
|
val result = Try {
|
||||||
eventType match {
|
eventType match {
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ class UserWebsocketActor(
|
|||||||
val event = eventOpt.get
|
val event = eventOpt.get
|
||||||
val data = (json \ "data").asOpt[JsObject].getOrElse(Json.obj())
|
val data = (json \ "data").asOpt[JsObject].getOrElse(Json.obj())
|
||||||
val result = Try {
|
val result = Try {
|
||||||
session.handleWebResponse(event, data, session.user, session.gameLobby)
|
session.handleWebResponse(event, data)
|
||||||
|
lq64 marked this conversation as resolved
Outdated
Janis
commented
Ne Ne
|
|||||||
}
|
}
|
||||||
if (result.isSuccess) {
|
if (result.isSuccess) {
|
||||||
transmitJsonToClient(Json.obj(
|
transmitJsonToClient(Json.obj(
|
||||||
|
|||||||
Reference in New Issue
Block a user
Remove unused import