Skip to content

Commit 9dd174a

Browse files
zefir-gitzefir-git
committed
fix errors
1 parent d3838f8 commit 9dd174a

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

‎src/main/java/pro/cloudnode/smp/cloudnodemsg/CloudnodeMSG.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import pro.cloudnode.smp.cloudnodemsg.command.MainCommand;
1414
import pro.cloudnode.smp.cloudnodemsg.command.MessageCommand;
1515
import pro.cloudnode.smp.cloudnodemsg.command.ReplyCommand;
16+
import pro.cloudnode.smp.cloudnodemsg.command.TeamMessageCommand;
1617
import pro.cloudnode.smp.cloudnodemsg.command.ToggleMessageCommand;
1718
import pro.cloudnode.smp.cloudnodemsg.command.UnIgnoreCommand;
1819
import pro.cloudnode.smp.cloudnodemsg.listener.AsyncChatListener;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,14 @@ public void send(final boolean channel) throws InvalidPlayerError {
4747
if (!channel) new PlayerNotFoundError(senderPlayer.get().getName()).send(senderPlayer.get());
4848
else {
4949
Message.exitChannel(senderPlayer.get());
50-
new ChannelOfflineError(senderPlayer.get().getName(), Optional.ofNullable(recipient.getName())
51-
.orElse("Unknown Player")).send(senderPlayer.get());
50+
new ChannelOfflineError(senderPlayer.get(), recipient).send(senderPlayer.get());
5251
}
5352
return;
5453
}
5554

5655
if (recipientPlayer.isPresent() && senderPlayer.isPresent() && !Message.isIncomingEnabled(recipientPlayer.get()) && !senderPlayer
5756
.get().hasPermission(Permission.TOGGLE_BYPASS)) {
58-
new PlayerHasIncomingDisabledError(recipientPlayer.get().getName()).send(senderPlayer.get());
57+
new PlayerHasIncomingDisabledError(recipientPlayer.get()).send(senderPlayer.get());
5958
return;
6059
}
6160

