Skip to content

Fix: custom model data blacklist automatically blocks items without model data #606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WyndevCodes wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix: custom model data blacklist automatically blocks items without model data #606

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ...em-Spigot/src/main/java/de/codingair/tradesystem/spigot/extras/blacklist/BlockedItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down