fix(ui): Websocket
Removed debug messages, reformatted method
This commit is contained in:
@@ -59,9 +59,6 @@ class GameLobby private(
|
||||
if (event.oldState == MainMenu && event.newState == Lobby) {
|
||||
return
|
||||
}
|
||||
if (event.oldState == Lobby && event.newState == InGame) {
|
||||
println("RECEIVED GAMESTATEEVENT")
|
||||
}
|
||||
users.values.foreach(session => session.updatePlayer(event))
|
||||
case event: SimpleEvent =>
|
||||
users.values.foreach(session => session.updatePlayer(event))
|
||||
@@ -74,7 +71,6 @@ class GameLobby private(
|
||||
* @param user the user who wants to start the game.
|
||||
*/
|
||||
def startGame(user: User): Unit = {
|
||||
println("STARTED GAME IN LOGIC")
|
||||
val sessionOpt = users.get(user.id)
|
||||
if (sessionOpt.isEmpty) {
|
||||
throw new NotInThisGameException("You are not in this game!")
|
||||
|
||||
@@ -28,7 +28,7 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e
|
||||
else canInteract = Some(InteractionType.Card)
|
||||
case _ =>
|
||||
}
|
||||
websocketActor.foreach(_.transmitEventToClient(event, gameLobby, user))
|
||||
websocketActor.foreach(_.transmitEventToClient(event))
|
||||
}
|
||||
|
||||
override def id: UUID = user.id
|
||||
@@ -47,7 +47,6 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e
|
||||
// No action needed for Ping
|
||||
()
|
||||
case "Start Game" =>
|
||||
println("INSIDE HANDLE WEB RESPONSE" + data)
|
||||
gameLobby.startGame(user)
|
||||
case "play Card" =>
|
||||
println("PLAYING CARD..." + data)
|
||||
|
||||
@@ -99,8 +99,7 @@ class UserWebsocketActor(
|
||||
transmitTextToClient(jsonObj.toString())
|
||||
}
|
||||
|
||||
def transmitEventToClient(event: SimpleEvent, gameLobby: GameLobby, user: User): Unit = {
|
||||
val session = gameLobby.getUserSession(user.id)
|
||||
def transmitEventToClient(event: SimpleEvent): Unit = {
|
||||
transmitJsonToClient(WebsocketEventMapper.toJson(event, session))
|
||||
}
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
}
|
||||
</div>
|
||||
<div class="col-12 text-center mb-5">
|
||||
<div class="btn btn-success" onclick="startGame('@gamelobby.id', '@user.get.id', '@user.get.name','@user.get.passwordHash', @user.get.internalId)">Start Game</div>
|
||||
<div class="btn btn-success" onclick="startGame()">Start Game</div>
|
||||
</div>
|
||||
} else {
|
||||
<div id="players" class="justify-content-center align-items-center d-flex">
|
||||
|
||||
@@ -27,7 +27,6 @@ function handlePlayCard(cardIndex, dog) {
|
||||
).catch(
|
||||
(err) => {
|
||||
const cardslide = $('#card-slide')
|
||||
console.log("EERROOOORRR PLAYING CARD" + (err.toString() === "You can't play this card!") + err.message)
|
||||
console.warn("play card was not successful")
|
||||
if (err.message === "You can't play this card!") {
|
||||
cardslide.removeClass("inactive")
|
||||
|
||||
Reference in New Issue
Block a user