From e9bb2f15aaeee1729450a5c2794d4d8f2445dc94 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 5 Dec 2019 10:37:02 +1100
Subject: [PATCH] SPIGOT-5403: isSimilar returns true for different skulls

---
 .../java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
index abc9f6ddbd..961e2cc5b0 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
@@ -191,7 +191,8 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
         if (meta instanceof CraftMetaSkull) {
             CraftMetaSkull that = (CraftMetaSkull) meta;
 
-            return (this.hasOwner() ? that.hasOwner() && this.profile.equals(that.profile) : !that.hasOwner());
+            // SPIGOT-5403: equals does not check properties
+            return (this.profile != null ? that.profile != null && this.profile.equals(that.profile) && this.profile.getProperties().equals(that.profile.getProperties()) : that.profile == null);
         }
         return true;
     }