Fix null config values throwing exception - closes #147

LuckPerms · Jan 24, 2017 · 599072e · 599072e
1 parent 02ea3af
commit 599072e
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/common/src/main/java/me/lucko/luckperms/common/config/AbstractConfiguration.java b/common/src/main/java/me/lucko/luckperms/common/config/AbstractConfiguration.java
@@ -28,22 +28,23 @@
 
 import me.lucko.luckperms.common.config.keys.EnduringKey;
 
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 @SuppressWarnings("unchecked")
 public abstract class AbstractConfiguration implements LPConfiguration {
-    private final LoadingCache<ConfigKey<?>, Object> cache = CacheBuilder.newBuilder()
-            .build(new CacheLoader<ConfigKey<?>, Object>() {
+    private final LoadingCache<ConfigKey<?>, Optional<Object>> cache = CacheBuilder.newBuilder()
+            .build(new CacheLoader<ConfigKey<?>, Optional<Object>>() {
                 @Override
-                public Object load(ConfigKey<?> key) {
-                    return key.get(AbstractConfiguration.this);
+                public Optional<Object> load(ConfigKey<?> key) {
+                    return Optional.ofNullable(key.get(AbstractConfiguration.this));
                 }
             });
 
     @Override
     public <T> T get(ConfigKey<T> key) {
-        return (T) cache.getUnchecked(key);
+        return (T) cache.getUnchecked(key).orElse(null);
     }
 
     @Override