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

Merge commit

Browse Source
This commit is contained in:
Felix Koppe
2024-12-11 13:57:43 +01:00
parent 170a282077 5854609b12
commit 14a407b7d5
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@ public class MdgaApp extends SimpleApplication {
private final TimerManager timerManager = new TimerManager(); private final TimerManager timerManager = new TimerManager();
public static final int DEBUG_MULTIPLIER = 1; public static final int DEBUG_MULTIPLIER = 0;
public MdgaApp() { public MdgaApp() {
networkConnection = new NetworkSupport(this); networkConnection = new NetworkSupport(this);
@@ -351,5 +351,9 @@ public GameView getGameView() {
public TimerManager getTimerManager() { public TimerManager getTimerManager() {
return timerManager; return timerManager;
} }
public CeremonyView getCeremonyView() {
return ceremonyView;
}
} }

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

@@ -133,7 +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) {
CeremonyView ceremonyView = app.ceremonyView; CeremonyView ceremonyView = app.getCeremonyView();
int size = ceremonyNotification.getNames().size(); int size = ceremonyNotification.getNames().size();
if (ceremonyNotification.getPiecesThrown().size() != size || if (ceremonyNotification.getPiecesThrown().size() != size ||

2
Projekte/mdga/model/src/main/java/pp/mdga/client/ceremonystate/StatisticsState.java
View File

@@ -2,6 +2,7 @@
import pp.mdga.client.ClientGameLogic; import pp.mdga.client.ClientGameLogic;
import pp.mdga.client.ClientState; import pp.mdga.client.ClientState;
import pp.mdga.notification.StartDialogNotification;
public class StatisticsState extends CeremonyStates { public class StatisticsState extends CeremonyStates {
@@ -36,6 +37,7 @@ public void exit() {
*/ */
@Override @Override
public void selectNext() { public void selectNext() {
logic.addNotification(new StartDialogNotification());
logic.setState(logic.getDialogs()); logic.setState(logic.getDialogs());
} }
} }