mirror/Essentials
2
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-18 11:45:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

use playerNeverOnServer msg correctly

Browse Source
This commit is contained in:
uf0h 2020-07-11 06:50:38 +01:00
parent 8046b8594a
commit 309e1c470d
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Essentials/src/com/earth2me/essentials/commands/Commandmail.java
View File

@ -56,8 +56,10 @@ public class Commandmail extends EssentialsCommand {
throw new Exception(user.hasMuteReason() ? tl("voiceSilencedReasonTime", dateDiff, user.getMuteReason()) : tl("voiceSilencedTime", dateDiff));
}
User u = getPlayer(server, args[1], true, true);
if (u == null) {
User u;
try {
u = getPlayer(server, args[1], true, true);
} catch (PlayerNotFoundException e) {
throw new Exception(tl("playerNeverOnServer", args[1]));
}
@ -111,8 +113,10 @@ public class Commandmail extends EssentialsCommand {
} else if (args.length >= 1 && "clear".equalsIgnoreCase(args[0])) {
throw new Exception(tl("onlyPlayers", commandLabel + " clear"));
} else if (args.length >= 3 && "send".equalsIgnoreCase(args[0])) {
User u = getPlayer(server, args[1], true, true);
if (u == null) {
User u;
try {
u = getPlayer(server, args[1], true, true);
} catch (PlayerNotFoundException e) {
throw new Exception(tl("playerNeverOnServer", args[1]));
}
u.addMail(tl("mailFormat", "Server", FormatUtil.replaceFormat(getFinalArg(args, 2))));
@ -124,8 +128,10 @@ public class Commandmail extends EssentialsCommand {
return;
} else if (args.length >= 2) {
//allow sending from console without "send" argument, since it's the only thing the console can do
User u = getPlayer(server, args[0], true, true);
if (u == null) {
User u;
try {
u = getPlayer(server, args[0], true, true);
} catch (PlayerNotFoundException e) {
throw new Exception(tl("playerNeverOnServer", args[0]));
}
u.addMail(tl("mailFormat", "Server", FormatUtil.replaceFormat(getFinalArg(args, 1))));

9
Essentials/src/com/earth2me/essentials/commands/Commandseen.java
View File

@ -69,7 +69,11 @@ public class Commandseen extends EssentialsCommand {
if (userFromBukkit != null) {
showUserSeen(userFromBukkit);
} else {
showUserSeen(getPlayer(server, sender, args, 0));
try {
showUserSeen(getPlayer(server, sender, args, 0));
} catch (PlayerNotFoundException e) {
throw new Exception(tl("playerNeverOnServer", args[0]));
}
}
} catch (Exception e) {
ess.showError(sender, e, commandLabel);
@ -77,9 +81,6 @@ public class Commandseen extends EssentialsCommand {
}
private void showUserSeen(User user) throws Exception {
if (user == null) {
throw new PlayerNotFoundException();
}
showSeenMessage(server, sender, user, showBan, showIp, showLocation);
}
});