From bb6d4a70187bb4d3898440f3d61b4813e46bb6e9 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Tue, 27 Nov 2018 17:34:27 -0600 Subject: [PATCH] Actually take into account the default value given to findPlayer --- .../tc/oc/commons/bukkit/commands/UserFinder.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/UserFinder.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/UserFinder.java index 1029076..853d335 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/UserFinder.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/UserFinder.java @@ -140,6 +140,19 @@ public class UserFinder { public ListenableFuture findPlayer(CommandSender sender, @Nullable String name, Scope scope, Default def) { try { + if (name == null || name.isEmpty()) { + switch(def) { + case NULL: + return Futures.immediateFuture(null); + + case SENDER: + return Futures.immediateFuture(localPlayerResponse(sender, senderToPlayer(sender))); + + default: + throw new TranslatableCommandException("command.specifyPlayer"); + } + } + final Player player = getLocalPlayer(sender, name); if(player != null) { return Futures.immediateFuture(localPlayerResponse(sender, player));