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

Version 1.0 #40

Merged
j23f0779 merged 947 commits from development2 into main 2024-12-13 10:26:49 +01:00
Conversation 2 Commits 947 Files Changed 528 +3 -3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 07029407d8 - Show all commits

4
Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
View File

@@ -133,8 +133,7 @@ private void handleGame(Notification notification) {
app.getAcousticHandler().playSound(MdgaSound.UI90); app.getAcousticHandler().playSound(MdgaSound.UI90);
delay = STANDARD_DELAY; delay = STANDARD_DELAY;
} else if (notification instanceof CeremonyNotification ceremonyNotification) { } else if (notification instanceof CeremonyNotification ceremonyNotification) {
app.enter(MdgaState.CEREMONY); CeremonyView ceremonyView = app.ceremonyView;
CeremonyView ceremonyView = (CeremonyView) app.getView();
int size = ceremonyNotification.getNames().size(); int size = ceremonyNotification.getNames().size();
if (ceremonyNotification.getPiecesThrown().size() != size || if (ceremonyNotification.getPiecesThrown().size() != size ||
@@ -162,6 +161,7 @@ private void handleGame(Notification notification) {
ceremonyView.addStatisticsRow(name, v1, v2, v3, v4, v5, v6); ceremonyView.addStatisticsRow(name, v1, v2, v3, v4, v5, v6);
} }
app.enter(MdgaState.CEREMONY);
} else if (notification instanceof DiceNowNotification) { } else if (notification instanceof DiceNowNotification) {
guiHandler.hideText(); guiHandler.hideText();
guiHandler.showDice(); guiHandler.showDice();

2
Projekte/mdga/client/src/main/java/pp/mdga/client/view/CeremonyView.java
View File

@@ -205,7 +205,7 @@ public void addCeremonyParticipant(Color color, int pos, String name) {
ceremonyButtons.add(button); ceremonyButtons.add(button);
if (state.equals(SubState.AWARD_CEREMONY)) { if (state != null && state.equals(SubState.AWARD_CEREMONY)) {
button.hide(); button.hide();
button.show(); button.show();
} }