mirror of
https://github.com/ChestShop-authors/ChestShop-3.git
synced 2025-01-10 00:57:34 +01:00
Revert "Fix merging of items that aren't actually equal. (Like skulls with textures)"
This reverts commit 11d2280d3e
.
The method isn't actually the issue and the workaround introduces new
issues.
This commit is contained in:
parent
11d2280d3e
commit
583c50438c
@ -48,10 +48,7 @@ public class MaterialUtil {
|
||||
* @return Are they equal?
|
||||
*/
|
||||
public static boolean equals(ItemStack one, ItemStack two) {
|
||||
return one.isSimilar(two)
|
||||
&& one.toString().equals(two.toString());
|
||||
// The string comparision is necessary as CB has a bug where it counts items with similar ItemMeta
|
||||
// but different NBT data as being equal. (See https://hub.spigotmc.org/jira/browse/SPIGOT-3077)
|
||||
return one.isSimilar(two);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user