Merge commit

This commit is contained in:
Felix Koppe
2024-12-11 13:57:43 +01:00
3 changed files with 8 additions and 2 deletions

View File

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

View File

@@ -133,7 +133,7 @@ private void handleGame(Notification notification) {
app.getAcousticHandler().playSound(MdgaSound.UI90);
delay = STANDARD_DELAY;
} else if (notification instanceof CeremonyNotification ceremonyNotification) {
CeremonyView ceremonyView = app.ceremonyView;
CeremonyView ceremonyView = app.getCeremonyView();
int size = ceremonyNotification.getNames().size();
if (ceremonyNotification.getPiecesThrown().size() != size ||

View File

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