From f0080118d096be9d9c8a737f44f4a9d791d72554 Mon Sep 17 00:00:00 2001
From: Hanno Fleischer <hanno.fleischer@unibw.de>
Date: Thu, 5 Dec 2024 22:34:53 +0100
Subject: [PATCH] Changed  and : removed the selectAnimationEnd Method from
 Waitranking and moved logic into the receivedActivePlayerMessage. Added in
 selectStart to always send a StartGameMessage in order to trigger
 incorrectRequestMEssage

---
 Projekte/.run/MdgaApp.run.xml                 |  1 +
 .../mdga/client/dialogstate/LobbyState.java   |  1 +
 .../WaitRankingState.java                     | 22 ++-----------------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/Projekte/.run/MdgaApp.run.xml b/Projekte/.run/MdgaApp.run.xml
index 4c60627e..776076f1 100644
--- a/Projekte/.run/MdgaApp.run.xml
+++ b/Projekte/.run/MdgaApp.run.xml
@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="MdgaApp" type="Application" factoryName="Application" singleton="false" nameIsGenerated="true">
+    <option name="ALTERNATIVE_JRE_PATH" value="temurin-20" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="pp.mdga.client.MdgaApp" />
     <module name="Projekte.mdga.client.main" />
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/LobbyState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/LobbyState.java
index bada315a..c75da3ba 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/LobbyState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/dialogstate/LobbyState.java
@@ -65,6 +65,7 @@ public void selectStart() {
         if (logic.isHost() && logic.getGame().areAllReady()) {
             logic.send(new StartGameMessage());
         } else {
+            logic.send(new StartGameMessage());
             LOGGER.log(System.Logger.Level.ERROR, "You are not the host");
         }
     }
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/WaitRankingState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/WaitRankingState.java
index 97f828bd..c5102152 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/WaitRankingState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/WaitRankingState.java
@@ -4,15 +4,12 @@
 import pp.mdga.client.ClientState;
 import pp.mdga.client.gamestate.DetermineStartPlayerState;
 import pp.mdga.message.client.AnimationEndMessage;
-import pp.mdga.message.server.ActivePlayerMessage;
-import pp.mdga.message.server.RankingResponseMessage;
-import pp.mdga.message.server.RankingRollAgainMessage;
+import pp.mdga.message.server.*;
 import pp.mdga.notification.ActivePlayerNotification;
 
 public class WaitRankingState extends DetermineStartPlayerStates {
 
     private final DetermineStartPlayerState parent;
-    private boolean canTransition = false;
 
     public WaitRankingState(ClientState parent, ClientGameLogic logic) {
         super(parent, logic);
@@ -29,33 +26,18 @@ public void exit() {
     }
 
     @Override
-    public void received(RankingRollAgainMessage msg){
+    public void received(DiceNowMessage msg){
         parent.setState(parent.getRollRankingDice());
     }
 
     @Override
     public void received(RankingResponseMessage msg){
-    }
 
-
-    @Override
-    public void selectAnimationEnd(){
-        logic.send(new AnimationEndMessage());
-        changeToIntro();
     }
 
     @Override
     public void received(ActivePlayerMessage msg){
-        logic.addNotification(new ActivePlayerNotification(msg.getColor()));
         logic.getGame().setActiveColor(msg.getColor());
-        changeToIntro();
-    }
-
-    private void changeToIntro(){
-        if (!canTransition){
-            canTransition = true;
-            return;
-        }
         parent.setState(parent.getIntro());
     }
 }