From adfe2b94b8dba48fae9b11a3ae328d1939f86870 Mon Sep 17 00:00:00 2001
From: Cedric Beck <cedric.beck@unibw.de>
Date: Sun, 8 Dec 2024 11:19:00 +0100
Subject: [PATCH] fixed cardLayer shutdown bug

---
 .../client/src/main/java/pp/mdga/client/gui/CardLayer.java  | 6 +++---
 .../src/main/java/pp/mdga/client/gui/CardLayerHandler.java  | 3 ++-
 .../src/main/java/pp/mdga/client/gui/PlayerNameHandler.java | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayer.java
index 25d34f94..ed68fd95 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayer.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayer.java
@@ -84,14 +84,14 @@ public void initialize(AppStateManager stateManager, Application app) {
     }
 
     public void shutdown() {
-        view.clearProcessors();
+//        view.clearProcessors();
         fpp.removeFilter(dlsf);
         dlsf = null;
         root.removeLight(sun);
         fpp.removeFilter(fxaaFilter);
-        fpp.removeFilter(compose);
+//        fpp.removeFilter(compose);
         view.detachScene(root);
-        app.getRenderManager().removeMainView(view);
+//        app.getRenderManager().removeMainView(view);
 
         cardBuffer.clear();
         root.detachAllChildren();
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 94684ef9..636db5ee 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
@@ -50,9 +50,10 @@ public void init() {
     }
 
     public void shutdown() {
+        clearSelectableCards();
         if (cardLayer != null) {
             cardLayer.shutdown();
-            clearSelectableCards();
+            app.getStateManager().detach(cardLayer);
         }
         cardLayer = null;
     }
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/PlayerNameHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/PlayerNameHandler.java
index e5069eae..014c00a9 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/PlayerNameHandler.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/PlayerNameHandler.java
@@ -141,10 +141,11 @@ public void addPlayer(Color color, String name, boolean own){
     }
 
     public void setActivePlayer(Color color) {
-        Color lastFirst = playerOrder.remove(0);
+        if(playerOrder.get(0) == color) return;
+        Color oldFirst = playerOrder.remove(0);
         playerOrder.remove(color);
         playerOrder.add(0, color);
-        playerOrder.add(lastFirst);
+        playerOrder.add(oldFirst);
 
         drawPlayers();
     }