From 2cf7725b586f92faeff9fcbe18c970d8b31a7c3e Mon Sep 17 00:00:00 2001 From: Risto Lahtela <24460436+Rsl1122@users.noreply.github.com> Date: Mon, 21 Sep 2020 15:20:55 +0300 Subject: [PATCH] Fixed NPE on bungee tab completion sometimes --- .../main/java/com/djrapitops/plan/commands/use/Arguments.java | 2 +- .../main/java/com/djrapitops/plan/commands/use/Subcommand.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/commands/use/Arguments.java b/Plan/common/src/main/java/com/djrapitops/plan/commands/use/Arguments.java index 6e579a1e0..5b6665f3d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/commands/use/Arguments.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/commands/use/Arguments.java @@ -82,7 +82,7 @@ public class Arguments { } public boolean isEmpty() { - return args.isEmpty(); + return args.isEmpty() || args.get(0).isEmpty(); } @Override diff --git a/Plan/common/src/main/java/com/djrapitops/plan/commands/use/Subcommand.java b/Plan/common/src/main/java/com/djrapitops/plan/commands/use/Subcommand.java index d01d10203..2b411dd8b 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/commands/use/Subcommand.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/commands/use/Subcommand.java @@ -71,7 +71,7 @@ public class Subcommand { } public BiFunction> getArgumentResolver() { - return argumentResolver; + return argumentResolver != null ? argumentResolver : ((sender, arguments) -> Collections.emptyList()); } public String getArgumentsAsString() {