From ddd2fcfc213ced08952dcc0e5ce10e09531fe7bb Mon Sep 17 00:00:00 2001
From: Wyndev <108705186+WyndevCodes@users.noreply.github.com>
Date: Thu, 5 Feb 2026 16:28:15 -0500
Subject: [PATCH] Fix: items without custom model data are automatically
 blacklisted when a custom model data check is present due to an exception

---
 .../spigot/extras/blacklist/BlockedItem.java          | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/TradeSystem-Spigot/src/main/java/de/codingair/tradesystem/spigot/extras/blacklist/BlockedItem.java b/TradeSystem-Spigot/src/main/java/de/codingair/tradesystem/spigot/extras/blacklist/BlockedItem.java
index 0b3bd0a9..428b630b 100644
--- a/TradeSystem-Spigot/src/main/java/de/codingair/tradesystem/spigot/extras/blacklist/BlockedItem.java
+++ b/TradeSystem-Spigot/src/main/java/de/codingair/tradesystem/spigot/extras/blacklist/BlockedItem.java
@@ -167,9 +167,14 @@ private boolean missLore(@NotNull ItemStack item) {
     private boolean missCustomModelData(@NotNull ItemStack item) {
         if (customModelData == null || Version.before(14)) return false;
 
-        if (item.hasItemMeta() && item.getItemMeta() != null) {
-            return customModelData != item.getItemMeta().getCustomModelData();
-        } else return true;
+        if (item.hasItemMeta()) {
+            ItemMeta itemMeta = item.getItemMeta();
+            if (itemMeta != null && itemMeta.hasCustomModelData()) {
+                return customModelData != itemMeta.getCustomModelData();
+            }
+        }
+
+        return true;
     }
 
     @Nullable