From 33c005603377557d6a160a84ac1bd988502f5fbd Mon Sep 17 00:00:00 2001
From: crashdemons <crashenator@gmail.com>
Date: Fri, 12 Feb 2021 13:21:30 -0600
Subject: [PATCH] bugfix: use inbuilt craftbukkit setProfile method if it is
 available this helps prevent serializations exceptions for items.

---
 .../dependency-reduced-pom.xml                |  2 +-
 .../PlayerHeads-compatibility-lib/pom.xml     | 12 ++++-----
 .../pom.xml                                   |  4 +--
 .../pom.xml                                   |  4 +--
 .../PlayerHeads-craftbukkit-support/pom.xml   |  2 +-
 .../craftbukkit/ProfileUtils.java             | 26 ++++++++++++++++---
 .../pom.xml                                   |  4 +--
 .../PlayerHeads-paperapi-support/pom.xml      |  2 +-
 .../compatibility/paperapi/ProfileUtils.java  | 22 ++++++++++++++++
 PlayerHeads-compatibility/pom.xml             |  2 +-
 .../dependency-reduced-pom.xml                | 10 ++++++-
 PlayerHeads-crossversion-plugin/pom.xml       |  4 +--
 12 files changed, 72 insertions(+), 22 deletions(-)

diff --git a/PlayerHeads-compatibility/PlayerHeads-compatibility-lib/dependency-reduced-pom.xml b/PlayerHeads-compatibility/PlayerHeads-compatibility-lib/dependency-reduced-pom.xml
index 57cfaffc..abd1d4e0 100644
--- a/PlayerHeads-compatibility/PlayerHeads-compatibility-lib/dependency-reduced-pom.xml
+++ b/PlayerHeads-compatibility/PlayerHeads-compatibility-lib/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>PlayerHeads-compatibility</artifactId>
     <groupId>org.shininet.bukkit</groupId>
-    <version>5.2.14-SNAPSHOT</version>
+    <version>5.2.15-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>PlayerHeads-compatibility-lib</artifactId>
diff --git a/PlayerHeads-compatibility/PlayerHeads-compatibility-lib/pom.xml b/PlayerHeads-compatibility/PlayerHeads-compatibility-lib/pom.xml
index 0ce19a65..6e6bca55 100644
--- a/PlayerHeads-compatibility/PlayerHeads-compatibility-lib/pom.xml
+++ b/PlayerHeads-compatibility/PlayerHeads-compatibility-lib/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.shininet.bukkit</groupId>
         <artifactId>PlayerHeads-compatibility</artifactId>
-        <version>5.2.14-SNAPSHOT</version>
+        <version>5.2.15-SNAPSHOT</version>
     </parent>
     <artifactId>PlayerHeads-compatibility-lib</artifactId>
     <packaging>jar</packaging>
@@ -31,7 +31,7 @@
             <!-- This shouldn't be a dep which is packaging: pom -->
             <groupId>${project.groupId}</groupId>
             <artifactId>PlayerHeads-craftbukkit-support</artifactId>
-            <version>5.2.14-SNAPSHOT</version>
+            <version>5.2.15-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>
@@ -67,7 +67,7 @@
             <!-- This shouldn't be a dep which is packaging: pom -->
             <groupId>${project.groupId}</groupId>
             <artifactId>PlayerHeads-craftbukkit-1.8-support</artifactId>
-            <version>5.2.14-SNAPSHOT</version>
+            <version>5.2.15-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>
@@ -79,14 +79,14 @@
             <!-- This shouldn't be a dep which is packaging: pom -->
             <groupId>${project.groupId}</groupId>
             <artifactId>PlayerHeads-craftbukkit-1.13-support</artifactId>
-            <version>5.2.14-SNAPSHOT</version>
+            <version>5.2.15-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <!-- This shouldn't be a dep which is packaging: pom -->
             <groupId>${project.groupId}</groupId>
             <artifactId>PlayerHeads-paperapi-support</artifactId>
-            <version>5.2.14-SNAPSHOT</version>
+            <version>5.2.15-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>
@@ -107,7 +107,7 @@
             <!-- This shouldn't be a dep which is packaging: pom -->
             <groupId>${project.groupId}</groupId>
             <artifactId>PlayerHeads-glowstone-1.12-support</artifactId>
