From bcfaf71c7ca8928c01abb8528bdb39e4a618d050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A9meth=20Noel?= Date: Sun, 28 Feb 2021 21:01:23 +0100 Subject: [PATCH] Added checks for canPlaceOn and canDestroy sets in #isSimilar, changed emptiness check to Collection#isEmpty from != 0 in #hasNbtTag --- src/main/java/net/minestom/server/item/ItemStack.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minestom/server/item/ItemStack.java b/src/main/java/net/minestom/server/item/ItemStack.java index 62e3f6abb..67d7f6667 100644 --- a/src/main/java/net/minestom/server/item/ItemStack.java +++ b/src/main/java/net/minestom/server/item/ItemStack.java @@ -191,7 +191,9 @@ public class ItemStack implements DataContainer, PublicCloneable { itemStack.attributes.equals(attributes) && itemStack.hideFlag == hideFlag && sameMeta && - dataCheck; + dataCheck && + itemStack.canPlaceOn.equals(canPlaceOn) && + itemStack.canDestroy.equals(canDestroy); } } @@ -632,8 +634,8 @@ public class ItemStack implements DataContainer, PublicCloneable { customModelData != 0 || (itemMeta != null && itemMeta.hasNbt()) || (data != null && !data.isEmpty()) || - canDestroy.size() != 0 || - canPlaceOn.size() != 0; + !canDestroy.isEmpty() || + !canPlaceOn.isEmpty(); } /**