From ad81d7aa1f350b866185de021a9cfbf490b3e1be Mon Sep 17 00:00:00 2001 From: DHEnry-FMCRAFT <3926782841@qq.com> Date: Sat, 18 Apr 2026 19:20:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DCoreProtect=E4=B8=8ESl?= =?UTF-8?q?imefun=E7=89=A9=E5=93=81meta=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/entity/EntityDeathListener.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/coreprotect/listener/entity/EntityDeathListener.java b/src/main/java/net/coreprotect/listener/entity/EntityDeathListener.java index f07052f15..9cf2000c8 100644 --- a/src/main/java/net/coreprotect/listener/entity/EntityDeathListener.java +++ b/src/main/java/net/coreprotect/listener/entity/EntityDeathListener.java @@ -387,7 +387,13 @@ else if (entity instanceof AbstractVillager) { List itemMap = new ArrayList<>(); ItemStack item = merchantRecipe.getResult().clone(); List>> metadata = ItemMetaHandler.serialize(item, item.getType(), null, 0); - item.setItemMeta(null); + try { + if (item.hasItemMeta() && item.getItemMeta() != null) { + item.setItemMeta(null); + } + } + catch (Exception ignored) { + } itemMap.add(item.serialize()); itemMap.add(metadata); recipe.add(itemMap); @@ -399,7 +405,13 @@ else if (entity instanceof AbstractVillager) { itemMap = new ArrayList<>(); item = ingredient.clone(); metadata = ItemMetaHandler.serialize(item, item.getType(), null, 0); - item.setItemMeta(null); + try { + if (item.hasItemMeta() && item.getItemMeta() != null) { + item.setItemMeta(null); + } + } + catch (Exception ignored) { + } itemMap.add(item.serialize()); itemMap.add(metadata); ingredients.add(itemMap);