From da2b1af69848b8b288c0046d34044a98009592bd Mon Sep 17 00:00:00 2001
From: Cedric Beck <cedric.beck@unibw.de>
Date: Sun, 1 Dec 2024 20:45:24 +0100
Subject: [PATCH] fixed shutdown guiHandler bug

---
 .../src/main/java/pp/mdga/client/InputSynchronizer.java      | 5 +++++
 .../src/main/java/pp/mdga/client/gui/CardLayerHandler.java   | 2 ++
 .../client/src/main/java/pp/mdga/client/view/GameView.java   | 5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java
index d7628792..39732816 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java
@@ -18,8 +18,12 @@
 import pp.mdga.client.board.PieceControl;
 import pp.mdga.client.gui.CardControl;
 import pp.mdga.client.view.GameView;
+import pp.mdga.game.BonusCard;
 import pp.mdga.game.Color;
 import pp.mdga.game.Piece;
+import pp.mdga.notification.SelectableCardsNotification;
+
+import java.util.List;
 
 public class InputSynchronizer {
 
@@ -112,6 +116,7 @@ else if(boardSelect != null) {
             }
             if(name.equals("Test") &&isPressed){
                 if(app.getView() instanceof GameView gameView){
+                    app.getNotificationSynchronizer().addTestNotification(new SelectableCardsNotification(List.of(BonusCard.SHIELD)));
                 }
             }
         }
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayerHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayerHandler.java
index 81df1da7..fede1dba 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayerHandler.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayerHandler.java
@@ -43,6 +43,7 @@ public void init() {
         cardLayerCamera = createOverlayCam();
         cardLayer = new CardLayer(fpp, cardLayerCamera, backTexture);
         app.getStateManager().attach(cardLayer);
+
         diceControl = new DiceControl(app.getAssetManager());
         diceControl.create(new Vector3f(0, 0, 0), 1f, false);
     }
@@ -50,6 +51,7 @@ public void init() {
     public void shutdown() {
         if (cardLayer != null) {
             cardLayer.shutdown();
+            clearSelectableCards();
         }
         cardLayer = null;
     }
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java
index 3d908271..c4178e70 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java
@@ -67,7 +67,6 @@ public void onEnter() {
 
         app.getAcousticHandler().playSound(MdgaSound.START);
 
-
         //Test
 
         List<UUID> uuid1 = new ArrayList<>();
@@ -92,7 +91,8 @@ public void onEnter() {
         app.getNotificationSynchronizer().addTestNotification(new MovePieceNotification(p1_2, 30, true));
 //        app.getNotificationSynchronizer().addTestNotification(new SelectableMoveNotification(List.of(p1), List.of(4), List.of(false)));
         app.getNotificationSynchronizer().addTestNotification(new AcquireCardNotification(BonusCard.SHIELD));
-        app.getNotificationSynchronizer().addTestNotification(new SelectableCardsNotification(List.of(BonusCard.SHIELD)));
+
+//        app.getNotificationSynchronizer().addTestNotification(new SelectableCardsNotification(List.of(BonusCard.SHIELD)));
 //        app.getNotificationSynchronizer().addTestNotification(new ShieldActiveNotification(p1));
 //        app.getNotificationSynchronizer().addTestNotification(new ActivePlayerNotification(Color.NAVY));
 
@@ -103,6 +103,7 @@ public void onEnter() {
 
         p1 = p1;
 
+
     }
 
     @Override