From a4770bbaa1748a83187860fd590060f2389d912c Mon Sep 17 00:00:00 2001
From: XiaoMoMi <littlemomi@qq.com>
Date: Mon, 15 Dec 2025 17:25:49 +0800
Subject: [PATCH] Update ContextHolder.java

---
 .../craftengine/core/plugin/context/ContextHolder.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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> T getOrNull(ContextKey<T> parameter) {
-        return (T) Optional.ofNullable(this.params.get(parameter)).map(Supplier::get).orElse(null);
+        Supplier<Object> supplier = this.params.get(parameter);
+        if (supplier == null) {
+            return null;
+        }
+        return (T) supplier.get();
     }
 
     @SuppressWarnings("unchecked")