Skip to content

Commit fd7d773

Browse files
committed
add Optionals for online players
1 parent 5072541 commit fd7d773

File tree

1 file changed

+5
-2
lines changed
  • src/main/java/pro/cloudnode/smp/cloudnodemsg/message

1 file changed

+5
-2
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,16 @@ public void send() throws InvalidPlayerError {
4747
final @NotNull String senderUsername = playerOrServerUsername(this.sender);
4848
final @NotNull String recipientUsername = playerOrServerUsername(this.recipient);
4949

50+
final @NotNull Optional<@NotNull Player> senderPlayer = Optional.ofNullable(this.sender.getPlayer());
51+
final @NotNull Optional<@NotNull Player> recipientPlayer = Optional.ofNullable(this.recipient.getPlayer());
52+
5053
sendMessage(sender, CloudnodeMSG.getInstance().config().outgoing(senderUsername, recipientUsername, message));
5154
setReplyTo(sender, recipient);
5255

5356
if (
54-
(recipient.isOnline() && Message.isIgnored(Objects.requireNonNull(recipient.getPlayer()), sender))
57+
(recipientPlayer.isPresent() && Message.isIgnored(recipientPlayer.get(), sender))
5558
&&
56-
(sender.isOnline() && !Objects.requireNonNull(sender.getPlayer()).hasPermission(Permission.IGNORE_BYPASS))
59+
(senderPlayer.isPresent() && !senderPlayer.get().hasPermission(Permission.IGNORE_BYPASS))
5760
) return;
5861
sendMessage(recipient, CloudnodeMSG.getInstance().config()
5962
.incoming(senderUsername, recipientUsername, message));

0 commit comments

Comments
 (0)