From 5d45cf293476fe035bef46fa16b9d9325a5ceef6 Mon Sep 17 00:00:00 2001 From: Fleischer Hanno Date: Sun, 8 Dec 2024 20:24:05 +0100 Subject: [PATCH] fixed an error in clientstates where a missing servermessage received istn overwritte --- .../src/main/java/pp/mdga/client/ClientGameLogic.java | 8 ++++++++ .../model/src/main/java/pp/mdga/client/ClientState.java | 5 +++++ .../model/src/main/java/pp/mdga/client/GameState.java | 5 +++++ .../src/main/java/pp/mdga/client/gamestate/TurnState.java | 5 +++++ 4 files changed, 23 insertions(+) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java index 391e7c01..6a6735fa 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientGameLogic.java @@ -416,6 +416,14 @@ public void received(IncorrectRequestMessage msg) { addNotification(new InfoNotification(Resources.stringLookup("incorrect.request." + msg.getId()))); } + /** + * @param choosePieceStateMessage + */ + @Override + public void received(ChoosePieceStateMessage choosePieceStateMessage) { + state.received(choosePieceStateMessage); + } + /** * This method calls the method received of the state * diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientState.java index c81e56d6..e9b5c5e6 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/ClientState.java @@ -95,6 +95,11 @@ public void received(LobbyPlayerLeaveMessage msg) { LOGGER.log(Level.DEBUG, "Received {0} not allowed.", msg.toString()); } + @Override + public void received(ChoosePieceStateMessage msg) { + LOGGER.log(Level.DEBUG, "Received {0} not allowed.", msg.toString()); + } + @Override public void received(MoveMessage msg) { LOGGER.log(Level.DEBUG, "Received {0} not allowed.", msg.toString()); diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java index 2b846621..100a8072 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java @@ -281,6 +281,11 @@ public void received(PossiblePieceMessage msg){ state.received(msg); } + @Override + public void received(ChoosePieceStateMessage msg){ + state.received(msg); + } + /** * This method returns the current state * diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java index 03a9b4ff..80f57ae5 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/TurnState.java @@ -138,6 +138,11 @@ public void received(PossiblePieceMessage msg){ state.received(msg); } + @Override + public void received(ChoosePieceStateMessage msg){ + state.received(msg); + } + public ChoosePieceState getChoosePiece() { return choosePieceState; }