funkemunky/commands
1
0
Fork 0
mirror of https://github.com/aikar/commands.git synced 2026-05-31 06:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove extra error feedback on OnlinePlayer's

Browse Source
This commit is contained in:
Aikar
2017-08-02 22:44:11 -04:00
parent bba86047aa
commit 85554c2b6e
3 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bukkit/src/main/java/co/aikar/commands/BukkitCommandContexts.java
-2
View File
@@ -204,14 +204,12 @@ public class BukkitCommandContexts extends CommandContexts<BukkitCommandExecutio
@Nullable
OnlinePlayer getOnlinePlayer(BukkitCommandIssuer issuer, String lookup, boolean allowMissing) throws InvalidCommandArgument {
CommandSender sender = issuer.getIssuer();
Player player = ACFBukkitUtil.findPlayerSmart(issuer, lookup);
//noinspection Duplicates
if (player == null) {
if (allowMissing) {
return null;
}
this.manager.sendMessage(sender, MessageType.ERROR, MessageKeys.COULD_NOT_FIND_PLAYER, "{search}", lookup);
throw new InvalidCommandArgument(false);
}
return new OnlinePlayer(player);
bungee/src/main/java/co/aikar/commands/BungeeCommandContexts.java
+1 -4
View File
@@ -38,14 +38,11 @@ public class BungeeCommandContexts extends CommandContexts<BungeeCommandExecutio
BungeeCommandContexts(CommandManager manager) {
super(manager);
registerContext(OnlineProxiedPlayer.class, (c) -> {
final String playercheck = c.popFirstArg();
ProxiedPlayer proxiedPlayer = ACFBungeeUtil.findPlayerSmart(c.getIssuer(), playercheck);
ProxiedPlayer proxiedPlayer = ACFBungeeUtil.findPlayerSmart(c.getIssuer(), c.popFirstArg());
if (proxiedPlayer == null) {
if (c.hasAnnotation(Optional.class)) {
return null;
}
c.getIssuer().sendMessage(MessageType.ERROR, MessageKeys.COULD_NOT_FIND_PLAYER,
"{search}", playercheck);
throw new InvalidCommandArgument(false);
}
return new OnlineProxiedPlayer(proxiedPlayer);
sponge/src/main/java/co/aikar/commands/SpongeCommandContexts.java
-2
View File
@@ -141,14 +141,12 @@ public class SpongeCommandContexts extends CommandContexts<SpongeCommandExecutio
@Nullable
OnlinePlayer getOnlinePlayer(SpongeCommandIssuer issuer, String lookup, boolean allowMissing) throws InvalidCommandArgument {
CommandSource sender = issuer.getIssuer();
Player player = ACFSpongeUtil.findPlayerSmart(issuer, lookup);
//noinspection Duplicates
if (player == null) {
if (allowMissing) {
return null;
}
this.manager.sendMessage(sender, MessageType.ERROR, MessageKeys.COULD_NOT_FIND_PLAYER, "{search}", lookup);
throw new InvalidCommandArgument(false);
}
return new OnlinePlayer(player);