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

use proper issuer based player search for bungee

Browse Source
This commit is contained in:
Aikar
2017-08-01 18:17:19 -04:00
parent 6be206ffa7
commit 4e39a72326
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bungee/src/main/java/co/aikar/commands/BungeeCommandContexts.java
+3 -3
View File
@@ -39,7 +39,7 @@ public class BungeeCommandContexts extends CommandContexts<BungeeCommandExecutio
super(manager);
registerContext(OnlineProxiedPlayer.class, (c) -> {
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<BungeeCommandExecutio
}
return new OnlineProxiedPlayer(proxiedPlayer);
});
registerSenderAwareContext(CommandSender.class, BungeeCommandExecutionContext::getSender);
registerSenderAwareContext(ProxiedPlayer.class, (c) -> {
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);