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

add OnlinePlayer[] Bukkit Context

Browse Source
This commit is contained in:
Aikar
2017-06-17 21:14:17 -04:00
parent 15accea47b
commit 5e4d20cf61
1 changed files with 35 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
+35 -8
View File
@@ -32,7 +32,10 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.PlayerInventory;
import org.jetbrains.annotations.Nullable;
import java.util.HashSet;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -44,17 +47,28 @@ public class BukkitCommandContexts extends CommandContexts<BukkitCommandExecutio
public BukkitCommandContexts(BukkitCommandManager manager) {
super(manager);
registerContext(OnlinePlayer.class, (c) -> {
final String playercheck = c.popFirstArg();
Player player = ACFBukkitUtil.findPlayerSmart(c.getSender(), playercheck);
if (player == null) {
if (c.hasAnnotation(Optional.class)) {
return null;
registerContext(OnlinePlayer.class, c -> getOnlinePlayer(c.getSender(), c.popFirstArg(), c.hasAnnotation(Optional.class)));
registerContext(OnlinePlayer[].class, (c) -> {
CommandSender sender = c.getSender();
final String input = c.popFirstArg();
boolean allowMissing = c.hasFlag("allowmissing");
Set<OnlinePlayer> players = new HashSet<>();
Pattern split = ACFPatterns.COMMA;
String splitter = c.getFlagValue("splitter", (String) null);
if (splitter != null) {
split = Pattern.compile(Pattern.quote(splitter));
}
for (String lookup : split.split(input)) {
OnlinePlayer player = getOnlinePlayer(sender, lookup, allowMissing);
if (player != null) {
players.add(player);
}
ACFBukkitUtil.sendMsg(c.getSender(), "&cCould not find a player by the name " + playercheck);
}
if (players.isEmpty() && !c.hasFlag("allowempty")) {
ACFBukkitUtil.sendMsg(sender, "&cCould not find any players by " + input);
throw new InvalidCommandArgument(false);
}
return new OnlinePlayer(player);
return players.toArray(new OnlinePlayer[players.size()]);
});
registerSenderAwareContext(World.class, (c) -> {
String firstArg = c.getFirstArg();
@@ -116,4 +130,17 @@ public class BukkitCommandContexts extends CommandContexts<BukkitCommandExecutio
}
}
}
@Nullable
OnlinePlayer getOnlinePlayer(CommandSender sender, String lookup, boolean allowMissing) throws InvalidCommandArgument {
Player player = ACFBukkitUtil.findPlayerSmart(sender, lookup);
if (player == null) {
if (allowMissing) {
return null;
}
ACFBukkitUtil.sendMsg(sender, "&cCould not find a player by the name " + lookup);
throw new InvalidCommandArgument(false);
}
return new OnlinePlayer(player);
}
}