Re-use existing name/uuid from old profile when applying new skin

Author: onebeastchris

spigot/src/main/java/org/geysermc/floodgate/pluginmessage/SpigotSkinApplier.java

@@ -87,7 +87,7 @@ private void applySkin0(FloodgatePlayer floodgatePlayer, SkinData skinData, bool
         }
 
         if (ClassNames.GAME_PROFILE_FIELD != null) {
-            replaceSkin(player, floodgatePlayer, event.newSkin());
+            replaceSkin(player, profile, event.newSkin());
         } else {
             // We're on a version with mutable GameProfiles
             replaceSkinOld(profile.getProperties(), event.newSkin());
@@ -102,10 +102,9 @@ private void applySkin0(FloodgatePlayer floodgatePlayer, SkinData skinData, bool
         });
     }
 
-    private void replaceSkin(Player player, FloodgatePlayer floodgatePlayer, SkinData skinData) {
+    private void replaceSkin(Player player, GameProfile oldProfile, SkinData skinData) {
         Property skinProperty = new Property("textures", skinData.value(), skinData.signature());
-        GameProfile profile = versionSpecificMethods.createGameProfile(floodgatePlayer.getCorrectUniqueId(),
-                floodgatePlayer.getCorrectUsername(), skinProperty);
+        GameProfile profile = versionSpecificMethods.createGameProfile(oldProfile, skinProperty);
         Object entityHuman = ReflectionUtils.invoke(player, ClassNames.GET_ENTITY_HUMAN_METHOD);
         ReflectionUtils.setValue(entityHuman, ClassNames.GAME_PROFILE_FIELD, profile);
     }

spigot/src/main/java/org/geysermc/floodgate/util/SpigotVersionSpecificMethods.java

@@ -29,6 +29,7 @@
 import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.properties.PropertyMap;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
@@ -51,6 +52,8 @@ public final class SpigotVersionSpecificMethods {
     private static final Constructor<GameProfile> RECORD_GAME_PROFILE_CONSTRUCTOR;
     private static final Constructor<PropertyMap> IMMUTABLE_PROPERTY_MAP_CONSTRUCTOR;
     private static final Method MULTIMAP_FROM_MAP;
+    private static final Field PROFILE_NAME_FIELD;
+    private static final Field PROFILE_UUID_FIELD;
 
     static {
         GET_SPIGOT = ReflectionUtils.getMethod(Player.class, "spigot");
@@ -69,6 +72,8 @@ public final class SpigotVersionSpecificMethods {
                 GameProfile.class, true, UUID.class, String.class, PropertyMap.class);
         IMMUTABLE_PROPERTY_MAP_CONSTRUCTOR = (Constructor<PropertyMap>)
                 PropertyMap.class.getConstructors()[0];
+        PROFILE_NAME_FIELD = ReflectionUtils.getField(GameProfile.class, "name");
+        PROFILE_UUID_FIELD = ReflectionUtils.getField(GameProfile.class, "id");
         // Avoid relocation for this class.
         Class<?> multimaps = ReflectionUtils.getClass(String.join(".", "com",
                 "google", "common", "collect", "Multimaps"));
@@ -81,6 +86,12 @@ public SpigotVersionSpecificMethods(SpigotPlugin plugin) {
         this.plugin = plugin;
     }
 
+    public GameProfile createGameProfile(GameProfile oldProfile, Property textureProperty) {
+        String name = (String) ReflectionUtils.getValue(oldProfile, PROFILE_NAME_FIELD);
+        UUID uuid = (UUID) ReflectionUtils.getValue(oldProfile, PROFILE_UUID_FIELD);
+        return createGameProfile(uuid, name, textureProperty);
+    }
+
     public GameProfile createGameProfile(UUID uuid, String name, Property texturesProperty) {
         if (RECORD_GAME_PROFILE_CONSTRUCTOR != null && IMMUTABLE_PROPERTY_MAP_CONSTRUCTOR != null) {
             if (texturesProperty != null) {