From de592cfa48564dd95036d97d2e69daf9a91531ef Mon Sep 17 00:00:00 2001
From: Felix Koppe <fkoppe@web.de>
Date: Mon, 9 Dec 2024 02:43:02 +0100
Subject: [PATCH] Move receive DrawCardMessage to GameState

---
 .../src/main/java/pp/mdga/client/GameState.java    | 14 +++++++++++++-
 .../java/pp/mdga/client/gamestate/TurnState.java   |  7 -------
 2 files changed, 13 insertions(+), 8 deletions(-)

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 a41d66c7..99e2264b 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
@@ -3,8 +3,14 @@
 import pp.mdga.client.gamestate.*;
 import pp.mdga.game.BonusCard;
 import pp.mdga.game.Piece;
+import pp.mdga.game.card.HiddenCard;
+import pp.mdga.game.card.ShieldCard;
+import pp.mdga.game.card.SwapCard;
+import pp.mdga.game.card.TurboCard;
 import pp.mdga.message.client.LeaveGameMessage;
 import pp.mdga.message.server.*;
+import pp.mdga.notification.AcquireCardNotification;
+import pp.mdga.notification.DrawCardNotification;
 import pp.mdga.notification.InterruptNotification;
 import pp.mdga.notification.StartDialogNotification;
 
@@ -288,7 +294,13 @@ public void received(ChoosePieceStateMessage msg){
 
     @Override
     public void received(DrawCardMessage msg){
-        state.received(msg);
+        switch (msg.getCard()) {
+            case HiddenCard hiddenCard -> logic.addNotification(new DrawCardNotification(logic.getGame().getActiveColor(), BonusCard.HIDDEN));
+            case TurboCard turboCard -> logic.addNotification(new AcquireCardNotification(BonusCard.TURBO));
+            case ShieldCard shieldCard -> logic.addNotification(new AcquireCardNotification(BonusCard.SHIELD));
+            case SwapCard swapCard -> logic.addNotification(new AcquireCardNotification(BonusCard.SWAP));
+            case null, default -> throw new RuntimeException();
+        }
     }
 
     /**
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 15d8e772..eec65ac0 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
@@ -151,13 +151,6 @@ public void received(ChoosePieceStateMessage msg){
 
     @Override
     public void received(DrawCardMessage msg){
-        switch (msg.getCard()) {
-            case HiddenCard hiddenCard -> logic.addNotification(new DrawCardNotification(logic.getGame().getActiveColor(), BonusCard.HIDDEN));
-            case TurboCard turboCard -> logic.addNotification(new AcquireCardNotification(BonusCard.TURBO));
-            case ShieldCard shieldCard -> logic.addNotification(new AcquireCardNotification(BonusCard.SHIELD));
-            case SwapCard swapCard -> logic.addNotification(new AcquireCardNotification(BonusCard.SWAP));
-            case null, default -> throw new RuntimeException();
-        }
     }
 
     public ChoosePieceState getChoosePiece() {