diff --git a/wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/server/KickVotedMessage.java b/wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/server/KickVotedMessage.java deleted file mode 100644 index 0422d21..0000000 --- a/wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/server/KickVotedMessage.java +++ /dev/null @@ -1,26 +0,0 @@ -package eu.jonahbauer.wizard.common.messages.server; - -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - -import java.util.UUID; - -@Getter -@RequiredArgsConstructor -@EqualsAndHashCode(callSuper = true) -public final class KickVotedMessage extends ServerMessage { - /** - * UUID of the voting player - */ - private final @NonNull UUID voter; - /** - * UUID of player who is supposed to be kicked - */ - private final @NonNull UUID player; - /** - * Time until the vote ends in {@link System#currentTimeMillis() UNIX time} - */ - private final long timeout; -} diff --git a/wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/server/KickedMessage.java b/wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/server/KickedMessage.java deleted file mode 100644 index 0d07df3..0000000 --- a/wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/server/KickedMessage.java +++ /dev/null @@ -1,18 +0,0 @@ -package eu.jonahbauer.wizard.common.messages.server; - -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - -import java.util.UUID; - -@Getter -@RequiredArgsConstructor -@EqualsAndHashCode(callSuper = true) -public final class KickedMessage extends ServerMessage { - /** - * UUID of player who was kicked - */ - private final @NonNull UUID player; -} diff --git a/wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/server/ServerMessage.java b/wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/server/ServerMessage.java index 448534d..ebd255e 100644 --- a/wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/server/ServerMessage.java +++ b/wizard-common/src/main/java/eu/jonahbauer/wizard/common/messages/server/ServerMessage.java @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.SneakyThrows; @EqualsAndHashCode -public abstract sealed class ServerMessage permits AckMessage, GameMessage, KickVotedMessage, KickedMessage, NackMessage, PlayerLeftMessage, PlayerModifiedMessage, SessionJoinedMessage, SessionListMessage, SessionModifiedMessage, SessionRemovedMessage, StartingGameMessage { +public abstract sealed class ServerMessage permits AckMessage, GameMessage, NackMessage, PlayerLeftMessage, PlayerModifiedMessage, SessionJoinedMessage, SessionListMessage, SessionModifiedMessage, SessionRemovedMessage, StartingGameMessage { private static final ObjectMapper MAPPER = SerializationUtil.newObjectMapper(ServerMessage.class, ObserverMessage.class); public static ServerMessage parse(String json) throws ParseException {