Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-11-15 06:45:11 +01:00
Code Issues Projects Releases Wiki Activity

Fix merging of items that aren't actually equal. (Like skulls with textures)

Browse Source
This commit is contained in:
Phoenix616 2017-02-19 17:22:07 +01:00
parent 765548e0e5
commit 11d2280d3e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java
View File

@ -48,7 +48,10 @@ public class MaterialUtil {
* @return Are they equal? * @return Are they equal?
*/ */
public static boolean equals(ItemStack one, ItemStack two) { public static boolean equals(ItemStack one, ItemStack two) {
return one.isSimilar(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)
} }
/** /**