diff --git a/src/main/java/net/minestom/server/item/ItemMeta.java b/src/main/java/net/minestom/server/item/ItemMeta.java index e562da595..dc116fc93 100644 --- a/src/main/java/net/minestom/server/item/ItemMeta.java +++ b/src/main/java/net/minestom/server/item/ItemMeta.java @@ -95,9 +95,14 @@ public class ItemMeta { return customModelData; } - @Contract("_, null -> null; _, !null -> !null") public T getOrDefault(@NotNull ItemTag tag, @Nullable T defaultValue) { - return tag.read(toNBT()); + var nbt = toNBT(); + var key = tag.getKey(); + if (nbt.containsKey(key)) { + return tag.read(toNBT()); + } else { + return defaultValue; + } } public @Nullable T get(@NotNull ItemTag tag) {