diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/Ceremony.java b/Projekte/mdga/model/src/main/java/pp.mdga/message/server/CeremonyMessage.java similarity index 91% rename from Projekte/mdga/model/src/main/java/pp.mdga/message/server/Ceremony.java rename to Projekte/mdga/model/src/main/java/pp.mdga/message/server/CeremonyMessage.java index 3bff739c..10197038 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/Ceremony.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/message/server/CeremonyMessage.java @@ -6,11 +6,11 @@ * A message sent by the server to indicate the beginning of the ceremony. */ @Serializable -public class Ceremony extends ServerMessage { +public class CeremonyMessage extends ServerMessage { /** * Constructs a new Ceremony instance. */ - public Ceremony() { + public CeremonyMessage() { super(); } diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/ServerInterpreter.java b/Projekte/mdga/model/src/main/java/pp.mdga/message/server/ServerInterpreter.java index e9dde28a..c83abefd 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/message/server/ServerInterpreter.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/message/server/ServerInterpreter.java @@ -31,7 +31,7 @@ public interface ServerInterpreter { * * @param msg the Ceremony message received */ - void received(Ceremony msg); + void received(CeremonyMessage msg); /** * Handles a Dice message received from the server. diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java b/Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java index 4be9f928..4202226f 100644 --- a/Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java +++ b/Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java @@ -1,10 +1,8 @@ package pp.mdga.server; -import pp.mdga.client.Spectator; import pp.mdga.game.Player; import pp.mdga.message.server.ActivePlayer; -import pp.mdga.message.server.Ceremony; -import pp.mdga.message.server.EndOfTurn; +import pp.mdga.message.server.CeremonyMessage; public class Turn extends ServerState { private final TurnStateMachine turnStateMachine = new TurnStateMachine(this, logic); @@ -25,7 +23,7 @@ public void exit() { // } if (logic.getGame().getPlayers().size() == 1) { - broadcastUpdate(new Ceremony()); + broadcastUpdate(new CeremonyMessage()); this.getParent().getParent().exit(); } else { // todo: next player