From c99d6556db70950bfbf81d16ef5914579796ed65 Mon Sep 17 00:00:00 2001 From: Luck Date: Wed, 18 Jan 2017 21:37:41 +0000 Subject: [PATCH] Fix issues with default assignment loading on Sponge --- .../java/me/lucko/luckperms/common/defaults/LogicParser.java | 3 +++ .../src/main/java/me/lucko/luckperms/sponge/SpongeConfig.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/defaults/LogicParser.java b/common/src/main/java/me/lucko/luckperms/common/defaults/LogicParser.java index 0ffa19bf5..737683894 100644 --- a/common/src/main/java/me/lucko/luckperms/common/defaults/LogicParser.java +++ b/common/src/main/java/me/lucko/luckperms/common/defaults/LogicParser.java @@ -38,6 +38,9 @@ public class LogicParser { public static boolean parse(String s, PermissionHolder holder, Tristate tristate) throws IllegalArgumentException { try { String expression = generateExpression(s, s1 -> holder.hasPermission(NodeFactory.fromSerialisedNode(s1, true)) == tristate); + if (SCRIPT_ENGINE == null) { + throw new NullPointerException("script engine"); + } String result = SCRIPT_ENGINE.eval(expression).toString(); if (!result.equals("true") && !result.equals("false")) { diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfig.java b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfig.java index 3ec1823bd..bda74a98c 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfig.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/SpongeConfig.java @@ -118,7 +118,7 @@ class SpongeConfig extends AbstractConfiguration { return def; } - return node.getChildrenList().stream().map(n -> (String) n.getKey()).collect(Collectors.toList()); + return node.getChildrenMap().keySet().stream().map(Object::toString).collect(Collectors.toList()); } @SuppressWarnings("unchecked")