diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/ContextHolder.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/ContextHolder.java index 9fcb4bf8d..cb7124019 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/ContextHolder.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/ContextHolder.java @@ -65,7 +65,11 @@ public class ContextHolder { @SuppressWarnings("unchecked") public T getOrNull(ContextKey parameter) { - return (T) Optional.ofNullable(this.params.get(parameter)).map(Supplier::get).orElse(null); + Supplier supplier = this.params.get(parameter); + if (supplier == null) { + return null; + } + return (T) supplier.get(); } @SuppressWarnings("unchecked")