From 9199fbffd8990ede7f1de40aa3967bba93e8e003 Mon Sep 17 00:00:00 2001
From: Cedric Beck <cedric.beck@unibw.de>
Date: Wed, 4 Dec 2024 13:56:03 +0100
Subject: [PATCH] removed tests, fixed null exception in CardLayer

---
 .../client/src/main/java/pp/mdga/client/MdgaApp.java   |  2 +-
 .../src/main/java/pp/mdga/client/gui/CardLayer.java    |  7 +++----
 .../src/main/java/pp/mdga/client/view/GameView.java    | 10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
index fbe68143..b0120dfb 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
@@ -115,7 +115,7 @@ public void simpleInitApp() {
         gameView = new GameView(this);
         ceremonyView = new CeremonyView(this);
 
-        enter(MdgaState.GAME);
+        enter(MdgaState.MAIN);
     }
 
     /**
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 ebf21b6a..0f2eacbd 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
@@ -86,7 +86,7 @@ public void render(RenderManager rm) {
     public void update(float tpf) {
         if (init && !cardBuffer.isEmpty()) {
             for (Spatial spatial : cardBuffer) {
-//                root.attachChild(spatial);
+                root.attachChild(spatial);
             }
             cardBuffer.clear();
         }
@@ -94,9 +94,8 @@ public void update(float tpf) {
     }
 
     public void addSpatial(Spatial card) {
-//        cardBuffer.add(card);
-        root.attachChild(card);
-        root = root;
+        if(root == null) cardBuffer.add(card);
+        else root.attachChild(card);
     }
 
     public void deleteSpatial(Spatial spatial) {
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 60a2be45..bbdee257 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
@@ -56,7 +56,7 @@ public GameView(MdgaApp app) {
 
     @Override
     public void onEnter() {
-        setOwnColor(Color.AIRFORCE);
+//        setOwnColor(Color.AIRFORCE);
         camera.init(ownColor);
         boardHandler.init();
         guiHandler.init(ownColor);
@@ -65,10 +65,10 @@ public void onEnter() {
 
         app.getAcousticHandler().playSound(MdgaSound.START);
 
-        guiHandler.addPlayer(Color.AIRFORCE, "Cedric");
-        guiHandler.addPlayer(Color.ARMY, "Ben");
-        guiHandler.addPlayer(Color.CYBER, "Felix");
-        guiHandler.addPlayer(Color.NAVY, "Daniel");
+//        guiHandler.addPlayer(Color.AIRFORCE, "Cedric");
+//        guiHandler.addPlayer(Color.ARMY, "Ben");
+//        guiHandler.addPlayer(Color.CYBER, "Felix");
+//        guiHandler.addPlayer(Color.NAVY, "Daniel");