Skip to content

Commit 403af8a

Browse files
committed
Applied the methods to correctly handle toggle.
1 parent 8fe420c commit 403af8a

File tree

1 file changed

+20
-12
lines changed

1 file changed

+20
-12
lines changed

src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ToggleMessageCommand.java

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,31 @@ public boolean run(@NotNull CommandSender sender, @NotNull String label, @NotNul
2121
if (!sender.hasPermission(Permission.TOGGLE) || (args.length == 1 && !sender.hasPermission(Permission.TOGGLE_OTHER))) return new NoPermissionError().send(sender);
2222
if (!(sender instanceof final @NotNull Player player)) return new NotPlayerError().send(sender);
2323
if (args.length == 1) {
24-
final @NotNull OfflinePlayer recipient = CloudnodeMSG.getInstance().getServer().getOfflinePlayer(args[0]);
24+
final @NotNull Player recipient = Objects.requireNonNull(CloudnodeMSG.getInstance().getServer().getPlayer(args[0]));
25+
26+
if (!Message.isIncomeEnabled(recipient)) {
27+
Message.incomeDisable(recipient);
28+
sendMessage(sender, CloudnodeMSG.getInstance().config().toggleDisableOther(Objects.requireNonNull(recipient.getName())));
29+
30+
return true;
31+
}
32+
33+
Message.incomeEnable(recipient);
34+
sendMessage(sender, CloudnodeMSG.getInstance().config().toggleEnableOther(Objects.requireNonNull(recipient.getName())));
35+
36+
return true;
37+
}
38+
39+
if (Message.isIncomeEnabled(player)) {
40+
Message.incomeDisable(player);
41+
sendMessage(sender, CloudnodeMSG.getInstance().config().toggleDisable());
2542

26-
Message.setNoIncoming(recipient);
27-
sendMessage(sender, Message.getNoIncoming(recipient) ?
28-
CloudnodeMSG.getInstance().config().toggleDisableOther(Objects.requireNonNull(recipient.getName())) :
29-
CloudnodeMSG.getInstance().config().toggleEnableOther(Objects.requireNonNull(recipient.getName()))
30-
);
3143
return true;
3244
}
3345

34-
final @NotNull OfflinePlayer player = Message.offlinePlayer(sender);
46+
Message.incomeEnable(player);
47+
sendMessage(sender, CloudnodeMSG.getInstance().config().toggleEnable());
3548

36-
Message.setNoIncoming(player);
37-
sendMessage(sender, Message.getNoIncoming(player) ?
38-
CloudnodeMSG.getInstance().config().toggleDisable() :
39-
CloudnodeMSG.getInstance().config().toggleEnable()
40-
);
4149
return true;
4250
}
4351

0 commit comments

Comments
 (0)