From accbba2d32b57a2c819762ad2d0be726c7e76ed1 Mon Sep 17 00:00:00 2001
From: libraryaddict <github@lib.co.nz>
Date: Tue, 28 Jan 2020 17:02:30 +1300
Subject: [PATCH] Fix setName not working correctly in a few cases

---
 .../disguise/disguisetypes/PlayerDisguise.java           | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
index 43c96acb..46accb40 100644
--- a/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
+++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
@@ -269,6 +269,11 @@ public class PlayerDisguise extends TargetedDisguise {
             if (stopDisguise()) {
                 playerName = name;
 
+                if (gameProfile != null) {
+                    gameProfile = ReflectionManager
+                            .getGameProfileWithThisSkin(uuid, getProfileName(), getGameProfile());
+                }
+
                 if (!startDisguise()) {
                     throw new IllegalStateException("Unable to restart disguise");
                 }
@@ -277,6 +282,10 @@ public class PlayerDisguise extends TargetedDisguise {
             }
         } else {
             playerName = name;
+
+            if (gameProfile != null) {
+                gameProfile = ReflectionManager.getGameProfileWithThisSkin(uuid, getProfileName(), getGameProfile());
+            }
         }
 
         // Scare monger for the pirates of a certain site. Don't start messages until 14 days has passed!