‎src/main/java/pro/cloudnode/smp/cloudnodemsg/PluginConfig.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ public PluginConfig(final @NotNull FileConfiguration config) {
102102
* @param team The team
103103
* @param message The message text
104104
*/
105-
public @NotNull Component team(final @NotNull String sender, final @NotNull Team team, final @NotNull Component message) {
105+
public @NotNull Component team(final @NotNull OfflinePlayer sender, final @NotNull Team team, final @NotNull Component message) {
106106
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("team"))
107-
.replace("<sender>", sender),
107+
.replace("<sender>", Message.name(sender)),
108108
Placeholder.component("team", team.displayName()),
109109
Placeholder.component("message", message)
110110
);
@@ -144,9 +144,9 @@ public PluginConfig(final @NotNull FileConfiguration config) {
144144
* @param team The team
145145
* @param message The message text
146146
*/
147-
public @NotNull Component teamSpy(final @NotNull String sender, final @NotNull Team team, final @NotNull Component message) {
147+
public @NotNull Component teamSpy(final @NotNull OfflinePlayer sender, final @NotNull Team team, final @NotNull Component message) {
148148
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("team-spy"))
149-
.replace("<sender>", sender),
149+
.replace("<sender>", Message.name(sender)),
150150
Placeholder.component("team", team.displayName()),
151151
Placeholder.component("message", message)
152152
);
@@ -246,9 +246,9 @@ public PluginConfig(final @NotNull FileConfiguration config) {
246246
* @param sender The username of the message sender
247247
* @param team The team@
248248
*/
249-
public @NotNull Component channelTeamCreated(final @NotNull String sender, final @NotNull Team team) {
249+
public @NotNull Component channelTeamCreated(final @NotNull OfflinePlayer sender, final @NotNull Team team) {
250250
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("channel.team-created"))
251-
.replace("<sender>", sender),
251+
.replace("<sender>", Message.name(sender)),
252252
Placeholder.component("team", team.displayName()));
253253
}
254254

@@ -263,9 +263,9 @@ public PluginConfig(final @NotNull FileConfiguration config) {
263263
* @param sender The username of the message sender
264264
* @param team The team
265265
*/
266-
public @NotNull Component channelTeamClosed(final @NotNull String sender, final @NotNull Team team) {
266+
public @NotNull Component channelTeamClosed(final @NotNull OfflinePlayer sender, final @NotNull Team team) {
267267
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("channel.team-closed"))
268-
.replace("<sender>", sender),
268+
.replace("<sender>", Message.name(sender)),
269269
Placeholder.component("team", team.displayName()));
270270
}
271271

@@ -412,9 +412,9 @@ public int mailNotifyInterval() {
412412
*
413413
* @param player The player
414414
*/
415-
public @NotNull Component playerNotFound(final @NotNull OfflinePlayer player) {
415+
public @NotNull Component playerNotFound(final @NotNull String player) {
416416
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("errors.player-not-found")),
417-
Placeholder.unparsed("player", Message.name(player))
417+
Placeholder.unparsed("player", player)
418418
);
419419
}
420420

‎src/main/java/pro/cloudnode/smp/cloudnodemsg/command/MailCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static boolean send(final @NotNull CommandSender sender, final @NotNull S
3636
if (args.length == 1) return sendMessage(sender, CloudnodeMSG.getInstance().config().usage(label, args[0] + " <message>"));
3737
final @NotNull String message = String.join(" ", Arrays.copyOfRange(args, 1, args.length));
3838
final @NotNull OfflinePlayer recipient = CloudnodeMSG.getInstance().getServer().getOfflinePlayer(args[0]);
39-
if (!recipient.hasPlayedBefore()) return sendMessage(sender, CloudnodeMSG.getInstance().config().playerNotFound(recipient));
39+
if (!recipient.hasPlayedBefore()) return sendMessage(sender, CloudnodeMSG.getInstance().config().playerNotFound(Message.name(recipient)));
4040
final @NotNull Mail mail = new Mail(Message.offlinePlayer(sender), recipient, message);
4141
mail.insert();
4242
// TODO: notify recipient (if online)

‎src/main/java/pro/cloudnode/smp/cloudnodemsg/command/MessageCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public boolean run(final @NotNull CommandSender sender, final @NotNull String la
4747
if (recipient.isEmpty() || (CloudnodeMSG.isVanished(recipient.get()) && !player.hasPermission(Permission.SEND_VANISHED))) return new PlayerNotFoundError(args[0]).send(player);
4848
if (!Message.isIncomingEnabled(recipient.get())) return new PlayerHasIncomingDisabledError(recipient.get()).send(player);
4949
Message.createChannel(player, recipient.get());
50-
return sendMessage(player, CloudnodeMSG.getInstance().config().channelCreated(player.getName(), recipient.get().getName(), label));
50+
return sendMessage(player, CloudnodeMSG.getInstance().config().channelCreated(player, recipient.get(), label));
5151
}
5252

5353
try {

‎src/main/java/pro/cloudnode/smp/cloudnodemsg/command/TeamMessageCommand.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ public boolean run(final @NotNull CommandSender sender, final @NotNull String la
2828
if (Message.hasTeamChannel(player)) {
2929
Message.exitTeamChannel(player);
3030
return sendMessage(player, CloudnodeMSG.getInstance().config()
31-
.channelTeamClosed(player.getName(), team.get()));
31+
.channelTeamClosed(player, team.get()));
3232
}
3333
else {
3434
Message.createTeamChannel(player);
3535
return sendMessage(player, CloudnodeMSG.getInstance().config()
36-
.channelTeamCreated(player.getName(), team.get()));
36+
.channelTeamCreated(player, team.get()));
3737
}
3838
}
3939
return sendTeamMessage(player, team.get(), Component.text(String.join(" ", args)));
4040
}
4141

4242
@Override
43-
public @Nullable List<@NotNull String> onTabComplete(final @NotNull CommandSender sender, final org.bukkit.command.@NotNull Command command, final @NotNull String label, final @NotNull String @NotNull [] args) {
43+
public @Nullable List<@NotNull String> tab(final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {
4444
return new ArrayList<>();
4545
}
4646

@@ -52,12 +52,12 @@ public static boolean sendTeamMessage(final @NotNull Player sender, final @NotNu
5252
if (Message.isIgnored(player, sender)) continue;
5353
if (Optional.ofNullable(player.getScoreboard().getPlayerTeam(player)).map(t -> t.equals(team))
5454
.orElse(false))
55-
sendMessage(player, CloudnodeMSG.getInstance().config().team(sender.getName(), team, message));
55+
sendMessage(player, CloudnodeMSG.getInstance().config().team(sender, team, message));
5656
else if (player.hasPermission(Permission.SPY))
57-
sendMessage(player, CloudnodeMSG.getInstance().config().teamSpy(sender.getName(), team, message));
57+
sendMessage(player, CloudnodeMSG.getInstance().config().teamSpy(sender, team, message));
5858
}
5959
sender.getServer().getConsoleSender()
60-
.sendMessage(CloudnodeMSG.getInstance().config().teamSpy(sender.getName(), team, message));
60+
.sendMessage(CloudnodeMSG.getInstance().config().teamSpy(sender, team, message));
6161

6262
return true;
6363
}

‎src/main/java/pro/cloudnode/smp/cloudnodemsg/error/ChannelOfflineError.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package pro.cloudnode.smp.cloudnodemsg.error;
22

3+
import org.bukkit.OfflinePlayer;
34
import org.jetbrains.annotations.NotNull;
45
import pro.cloudnode.smp.cloudnodemsg.CloudnodeMSG;
56

@@ -13,7 +14,7 @@ public final class ChannelOfflineError extends Error {
1314
* @param sender The username of the message sender
1415
* @param recipient The username of the message recipient
1516
*/
16-
public ChannelOfflineError(final @NotNull String sender, final @NotNull String recipient) {
17+
public ChannelOfflineError(final @NotNull OfflinePlayer sender, final @NotNull OfflinePlayer recipient) {
1718
super(CloudnodeMSG.getInstance().config().channelOffline(sender, recipient));
1819
}
1920
}

‎src/main/java/pro/cloudnode/smp/cloudnodemsg/error/PlayerNotFoundError.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package pro.cloudnode.smp.cloudnodemsg.error;
22

3-
import org.bukkit.OfflinePlayer;
43
import org.jetbrains.annotations.NotNull;
54
import pro.cloudnode.smp.cloudnodemsg.CloudnodeMSG;
65

@@ -13,7 +12,7 @@ public final class PlayerNotFoundError extends Error {
1312
*
1413
* @param player the player's username
1514
*/
16-
public PlayerNotFoundError(final @NotNull OfflinePlayer player) {
15+
public PlayerNotFoundError(final @NotNull String player) {
1716
super(CloudnodeMSG.getInstance().config().playerNotFound(player));
1817
}
1918
}

0 commit comments

Comments
 (0)