-            <version>5.2.14-SNAPSHOT</version>
+            <version>5.2.15-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>
diff --git a/PlayerHeads-compatibility/PlayerHeads-craftbukkit-1.13-support/pom.xml b/PlayerHeads-compatibility/PlayerHeads-craftbukkit-1.13-support/pom.xml
index 69411454..a39e9aae 100644
--- a/PlayerHeads-compatibility/PlayerHeads-craftbukkit-1.13-support/pom.xml
+++ b/PlayerHeads-compatibility/PlayerHeads-craftbukkit-1.13-support/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>PlayerHeads-compatibility</artifactId>
         <groupId>org.shininet.bukkit</groupId>
-        <version>5.2.14-SNAPSHOT</version>
+        <version>5.2.15-SNAPSHOT</version>
     </parent>
 
     <organization>
@@ -62,7 +62,7 @@
             <!-- This shouldn't be a dep which is packaging: pom -->
             <groupId>${project.groupId}</groupId>
             <artifactId>PlayerHeads-craftbukkit-support</artifactId>
-            <version>5.2.14-SNAPSHOT</version>
+            <version>5.2.15-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>
diff --git a/PlayerHeads-compatibility/PlayerHeads-craftbukkit-1.8-support/pom.xml b/PlayerHeads-compatibility/PlayerHeads-craftbukkit-1.8-support/pom.xml
index d9282cb0..89c0736c 100644
--- a/PlayerHeads-compatibility/PlayerHeads-craftbukkit-1.8-support/pom.xml
+++ b/PlayerHeads-compatibility/PlayerHeads-craftbukkit-1.8-support/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>PlayerHeads-compatibility</artifactId>
         <groupId>org.shininet.bukkit</groupId>
-        <version>5.2.14-SNAPSHOT</version>
+        <version>5.2.15-SNAPSHOT</version>
     </parent>
   
     <organization>
@@ -46,7 +46,7 @@
             <!-- This shouldn't be a dep which is packaging: pom -->
             <groupId>${project.groupId}</groupId>
             <artifactId>PlayerHeads-craftbukkit-support</artifactId>
-            <version>5.2.14-SNAPSHOT</version>
+            <version>5.2.15-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>
diff --git a/PlayerHeads-compatibility/PlayerHeads-craftbukkit-support/pom.xml b/PlayerHeads-compatibility/PlayerHeads-craftbukkit-support/pom.xml
index a31a8ed1..0508feeb 100644
--- a/PlayerHeads-compatibility/PlayerHeads-craftbukkit-support/pom.xml
+++ b/PlayerHeads-compatibility/PlayerHeads-craftbukkit-support/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>PlayerHeads-compatibility</artifactId>
         <groupId>org.shininet.bukkit</groupId>
-        <version>5.2.14-SNAPSHOT</version>
+        <version>5.2.15-SNAPSHOT</version>
     </parent>
     
 
diff --git a/PlayerHeads-compatibility/PlayerHeads-craftbukkit-support/src/main/java/com/github/crashdemons/playerheads/compatibility/craftbukkit/ProfileUtils.java b/PlayerHeads-compatibility/PlayerHeads-craftbukkit-support/src/main/java/com/github/crashdemons/playerheads/compatibility/craftbukkit/ProfileUtils.java
index 717cedc2..ebbf6e5d 100644
--- a/PlayerHeads-compatibility/PlayerHeads-craftbukkit-support/src/main/java/com/github/crashdemons/playerheads/compatibility/craftbukkit/ProfileUtils.java
+++ b/PlayerHeads-compatibility/PlayerHeads-craftbukkit-support/src/main/java/com/github/crashdemons/playerheads/compatibility/craftbukkit/ProfileUtils.java
@@ -8,11 +8,10 @@
 import com.github.crashdemons.playerheads.compatibility.CompatibleProfile;
 import com.mojang.authlib.GameProfile;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.UUID;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.block.Skull;
