diff --git a/knockoutwhistweb/app/logic/game/GameLobby.scala b/knockoutwhistweb/app/logic/game/GameLobby.scala index 2bcdc7f..d998ea3 100644 --- a/knockoutwhistweb/app/logic/game/GameLobby.scala +++ b/knockoutwhistweb/app/logic/game/GameLobby.scala @@ -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!") diff --git a/knockoutwhistweb/app/model/sessions/UserSession.scala b/knockoutwhistweb/app/model/sessions/UserSession.scala index 7067850..4be8f15 100644 --- a/knockoutwhistweb/app/model/sessions/UserSession.scala +++ b/knockoutwhistweb/app/model/sessions/UserSession.scala @@ -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) diff --git a/knockoutwhistweb/app/model/sessions/UserWebsocketActor.scala b/knockoutwhistweb/app/model/sessions/UserWebsocketActor.scala index ffb7c0a..0ea5002 100644 --- a/knockoutwhistweb/app/model/sessions/UserWebsocketActor.scala +++ b/knockoutwhistweb/app/model/sessions/UserWebsocketActor.scala @@ -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)) } diff --git a/knockoutwhistweb/app/views/lobby/lobby.scala.html b/knockoutwhistweb/app/views/lobby/lobby.scala.html index 0d522b6..32b7fbc 100644 --- a/knockoutwhistweb/app/views/lobby/lobby.scala.html +++ b/knockoutwhistweb/app/views/lobby/lobby.scala.html @@ -69,7 +69,7 @@ }
-
Start Game
+
Start Game
} else {
diff --git a/knockoutwhistweb/public/javascripts/interact.js b/knockoutwhistweb/public/javascripts/interact.js index af04ab5..84ec6aa 100644 --- a/knockoutwhistweb/public/javascripts/interact.js +++ b/knockoutwhistweb/public/javascripts/interact.js @@ -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")