From ab9de3acf8cec80217ecfce3177a6d9620d7a54c Mon Sep 17 00:00:00 2001
From: Felix Koppe <fkoppe@web.de>
Date: Sun, 8 Dec 2024 18:09:13 +0100
Subject: [PATCH] Replace waitMoveNotification with moveNotification

---
 .../mdga/model/src/main/java/pp/mdga/client/GameState.java     | 1 +
 .../src/main/java/pp/mdga/client/gamestate/TurnState.java      | 1 +
 .../pp/mdga/client/gamestate/turnstate/ChoosePieceState.java   | 1 +
 .../gamestate/turnstate/choosepiecestate/NoPieceState.java     | 3 ++-
 .../turnstate/choosepiecestate/WaitingPieceState.java          | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

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..e827180b 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
@@ -152,6 +152,7 @@ public void received(RankingResponseMessage msg){
      */
     @Override
     public void received(SelectPieceMessage msg){
+        System.out.println("SelectPieceMessage received in GameState");
         state.received(msg);
     }
 
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..1e75b534 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
@@ -70,6 +70,7 @@ public void selectAnimationEnd(){
 
     @Override
     public void received(SelectPieceMessage msg){
+        System.out.println("SelectPieceMessage received in TurnState");
         state.received(msg);
     }
 
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/ChoosePieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/ChoosePieceState.java
index 57b7f257..f72d8f41 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/ChoosePieceState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/ChoosePieceState.java
@@ -49,6 +49,7 @@ public void selectPiece(Piece piece){
 
     @Override
     public void received(SelectPieceMessage msg){
+        System.out.println("SelectPieceMessage received in ChoosePieceState");
         currentState.received(msg);
     }
 
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java
index 6946de2f..e9f6aee9 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java
@@ -6,6 +6,7 @@
 import pp.mdga.game.Piece;
 import pp.mdga.message.server.*;
 import pp.mdga.message.server.StartPieceMessage;
+import pp.mdga.notification.MovePieceNotification;
 import pp.mdga.notification.SelectableMoveNotification;
 import pp.mdga.notification.WaitMoveNotification;
 
@@ -48,7 +49,7 @@ public void received(SelectPieceMessage msg) {
     @Override
     public void received(WaitPieceMessage msg){
         LOGGER.log(System.Logger.Level.INFO, "Received WaitPieceMessage");
-        logic.addNotification(new WaitMoveNotification(msg.getPieceID()));
+        logic.addNotification(new MovePieceNotification(msg.getPieceID(), logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getStartNodeIndex(), true));
         parent.setState(parent.getWaitingPiece());
     }
 
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java
index 4f001991..0d8b7f8f 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java
@@ -27,6 +27,7 @@ public WaitingPieceState(ClientState parent, ClientGameLogic logic) {
     @Override
     public void enter() {
         moveablePiece = null;
+
     }
 
     @Override