PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix potential NPE in BrigadierCommand.wrapSuggestions()

Browse Source
This commit is contained in:
Marc Baloup 2023-12-10 16:28:24 +01:00
parent b85c5acb21
commit b82b59d57b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandalib-commands/src/main/java/fr/pandacube/lib/commands/BrigadierCommand.java
View File

@ -13,6 +13,7 @@ import com.mojang.brigadier.tree.LiteralCommandNode;
import fr.pandacube.lib.util.log.Log; import fr.pandacube.lib.util.log.Log;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Predicate; import java.util.function.Predicate;
@ -235,9 +236,12 @@ public abstract class BrigadierCommand<S> {
args = Arrays.copyOf(args, args.length + 1); args = Arrays.copyOf(args, args.length + 1);
args[args.length - 1] = message.substring(tokenStartPos); args[args.length - 1] = message.substring(tokenStartPos);
for (String s : suggestions.getSuggestions(sender, args.length - 1, args[args.length - 1], args)) { List<String> wrappedResult = suggestions.getSuggestions(sender, args.length - 1, args[args.length - 1], args);
if (s != null) if (wrappedResult != null) {
builder.suggest(s); for (String s : wrappedResult) {
if (s != null)
builder.suggest(s);
}
} }
} catch (Throwable e) { } catch (Throwable e) {
Log.severe("Error while tab-completing '" + message + "' for " + sender, e); Log.severe("Error while tab-completing '" + message + "' for " + sender, e);