University-of-Basel-Studentprojects/Programmierprojekt
Archived
1
0
Fork 0
Code Issues 17 Pull Requests Actions Wiki Activity

Fix: Resolving Git Merge Conflicts #253

Merged
j.kropff merged 69 commits from chore/ui-checkstyle-fixes into main 2026-04-11 15:10:58 +02:00
Conversation 9 Commits 69 Files Changed 50
+4 -2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5d4d2655ef - Show all commits
src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java
+4 -2
View File
@@ -317,8 +317,10 @@ public class LobbyButtonGridManager {
}); });
// Start the Game UI using the prepared stage // Start the Game UI using the prepared stage
try { try {
new ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI() // ClientService an GameUI übergeben
.start(gameStage); ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI
.setClientService(lobbyClient.getClientService());
new ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.CasinoGameUI().start(gameStage);
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("Error starting Game UI: {}", e.getMessage()); LOGGER.error("Error starting Game UI: {}", e.getMessage());
// If starting fails, show the lobby again // If starting fails, show the lobby again