From 4e39a723265fb3f1ee5ed162306d7819adab76f9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Aug 2017 18:17:19 -0400 Subject: [PATCH] use proper issuer based player search for bungee --- .../main/java/co/aikar/commands/BungeeCommandContexts.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bungee/src/main/java/co/aikar/commands/BungeeCommandContexts.java b/bungee/src/main/java/co/aikar/commands/BungeeCommandContexts.java index e230ceeb..bacddfea 100644 --- a/bungee/src/main/java/co/aikar/commands/BungeeCommandContexts.java +++ b/bungee/src/main/java/co/aikar/commands/BungeeCommandContexts.java @@ -39,7 +39,7 @@ public class BungeeCommandContexts extends CommandContexts { final String playercheck = c.popFirstArg(); - ProxiedPlayer proxiedPlayer = ACFBungeeUtil.findPlayerSmart(c.getSender(), playercheck); + ProxiedPlayer proxiedPlayer = ACFBungeeUtil.findPlayerSmart(c.getIssuer(), playercheck); if (proxiedPlayer == null) { if (c.hasAnnotation(Optional.class)) { return null; @@ -50,8 +50,8 @@ public class BungeeCommandContexts extends CommandContexts { + registerIssuerAwareContext(CommandSender.class, BungeeCommandExecutionContext::getSender); + registerIssuerAwareContext(ProxiedPlayer.class, (c) -> { ProxiedPlayer proxiedPlayer = c.getSender() instanceof ProxiedPlayer ? (ProxiedPlayer) c.getSender() : null; if (proxiedPlayer == null && !c.hasAnnotation(Optional.class)) { throw new InvalidCommandArgument(MessageKeys.NOT_ALLOWED_ON_CONSOLE, false);