From 0b00e236e7c6d425c9310440ac0f6d3ccc6a93f3 Mon Sep 17 00:00:00 2001 From: Jonas Date: Mon, 16 May 2022 23:38:46 +0200 Subject: [PATCH] several minor adjustments --- .../java/ch/unibas/dmi/dbis/cs108/gamelogic/Timer.java | 2 +- .../dbis/cs108/gamelogic/klassenstruktur/Spectator.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/Timer.java b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/Timer.java index b121302..e31d356 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/Timer.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/Timer.java @@ -26,7 +26,7 @@ public class Timer { /** * The maximum length of the human vote in the day, in seconds */ - public static final int humanVoteTime = 60; + public static final int humanVoteTime = 63; /** * The length of time in seconds after the human vote, as the 'winner' of the vote is announced, diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/klassenstruktur/Spectator.java b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/klassenstruktur/Spectator.java index 338b8db..7baa834 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/klassenstruktur/Spectator.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/klassenstruktur/Spectator.java @@ -1,8 +1,10 @@ package ch.unibas.dmi.dbis.cs108.gamelogic.klassenstruktur; import ch.unibas.dmi.dbis.cs108.BudaLogConfig; +import ch.unibas.dmi.dbis.cs108.gamelogic.ClientGameInfoHandler; import ch.unibas.dmi.dbis.cs108.gamelogic.Game; import ch.unibas.dmi.dbis.cs108.gamelogic.ServerGameInfoHandler; +import ch.unibas.dmi.dbis.cs108.multiplayer.helpers.Protocol; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -29,6 +31,11 @@ public class Spectator extends Passenger{ */ @Override public void send(String msg, Game game) { - clientHandler.sendMsgToClient(ServerGameInfoHandler.spectatorFormat(msg, game)); + + if (msg.equals(ClientGameInfoHandler.noiseNotification)) { + clientHandler.sendMsgToClient(Protocol.noiseNotificationProtocol); + } else { + clientHandler.sendMsgToClient(ServerGameInfoHandler.spectatorFormat(msg, game)); + } } }