-import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
 
 /**
@@ -32,6 +31,12 @@ private static Field getProfileField(Object skull) throws IllegalArgumentExcepti
         profileField.setAccessible(true);
         return profileField;
     }
+    private static Method getCBProfileMethod(Object skull) throws IllegalArgumentException,NoSuchMethodException,SecurityException,IllegalAccessException{
+        if(!(skull instanceof SkullMeta || skull instanceof Skull)) throw new IllegalArgumentException("Object is not a supported type: SkullMeta or Skull (blockstate)");
+        Method profileMethod = skull.getClass().getDeclaredMethod("setProfile", GameProfile.class);
+        profileMethod.setAccessible(true);
+        return profileMethod;
+    }
     
     //-------------------------------------------------------------------------
     
@@ -47,8 +52,23 @@ public static CompatibleProfile getProfile(Object skull) throws IllegalStateExce
         if(profile==null) return new CompatibleProfileCB();
         return new CompatibleProfileCB(profile);
     }
+    
+    
+    private static boolean setInternalProfileCB(Object skull, GameProfile profile) throws IllegalStateException{
+        try {
+            getCBProfileMethod(skull).invoke(skull, profile);
+            return true;
+        } catch (NoSuchMethodException | InvocationTargetException | SecurityException | IllegalAccessException error) {
+            return false;
+        }
+    }
+    
     public static boolean setInternalProfile(Object skull, GameProfile profile) throws IllegalStateException{
         try {
+            /* in some version of Spigot after 1.8, a method was added to set the profile, which also sets serialization data
+            we shouuld prefer using the craftbukkit method over directly accessing the profile field in order to serialize correctly.
+            */
+            if(setInternalProfileCB(skull,profile)) return true; 
             getProfileField(skull).set(skull, profile);
             return true;
         } catch (IllegalArgumentException | NoSuchFieldException | SecurityException | IllegalAccessException error) {
diff --git a/PlayerHeads-compatibility/PlayerHeads-glowstone-1.12-support/pom.xml b/PlayerHeads-compatibility/PlayerHeads-glowstone-1.12-support/pom.xml
index db1a4317..85f213b4 100644
--- a/PlayerHeads-compatibility/PlayerHeads-glowstone-1.12-support/pom.xml
+++ b/PlayerHeads-compatibility/PlayerHeads-glowstone-1.12-support/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>PlayerHeads-compatibility</artifactId>
         <groupId>org.shininet.bukkit</groupId>
-        <version>5.2.14-SNAPSHOT</version>
+        <version>5.2.15-SNAPSHOT</version>
     </parent>
 
     <organization>
@@ -83,7 +83,7 @@
             <!-- This shouldn't be a dep which is packaging: pom -->
             <groupId>${project.groupId}</groupId>
             <artifactId>PlayerHeads-paperapi-support</artifactId>
-            <version>5.2.14-SNAPSHOT</version>
+            <version>5.2.15-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
diff --git a/PlayerHeads-compatibility/PlayerHeads-paperapi-support/pom.xml b/PlayerHeads-compatibility/PlayerHeads-paperapi-support/pom.xml
index e60fd25f..041e93f8 100644
--- a/PlayerHeads-compatibility/PlayerHeads-paperapi-support/pom.xml
+++ b/PlayerHeads-compatibility/PlayerHeads-paperapi-support/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>PlayerHeads-compatibility</artifactId>
         <groupId>org.shininet.bukkit</groupId>
-        <version>5.2.14-SNAPSHOT</version>
+        <version>5.2.15-SNAPSHOT</version>
     </parent>
     
 
diff --git a/PlayerHeads-compatibility/PlayerHeads-paperapi-support/src/main/java/com/github/crashdemons/playerheads/compatibility/paperapi/ProfileUtils.java b/PlayerHeads-compatibility/PlayerHeads-paperapi-support/src/main/java/com/github/crashdemons/playerheads/compatibility/paperapi/ProfileUtils.java
index 6f1f9672..f7b6a992 100644
--- a/PlayerHeads-compatibility/PlayerHeads-paperapi-support/src/main/java/com/github/crashdemons/playerheads/compatibility/paperapi/ProfileUtils.java
+++ b/PlayerHeads-compatibility/PlayerHeads-paperapi-support/src/main/java/com/github/crashdemons/playerheads/compatibility/paperapi/ProfileUtils.java
@@ -8,6 +8,8 @@
 import com.destroystokyo.paper.profile.PlayerProfile;
 import com.github.crashdemons.playerheads.compatibility.CompatibleProfile;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.UUID;
 import org.bukkit.block.Skull;
 import org.bukkit.inventory.meta.SkullMeta;
@@ -29,6 +31,12 @@ private static Field getProfileField(Object skull) throws IllegalArgumentExcepti
         profileField.setAccessible(true);
         return profileField;
     }
