peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fixed cardLayer shutdown bug

Browse Source
This commit is contained in:
Cedric Beck
2024-12-08 11:19:00 +01:00
parent 69108063a0
commit adfe2b94b8
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayer.java
View File

@@ -84,14 +84,14 @@ public void initialize(AppStateManager stateManager, Application app) {
} }
public void shutdown() { public void shutdown() {
view.clearProcessors(); // view.clearProcessors();
fpp.removeFilter(dlsf); fpp.removeFilter(dlsf);
dlsf = null; dlsf = null;
root.removeLight(sun); root.removeLight(sun);
fpp.removeFilter(fxaaFilter); fpp.removeFilter(fxaaFilter);
fpp.removeFilter(compose); // fpp.removeFilter(compose);
view.detachScene(root); view.detachScene(root);
app.getRenderManager().removeMainView(view); // app.getRenderManager().removeMainView(view);
cardBuffer.clear(); cardBuffer.clear();
root.detachAllChildren(); root.detachAllChildren();

3
Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayerHandler.java
View File

@@ -50,9 +50,10 @@ public void init() {
} }
public void shutdown() { public void shutdown() {
clearSelectableCards();
if (cardLayer != null) { if (cardLayer != null) {
cardLayer.shutdown(); cardLayer.shutdown();
clearSelectableCards(); app.getStateManager().detach(cardLayer);
} }
cardLayer = null; cardLayer = null;
} }

5
Projekte/mdga/client/src/main/java/pp/mdga/client/gui/PlayerNameHandler.java
View File

@@ -141,10 +141,11 @@ public void addPlayer(Color color, String name, boolean own){
} }
public void setActivePlayer(Color color) { 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.remove(color);
playerOrder.add(0, color); playerOrder.add(0, color);
playerOrder.add(lastFirst); playerOrder.add(oldFirst);
drawPlayers(); drawPlayers();
} }