From c40a72f34b12b45e803131970a17cf17a11095f0 Mon Sep 17 00:00:00 2001
From: Catnies <catnies@foxmail.com>
Date: Fri, 6 Jun 2025 15:36:09 +0800
Subject: [PATCH] =?UTF-8?q?Skript=E8=A1=A8=E8=BE=BE=E5=BC=8F=E4=B8=AD?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=89=BE=E5=88=B0=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?ID=E7=89=A9=E5=93=81=E5=88=99=E8=BF=94=E5=9B=9Enull,=20?=
 =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E6=8A=9B=E5=87=BAnpe.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compatibility/skript/expression/ExprCustomItem.java  | 6 +++---
 .../skript/expression/ExprEntityFurnitureID.java         | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/skript/expression/ExprCustomItem.java b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/skript/expression/ExprCustomItem.java
index 2c3557a47..aacfe01ff 100644
--- a/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/skript/expression/ExprCustomItem.java
+++ b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/skript/expression/ExprCustomItem.java
@@ -7,14 +7,13 @@ import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
 import net.momirealms.craftengine.bukkit.api.CraftEngineItems;
+import net.momirealms.craftengine.core.item.CustomItem;
 import net.momirealms.craftengine.core.item.ItemBuildContext;
 import net.momirealms.craftengine.core.util.Key;
 import org.bukkit.event.Event;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
-
 public class ExprCustomItem extends SimpleExpression<ItemStack> {
 
     public static void register() {
@@ -36,7 +35,8 @@ public class ExprCustomItem extends SimpleExpression<ItemStack> {
         String itemId = this.itemId.getSingle(e);
         if (itemId == null)
             return null;
-        return new ItemStack[] {Objects.requireNonNull(CraftEngineItems.byId(Key.of(itemId))).buildItemStack(ItemBuildContext.EMPTY)};
+        CustomItem<ItemStack> customItem = CraftEngineItems.byId(Key.of(itemId));
+        return customItem == null ? null : new ItemStack[] {customItem.buildItemStack(ItemBuildContext.EMPTY)};
     }
 
     @Override
diff --git a/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/skript/expression/ExprEntityFurnitureID.java b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/skript/expression/ExprEntityFurnitureID.java
index f11a78ac1..bd3d4b988 100644
--- a/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/skript/expression/ExprEntityFurnitureID.java
+++ b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/skript/expression/ExprEntityFurnitureID.java
@@ -5,7 +5,7 @@ import net.momirealms.craftengine.bukkit.api.CraftEngineFurniture;
 import org.bukkit.entity.Entity;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
+import java.util.Optional;
 
 public class ExprEntityFurnitureID extends SimplePropertyExpression<Object, String> {
 
@@ -15,8 +15,11 @@ public class ExprEntityFurnitureID extends SimplePropertyExpression<Object, Stri
 
     @Override
     public @Nullable String convert(Object object) {
-        if (object instanceof Entity entity && CraftEngineFurniture.isFurniture(entity))
-            return Objects.requireNonNull(CraftEngineFurniture.getLoadedFurnitureByBaseEntity(entity)).id().toString();
+        if (object instanceof Entity entity && CraftEngineFurniture.isFurniture(entity)) {
+            return Optional.ofNullable(CraftEngineFurniture.getLoadedFurnitureByBaseEntity(entity))
+                    .map(it -> it.id().toString())
+                    .orElse(null);
+        }
         return null;
     }