Skip to content

Commit c6a36b7

Browse files
committed
convert to record
1 parent 54c7e17 commit c6a36b7

File tree

1 file changed

+7
-13
lines changed
  • src/main/java/pro/cloudnode/smp/cloudnodemsg/message

1 file changed

+7
-13
lines changed

src/main/java/pro/cloudnode/smp/cloudnodemsg/message/Message.java

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,11 @@
1212
import java.util.Optional;
1313
import java.util.UUID;
1414

15-
public class Message {
16-
public final @NotNull OfflinePlayer sender;
17-
public final @NotNull OfflinePlayer recipient;
18-
public final @NotNull String message;
19-
20-
public Message(final @NotNull OfflinePlayer sender, final @NotNull OfflinePlayer recipient, final @NotNull String message) {
21-
this.sender = sender;
22-
this.recipient = recipient;
23-
this.message = message;
24-
}
15+
public record Message(@NotNull OfflinePlayer sender, @NotNull OfflinePlayer recipient, @NotNull String message) {
2516

2617
private @NotNull String playerOrServerUsername(final @NotNull OfflinePlayer player) throws InvalidPlayerError {
27-
if (player.getUniqueId().equals(console.getUniqueId())) return CloudnodeMSG.getInstance().config().consoleName();
18+
if (player.getUniqueId().equals(console.getUniqueId()))
19+
return CloudnodeMSG.getInstance().config().consoleName();
2820
else {
2921
final @NotNull Optional<@NotNull String> name = Optional.ofNullable(player.getName());
3022
if (name.isEmpty()) throw new InvalidPlayerError();
@@ -37,7 +29,8 @@ public void send() throws InvalidPlayerError {
3729
final @NotNull String recipientUsername = playerOrServerUsername(this.recipient);
3830

3931
sendMessage(sender, CloudnodeMSG.getInstance().config().outgoing(senderUsername, recipientUsername, message));
40-
sendMessage(recipient, CloudnodeMSG.getInstance().config().incoming(senderUsername, recipientUsername, message));
32+
sendMessage(recipient, CloudnodeMSG.getInstance().config()
33+
.incoming(senderUsername, recipientUsername, message));
4134
}
4235

4336
public final static @NotNull OfflinePlayer console = CloudnodeMSG.getInstance().getServer()
@@ -48,7 +41,8 @@ public void send() throws InvalidPlayerError {
4841
}
4942

5043
public static void sendMessage(final @NotNull OfflinePlayer recipient, final @NotNull Component message) {
51-
if (recipient.getUniqueId() == console.getUniqueId()) CloudnodeMSG.getInstance().getServer().getConsoleSender().sendMessage(message);
44+
if (recipient.getUniqueId() == console.getUniqueId())
45+
CloudnodeMSG.getInstance().getServer().getConsoleSender().sendMessage(message);
5246
else if (recipient.isOnline()) Objects.requireNonNull(recipient.getPlayer()).sendMessage(message);
5347
}
5448
}

0 commit comments

Comments
 (0)