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:
Phoenix616 2017-02-20 00:39:30 +01:00
parent 11d2280d3e
commit 583c50438c

View File

@ -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);
}
/**