+    private static Method getPAProfileMethod(Object skull) throws IllegalArgumentException,NoSuchMethodException,SecurityException,IllegalAccessException{
+        if(!(skull instanceof SkullMeta || skull instanceof Skull)) throw new IllegalArgumentException("Object is not a supported type: SkullMeta or Skull (blockstate)");
+        Method profileMethod = skull.getClass().getDeclaredMethod("setProfile", PlayerProfile.class);
+        profileMethod.setAccessible(true);
+        return profileMethod;
+    }
     
     //-------------------------------------------------------------------------
     
@@ -44,8 +52,22 @@ public static CompatibleProfile getProfile(Object skull) throws IllegalStateExce
         if(profile==null) return new CompatibleProfilePA();
         return new CompatibleProfilePA(profile);
     }
+    
+    private static boolean setInternalProfilePA(Object skull, PlayerProfile profile) throws IllegalStateException{
+        try {
+            getPAProfileMethod(skull).invoke(skull, profile);
+            return true;
+        } catch (NoSuchMethodException | InvocationTargetException | SecurityException | IllegalAccessException error) {
+            return false;
+        }
+    }
+    
     public static boolean setInternalProfile(Object skull, PlayerProfile profile) throws IllegalStateException{
         try {
+            /* in some version of Spigot after 1.8, a method was added to set the profile, which also sets serialization data
+            we shouuld prefer using the craftbukkit method over directly accessing the profile field in order to serialize correctly.
+            */
+            if(setInternalProfilePA(skull,profile)) return true; 
             getProfileField(skull).set(skull, profile);
             return true;
         } catch (IllegalArgumentException | NoSuchFieldException | SecurityException | IllegalAccessException error) {
diff --git a/PlayerHeads-compatibility/pom.xml b/PlayerHeads-compatibility/pom.xml
index a6cdde58..556b1837 100644
--- a/PlayerHeads-compatibility/pom.xml
+++ b/PlayerHeads-compatibility/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.shininet.bukkit</groupId>
         <artifactId>PlayerHeads</artifactId>
-        <version>5.2.14-SNAPSHOT</version>
+        <version>5.2.15-SNAPSHOT</version>
     </parent>
     <artifactId>PlayerHeads-compatibility</artifactId>
     <packaging>pom</packaging>
diff --git a/PlayerHeads-crossversion-plugin/dependency-reduced-pom.xml b/PlayerHeads-crossversion-plugin/dependency-reduced-pom.xml
index 0d41b297..d7d88804 100644
--- a/PlayerHeads-crossversion-plugin/dependency-reduced-pom.xml
+++ b/PlayerHeads-crossversion-plugin/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>PlayerHeads</artifactId>
     <groupId>org.shininet.bukkit</groupId>
-    <version>5.2.14-SNAPSHOT</version>
+    <version>5.2.15-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.shininet.bukkit</groupId>
@@ -190,6 +190,14 @@
           <artifactId>commons-lang</artifactId>
           <groupId>commons-lang</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>guava</artifactId>
+          <groupId>com.google.guava</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>gson</artifactId>
+          <groupId>com.google.code.gson</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>bungeecord-chat</artifactId>
           <groupId>net.md-5</groupId>
diff --git a/PlayerHeads-crossversion-plugin/pom.xml b/PlayerHeads-crossversion-plugin/pom.xml
index 7e39a634..ffdab5a6 100644
--- a/PlayerHeads-crossversion-plugin/pom.xml
+++ b/PlayerHeads-crossversion-plugin/pom.xml
@@ -47,7 +47,7 @@
             <!-- This shouldn't be a dep which is packaging: pom -->
             <groupId>${project.groupId}</groupId>
             <artifactId>PlayerHeads-core</artifactId>
-            <version>5.2.14-SNAPSHOT</version>
+            <version>5.2.15-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>
@@ -59,7 +59,7 @@
             <!-- This shouldn't be a dep which is packaging: pom -->
             <groupId>${project.groupId}</groupId>
             <artifactId>PlayerHeads-compatibility-lib</artifactId>
-            <version>5.2.14-SNAPSHOT</version>
+            <version>5.2.15-SNAPSHOT</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>